diff --git a/common-theme/assets/images/site-logo/logo.svg b/common-theme/assets/images/site-logo/logo.svg index c4a31d1c0..16c67e9a9 100644 --- a/common-theme/assets/images/site-logo/logo.svg +++ b/common-theme/assets/images/site-logo/logo.svg @@ -1 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/common-theme/assets/styles/02-variables/colors.scss b/common-theme/assets/styles/02-variables/colors.scss index 60a69ff70..242b6fa8b 100644 --- a/common-theme/assets/styles/02-variables/colors.scss +++ b/common-theme/assets/styles/02-variables/colors.scss @@ -1,13 +1,12 @@ @mixin light-palette { // these brand colours are set and then everything else is derived from the key - --theme-color--brand: hsla(0, 100%, 67%, 1); - --theme-color--brand-shade: hsla(0, 100%, 67%, 0.375); - --theme-color--accent: hsl(146, 100%, 46%); + --theme-color--brand: rgb(21, 212, 190); + --theme-color--brand-shade: rgba(21, 212, 190, .05); + --theme-color--accent: rgb(21, 212, 190); --theme-color--accent-shade: hsla(146, 100%, 46%, 0.5); - --theme-color--pop: hsla(262, 100%, 62%, 1); - --theme-color--pop-shade: hsla(262, 100%, 62%, 0.375); + --theme-color--pop: rgb(61, 97, 255); // key - --hue: 260; + --hue: 210; --sat: 35%; --lum: 90%; --alpha: 0.95; @@ -46,13 +45,8 @@ // backdrop --theme-color--block: hsla(var(--hsl), var(--alpha)); --theme-color--outline: hsl(var(--hsl), 1); - --theme-color--backdrop-from: hsla(var(--hsl), 0.25); - --theme-color--backdrop-to: hsla(var(--hsl), 0.2); - - // signals - - --theme-color--good: var(--theme-color--accent-shade); - --theme-color--bad: var(--theme-color--brand-shade); + --theme-color--backdrop-from: hsl(var(--hsl) / 0.25); + --theme-color--backdrop-to: hsl(var(--hsl) / 0.2); } @mixin dark-palette { @@ -66,8 +60,8 @@ calc(var(--lum) * 4.4), var(--alpha) ); - --theme-color--accent: hsla(262, 100%, 67%, 1); - --theme-color--pop: hsl(146, 100%, 46%); + --theme-color--accent: rgb(21, 212, 190); + --theme-color--pop: hsl(246, 100%, 46%); } :root { diff --git a/common-theme/assets/styles/02-variables/fonts.scss b/common-theme/assets/styles/02-variables/fonts.scss index 60b05376a..d90af6d2b 100644 --- a/common-theme/assets/styles/02-variables/fonts.scss +++ b/common-theme/assets/styles/02-variables/fonts.scss @@ -1,9 +1,7 @@ :root { - --theme-font--display: "Space Grotesk", serif; + --theme-font--display: "Jura", serif; --theme-font--copy: "Inter", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; --theme-font--system: 100 100%/2 "Monaco", "Menlo", "Space Grotesk", monospace; - --theme-font--emoji: "Fluent UI Emoji", Apple Color Emoji, "Noto Color Emoji", - "Segoe UI Emoji", "EmojiOne Color", "Twemoji Mozilla"; } diff --git a/org-cyf-itd/content/_index.md b/org-cyf-itd/content/_index.md index 57ec627ab..ff9ead1a3 100644 --- a/org-cyf-itd/content/_index.md +++ b/org-cyf-itd/content/_index.md @@ -1,6 +1,6 @@ +++ title="Intro to Digital" -description="How to participate in the Intro to Digital programme as a learner or teacher" +description="How to participate in the Intro to Digital programme as a student" menu="main" -menus_to_map=['start here', 'steps', 'workshops'] +menus_to_map=['start here', 'get connected','get coding' ] +++ diff --git a/org-cyf-itd/content/blocks/common-issues/index.md b/org-cyf-itd/content/blocks/common-issues/index.md index 8a7f27205..1517598c0 100644 --- a/org-cyf-itd/content/blocks/common-issues/index.md +++ b/org-cyf-itd/content/blocks/common-issues/index.md @@ -5,45 +5,26 @@ description="How to get help with the Intro to Digital programme" > When you have a question, ask it. -{{}} -Remember, Code Your Future is a community of adults sharing skills. We are all here to help each other, and _learn_. You are meant to ask questions at Code Your Future. +{{}} +Remember, MigraCode is a community of adults sharing skills. We are all here to help each other, and _learn_. You are meant to ask questions at MigraCode. When you see someone else has a question, help them if you can. {{}} -When you have questions about coursework, ask in a {{}} Code Your Future Workshops are meetings where you can get technical help.{{}} or in {{}} Slack is messaging software - once you have downloaded Slack you can visit our [Slack workspace](https://cyf-introtodigital.slack.com/signup#/domain-signup) to ask your questions.{{}} +When you have questions about coursework, ask in on {{}} Slack is messaging software - once you have downloaded Slack you can visit our [Slack workspace](https://join.slack.com/t/migracodebarcelona/shared_invite/zt-339w0t50n-oRF4iO90IbxVBYsyuu_pyg) to ask your questions. {{}} ### More common issues
I don't have a computer -Here are some ways CYF graduates solved this problem in the past: +Here are some ways MigraCode solved this problem in the past: -1. Use a computer in a local library. All UK public libraries have computers for public use. - In England and Wales: [Book internet access in your local library](https://www.gov.uk/book-internet-access-at-library) (This is popular, so you should book in advance.). For Scotland: [Find your local library](https://www.mygov.scot/public-libraries) - -1. Use another free computer centre. The [Digital Inclusion Project](https://network.goodthingsfoundation.org/#/map) is a network of online centres that are free for everyone to use. +1. Use a computer in a local library. 1. Borrow a computer from a friend or a relative if you can. -1. Buy a computer. In the UK, prices start from around £200. - -1. Use one of our laptops during a drop-in session. Please note: you might still need to use a laptop or computer from another source during the week. - -
- -
-I don't have internet access -Here are some ways CYF graduates solved this problem in the past: - -1. Use the free Wi-Fi in a local library. All UK public libraries have free Wi-Fi. - -1. Find a Good Things Foundation centre near you. The [Digital Inclusion Project](https://network.goodthingsfoundation.org/#/map) is a network of online centres that are free for everyone to use, and they have data banks too. +1. If you are accepted as a students you can borrow a laptop for the entirety of the bootcamp- which you can take home. Let us know you need one at barcelona@migracode.org or text us on the MigraCode Slack.
-
-I can't travel to workshops -1. Ask in Slack for an online workshop -
diff --git a/org-cyf-itd/content/blocks/help/index.md b/org-cyf-itd/content/blocks/help/index.md index 3e3b78f46..b2699e250 100644 --- a/org-cyf-itd/content/blocks/help/index.md +++ b/org-cyf-itd/content/blocks/help/index.md @@ -4,15 +4,27 @@ description="How to get help with the Intro to Digital programme" time="5" +++ -> When you have a question, ask it. + When you have a question, ask it. -{{}} -Remember, Code Your Future is a community of adults sharing skills. We are all here to help each other, and _learn_. You are meant to ask questions at Code Your Future. +{{}} +Remember, MigraCode is a community of adults sharing skills. We are all here to help each other, and _learn_. You are meant to ask questions at MigraCode. When you see someone else has a question, help them if you can. {{}} -First, visit our [frequently asked questions page](https://codeyourfuture.zendesk.com/hc/en-us) -When you have questions about coursework, ask in a {{}} Code Your Future Workshops are meetings where you can get technical help.{{}} or in {{}} Slack is messaging software - once you have downloaded Slack you can visit our [Slack workspace](https://cyf-introtodigital.slack.com/signup#/domain-signup) to ask your questions.{{}} +When you have questions about coursework, ask in on {{}} Slack is messaging software - once you have downloaded Slack you can visit our [Slack workspace](https://join.slack.com/t/migracodebarcelona/shared_invite/zt-339w0t50n-oRF4iO90IbxVBYsyuu_pyg) to ask your questions. {{}} -You do not need to wait for a workshop to ask a question. You can ask questions in Slack at any time. We are here to help you understand and complete this course. Our goal is to help you learn. +### More common issues + +
+I don't have a computer +Here are some ways MigraCode solved this problem in the past: + +1. Use a computer in a local library. + +1. Borrow a computer from a friend or a relative if you can. + +1. Use one of our laptops while at our office at Carrer del Rec 27 in Barcelona. We do not have enough laptops to borrow to all of the prospective students, therefore we can only lend you a laptop once you are enrolled. If you are accepted as a students you can borrow a laptop for the entirety of the bootcamp- which you can take home. + Let us know you need one at barcelona@migracode.org or text us on the MigraCode Slack. + +
diff --git a/org-cyf-itd/content/blocks/how-itd-works/what-is-itd/index.md b/org-cyf-itd/content/blocks/how-itd-works/what-is-itd/index.md index a4af6803e..459344207 100644 --- a/org-cyf-itd/content/blocks/how-itd-works/what-is-itd/index.md +++ b/org-cyf-itd/content/blocks/how-itd-works/what-is-itd/index.md @@ -7,44 +7,10 @@ time=5 ### What is ITD -When people [sign up to study](https://codeyourfuture.io/itc/) on our website, they are invited to begin our Intro To Digital (ITD) Course. This course opens for one month, then closes for one month, then reopens. It runs six times a year. +When people [sign up to study](https://migracode.org/web-development-course/) on our website, they are invited to begin our Intro To Digital (ITD) Course. This course opens for two months. -Learners complete the course on our [Guided Learning platform](https://course1.codeyourfuture.io/) by completing a sequence of steps. Each step is explained clearly in B1 English. The text is reproduced on this site in the [Steps](./steps) section. +Learners complete the course by following the sequence of steps found in this page. Each step is explained clearly in English. -These submissions are passed to our internal dashboard, where volunteers can track the progress of each person and help them move forward. +In order for you to enter our courses (Web Development, AWS...) you need to do **all the steps** and share the content with us. After the submission has been done, you will be invited to an interview with our team. -Volunteers review the submissions and guide learners via: - -1. the comment threads on the dashboard -1. our Slack workspace for ITD -1. [drop-in sessions](./workshops) organised in-person or online by respective regional CYF teams -1. calling and SMS messaging directly from the dashboard - -If you'd like to help, please [sign up as a volunteer](https://codeyourfuture.io/volunteer/). - ---- - -### When does ITD run? - -{{}} - -### 📅 Open - -January -March -May -July -September -November -<---> - -### ⛔ Closed - -February -April -June -August -October -December - -{{}} +While doing this course, you can join our Slack channel for ITD and get support on the process. \ No newline at end of file diff --git a/org-cyf-itd/content/blocks/peer-learning/index.md b/org-cyf-itd/content/blocks/peer-learning/index.md index f979362bc..ed043c045 100644 --- a/org-cyf-itd/content/blocks/peer-learning/index.md +++ b/org-cyf-itd/content/blocks/peer-learning/index.md @@ -10,7 +10,7 @@ objectives =['Work together on exercises and activities to find gaps in understa +++ -At {{}} we always make time to help others. In fact, the best way to _learn_ is to teach others. This is how we secure our understanding. Remember: focus on the blockers that are stopping your group from progressing. Volunteers may be around to help you with your questions, but this is your time to work together. +At Migracode Barcelona we always make time to help others. In fact, the best way to _learn_ is to teach others. This is how we secure our understanding. Remember: focus on the blockers that are stopping your group from progressing. Volunteers may be around to help you with your questions, but this is your time to work together. #### 📢 Caller: diff --git a/org-cyf-itd/content/blocks/step-0/acceptance/index.md b/org-cyf-itd/content/blocks/step-0/acceptance/index.md index 5f5fd5b07..d3574f0ef 100644 --- a/org-cyf-itd/content/blocks/step-0/acceptance/index.md +++ b/org-cyf-itd/content/blocks/step-0/acceptance/index.md @@ -9,14 +9,10 @@ time= 10 publishResources = false +++ -A volunteer will review your submission and check it meets the acceptance criteria. They will give you feedback on your submission and help you make any changes to meet the criteria. - Here is the criteria you need to meet: ```objectives -- You have joined the CodeYourFuture ITD Slack -- You have used the same name on the Slack as you have on this platform so we can tell who you are -- You have introduced yourself on the #introduce-yourself-to-codeyourfuture channel -- You have taken a screenshot of your introduction on the channel -- You have uploaded the screenshot to this platform +- You have joined the MigraCode ITD Slack +- You have introduced yourself on the itd-2025 channel +- You have a professional name and photo on your Slack profile ``` diff --git a/org-cyf-itd/content/blocks/step-0/instructions/index.md b/org-cyf-itd/content/blocks/step-0/instructions/index.md index bdf26ceeb..8b0bbebae 100644 --- a/org-cyf-itd/content/blocks/step-0/instructions/index.md +++ b/org-cyf-itd/content/blocks/step-0/instructions/index.md @@ -1,6 +1,6 @@ +++ -title ="Step 0: What to do" -description= "Join the CodeYourFuture Intro To Digital Slack" +title ="What to do" +description= "Join the MigraCode Intro To Digital Slack" emoji= "🗨" time= 60 [build] @@ -9,17 +9,15 @@ time= 60 publishResources = false +++ -### Join the CodeYourFuture Intro To Digital Slack +### Join the MigraCode Intro To Digital Slack We have an environment in which you can ask for help and build your local community. Slack helps us have asynchronous conversations with our community. It is used by most tech teams. +By this time you should have already received an invitation to our Slack channel which will automatically put you into all relevant slack channels. -Please use a consistent professional name on Slack and add a consistent profile picture. We ask this so we can recognise each other. You don't have to share any information you are not comfortable with. +Please use a consistent professional name on Slack and add a consistent profile picture. We ask this so we can recognise each other. You don't have to share any information you are not comfortable with. After having joined make sure to: -1. Accept this invite _(invite available in Learner view on CYF Platform, not on this public copy)_ to our Introduction to Digital Slack -2. [Read the Slack tutorial](https://slack.com/intl/en-gb/help/articles/360059928654-How-to-use-Slack--your-quick-start-guide) to get started on Slack -3. Introduce yourself on the [#introduce-yourself-to-codeyourfuture channel](https://cyf-introtodigital.slack.com/archives/CQ8HYL25C) -4. Make a screenshot of your introduction on our Slack channel -5. Upload the screenshot to this platform + - Introduce yourself on the itd-2025 channel so we know you have successfully joined and are working on your application. In the introduction tell us your name, where you are from as (this step is optional) a fun fact about you! -> [!TIP] -> If you don't know how to take a screenshot from your device, [Take a screenshot](https://www.take-a-screenshot.org/android.html) can help you. + - E.g. "Hi everyone! My name is Amanda- but you can all me Mandy. I am from Uruguay and before migrating to Spain I was running an animal shelter in my home country. Exited to get started with web development 😊" + +If you have not yet received an invite to our Slack channel, please send a message to barcelona@migracode.org \ No newline at end of file diff --git a/org-cyf-itd/content/blocks/step-0/submission/index.md b/org-cyf-itd/content/blocks/step-0/submission/index.md index 681a61ceb..1170abe96 100644 --- a/org-cyf-itd/content/blocks/step-0/submission/index.md +++ b/org-cyf-itd/content/blocks/step-0/submission/index.md @@ -11,6 +11,4 @@ time= 5 ### Submission -You must do this in the [CYF Course platform](https://application-process.codeyourfuture.io/) - -1. Upload the screenshot of your introduction on Slack +Send an introductory message stating your name, where you are from and an optional fun fact about you in the itd-2025 channel. diff --git a/org-cyf-itd/content/blocks/step-1-using-slack/acceptance/index.md b/org-cyf-itd/content/blocks/step-1-using-slack/acceptance/index.md index 8a47b6cbf..e8fd16236 100644 --- a/org-cyf-itd/content/blocks/step-1-using-slack/acceptance/index.md +++ b/org-cyf-itd/content/blocks/step-1-using-slack/acceptance/index.md @@ -17,5 +17,5 @@ Here is the criteria you need to meet: - You have submitted your answers in the "Slack and Search Engine Exercise" and scored at least 25/30. - You have saved your Result Page (Score Summary Page) as a PDF file. - The PDF file contains your **name**, your **score**, and your **answers**. -- You have uploaded the PDF file to the CYF Course Platform. +- You have attached your file to the final email (check ITD manual) ``` \ No newline at end of file diff --git a/org-cyf-itd/content/blocks/step-1-using-slack/instructions/index.md b/org-cyf-itd/content/blocks/step-1-using-slack/instructions/index.md index 3f89a9e3f..6902640cb 100644 --- a/org-cyf-itd/content/blocks/step-1-using-slack/instructions/index.md +++ b/org-cyf-itd/content/blocks/step-1-using-slack/instructions/index.md @@ -1,5 +1,5 @@ +++ -title ="Step 1: What to do" +title ="What to do" description= "Essential Digital Skills: Navigating Slack & Google Search" emoji= "🗨" time= 60 diff --git a/org-cyf-itd/content/blocks/step-1-using-slack/submission/index.md b/org-cyf-itd/content/blocks/step-1-using-slack/submission/index.md index 98767a0a4..1f155db1e 100644 --- a/org-cyf-itd/content/blocks/step-1-using-slack/submission/index.md +++ b/org-cyf-itd/content/blocks/step-1-using-slack/submission/index.md @@ -11,6 +11,4 @@ time= 5 ### Submission -You must do this in the [CYF Course Platform](https://application-process.codeyourfuture.io/) - -1. Upload a PDF file created from your Result Page (Score Summary Page) \ No newline at end of file +Attach the PDF file created from your Result Page (Score Summary Page) to the email you send to us. (Check the ITD Manual for exact instructions) \ No newline at end of file diff --git a/org-cyf-itd/content/blocks/step-1/acceptance/index.md b/org-cyf-itd/content/blocks/step-1/acceptance/index.md index e981a0b72..dfd3aa723 100644 --- a/org-cyf-itd/content/blocks/step-1/acceptance/index.md +++ b/org-cyf-itd/content/blocks/step-1/acceptance/index.md @@ -18,7 +18,7 @@ Here is the criteria you need to meet: - You have saved the cover letter in a Google Docs document - You have added your name to the document's file name - You have made the document public -- You have uploaded the link to the document to the CYF Course Platform +- You have uploaded the link to the document to the MigraCode Barcelona Course Platform - You have added at least one comment giving feedback on the content of the AI's work -- Your comment is made on the CYF Course Platform (not on Google docs). +- Your comment is made on the MigraCode Barcelona Course Platform (not on Google docs). ``` diff --git a/org-cyf-itd/content/blocks/step-1/instructions/index.md b/org-cyf-itd/content/blocks/step-1/instructions/index.md index 375933626..a62a5ac0e 100644 --- a/org-cyf-itd/content/blocks/step-1/instructions/index.md +++ b/org-cyf-itd/content/blocks/step-1/instructions/index.md @@ -57,7 +57,7 @@ Software for Lawyers Ltd makes case management software. Their software helps la 5. Create a Google doc with the text of the cover letter you generated. If this platform is new to you, there is this [guide on what Google docs is and how to use it](https://support.google.com/docs/answer/7068618?hl=en-GB&co=GENIE.Platform%3DDesktop) available. 6. Please put your name in the title of the Google doc and **make it public**. You can add just your given name or your family name if you prefer. 7. Add the link to the Google doc to this platform -8. Add a comment *on the CYF Course Platform* with feedback (positive or negative) on the text the AI has generated. It should not be a general comment about AI or your feelings about using AI; it should be your own evaluation of the text you are submitting. +8. Add a comment *on the Migracode Barcelona Course Platform* with feedback (positive or negative) on the text the AI has generated. It should not be a general comment about AI or your feelings about using AI; it should be your own evaluation of the text you are submitting. {{}} Before you share your link with your mentors, edit your file name to include your name. It can just be your given name or your family name if you prefer. diff --git a/org-cyf-itd/content/blocks/step-3/acceptance/index.md b/org-cyf-itd/content/blocks/step-3/acceptance/index.md index 7af479bf9..d89fac43e 100644 --- a/org-cyf-itd/content/blocks/step-3/acceptance/index.md +++ b/org-cyf-itd/content/blocks/step-3/acceptance/index.md @@ -9,12 +9,12 @@ time= 5 publishResources = false +++ -A volunteer will review your submission and check it meets the acceptance criteria. They will give you feedback on your submission and help you make any changes to meet the criteria. +One of us will review your submission once you have sent us the full email with all requirements and will check it meets the acceptance criteria. Here is the criteria you need to meet: ```objectives -- You confirm you have completed Unit 2 of Khan Academy Computer Programming course: HTML/CSS Making Webpages -- You have shared a link to your Invitation project on GitHub Pages -- Your website link includes your name +- You confirm you have completed the Scrimba course on HTML/CSS +- You have created your own files on VSCode and polished the GIFt site +- You have deployed the GIFt site on Netlify ``` diff --git a/org-cyf-itd/content/blocks/step-3/instructions/index.md b/org-cyf-itd/content/blocks/step-3/instructions/index.md index 44a3be354..3ec2d173a 100644 --- a/org-cyf-itd/content/blocks/step-3/instructions/index.md +++ b/org-cyf-itd/content/blocks/step-3/instructions/index.md @@ -1,7 +1,4 @@ +++ -title ="Step 3: What to do" -description= "Learn HTML and CSS fundamentals with Khan Academy" -emoji= "🤖" time= 480 [build] render = 'never' @@ -9,27 +6,68 @@ time= 480 publishResources = false +++ - +# 🤖 Step 3: Learn HTML and CSS with Scrimba -Learn HTML and CSS by completing Unit 2 of [Khan Academy](https://www.khanacademy.org)'s Computer Programming course. You don't need to know anything about coding to start - it's good for complete beginners. There are 9 lessons in Unit 2. The [video playlist](https://www.youtube.com/playlist?list=PLC51FJvpvRvyK3n1d-Kth7ldHO__Tpygr) is ~2 hours long, and the whole course will take 4-10 hours. This course is completely free. +This course will teach you HTML and CSS through building and deploying four awesome projects. +It’s fully interactive with over *75 coding challenges* and *no prerequisites* — perfect for beginners! -1. Create an [account on Khan Academy](https://www.khanacademy.org/computing/computer-programming/html-css) -1. Go to the course: [Computer Programming: Unit 2](https://www.khanacademy.org/computing/computer-programming/html-css) HTML/CSS Making webpages -1. Follow along and build the projects. -1. Deploy the Lesson 6 project "Event Invitation" to GitHub Pages and share the link in the submission form +

-#### The 4 projects you will do are: -1. Project: Travel webpage -1. Project: Recipe book -1. Project: Blog -1. Project: Event invite +## 🚀 Getting Started -#### The project you will deploy to GitHub Pages is: +1. **Create an account** on [Scrimba](https://scrimba.com) +2. Go to the course: [**Learn HTML and CSS**](https://scrimba.com/learn-html-and-css-c0p) +3. Follow along with the interactive lessons and complete the challenges +4. Build and deploy your projects -4. Project: [Event invite](https://www.khanacademy.org/computing/computer-programming/html-css/css-layout-properties/pp/project-event-invite) + +

+ +## 📚 What You'll Learn + +### 🧱 HTML + +- Basic HTML tags +- HTML document structure +- Anchor tags & input fields +- Chrome Dev Tools +- How HTML and CSS work together + +### 🎨 CSS + +- Basic CSS syntax +- Centering with CSS +- CSS Flexbox basics +- Padding, margins, and borders + +### 🧰 Tools & Deployment + +- Deployment with Netlify +- Getting started with GitHub +

+

+ + +## 🧠 What you need to pass this module + +- ⏱️ **Course Duration**: ~5.7 hours +- 🧩 **Full Completion Time**: 10–15 hours (with projects and challenges) +- ⚡ **Requirement to pass**: A screenshot of all having watched all parts of the course and submitted al scrimbs (i.e., small code snippets) along the way and the deployment of the Birthday GIFt Site. + + +⚠️ **Note: You do not need to pay for Scrimba! It is a free resource except for the "solo project" which we are skipping** ➡️ +

+ +### 💪 Just in case it was not clear yet... +- All projects except the Hometown Homepage are mandatory for passing into the next round. +- The Birthday GIFt Site needs to be deployed externally, you will need to have created your own files on your local machine. +- For that it will be necessary for you to download VSCode to edit code and make a free Netlify account to deploy your site at the end- follow instructions on the Scrimba course. +- In the case that you need assistance, do not hesitate to contact us on Slack (view help section) - asking for help will not impact your application negatively (quite the opposite, we believe in sharing blockers and helping one another in the MigraCode community!) + +✅ A **screenshot showing course completion** and **a link to your deplyed GIFt Site** is enough — no official Scrimba certificate is required (no need to pay for the PRO version of Scrimba)! {{}} +src="https://scrimba.com/learn-html-and-css-c0p" +name="Learn HTML and CSS" +caption="Scrimba">}} diff --git a/org-cyf-itd/content/blocks/step-3/submission/index.md b/org-cyf-itd/content/blocks/step-3/submission/index.md index 0255bdbe8..8e70e0a04 100644 --- a/org-cyf-itd/content/blocks/step-3/submission/index.md +++ b/org-cyf-itd/content/blocks/step-3/submission/index.md @@ -11,11 +11,6 @@ time= 5 ### Submission -You must submit a link to your work in the [CYF Course platform](https://application-process.codeyourfuture.io) +You must submit the screenshots and the link to your deployed site by sending it (along with the other requirements) to barcelona@migracode.org. Please check the Manual for exact instructions. -1. Share a link to your Invitation project on [GitHub Pages](https://pages.github.com/) - -### Personalise your URLs - -Before you share your link, set your [Github](https://github.com/) Pages URL to include your name, so we can tell who you are. You can use your first name or last name. diff --git a/org-cyf-itd/content/blocks/step-4/extend/index.md b/org-cyf-itd/content/blocks/step-4/extend/index.md index c5069c349..313f1aceb 100644 --- a/org-cyf-itd/content/blocks/step-4/extend/index.md +++ b/org-cyf-itd/content/blocks/step-4/extend/index.md @@ -11,4 +11,4 @@ time= 60 #### Use your new skill in real life: -This step is just for you. You don't need to submit it. Next, deploy your personal home page to GitHub Pages, using what you learned in Khan Academy. +This step is just for you. You don't need to submit it. Next, deploy your personal home page to GitHub Pages, using what you learned on Scrimba. diff --git a/org-cyf-itd/content/blocks/step-4/instructions/index.md b/org-cyf-itd/content/blocks/step-4/instructions/index.md index e8f187748..d7b7ed88c 100644 --- a/org-cyf-itd/content/blocks/step-4/instructions/index.md +++ b/org-cyf-itd/content/blocks/step-4/instructions/index.md @@ -1,6 +1,6 @@ +++ title ="Step 4: What to do" -description= "Build a personal home page with CodePen" +description= "Build a portfolio with CodePen" emoji= "🤖" time= 300 [build] @@ -13,7 +13,7 @@ You must now build your own home page, and get all of the tests to pass. Give it ### Steps 1. Make a free account on [CodePen](https://codepen.io/) -2. [Fork](https://blog.codepen.io/documentation/forks/) the CYF starter page [Personal Home Page Template](https://codepen.io/IntroToTech/pen/PomeEod) +2. [Fork](https://blog.codepen.io/documentation/forks/) the CYF starter page from Code Your Future (our partner organisation in the UK) [Personal Home Page Template](https://codepen.io/IntroToTech/pen/PomeEod) 3. Read the instructions in the code panels and edit the code to meet all the criteria you discover Use HTML and CSS to complete this project. diff --git a/org-cyf-itd/content/blocks/step-4/submission/index.md b/org-cyf-itd/content/blocks/step-4/submission/index.md index c62ba2029..b63bbaaf5 100644 --- a/org-cyf-itd/content/blocks/step-4/submission/index.md +++ b/org-cyf-itd/content/blocks/step-4/submission/index.md @@ -11,6 +11,6 @@ time= 5 ### Submission -You must do this in the [CYF Course platform](https://application-process.codeyourfuture.io/) +You must send us the link to your personal homepage to Barcelona@migracode.org 1. Share a link to your personal homepage on CodePen with all the tests passing diff --git a/org-cyf-itd/content/steps/five/index.md b/org-cyf-itd/content/steps/five/index.md index a3bcc0e8d..ffb53599e 100644 --- a/org-cyf-itd/content/steps/five/index.md +++ b/org-cyf-itd/content/steps/five/index.md @@ -1,10 +1,10 @@ +++ -title = 'Five' -description="Build a personal home page with CodePen" +title = 'Four' +description="Build a portfolio with CodePen" layout = 'prep' emoji= '🏠' menu_level = ['module'] -menu=[ 'steps'] +menu=[ 'get coding'] weight = 6 [[blocks]] name="Instructions" @@ -18,7 +18,8 @@ src="blocks/step-4/submission" [[blocks]] name="Help" src="blocks/help" -[[blocks]] -name="Extensions" -src="blocks/step-4/extend" +# [[blocks]] +# name = "Extensions" +# src = "blocks/step-4/extend" +++ + diff --git a/org-cyf-itd/content/steps/four/index.md b/org-cyf-itd/content/steps/four/index.md index 572f85b92..696dcaac6 100644 --- a/org-cyf-itd/content/steps/four/index.md +++ b/org-cyf-itd/content/steps/four/index.md @@ -1,10 +1,10 @@ +++ -title = 'Four' -description = 'Build four simple projects using HTML and CSS in Khan Academy' +title = 'Three' +description = 'Build five simple projects using HTML and CSS in Scrimba' layout = 'prep' emoji= '🚀' menu_level = ['module'] -menu=[ 'steps'] +menu=[ 'get coding'] weight = 5 [[blocks]] name="Instructions" @@ -18,8 +18,8 @@ src="blocks/step-3/submission" [[blocks]] name="Help" src="blocks/help" -[[blocks]] -name="Extensions" -src="blocks/step-3/extend" +# [[blocks]] +# name="Extensions" +# src="blocks/step-3/extend" time=5 +++ diff --git a/org-cyf-itd/content/steps/one/index.md b/org-cyf-itd/content/steps/one/index.md index 6f969e45a..700ad0ad1 100644 --- a/org-cyf-itd/content/steps/one/index.md +++ b/org-cyf-itd/content/steps/one/index.md @@ -4,7 +4,7 @@ description = 'Using Slack and search engines' layout = 'prep' emoji= '🧑‍🤝‍🧑' menu_level = ['module'] -menu=[ 'steps'] +menu=[ 'get connected'] weight = 2 [[blocks]] name="Instructions" diff --git a/org-cyf-itd/content/steps/six/index.md b/org-cyf-itd/content/steps/six/index.md index 16e2f125f..ed3192bc3 100644 --- a/org-cyf-itd/content/steps/six/index.md +++ b/org-cyf-itd/content/steps/six/index.md @@ -1,24 +1,24 @@ +++ -title = 'Six' -description="Check your English CEFR level is B1 or above" -layout = 'prep' -emoji= '🏴󠁧󠁢󠁥󠁮󠁧󠁿' -menu_level = ['module'] -menu=[ 'steps'] -weight = 7 -[[blocks]] -name="Instructions" -src="blocks/step-5/instructions" -[[blocks]] -name="Acceptance Criteria" -src="blocks/step-5/acceptance" -[[blocks]] -name="Submission" -src="blocks/step-5/submission" -[[blocks]] -name="Help" -src="blocks/help" -[[blocks]] -name="Extensions" -src="blocks/step-5/extend" +# title = 'Six' +# description="Check your English CEFR level is B1 or above" +# layout = 'prep' +# emoji= '🏴󠁧󠁢󠁥󠁮󠁧󠁿' +# menu_level = ['module'] +# menu=[ 'steps'] +# weight = 7 +# [[blocks]] +# name="Instructions" +# src="blocks/step-5/instructions" +# [[blocks]] +# name="Acceptance Criteria" +# src="blocks/step-5/acceptance" +# [[blocks]] +# name="Submission" +# src="blocks/step-5/submission" +# [[blocks]] +# name="Help" +# src="blocks/help" +# [[blocks]] +# name="Extensions" +# src="blocks/step-5/extend" +++ diff --git a/org-cyf-itd/content/steps/three/index.md b/org-cyf-itd/content/steps/three/index.md index 168230642..a20c43a7a 100644 --- a/org-cyf-itd/content/steps/three/index.md +++ b/org-cyf-itd/content/steps/three/index.md @@ -1,10 +1,10 @@ +++ -title = 'Three' +title = 'Two' description = 'Evaluate data with Google Sheets' layout = 'prep' emoji= '📊' menu_level = ['module'] -menu=[ 'steps'] +menu=[ 'get connected'] weight = 4 [[blocks]] name="Instructions" @@ -18,7 +18,7 @@ src="blocks/step-2/submission" [[blocks]] name="Help" src="blocks/help" -[[blocks]] -name="Extensions" -src="blocks/step-2/extend" +# [[blocks]] +# name="Extensions" +# src="blocks/step-2/extend" +++ diff --git a/org-cyf-itd/content/steps/two/index.md b/org-cyf-itd/content/steps/two/index.md index 787a5570a..0e8585c52 100644 --- a/org-cyf-itd/content/steps/two/index.md +++ b/org-cyf-itd/content/steps/two/index.md @@ -18,7 +18,7 @@ src="blocks/step-1/submission" [[blocks]] name="Help" src="blocks/help" -[[blocks]] -name="Extensions" -src="blocks/step-1/extend" +# [[blocks]] +# name="Extensions" +# src="blocks/step-1/extend" +++ diff --git a/org-cyf-itd/content/steps/zero/index.md b/org-cyf-itd/content/steps/zero/index.md index 9245ed582..281db1a5f 100644 --- a/org-cyf-itd/content/steps/zero/index.md +++ b/org-cyf-itd/content/steps/zero/index.md @@ -1,10 +1,10 @@ +++ title = 'Zero' -description = 'Join the CodeYourFuture Intro to Digital Slack' +description = 'Join the MigraCode Intro to Digital Slack' layout = 'prep' emoji= '🗨' menu_level = ['module'] -menu=[ 'steps'] +menu=[ 'get connected'] weight = 1 [[blocks]] name="Instructions" diff --git a/org-cyf-theme/assets/custom-images/site-logo/site-logo.svg b/org-cyf-theme/assets/custom-images/site-logo/site-logo.svg index 6a181831a..16c67e9a9 100644 --- a/org-cyf-theme/assets/custom-images/site-logo/site-logo.svg +++ b/org-cyf-theme/assets/custom-images/site-logo/site-logo.svg @@ -1,15 +1,2 @@ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/org-cyf-theme/assets/custom-theme/02-variables/colors.scss b/org-cyf-theme/assets/custom-theme/02-variables/colors.scss index 71b3a4252..07942fd74 100644 --- a/org-cyf-theme/assets/custom-theme/02-variables/colors.scss +++ b/org-cyf-theme/assets/custom-theme/02-variables/colors.scss @@ -1,12 +1,12 @@ @mixin light-palette { // these brand colours are set and then everything else is derived from the key - --theme-color--brand: hsla(360, 83%, 60%, 0.95); - --theme-color--brand-shade: hsla(360, 83%, 60%, 0.25); + --theme-color--brand: rgb(21, 212, 190); + --theme-color--brand-shade: rgba(21, 212, 190, .05); // this is picked from CYF Canva brand palette and we will take the hue from this - --theme-color--accent: hsl(247, 35%, 19%); - --theme-color--accent-shade: hsla(247, 35%, 35%, 0.15); + --theme-color--accent: rgb(21, 212, 190); + --theme-color--accent-shade: hsla(146, 100%, 46%, 0.5); // this is the nearest accessible shade to brand red - --theme-color--pop: hsla(360, 83%, 45%, 0.95); + --theme-color--pop: hsla(262, 100%, 62%, 1); // key --hue: 247; diff --git a/org-cyf-theme/assets/custom-theme/02-variables/fonts.scss b/org-cyf-theme/assets/custom-theme/02-variables/fonts.scss index 2e90a8853..c7a0754e1 100644 --- a/org-cyf-theme/assets/custom-theme/02-variables/fonts.scss +++ b/org-cyf-theme/assets/custom-theme/02-variables/fonts.scss @@ -1,6 +1,4 @@ :root { - --theme-font--display: "Raleway", serif; - --theme-font--copy: "Lato", system-ui, -apple-system, BlinkMacSystemFont, - "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", - sans-serif; + --theme-font--display: "Jura", sans-serif;; + --theme-font--copy: "Inter", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; } diff --git a/org-cyf-theme/hugo.toml b/org-cyf-theme/hugo.toml index 7e8fdfa2c..5d65aa830 100644 --- a/org-cyf-theme/hugo.toml +++ b/org-cyf-theme/hugo.toml @@ -49,7 +49,7 @@ org = "https://github.com/CodeYourFuture" repo = "https://github.com/CodeYourFuture/curriculum/" pdrepo = "CYF-PD" root = "curriculum" -googleFonts="https://fonts.googleapis.com/css2?family=Noto+Color+Emoji&family=Raleway:wght@300;600;800;900&family=Lato:wght@500;800&display=swap" +googleFonts="https://fonts.googleapis.com/css2?family=Jura:wght@400;600;700&family=Inter:wght@400;500;700&family=Noto+Color+Emoji&family=Raleway:wght@300;600;800;900&family=Lato:wght@500;800&display=swap" # We use a proxy which concatenates paginated responses, otherwise we miss results. # Daniel is currently hosting this code https://github.com/illicitonion/github-issue-proxy but we should work out a long-term maintainable solution to this problem. diff --git a/org-cyf-tracks/.env.example b/org-cyf-tracks/.env.example deleted file mode 100644 index dbbe14ac8..000000000 --- a/org-cyf-tracks/.env.example +++ /dev/null @@ -1,10 +0,0 @@ -# Allow accessing a GitHub bearer token to avoid rate limits when doing HTTP fetches to the GitHub API. -# This can be generated at https://github.com/settings/tokens?type=beta and needs read-only access to all public CYF GitHub repos. -HUGO_CURRICULUM_GITHUB_BEARER_TOKEN="" - -# Client ID and secret for the GitHub OAuth app used to authenticate users. -GITHUB_CLIENT_ID="clientid" -GITHUB_CLIENT_SECRET="clientsecret" - -# The domain of the site, used for generating redirect URLs. -DOMAIN="http://localhost:1313" diff --git a/org-cyf/.env.example b/org-cyf/.env.example deleted file mode 100644 index dbbe14ac8..000000000 --- a/org-cyf/.env.example +++ /dev/null @@ -1,10 +0,0 @@ -# Allow accessing a GitHub bearer token to avoid rate limits when doing HTTP fetches to the GitHub API. -# This can be generated at https://github.com/settings/tokens?type=beta and needs read-only access to all public CYF GitHub repos. -HUGO_CURRICULUM_GITHUB_BEARER_TOKEN="" - -# Client ID and secret for the GitHub OAuth app used to authenticate users. -GITHUB_CLIENT_ID="clientid" -GITHUB_CLIENT_SECRET="clientsecret" - -# The domain of the site, used for generating redirect URLs. -DOMAIN="http://localhost:1313" diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..05e2fc2bc --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "curriculum2.0", + "lockfileVersion": 3, + "requires": true, + "packages": {} +}