diff --git a/.github/workflows/backup-results.yml b/.github/workflows/backup-results.yml index e061ffe..d313e87 100644 --- a/.github/workflows/backup-results.yml +++ b/.github/workflows/backup-results.yml @@ -2,8 +2,8 @@ name: Backup results # on: push on: - # schedule: - # - cron: "0 1 * * *" + schedule: + - cron: "0 1 * * *" workflow_dispatch: jobs: diff --git a/astro.config.mjs b/astro.config.mjs index f617b61..68f1336 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -1,16 +1,16 @@ -import { defineConfig } from "astro/config"; +import mdx from "@astrojs/mdx"; +import netlify from "@astrojs/netlify"; +import react from "@astrojs/react"; import tailwind from "@astrojs/tailwind"; import yaml from "@rollup/plugin-yaml"; -import icon from "astro-icon"; -import mdx from "@astrojs/mdx"; -import react from "@astrojs/react"; +import icon from "astro-icon"; -import netlify from "@astrojs/netlify"; +import { defineConfig } from "astro/config"; -const SURVEY_OPEN = false; +const SURVEY_OPEN = true; -const redirects = SURVEY_OPEN +const redirects = !SURVEY_OPEN ? { "/before-start": "/", "/survey": "/", diff --git a/src/components/header.astro b/src/components/header.astro index 45eb05a..32d3ea2 100644 --- a/src/components/header.astro +++ b/src/components/header.astro @@ -11,6 +11,7 @@ const navItems = [ { year: 2021, href: "/2021" }, { year: 2022, href: "/2022" }, { year: 2023, href: "/2023" }, + { year: 2024, href: "/2024" }, { label: "Playground", href: "/playground", icon: Chart }, { label: "FAQ", href: "/faq" }, { label: "Github", href: website.repoGithub, icon: Github, external: true } diff --git a/src/components/home/hero.astro b/src/components/home/hero.astro index 931ce29..eb61dd4 100644 --- a/src/components/home/hero.astro +++ b/src/components/home/hero.astro @@ -86,7 +86,7 @@ import Crea2 from "../../assets/undraw_visual_data.svg"; Take part in the survey{" "} - +
diff --git a/src/pages/index.astro b/src/pages/index.astro index 8dc15bf..e512ddf 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,8 +1,8 @@ --- -import Report2024 from "./2024.astro"; -// import Home from "./home.astro"; +// import Report2024 from "./2024.astro"; +import Home from "./home.astro"; export const prerender = true; --- - + diff --git a/survey/1-profile.yml b/survey/1-profile.yml index 871ceba..62f257b 100644 --- a/survey/1-profile.yml +++ b/survey/1-profile.yml @@ -21,21 +21,21 @@ questions: - label: Where are you currently located? required: true choices: - - "Rabat-Salé-Kénitra" - - "Casablanca-Settat" - - "Marrakech-Safi" - - "Tanger-Tétouan-Al Hoceïma" + - Rabat-Salé-Kénitra + - Casablanca-Settat + - Marrakech-Safi + - Tanger-Tétouan-Al Hoceïma - "L'Oriental" - - "Fès-Meknès" - - "Béni Mellal-Khénifra" - - "Drâa-Tafilalet" - - "Souss-Massa" - - "Guelmim-Oued Noun" - - "Laâyoune-Sakia El Hamra" - - "Dakhla-Oued Ed Dahab" + - Fès-Meknès + - Béni Mellal-Khénifra + - Drâa-Tafilalet + - Souss-Massa + - Guelmim-Oued Noun + - Laâyoune-Sakia El Hamra + - Dakhla-Oued Ed Dahab - Europe - "US & Canada" - - "Middle East" + - Middle East - Others - label: What is your occupation? diff --git a/survey/2-learning-and-education.yml b/survey/2-learning-and-education.yml index 6517407..08361a2 100644 --- a/survey/2-learning-and-education.yml +++ b/survey/2-learning-and-education.yml @@ -58,6 +58,7 @@ questions: - label: What are the biggest challenges you find in learning new technologies (pick 3)? required: true + multiple: true choices: - Lack of time - Language barriers (English/French proficiency) diff --git a/survey/3-work.yml b/survey/3-work.yml index a44084c..404ca63 100644 --- a/survey/3-work.yml +++ b/survey/3-work.yml @@ -1,8 +1,11 @@ title: Work label: work position: 3 +showIf: + question: profile-q-5 + notEquals: 0 questions: - - label: "What is your employment status?" + - label: What is your employment status? required: true multiple: false choices: @@ -24,7 +27,7 @@ questions: - "Sometimes: 1-2 days per month but less than weekly" - "Often: 1-2 days per week or more" - "Very often: 3-5 days per week" - - "Daily" + - Daily - label: How do you feel about your job? required: false @@ -36,6 +39,7 @@ questions: - Very satisfied - label: How long have you been unemployed after graduation? + required: false choices: - None, I worked straight after my graduation 😎 - Up to 3 months @@ -44,56 +48,72 @@ questions: - More than 1 year - label: "If you are a full time employee in Morocco(CDI), Your NET salary range per month in MAD is:" + required: false + showIf: + question: profile-q-7 + notEquals: 3 choices: - - "< 4 000" - - "4 000 - 6 000" - - "6 000 - 8 000" - - "8 000 - 10 000" - - "10 000 - 12 000" - - "12 000 - 14 000" - - "14 000 - 16 000" - - "16 000 - 18 000" - - "18 000 - 20 000" - - "20 000 - 22 000" - - "22 000 - 25 000" - - "25 000 - 30 000" + - < 4 000 + - 4 000 - 6 000 + - 6 000 - 8 000 + - 8 000 - 10 000 + - 10 000 - 12 000 + - 12 000 - 14 000 + - 14 000 - 16 000 + - 16 000 - 18 000 + - 18 000 - 20 000 + - 20 000 - 22 000 + - 22 000 - 25 000 + - 25 000 - 30 000 - "> 30 000" - label: "If you are working as a freelancer in Morocco, Your salary range per day in MAD(TJM) is:" + required: false + showIf: + question: profile-q-7 + notEquals: 3 choices: - - "< 1 000" - - "1 000 - 1 500" - - "1 500 - 2 000" - - "2 000 - 2 500" - - "2 500 - 3 000" - - "3 000 - 4 000" - - "4 000 - 5 000" + - < 1 000 + - 1 000 - 1 500 + - 1 500 - 2 000 + - 2 000 - 2 500 + - 2 500 - 3 000 + - 3 000 - 4 000 + - 4 000 - 5 000 - "> 5 000" - label: "If you are working full-time contract outside Morocco, Your gross salary range per year in USD is:" + required: false + showIf: + question: profile-q-7 + equals: 3 choices: - - "< 20 000" - - "20 000 - 25 000" - - "25 000 - 30 000" - - "30 000 - 40 000" - - "40 000 - 50 000" - - "50 000 - 60 000" - - "60 000 - 80 000" - - "80 000 - 100 000" - - "100 000 - 120 000" - - "120 000 - 150 000" - - "150 000 - 200 000" + - < 20 000 + - 20 000 - 25 000 + - 25 000 - 30 000 + - 30 000 - 40 000 + - 40 000 - 50 000 + - 50 000 - 60 000 + - 60 000 - 80 000 + - 80 000 - 100 000 + - 100 000 - 120 000 + - 120 000 - 150 000 + - 150 000 - 200 000 - "> 200 000" - label: "If you are working as a freelancer/contractor outside Morocco, Your daily gross wage in USD is:" + required: false + showIf: + question: profile-q-7 + equals: 3 choices: - - "< 200" - - "200 - 500" - - "500 - 1 000" - - "1 000 - 2 000" - - "2 000 - 3 000" - - "3 000 - 5 000" - - "5 000 - 10 000" + - < 200 + - 200 - 500 + - 500 - 1 000 + - 1 000 - 2 000 + - 2 000 - 3 000 + - 3 000 - 5 000 + - 5 000 - 10 000 - "> 10 000" - label: What characteristics would mostly influence your decision to choose one job offer over another? @@ -148,7 +168,7 @@ questions: - Full remote - Part-time remote/Hybrid - - label: "Which sectors are you currently working in?" + - label: Which sectors are you currently working in? multiple: true required: false choices: @@ -174,3 +194,22 @@ questions: - Blockchain/Web3 - Government/Public sector - Other + + - label: What best describes your relationship with entrepreneurship? + required: false + showIf: + question: work-q-0 + notEquals: 0 + choices: + - Currently building a side project/startup while employed + - Planning to start a business within the next year + - Interested, but not ready yet (2-5 years) + - Interested, but lack a viable business idea + - Interested, but need more business/entrepreneurship knowledge + - Interested, but financial risk is too high + - Interested, but family/social pressure for stable job + - Interested, but legal/administrative barriers in Morocco + - Tried entrepreneurship before, didn't work out + - Not interested, prefer working for a company + - Not interested, prefer technical work over business + - Other diff --git a/survey/4-ai.yml b/survey/4-ai.yml index 2433bc9..8c5af1c 100644 --- a/survey/4-ai.yml +++ b/survey/4-ai.yml @@ -19,7 +19,7 @@ questions: - I am a 10x engineer now (+50%) - It decreased my productivity - - label: "Do you think AI will replace developers in the future?" + - label: Do you think AI will replace developers in the future? required: true choices: - Not very much ( less than 10% ) @@ -29,7 +29,7 @@ questions: - Completely ( more than 80% ) - Not sure - - label: "Are you planning to learn AI to build apps?" + - label: Are you planning to learn AI to build apps? required: true choices: - No, I am not interested @@ -38,14 +38,15 @@ questions: - I can build complex apps and play with models. - I am already an expert - - label: "How much is your company investing in AI?" + - label: How much is your company investing in AI? + required: false choices: - We haven't started adopting AI - We're getting the basics in place - We have some ad-hoc use cases in production - We have several use cases in production - - label: "Which AI tools and apps do you use?" + - label: Which AI tools and apps do you use? multiple: true choices: # Web/Desktop AI Assistants @@ -80,7 +81,7 @@ questions: # Other - Other - - label: "Which AI frameworks and models do you use?" + - label: Which AI frameworks and models do you use? multiple: true choices: # LLM APIs & Cloud Providers diff --git a/survey/5-tech.yml b/survey/5-tech.yml index cc5227b..c22671c 100644 --- a/survey/5-tech.yml +++ b/survey/5-tech.yml @@ -2,7 +2,7 @@ title: Tech label: tech position: 5 questions: - - label: "What are the programming languages you like the most?" + - label: What are the programming languages you like the most? required: true multiple: true choices: @@ -39,7 +39,7 @@ questions: - F# - Other - - label: "What are the programming languages you want to learn next?" + - label: What are the programming languages you want to learn next? required: false multiple: true choices: @@ -76,7 +76,7 @@ questions: - F# - Other - - label: "What are the programming languages you are using on a daily basis?" + - label: What are the programming languages you are using on a daily basis? required: true multiple: true choices: @@ -113,7 +113,8 @@ questions: - F# - Other - - label: "What are the front-end frameworks/libraries you are using on a daily basis?" + - label: What are the front-end frameworks/libraries you are using on a daily basis? + required: false multiple: true choices: - jQuery @@ -141,7 +142,7 @@ questions: - Stencil - Other - - label: "What are the front-end frameworks/libraries you want to learn next?" + - label: What are the front-end frameworks/libraries you want to learn next? required: false multiple: true choices: @@ -170,7 +171,8 @@ questions: - Stencil - Other - - label: "What approach do you use for styling your web apps?" + - label: What approach do you use for styling your web apps? + required: false multiple: true choices: - CSS @@ -185,7 +187,8 @@ questions: - Vanilla Extract - Other - - label: "What are the backend frameworks you are using on a daily basis?" + - label: What are the backend frameworks you are using on a daily basis? + required: false multiple: true choices: - .NET @@ -220,7 +223,8 @@ questions: - Axum - Other - - label: "What are the backend frameworks you want to learn next?" + - label: What are the backend frameworks you want to learn next? + required: false multiple: true choices: - .NET @@ -255,7 +259,7 @@ questions: - Axum - Other - - label: "What are the platforms and tools you are using on a daily basis?" + - label: What are the platforms and tools you are using on a daily basis? required: true multiple: true choices: @@ -296,7 +300,7 @@ questions: - esbuild - Other - - label: "What are the platforms and tools you want to learn next?" + - label: What are the platforms and tools you want to learn next? required: true multiple: true choices: @@ -345,7 +349,7 @@ questions: - Linux-based - Windows + WSL2 - - label: "What is you current IDE or code editor for daily work?" + - label: What is you current IDE or code editor for daily work? required: true multiple: true choices: @@ -368,7 +372,7 @@ questions: - Xcode - Other - - label: "What do you do when you get stuck on a problem?" + - label: What do you do when you get stuck on a problem? required: true multiple: true choices: @@ -392,7 +396,8 @@ questions: - Shared hosting - Managed PaaS (heroku, app platform, Salesforce, AWS Beanstalk ...) - - label: "What cloud platform are you using?" + - label: What cloud platforms you or your team are using? + required: false multiple: true choices: - GCP @@ -415,6 +420,7 @@ questions: - None - label: "The production database you or your team are using is:" + required: false multiple: true choices: - Oracle Database @@ -441,7 +447,7 @@ questions: - TimescaleDB - Other - - label: "What type of tests do you write?" + - label: What type of tests do you write? required: true multiple: true choices: diff --git a/survey/6-community.yml b/survey/6-community.yml index 22c22d1..520bfbc 100644 --- a/survey/6-community.yml +++ b/survey/6-community.yml @@ -2,7 +2,7 @@ title: Community label: community position: 6 questions: - - label: "What prevents you from participating more in the Moroccan tech community?" + - label: What prevents you from participating more in the Moroccan tech community? required: true multiple: true choices: @@ -14,7 +14,7 @@ questions: - Financial constraints (event costs, travel) - Other - - label: "What would make you more likely to attend tech events in Morocco?" + - label: What would make you more likely to attend tech events in Morocco? required: true multiple: true choices: @@ -26,7 +26,7 @@ questions: - Better timing (weekends, evenings) - Other - - label: "How has the Moroccan tech community helped your career?" + - label: How has the Moroccan tech community helped your career? required: true multiple: true choices: @@ -38,9 +38,9 @@ questions: - It hasn't helped my career yet - Other - - label: "What do you MOST need from the Moroccan tech community right now?" + - label: What do you MOST need from the Moroccan tech community right now (pick 3 max)? required: true - multiple: false + multiple: true choices: - Job opportunities and career guidance - Mentorship from experienced developers @@ -50,9 +50,9 @@ questions: - Collaboration opportunities on projects - Other - - label: "What type of community content would be MOST valuable to you?" + - label: What type of community content would be MOST valuable to you (pick 3 max)? required: true - multiple: false + multiple: true choices: - Technical workshops (hands-on coding) - Case studies from Moroccan companies @@ -63,7 +63,7 @@ questions: - Freelancing and entrepreneurship guidance - Other - - label: "What prevents you from contributing to open source?" + - label: What prevents you from contributing to open source? required: true multiple: true choices: