From cbd1fd2e27b4d60045329fc678c6937aaca99daa Mon Sep 17 00:00:00 2001 From: Ankur Sinha (Ankur Sinha Gmail) Date: May 13 2022 15:41:58 +0000 Subject: [PATCH 1/6] feat: rename badges page These are not the first steps we want newbies to take according to the Welcome to Fedora workflow. Fixes #17 --- diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc index f940d6b..d3f76d5 100644 --- a/modules/ROOT/nav.adoc +++ b/modules/ROOT/nav.adoc @@ -1,6 +1,8 @@ * Welcome! ** xref:welcome/welcome.adoc[Welcome to Fedora!] -** xref:welcome/first-steps.adoc[First steps] + +* Resources +** xref:welcome/badges.adoc[Get started with badges!] * Classroom ** xref:classroom/classroom.adoc[Classroom] diff --git a/modules/ROOT/pages/welcome/badges.adoc b/modules/ROOT/pages/welcome/badges.adoc new file mode 100644 index 0000000..3316895 --- /dev/null +++ b/modules/ROOT/pages/welcome/badges.adoc @@ -0,0 +1,121 @@ +include::ROOT:partial$attributes.adoc[] + += Make your first steps in Fedora +Justin W. Flory; Fedora Community +:page-authors: {author}, {author_2} + +Are you new to the Fedora community? +Not sure where to start? +Learn how to make the first steps in the Fedora community by earning these Fedora Badges. + + +[[fedora-badges]] +== What are Fedora Badges? + +Fedora Badges are a fun way to earn virtual badges for doing helpful things in the Fedora community. +There are hundreds of badges to earn for different types of activities. +Some badges are for technical tasks while others are for non-technical tasks. +To learn more about Fedora Badges, link:https://badges.fedoraproject.org/about[read the website] for more info. + +This page suggests the best Fedora Badges to earn when you are getting started. +You may be able to earn other badges too! +But if you aren't sure where to start, begin with these ones. + + +[[involvement]] +== Involvement + +link:https://badges.fedoraproject.org/badge/involvement[Involvement] is awarded when you sign the link:https://fedoraproject.org/wiki/Legal:Fedora_Project_Contributor_Agreement[Fedora Project Contributor Agreement] (FPCA). +To sign the FPCA, do this from the link:https://accounts.fedoraproject.org/[Fedora Account System] (FAS). + +image::https://badges.fedoraproject.org/pngs/involvement.png[Involvement - Fedora Badges] + + +[[white-rabbit]] +== White Rabbit + +link:https://badges.fedoraproject.org/badge/white-rabbit[White Rabbit] is awarded when you set your time zone in your Fedora Account System (FAS) account. +Some tools in Fedora will display your time zone or what your current local time is. +This is helpful so others know when you may be around or not to disturb you. +To set your time zone in FAS, follow these steps: + +. Go to link:https://accounts.fedoraproject.org/[Fedora Account System] +. Select _Login_ in the top-right corner +. Login with username and password +. Select _My Account_ on menu at the top +. Select _Edit_ on the _Your Fedora Account_ page +. Change the _Time Zone_ field to your current time zone +. Select _Save_ + +This badge is not awarded immediately. You should receive it in a few days of updating your time zone. + +image::https://badges.fedoraproject.org/pngs/fas-white-rabbit.png[White Rabbit - Fedora Badges] + + +[[crypto-badger]] +== Crypto Badger + +link:https://badges.fedoraproject.org/badge/crypto-badger[Crypto Badger] is awarded when you add an SSH key to your Fedora Account System (FAS) account. +You may or may not have an SSH key already. +If you do, you can add it from a macOS/UNIX/Linux system to your FAS account with these steps: + +. Generate SSH key using `ssh-keygen` +.. If you use defaults, this generates a `~/.ssh/id_rsa` private key file and a `~/.ssh/id_rsa.pub` public key file +. Go to link:https://accounts.fedoraproject.org/[Fedora Account System] +. Select _Login_ in the top-right corner +. Login with username and password +. Select _My Account_ on menu at the top +. Select _Edit_ on the _Your Fedora Account_ page +. Go to tab _SSH & GPG Keys_ +. Upload `~/.ssh/id_rsa.pub` public key file you generated in first step +. Select _Save_ + +The badge is awarded once per week, so you may not get the badge immediately. +If it is longer than seven days, ask for help in link:https://libera.chat/#fedora-admin[#fedora-admin] on IRC. + +image::https://badges.fedoraproject.org/pngs/fas-crypto-badger.png[Crypto Badger - Fedora Badges] + + +[[crypto-panda]] +== Crypto Panda + +link:https://badges.fedoraproject.org/badge/crypto-panda[Crypto Panda] is awarded when you add a GPG public key to your Fedora Account System (FAS) account. +You may or may not have a GPG key already. +They are not required to participate. +If you want to generate one, read the link:https://fedoramagazine.org/gnupg-a-fedora-primer/[GPG series] on the Fedora Magazine. +If you have a GPG public key, upload it FAS with these steps: + +. Go to link:https://accounts.fedoraproject.org/[Fedora Account System] +. Select _Login_ in the top-right corner +. Login with username and password +. Select _My Account_ on menu at the top +. Select _Edit_ on the _Your Fedora Account_ page +. Go to tab _SSH & GPG Keys_ +. Add the last 16 characters of your public key fingerprint file (e.g. `39E45FB6014131E4`) to _GPG Key ID_ +. Select _Save_ + +image::https://badges.fedoraproject.org/pngs/fas-crypto-panda.png[Crypto Panda - Fedora Badges] + + +[[baby-badger]] +== Baby Badger + +link:https://badges.fedoraproject.org/badge/baby-badger[Baby Badger] is awarded when you log into the Fedora Badges website for the first time. +To log into the Fedora Badges site, you need to register in the Fedora Account System (FAS). +After you have an account, link:https://badges.fedoraproject.org/login[log in] to the Badges application to earn this badge. + +image::https://badges.fedoraproject.org/pngs/baby-badger.png[Baby Badger - Fedora Badges] + + +== Other badges + +The badges listed here are also good badges to earn. +They aren't explained yet, but they will be soon. +If you want to help with this, come say hello in link:https://libera.chat/#fedora-commops[#fedora-commops] on Libera.chat's IRC network. + +* link:https://badges.fedoraproject.org/badge/bloggin-it!-planet-i[Bloggin' it!] +* link:https://badges.fedoraproject.org/badge/curious-penguin-ask-fedora-i[Curious Penguin] +* link:https://badges.fedoraproject.org/badge/macaron-cookie-i[Macaron - Cookie I] +* link:https://badges.fedoraproject.org/badge/mugshot[Mugshot] +* link:https://badges.fedoraproject.org/badge/origin[Origin] +* link:https://blog.justinwflory.com/2016/01/gotta-badge-em-all-speak-up/[Speak Up!] diff --git a/modules/ROOT/pages/welcome/first-steps.adoc b/modules/ROOT/pages/welcome/first-steps.adoc deleted file mode 100644 index 3316895..0000000 --- a/modules/ROOT/pages/welcome/first-steps.adoc +++ /dev/null @@ -1,121 +0,0 @@ -include::ROOT:partial$attributes.adoc[] - -= Make your first steps in Fedora -Justin W. Flory; Fedora Community -:page-authors: {author}, {author_2} - -Are you new to the Fedora community? -Not sure where to start? -Learn how to make the first steps in the Fedora community by earning these Fedora Badges. - - -[[fedora-badges]] -== What are Fedora Badges? - -Fedora Badges are a fun way to earn virtual badges for doing helpful things in the Fedora community. -There are hundreds of badges to earn for different types of activities. -Some badges are for technical tasks while others are for non-technical tasks. -To learn more about Fedora Badges, link:https://badges.fedoraproject.org/about[read the website] for more info. - -This page suggests the best Fedora Badges to earn when you are getting started. -You may be able to earn other badges too! -But if you aren't sure where to start, begin with these ones. - - -[[involvement]] -== Involvement - -link:https://badges.fedoraproject.org/badge/involvement[Involvement] is awarded when you sign the link:https://fedoraproject.org/wiki/Legal:Fedora_Project_Contributor_Agreement[Fedora Project Contributor Agreement] (FPCA). -To sign the FPCA, do this from the link:https://accounts.fedoraproject.org/[Fedora Account System] (FAS). - -image::https://badges.fedoraproject.org/pngs/involvement.png[Involvement - Fedora Badges] - - -[[white-rabbit]] -== White Rabbit - -link:https://badges.fedoraproject.org/badge/white-rabbit[White Rabbit] is awarded when you set your time zone in your Fedora Account System (FAS) account. -Some tools in Fedora will display your time zone or what your current local time is. -This is helpful so others know when you may be around or not to disturb you. -To set your time zone in FAS, follow these steps: - -. Go to link:https://accounts.fedoraproject.org/[Fedora Account System] -. Select _Login_ in the top-right corner -. Login with username and password -. Select _My Account_ on menu at the top -. Select _Edit_ on the _Your Fedora Account_ page -. Change the _Time Zone_ field to your current time zone -. Select _Save_ - -This badge is not awarded immediately. You should receive it in a few days of updating your time zone. - -image::https://badges.fedoraproject.org/pngs/fas-white-rabbit.png[White Rabbit - Fedora Badges] - - -[[crypto-badger]] -== Crypto Badger - -link:https://badges.fedoraproject.org/badge/crypto-badger[Crypto Badger] is awarded when you add an SSH key to your Fedora Account System (FAS) account. -You may or may not have an SSH key already. -If you do, you can add it from a macOS/UNIX/Linux system to your FAS account with these steps: - -. Generate SSH key using `ssh-keygen` -.. If you use defaults, this generates a `~/.ssh/id_rsa` private key file and a `~/.ssh/id_rsa.pub` public key file -. Go to link:https://accounts.fedoraproject.org/[Fedora Account System] -. Select _Login_ in the top-right corner -. Login with username and password -. Select _My Account_ on menu at the top -. Select _Edit_ on the _Your Fedora Account_ page -. Go to tab _SSH & GPG Keys_ -. Upload `~/.ssh/id_rsa.pub` public key file you generated in first step -. Select _Save_ - -The badge is awarded once per week, so you may not get the badge immediately. -If it is longer than seven days, ask for help in link:https://libera.chat/#fedora-admin[#fedora-admin] on IRC. - -image::https://badges.fedoraproject.org/pngs/fas-crypto-badger.png[Crypto Badger - Fedora Badges] - - -[[crypto-panda]] -== Crypto Panda - -link:https://badges.fedoraproject.org/badge/crypto-panda[Crypto Panda] is awarded when you add a GPG public key to your Fedora Account System (FAS) account. -You may or may not have a GPG key already. -They are not required to participate. -If you want to generate one, read the link:https://fedoramagazine.org/gnupg-a-fedora-primer/[GPG series] on the Fedora Magazine. -If you have a GPG public key, upload it FAS with these steps: - -. Go to link:https://accounts.fedoraproject.org/[Fedora Account System] -. Select _Login_ in the top-right corner -. Login with username and password -. Select _My Account_ on menu at the top -. Select _Edit_ on the _Your Fedora Account_ page -. Go to tab _SSH & GPG Keys_ -. Add the last 16 characters of your public key fingerprint file (e.g. `39E45FB6014131E4`) to _GPG Key ID_ -. Select _Save_ - -image::https://badges.fedoraproject.org/pngs/fas-crypto-panda.png[Crypto Panda - Fedora Badges] - - -[[baby-badger]] -== Baby Badger - -link:https://badges.fedoraproject.org/badge/baby-badger[Baby Badger] is awarded when you log into the Fedora Badges website for the first time. -To log into the Fedora Badges site, you need to register in the Fedora Account System (FAS). -After you have an account, link:https://badges.fedoraproject.org/login[log in] to the Badges application to earn this badge. - -image::https://badges.fedoraproject.org/pngs/baby-badger.png[Baby Badger - Fedora Badges] - - -== Other badges - -The badges listed here are also good badges to earn. -They aren't explained yet, but they will be soon. -If you want to help with this, come say hello in link:https://libera.chat/#fedora-commops[#fedora-commops] on Libera.chat's IRC network. - -* link:https://badges.fedoraproject.org/badge/bloggin-it!-planet-i[Bloggin' it!] -* link:https://badges.fedoraproject.org/badge/curious-penguin-ask-fedora-i[Curious Penguin] -* link:https://badges.fedoraproject.org/badge/macaron-cookie-i[Macaron - Cookie I] -* link:https://badges.fedoraproject.org/badge/mugshot[Mugshot] -* link:https://badges.fedoraproject.org/badge/origin[Origin] -* link:https://blog.justinwflory.com/2016/01/gotta-badge-em-all-speak-up/[Speak Up!] From a33ee73cb4064a04ab57e831c3b079b92de6c0ed Mon Sep 17 00:00:00 2001 From: Ankur Sinha (Ankur Sinha Gmail) Date: May 13 2022 15:49:21 +0000 Subject: [PATCH 2/6] feat(badges): update introduction text --- diff --git a/modules/ROOT/pages/welcome/badges.adoc b/modules/ROOT/pages/welcome/badges.adoc index 3316895..6131cf0 100644 --- a/modules/ROOT/pages/welcome/badges.adoc +++ b/modules/ROOT/pages/welcome/badges.adoc @@ -1,25 +1,12 @@ include::ROOT:partial$attributes.adoc[] -= Make your first steps in Fedora -Justin W. Flory; Fedora Community -:page-authors: {author}, {author_2} - -Are you new to the Fedora community? -Not sure where to start? -Learn how to make the first steps in the Fedora community by earning these Fedora Badges. - - -[[fedora-badges]] -== What are Fedora Badges? += Get started with badges! Fedora Badges are a fun way to earn virtual badges for doing helpful things in the Fedora community. -There are hundreds of badges to earn for different types of activities. -Some badges are for technical tasks while others are for non-technical tasks. +There are hundreds of badges to earn for all types of activities---technical and non-technical tasks. To learn more about Fedora Badges, link:https://badges.fedoraproject.org/about[read the website] for more info. -This page suggests the best Fedora Badges to earn when you are getting started. -You may be able to earn other badges too! -But if you aren't sure where to start, begin with these ones. +This page introduces a few Fedora Badges that you can earn when you start your Fedora journey. [[involvement]] From 4ad378fbb0caba955efaa94d38dd6fceaae9efb7 Mon Sep 17 00:00:00 2001 From: Ankur Sinha (Ankur Sinha Gmail) Date: May 13 2022 15:50:16 +0000 Subject: [PATCH 3/6] feat(badges): update involvement and white rabbit badges for new FAS --- diff --git a/modules/ROOT/pages/welcome/badges.adoc b/modules/ROOT/pages/welcome/badges.adoc index 6131cf0..019f736 100644 --- a/modules/ROOT/pages/welcome/badges.adoc +++ b/modules/ROOT/pages/welcome/badges.adoc @@ -13,7 +13,7 @@ This page introduces a few Fedora Badges that you can earn when you start your F == Involvement link:https://badges.fedoraproject.org/badge/involvement[Involvement] is awarded when you sign the link:https://fedoraproject.org/wiki/Legal:Fedora_Project_Contributor_Agreement[Fedora Project Contributor Agreement] (FPCA). -To sign the FPCA, do this from the link:https://accounts.fedoraproject.org/[Fedora Account System] (FAS). +You can sign the FPCA in your profile in the link:https://accounts.fedoraproject.org/[Fedora Account System] (FAS). image::https://badges.fedoraproject.org/pngs/involvement.png[Involvement - Fedora Badges] @@ -27,14 +27,13 @@ This is helpful so others know when you may be around or not to disturb you. To set your time zone in FAS, follow these steps: . Go to link:https://accounts.fedoraproject.org/[Fedora Account System] -. Select _Login_ in the top-right corner -. Login with username and password -. Select _My Account_ on menu at the top -. Select _Edit_ on the _Your Fedora Account_ page -. Change the _Time Zone_ field to your current time zone +. Enter your credentials and select _Login_ +. Click _Edit profile_ in the left side bar +. Change the _Time Zone_ field to your current time zone in your profile . Select _Save_ -This badge is not awarded immediately. You should receive it in a few days of updating your time zone. +This badge is not awarded immediately. +You should receive it in a few days of updating your time zone. image::https://badges.fedoraproject.org/pngs/fas-white-rabbit.png[White Rabbit - Fedora Badges] From 24b20e5f5a34acdd78b9bb59d3f309b9f77fbf03 Mon Sep 17 00:00:00 2001 From: Ankur Sinha (Ankur Sinha Gmail) Date: May 13 2022 15:55:22 +0000 Subject: [PATCH 4/6] feat(badges): update ssh key instructions --- diff --git a/modules/ROOT/pages/welcome/badges.adoc b/modules/ROOT/pages/welcome/badges.adoc index 019f736..a00f48c 100644 --- a/modules/ROOT/pages/welcome/badges.adoc +++ b/modules/ROOT/pages/welcome/badges.adoc @@ -42,18 +42,21 @@ image::https://badges.fedoraproject.org/pngs/fas-white-rabbit.png[White Rabbit - == Crypto Badger link:https://badges.fedoraproject.org/badge/crypto-badger[Crypto Badger] is awarded when you add an SSH key to your Fedora Account System (FAS) account. -You may or may not have an SSH key already. -If you do, you can add it from a macOS/UNIX/Linux system to your FAS account with these steps: +If you have a SSH key pair already, you can add your SSH key system to your FAS account with the steps below. + +To learn more about SSH keys and how to generate them on a Fedora Linux installation, link:https://fedoraproject.org/wiki/Cryptography[see this wiki page]. + + +Once you have your SSH key pair, you should have two files. +The defaults are: `~/.ssh/id_rsa` and `~/.ssh/id_rsa.pub`. +The first is your private key, keep this safe! +The second is your public key, and is the one we share. -. Generate SSH key using `ssh-keygen` -.. If you use defaults, this generates a `~/.ssh/id_rsa` private key file and a `~/.ssh/id_rsa.pub` public key file . Go to link:https://accounts.fedoraproject.org/[Fedora Account System] -. Select _Login_ in the top-right corner -. Login with username and password -. Select _My Account_ on menu at the top -. Select _Edit_ on the _Your Fedora Account_ page +. Enter your credentials and select _Login_ +. Click _Edit profile_ in the left side bar . Go to tab _SSH & GPG Keys_ -. Upload `~/.ssh/id_rsa.pub` public key file you generated in first step +. Copy the contents of your public key file, `~/.ssh/id_rsa.pub`, an paste it in the text box for SSH Keys. . Select _Save_ The badge is awarded once per week, so you may not get the badge immediately. From 3bd8a7601571a74ceb1115017ed0a91b6e2d4fee Mon Sep 17 00:00:00 2001 From: Ankur Sinha (Ankur Sinha Gmail) Date: May 13 2022 15:58:17 +0000 Subject: [PATCH 5/6] feat(badges): update instructions for GPG keys --- diff --git a/modules/ROOT/pages/welcome/badges.adoc b/modules/ROOT/pages/welcome/badges.adoc index a00f48c..8995ed2 100644 --- a/modules/ROOT/pages/welcome/badges.adoc +++ b/modules/ROOT/pages/welcome/badges.adoc @@ -71,16 +71,16 @@ image::https://badges.fedoraproject.org/pngs/fas-crypto-badger.png[Crypto Badger link:https://badges.fedoraproject.org/badge/crypto-panda[Crypto Panda] is awarded when you add a GPG public key to your Fedora Account System (FAS) account. You may or may not have a GPG key already. They are not required to participate. -If you want to generate one, read the link:https://fedoramagazine.org/gnupg-a-fedora-primer/[GPG series] on the Fedora Magazine. -If you have a GPG public key, upload it FAS with these steps: + +To learn more about GPG keys and how to generate them on a Fedora Linux installation, link:https://fedoraproject.org/wiki/Cryptography[see this wiki page]. + +If you have a GPG public key, you can set it it FAS with these steps: . Go to link:https://accounts.fedoraproject.org/[Fedora Account System] -. Select _Login_ in the top-right corner -. Login with username and password -. Select _My Account_ on menu at the top -. Select _Edit_ on the _Your Fedora Account_ page +. Enter your credentials and select _Login_ +. Click _Edit profile_ in the left side bar . Go to tab _SSH & GPG Keys_ -. Add the last 16 characters of your public key fingerprint file (e.g. `39E45FB6014131E4`) to _GPG Key ID_ +. Copy the last 16 characters of your public key fingerprint file (e.g. `39E45FB6014131E4`) and paste it in the text box under _GPG Keys_. . Select _Save_ image::https://badges.fedoraproject.org/pngs/fas-crypto-panda.png[Crypto Panda - Fedora Badges] From bc62f1267c5a3932fbbc52f111a823f100a3c1c9 Mon Sep 17 00:00:00 2001 From: Ankur Sinha (Ankur Sinha Gmail) Date: May 13 2022 16:00:22 +0000 Subject: [PATCH 6/6] feat(badges): tweak baby-badger text It's after people create their FAS and upload SSH/GPG keys etc. so there's no need to ask them to create an account now. --- diff --git a/modules/ROOT/pages/welcome/badges.adoc b/modules/ROOT/pages/welcome/badges.adoc index 8995ed2..a657599 100644 --- a/modules/ROOT/pages/welcome/badges.adoc +++ b/modules/ROOT/pages/welcome/badges.adoc @@ -85,13 +85,11 @@ If you have a GPG public key, you can set it it FAS with these steps: image::https://badges.fedoraproject.org/pngs/fas-crypto-panda.png[Crypto Panda - Fedora Badges] - [[baby-badger]] == Baby Badger link:https://badges.fedoraproject.org/badge/baby-badger[Baby Badger] is awarded when you log into the Fedora Badges website for the first time. -To log into the Fedora Badges site, you need to register in the Fedora Account System (FAS). -After you have an account, link:https://badges.fedoraproject.org/login[log in] to the Badges application to earn this badge. +link:https://badges.fedoraproject.org/login[Log in] to the Badges application to earn this badge now! image::https://badges.fedoraproject.org/pngs/baby-badger.png[Baby Badger - Fedora Badges]