Skip to content

Commit

Permalink
update landing links
Browse files Browse the repository at this point in the history
  • Loading branch information
JMHumphreys committed Apr 19, 2024
1 parent 759b550 commit 7d1850c
Show file tree
Hide file tree
Showing 10 changed files with 83 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .Rproj.user/FFAE6732/pcs/source-pane.pper
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"activeTab": 6
"activeTab": 5
}
7 changes: 6 additions & 1 deletion .Rproj.user/FFAE6732/sources/prop/1487FE94
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,10 @@
"source_window_id": "",
"Source": "Source",
"cursorPosition": "2,0",
"scrollLine": "0"
"scrollLine": "0",
"rmdVisualMode": "true",
"rmdVisualWrapConfigured": "true",
"docOutlineVisible": "1",
"rmdVisualCollapsedChunks": "",
"rmdVisualModeLocation": "2:0"
}
2 changes: 1 addition & 1 deletion .quarto/xref/23844f6f
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"options":{"chapters":true},"entries":[],"headings":[]}
{"headings":[],"entries":[],"options":{"chapters":true}}
2 changes: 1 addition & 1 deletion .quarto/xref/d37314d0
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"entries":[],"options":{"chapters":true},"headings":["geoepi-research-group"]}
{"options":{"chapters":true},"entries":[],"headings":["geoepi-research-group"]}
16 changes: 13 additions & 3 deletions docs/github_elements.html
Original file line number Diff line number Diff line change
Expand Up @@ -132,16 +132,26 @@ <h1 class="quarto-secondary-nav-title"><span class="chapter-number">2</span>&nbs
</li>
<li class="sidebar-item">
<div class="sidebar-item-container">
<a href="./repo_components.html" class="sidebar-item-text sidebar-link"><span class="chapter-number">3</span>&nbsp; <span class="chapter-title">Repository Components</span></a>
<a href="./repo_components.html" class="sidebar-item-text sidebar-link"><span class="chapter-number">3</span>&nbsp; <span class="chapter-title">GH Repo Components</span></a>
</div>
</li>
<li class="sidebar-item">
<div class="sidebar-item-container">
<a href="./references.html" class="sidebar-item-text sidebar-link">References</a>
<a href="./openscifw.html" class="sidebar-item-text sidebar-link"><span class="chapter-number">4</span>&nbsp; <span class="chapter-title">Data Storage (OSF)</span></a>
</div>
</li>
<li class="sidebar-item">
<div class="sidebar-item-container">
<a href="./overleaf.html" class="sidebar-item-text sidebar-link"><span class="chapter-number">5</span>&nbsp; <span class="chapter-title">LaTeX and Overleaf</span></a>
</div>
</li>
</ul>
</li>
<li class="sidebar-item">
<div class="sidebar-item-container">
<a href="./references.html" class="sidebar-item-text sidebar-link">References</a>
</div>
</li>
</ul>
</div>

Expand Down Expand Up @@ -330,7 +340,7 @@ <h1><strong>GitHub Elements</strong></h1>
</div>
<div class="nav-page nav-page-next">
<a href="./repo_components.html" class="pagination-link">
<span class="nav-page-text"><span class="chapter-number">3</span>&nbsp; <span class="chapter-title">Repository Components</span></span> <i class="bi bi-arrow-right-short"></i>
<span class="nav-page-text"><span class="chapter-number">3</span>&nbsp; <span class="chapter-title">GH Repo Components</span></span> <i class="bi bi-arrow-right-short"></i>
</a>
</div>
</nav>
Expand Down
12 changes: 11 additions & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,17 @@ <h1 class="quarto-secondary-nav-title">GeoEpi Notebook</h1>
</li>
<li class="sidebar-item">
<div class="sidebar-item-container">
<a href="./repo_components.html" class="sidebar-item-text sidebar-link"><span class="chapter-number">3</span>&nbsp; <span class="chapter-title">GH Repository Components</span></a>
<a href="./repo_components.html" class="sidebar-item-text sidebar-link"><span class="chapter-number">3</span>&nbsp; <span class="chapter-title">GH Repo Components</span></a>
</div>
</li>
<li class="sidebar-item">
<div class="sidebar-item-container">
<a href="./openscifw.html" class="sidebar-item-text sidebar-link"><span class="chapter-number">4</span>&nbsp; <span class="chapter-title">Data Storage (OSF)</span></a>
</div>
</li>
<li class="sidebar-item">
<div class="sidebar-item-container">
<a href="./overleaf.html" class="sidebar-item-text sidebar-link"><span class="chapter-number">5</span>&nbsp; <span class="chapter-title">LaTeX and Overleaf</span></a>
</div>
</li>
</ul>
Expand Down
20 changes: 15 additions & 5 deletions docs/references.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<script src="site_libs/quarto-search/fuse.min.js"></script>
<script src="site_libs/quarto-search/quarto-search.js"></script>
<meta name="quarto:offset" content="./">
<link href="./repo_components.html" rel="prev">
<link href="./overleaf.html" rel="prev">
<script src="site_libs/quarto-html/quarto.js"></script>
<script src="site_libs/quarto-html/popper.min.js"></script>
<script src="site_libs/quarto-html/tippy.umd.min.js"></script>
Expand Down Expand Up @@ -149,16 +149,26 @@ <h1 class="quarto-secondary-nav-title">References</h1>
</li>
<li class="sidebar-item">
<div class="sidebar-item-container">
<a href="./repo_components.html" class="sidebar-item-text sidebar-link"><span class="chapter-number">3</span>&nbsp; <span class="chapter-title">Repository Components</span></a>
<a href="./repo_components.html" class="sidebar-item-text sidebar-link"><span class="chapter-number">3</span>&nbsp; <span class="chapter-title">GH Repo Components</span></a>
</div>
</li>
<li class="sidebar-item">
<div class="sidebar-item-container">
<a href="./references.html" class="sidebar-item-text sidebar-link active">References</a>
<a href="./openscifw.html" class="sidebar-item-text sidebar-link"><span class="chapter-number">4</span>&nbsp; <span class="chapter-title">Data Storage (OSF)</span></a>
</div>
</li>
<li class="sidebar-item">
<div class="sidebar-item-container">
<a href="./overleaf.html" class="sidebar-item-text sidebar-link"><span class="chapter-number">5</span>&nbsp; <span class="chapter-title">LaTeX and Overleaf</span></a>
</div>
</li>
</ul>
</li>
<li class="sidebar-item">
<div class="sidebar-item-container">
<a href="./references.html" class="sidebar-item-text sidebar-link active">References</a>
</div>
</li>
</ul>
</div>
</nav>
Expand Down Expand Up @@ -328,8 +338,8 @@ <h1 class="title d-none d-lg-block">References</h1>
</script>
<nav class="page-navigation">
<div class="nav-page nav-page-previous">
<a href="./repo_components.html" class="pagination-link">
<i class="bi bi-arrow-left-short"></i> <span class="nav-page-text"><span class="chapter-number">3</span>&nbsp; <span class="chapter-title">Repository Components</span></span>
<a href="./overleaf.html" class="pagination-link">
<i class="bi bi-arrow-left-short"></i> <span class="nav-page-text"><span class="chapter-number">5</span>&nbsp; <span class="chapter-title">LaTeX and Overleaf</span></span>
</a>
</div>
<div class="nav-page nav-page-next">
Expand Down
2 changes: 1 addition & 1 deletion docs/site_libs/bootstrap/bootstrap.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docs/sitemap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</url>
<url>
<loc>https://github.com/geoepi/index.html</loc>
<lastmod>2024-04-19T16:43:09.173Z</lastmod>
<lastmod>2024-04-19T16:57:41.567Z</lastmod>
</url>
<url>
<loc>https://github.com/geoepi/intro.html</loc>
Expand All @@ -34,7 +34,7 @@
</url>
<url>
<loc>https://github.com/geoepi/references.html</loc>
<lastmod>2024-04-19T16:35:55.893Z</lastmod>
<lastmod>2024-04-19T16:58:15.648Z</lastmod>
</url>
<url>
<loc>https://github.com/geoepi/summary.html</loc>
Expand All @@ -50,7 +50,7 @@
</url>
<url>
<loc>https://github.com/geoepi/github_elements.html</loc>
<lastmod>2024-04-19T16:36:12.420Z</lastmod>
<lastmod>2024-04-19T16:58:05.546Z</lastmod>
</url>
<url>
<loc>https://github.com/geoepi/repo_components.html</loc>
Expand Down
64 changes: 31 additions & 33 deletions github_elements.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,34 @@ editor_options:

Essential steps in collaborative code development with GitHub

**Element 1: Introduction to GitHub and its Importance in Scientific Computing**
- Overview of GitHub
- Importance of version control in software development
- Role of GitHub in collaborative research and development
- GitHub's impact on reproducibility and transparency in science

**Element 2: Setting Up and Navigating GitHub**
- Creating a GitHub account
- Overview of the GitHub interface
- Key terminology (repository, branch, commit, pull request, merge, etc.)

**Element 3: Creating and Cloning Repositories**
- Introduction to repositories
- How to create a new repository
- Initializing a repository with README, .gitignore, and license
- Cloning a repository to your local machine

**Element 4: Branches and Commits**
- The concept of branches in version control
- Creating and switching between branches
- Making changes and committing them to a branch

**Element 5: Pull Requests and Code Reviews**
- The purpose of pull requests in collaborative development
- Creating a pull request
- Reviewing pull requests from collaborators
- Best practices for code reviews

**Element 6: Merging Pull Requests and Resolving Conflicts**
- The merge process
- Handling merge conflicts
- Strategies for successful merges

**Element 1: Introduction to GitHub and its Importance in Scientific Computing**\
- Overview of GitHub\
- Importance of version control in software development\
- Role of GitHub in collaborative research and development\
- GitHub's impact on reproducibility and transparency in science

**Element 2: Setting Up and Navigating GitHub**\
- Creating a GitHub account\
- Overview of the GitHub interface\
- Key terminology (repository, branch, commit, pull request, merge, etc.)

**Element 3: Creating and Cloning Repositories**\
- Introduction to repositories\
- How to create a new repository\
- Initializing a repository with README, .gitignore, and license\
- Cloning a repository to your local machine

**Element 4: Branches and Commits**\
- The concept of branches in version control\
- Creating and switching between branches\
- Making changes and committing them to a branch

**Element 5: Pull Requests and Code Reviews**\
- The purpose of pull requests in collaborative development\
- Creating a pull request\
- Reviewing pull requests from collaborators\
- Best practices for code reviews

**Element 6: Merging Pull Requests and Resolving Conflicts**\
- The merge process - Handling merge conflicts\
- Strategies for successful merges

0 comments on commit 7d1850c

Please # to comment.