Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20 exploring a repository on GitHub #21

Closed
wants to merge 23 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
cdd85ac
Setting up initial quarto site config
rmbielby Nov 19, 2024
f1df095
Added welcome note and updated styling
rmbielby Nov 20, 2024
5a43700
Added pre-requisites and making a branch pages
rmbielby Nov 20, 2024
910b73e
Removing rendering files
rmbielby Nov 20, 2024
f7a37ea
Adding */*_files back into .gitignore
rmbielby Nov 20, 2024
7d2bbf7
Updated pre-requisites with text editors and running Git commands
rmbielby Nov 20, 2024
c58c669
Added PyCharm instructions for making a new branch
rmbielby Nov 20, 2024
d58057e
Added VS Code to editor list
rmbielby Nov 20, 2024
93152ac
Added basics-refresher branch as trigger for publishing
rmbielby Nov 20, 2024
da08873
Fixing code grammar in yml
rmbielby Nov 20, 2024
855c05e
Merge branch 'main' into newcontent/basics-refresher
rmbielby Nov 21, 2024
37b7aee
Adding in cloning instructions and standardising filenames
rmbielby Nov 21, 2024
a532462
Updating image filenames in making a branch
rmbielby Nov 21, 2024
d016c83
Adding template files for the first few stages of the git refresher c…
rmbielby Nov 21, 2024
a9dcd9d
Shortening titles in git refresher
rmbielby Nov 21, 2024
707db1d
Shortening titles in git refresher
rmbielby Nov 21, 2024
c44d5ff
Add tabs for alternative software in cloning step
rmbielby Nov 21, 2024
aa82204
Creating new .qmd page for this section, adding to the quarto.yml
Lsnaathorst1 Dec 5, 2024
a8b634e
Adding first lot of information on viewing different branches
Lsnaathorst1 Dec 5, 2024
7c2511c
Adding alt text for first image and instructions for viewing code
Lsnaathorst1 Dec 6, 2024
bea5961
Adding screengrabs and more instructions
Lsnaathorst1 Dec 9, 2024
dcf4b01
Adding more images
Lsnaathorst1 Dec 11, 2024
9bf02f1
Adding files pane image
Lsnaathorst1 Dec 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
13 changes: 13 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## Overview of changes

## Why are these changes being made?

## Detailed description of changes

## Issue ticket number/s and link

## Checklist before requesting a review
- [ ] I have checked the contributing guidelines
- [ ] I have checked for and linked any relevant issues that this may resolve
- [ ] I have checked that these changes build locally
- [ ] I understand that if merged into main, these changes will be publicly available
47 changes: 47 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
on:
workflow_dispatch:
push:
branches:
- main
- newcontent/basics-refresher
pull_request:
branches:
- main
- newcontent/basics-refresher

name: Publish to pages

jobs:
build-deploy:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Set up R
uses: r-lib/actions/setup-r@v2

- name: Restore renv
uses: r-lib/actions/setup-renv@v2
with:
cache-version: 1

- name: Set up Quarto
uses: quarto-dev/quarto-actions/setup@v2

- name: Render Quarto Project
uses: quarto-dev/quarto-actions/render@v2
env:
QUARTO_PROFILE: preview
with:
to: html

- name: Render and Publish
if: github.event_name != 'pull_request'
uses: quarto-dev/quarto-actions/publish@v2
with:
target: gh-pages
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,6 @@ po/*~
rsconnect/

*/*_files
*/*.html
*/*.html
/.quarto/
_site/
77 changes: 77 additions & 0 deletions _quarto.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
project:
type: website

website:
page-navigation: true
back-to-top-navigation: true
title: "DfE Git Academy"
site-url: "https://dfe-analytical-services.github.io/git-academy"
repo-url: https://github.com/dfe-analytical-services/git-academy
repo-actions: [edit, issue]
google-analytics: "G-xxxxxxxxx"
cookie-consent:
style: headline
palette: dark

page-footer:
right: "This page is maintained by [email protected]"
left: "Department for Education, 2024"

search:
location: navbar
type: textbox

sidebar:
pinned: true
align: center
tools:
- icon: envelope
href: mailto:[email protected]
text: "Email us"
- icon: microsoft-teams
menu:
- text: "DfE analysts network"
href: https://teams.microsoft.com/l/team/19%3a50f82a2718184a0e98ba86c3d411a02f%40thread.skype/conversations?groupId=6572094f-43a3-4537-bcf0-fc27dc6557ed&tenantId=fad277c9-c60a-4da1-b5f3-b3b8b34a82f9
target: _blank
- text: "Statistics production"
href: https://teams.microsoft.com/l/team/19%3ae3c8551e86094e259a60848fcff4dbc1%40thread.skype/conversations?groupId=679b2376-8c8c-4062-a1c9-0744ce5ac88f&tenantId=fad277c9-c60a-4da1-b5f3-b3b8b34a82f9
target: _blank

- icon: github
menu:
- href: https://github.com/dfe-analytical-services/git-academy
target: _blank
text: "Source code"
- href: https://github.com/dfe-analytical-services/git-academy/issues/new
target: _blank
text: "Suggest changes"

style: "floating"
search: true
collapse-level: 1
contents:
- href: index.qmd
text: Welcome
- href: pre-requisites.qmd
- section: "Git basics refresher"
contents:
- git-refresher/clone-a-repo.qmd
- git-refresher/making-a-branch.qmd
- git-refresher/recording-changes.qmd
- git-refresher/syncing-changes-to-remote.qmd
- git-refresher/exploring-a-repo.qmd
- git-refresher/moving-between-branches.qmd

format:
html:
theme:
light: [united, theme-light.scss]
dark: [cyborg, theme-dark.scss]
code-copy: true
highlight-style: printing
code-overflow: wrap
toc: true

filters:
- quarto

Loading
Loading