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

New checkout docs #2509

Merged
merged 24 commits into from
Aug 14, 2023
Merged

New checkout docs #2509

merged 24 commits into from
Aug 14, 2023

Conversation

maneesha
Copy link
Contributor

@maneesha maneesha commented Aug 8, 2023

Updates AMY documentation with new checkout instructions. To be merged along with deploy on 2023-08-12. Tagging @pbanaszkiewicz and @elichad

@carpentries carpentries deleted a comment from netlify bot Aug 8, 2023
@maneesha
Copy link
Contributor Author

maneesha commented Aug 8, 2023

Ignore all the failed checks - I was trying to get Netlify previews to work. These checks are not necessary to merge.

Copy link
Contributor

@klbarnes20 klbarnes20 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made a few changes, but otherwise looks good!

maneesha and others added 5 commits August 8, 2023 14:13
Update language (teaching demo, not lesson demo)

Co-authored-by: Kelly Barnes <[email protected]>
Co-authored-by: Kelly Barnes <[email protected]>
@pbanaszkiewicz pbanaszkiewicz added this to the v4.2 milestone Aug 8, 2023
@pbanaszkiewicz
Copy link
Contributor

@maneesha go ahead and merge when you think it's ready. Once that's done we can create a release branch for v4.2. CC @elichad

@maneesha
Copy link
Contributor Author

maneesha commented Aug 8, 2023

If I merge to develop now, it will be live at https://carpentries.github.io/amy/, right? The information here won't be correct until Monday so I would like to see it merged when the other changes are deployed.

@pbanaszkiewicz
Copy link
Contributor

Looks like we need to have stable docs and develop docs that correspond to versions deployed in production and test-amy. Is there a place (domain or directory) where we could host docs corresponding to develop amy version?

@maneesha the easiest way is for me to mark this PR as v4.3 and merge it after the production AMY has been upgraded.

Comment on lines 69 to 74
Note the additional information required for each activity:

Carpentries Instructor trainees can log in to AMY to view their checkout progress towards their Instructor badge. Due to the structure of our checkout tracking progress, all steps towards checkout may not be included here. If your instructor badge is correctly displayed, you are in good standing.
* Attended a regional meetup, skill-up, or other community meeting: Date of event and description of event (as additional information)
* Submitted a contribution to a Carpentries repository on GitHub: Date of contribution and link to contribution. This must be to a repo in a [Carpentries organisation](https://docs.carpentries.org/topic_folders/communications/tools/github_organisations.html).
* Served as an Instructor or a helper at a Carpentries workshop: Date of workshop and link to workshop website
* Other: Date and description of contribution (as additional information)
Copy link
Contributor

@elichad elichad Aug 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This information may be better provided in a tabular format (with a heading that we can link to from the admin guide too!) Suggestion below:

Suggested change
Note the additional information required for each activity:
Carpentries Instructor trainees can log in to AMY to view their checkout progress towards their Instructor badge. Due to the structure of our checkout tracking progress, all steps towards checkout may not be included here. If your instructor badge is correctly displayed, you are in good standing.
* Attended a regional meetup, skill-up, or other community meeting: Date of event and description of event (as additional information)
* Submitted a contribution to a Carpentries repository on GitHub: Date of contribution and link to contribution. This must be to a repo in a [Carpentries organisation](https://docs.carpentries.org/topic_folders/communications/tools/github_organisations.html).
* Served as an Instructor or a helper at a Carpentries workshop: Date of workshop and link to workshop website
* Other: Date and description of contribution (as additional information)
#### Information required for each Get Involved activity
| Activity | Date required? | URL required? | Additional information required? |
| --- | --- | --- | --- |
| Attended a regional meetup, skill-up, or other community meeting | yes | no | yes, description of event |
| Submitted a contribution to a Carpentries repository on GitHub | yes | yes, to a contribution to a repo in a [Carpentries organisation](https://docs.carpentries.org/topic_folders/communications/tools/github_organisations.html) | no |
| Served as an Instructor or a helper at a Carpentries workshop | yes | yes, to a workshop website | no |
| Other | yes | no | yes, description of contribution |
#### After submitting

(final line of suggestion just separates the table from the next paragraph)

This renders like this (ignore the dark mode, that's just my local Markdown previewer):
Rendered table output from suggested change

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@klbarnes20 approved this in #2514 (comment)


![AMY Training Progress Submit](images/training_progress_submit.png)

This will take you to a page where you can select what type of activity you are submitting and provide additional information.
Copy link
Contributor

@elichad elichad Aug 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion to go along with my other suggestion https://github.com/carpentries/amy/pull/2509/files#r1291340107

Suggested change
This will take you to a page where you can select what type of activity you are submitting and provide additional information.
This will take you to a page where you can select what type of activity you are submitting and provide additional information. The table below shows which information must be provided for each activity.

@elichad
Copy link
Contributor

elichad commented Aug 14, 2023

@maneesha I'm going to apply the suggestions above, and then merge this branch. Thanks!

@elichad elichad merged commit f09c30e into develop Aug 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants