Fix local development environment

.github/CODE_OF_CONDUCT.md

@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [`hello@fvcproductions.com`](mailto:hello@fvcproductions.com). The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [`hello@francescoronel.com`](mailto:hello@francescoronel.com). The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

.github/CONTRIBUTING.md

@@ -23,11 +23,11 @@
 
 ## Ways You Can Contribute
 
-- [Add apprenticeship](https://github.com/FrancesCoronel/apprenticeships.me/issues/new?assignees=&labels=addition&template=add-apprenticeship.md&title=Add%3A+) - Add an apprenticeship to our growing list 🌱
-- [Bug Report](https://github.com/FrancesCoronel/apprenticeships.me/issues/new?assignees=&labels=bug&template=bug_report.md&title=Bug%3A+) - Create a bug report to help us improve this website 🐛
-- [Edit apprenticeship](https://github.com/FrancesCoronel/apprenticeships.me/issues/new?assignees=&labels=edit&template=edit-apprenticeship.md&title=Edit%3A+) - Edit an existing apprenticeship 📝
-- [Feature Request](https://github.com/FrancesCoronel/apprenticeships.me/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=Feature+Request%3A+) - Suggest an idea for this project 💡
-- [Remove apprenticeship](https://github.com/FrancesCoronel/apprenticeships.me/issues/new?assignees=&labels=remove&template=remove-apprenticeship.md&title=Remove%3A+) - Remove an existing apprenticeship 🔻
+- [Add apprenticeship](https://github.com/FrancesCoronel/apprenticeships/issues/new?assignees=&labels=addition&template=add-apprenticeship.md&title=Add%3A+) - Add an apprenticeship to our growing list 🌱
+- [Bug Report](https://github.com/FrancesCoronel/apprenticeships/issues/new?assignees=&labels=bug&template=bug_report.md&title=Bug%3A+) - Create a bug report to help us improve this website 🐛
+- [Edit apprenticeship](https://github.com/FrancesCoronel/apprenticeships/issues/new?assignees=&labels=edit&template=edit-apprenticeship.md&title=Edit%3A+) - Edit an existing apprenticeship 📝
+- [Feature Request](https://github.com/FrancesCoronel/apprenticeships/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=Feature+Request%3A+) - Suggest an idea for this project 💡
+- [Remove apprenticeship](https://github.com/FrancesCoronel/apprenticeships/issues/new?assignees=&labels=remove&template=remove-apprenticeship.md&title=Remove%3A+) - Remove an existing apprenticeship 🔻
 - Or just [create a regular issue](https://github.com/FrancesCoronel/apprenticeships/issues/new/choose) - any little bit of help counts! 😊
 
 ## Guidelines

.github/FUNDING.yml

@@ -1,5 +1,3 @@
 github: francescoronel
 open_collective: francescoronel
 ko_fi: francescoronel
-liberapay: fvcproductions
-otechie: francescoronel

.github/config.yml

@@ -37,7 +37,7 @@ sentimentBotToxicityThreshold: .7
 
 # *Required* Comment to reply with
 sentimentBotReplyComment: >
-  Please be sure to review our Code of Conduct and remember to be respectful of other users. cc/ @fvcproductions @benjamin
+  Please be sure to review our Code of Conduct and remember to be respectful of other users. cc/ @FrancesCoronel @benjamin
 
 ####################################################################################################
 

.github/workflows/codeql-analysis.yml → .github/workflows/codeql.yml

@@ -13,17 +13,17 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ "master", main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ "master" ]
   schedule:
-    - cron: '41 5 * * 5'
+    - cron: '34 12 * * 6'
 
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
     permissions:
       actions: read
       contents: read
@@ -34,7 +34,9 @@ jobs:
       matrix:
         language: [ 'javascript' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
     - name: Checkout repository
@@ -48,23 +50,27 @@ jobs:
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
       uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

README.md

@@ -2,7 +2,7 @@
 
 ![Screenshot](/static/images/readme.jpg)
 
-[![GitHub Issues](https://img.shields.io/github/issues/francescoronel/apprenticeships.me.svg)](https://github.com/francescoronel/apprenticeships.me/issues) [![GitHub Pull Requests](https://img.shields.io/github/issues-pr/francescoronel/apprenticeships.me.svg)](https://github.com/francescoronel/apprenticeships.me/pulls) [![MIT License](https://img.shields.io/github/license/francescoronel/apprenticeships.me.svg)](http://badges.mit-license.org) [![Netlify Status](https://api.netlify.com/api/v1/badges/bd2e661d-f9ac-493a-ac07-05429f092059/deploy-status)](https://app.netlify.com/sites/apprenticeships/deploys)
+[![GitHub Issues](https://img.shields.io/github/issues/francescoronel/apprenticeships.svg)](https://github.com/FrancesCoronel/apprenticeships/issues) [![GitHub Pull Requests](https://img.shields.io/github/issues-pr/francescoronel/apprenticeships.svg)](https://github.com/FrancesCoronel/apprenticeships/pulls) [![MIT License](https://img.shields.io/github/license/francescoronel/apprenticeships.svg)](http://badges.mit-license.org) [![Netlify Status](https://api.netlify.com/api/v1/badges/bd2e661d-f9ac-493a-ac07-05429f092059/deploy-status)](https://app.netlify.com/sites/apprenticeships/deploys)
 
 Back in the good old days of the Renaissance, [apprenticeships](https://www.wikiwand.com/en/Apprenticeship) were quite common and acted as legal contracts between the apprentice and master. This was a way for apprentices to start learning the necessary skills in their field and eventually become masters themselves.
 
@@ -16,13 +16,13 @@ Even though the formal university route became more popular over time, there has
 
 > To get started...
 
-1. 🍴 [Fork this repo](https://github.com/francescoronel/apprenticeships.me#fork-destination-box)
+1. 🍴 [Fork this repo](https://github.com/FrancesCoronel/apprenticeships#fork-destination-box)
 2. 🔨 View the contributing guidelines at [CONTRIBUTING.md](.github/CONTRIBUTING.md)
 3. 👥 Add yourself as a contributor in the credits section
-4. 🔧 [Open a new pull request](https://github.com/francescoronel/apprenticeships.me/compare)
+4. 🔧 [Open a new pull request](https://github.com/FrancesCoronel/apprenticeships/compare)
 5. 🎉 Get your pull request approved - success!
 
-Or just [create an issue](https://github.com/francescoronel/apprenticeships.me/issues/new/choose) - any little bit of help counts! 😊
+Or just [create an issue](https://github.com/FrancesCoronel/apprenticeships/issues/new/choose) - any little bit of help counts! 😊
 
 ## Code of Conduct
 
@@ -32,7 +32,7 @@ More details can be found at this project's [code of conduct](.github/CODE_OF_CO
 
 ## Maintainers
 
-- [Frances Coronel](https://github.com/francescoronel)
+- [Frances Coronel](https://github.com/FrancesCoronel)
 - [Benjamin Modayil](https://modayil.me)
 - [Angus Chang](https://github.com/changangus)
 

_redirects

@@ -1,7 +1,5 @@
 # These rules will change if you change your site’s custom domains or HTTPS settings
 
-# Redirect domain aliases to primary domain
-https://apprenticeships.fvcproductions.com/* https://apprenticeships.me/:splat 301!
+## Redirect default Netlify subdomain to primary domain
 
-# Optional: Redirect default Netlify subdomain to primary domain
-https://apprenticeships.netlify.com/* https://apprenticeships.me/:splat 301!
+https://apprenticeships.netlify.com/* https://apprenticeships.me/:splat 301!

data/github.json

@@ -1 +1 @@
-[{"user":"benjaminmodayil","avatar":"https://avatars2.githubusercontent.com/u/12306850?v=4","url":"https://github.com/benjaminmodayil"},{"user":"bgongre","avatar":"https://avatars0.githubusercontent.com/u/27456325?v=4","url":"https://github.com/bgongre"},{"user":"fvcproductions","avatar":"https://avatars0.githubusercontent.com/u/4284691?v=4","url":"https://github.com/FrancesCoronel"},{"user":"mdb1710","avatar":"https://avatars2.githubusercontent.com/u/4247126?v=4","url":"https://github.com/mdb1710"},{"user":"KGmajor","avatar":"https://avatars2.githubusercontent.com/u/46424740?v=4","url":"https://github.com/KGmajor"},{"user":"VelazquezAJ","avatar":"https://avatars0.githubusercontent.com/u/1715080?v=4","url":"https://github.com/VelazquezAJ"},{"user":"mikennaji","avatar":"https://avatars3.githubusercontent.com/u/11260020?v=4","url":"https://github.com/mikennaji"}]
+[{"user":"dana-rocha","avatar":"https://avatars.githubusercontent.com/u/46910672?v=4","url":"https://github.com/dana-rocha"},{"user":"FrancesCoronel","avatar":"https://avatars.githubusercontent.com/u/4284691?v=4","url":"https://github.com/FrancesCoronel"},{"user":"ArviiChoudhary","avatar":"https://avatars.githubusercontent.com/u/116561519?v=4","url":"https://github.com/ArviiChoudhary"},{"user":"Will513r","avatar":"https://avatars.githubusercontent.com/u/111171001?v=4","url":"https://github.com/Will513r"},{"user":"changangus","avatar":"https://avatars.githubusercontent.com/u/63685366?v=4","url":"https://github.com/changangus"},{"user":"LaUrrego","avatar":"https://avatars.githubusercontent.com/u/97683123?v=4","url":"https://github.com/LaUrrego"}]

layouts/list.algolia.json

@@ -1,10 +1,10 @@
 {{- $.Scratch.Add "index" slice -}}
 {{- $section := $.Site.GetPage "section" .Section }}
-{{- range .Site.AllPages -}}
-  {{- if or (and (.IsDescendant $section) (and (not .Draft) (not .Params.private))) $section.IsHome -}}
-    {{ if ( .Params.company ) and ( .Params.company "!=" "") and ( .Params.company "!=" "null") }}
-      {{- $.Scratch.Add "index" (dict "objectID" .UniqueID "company" .Date.UTC.Unix "description" .Description "company" .Params.company "location" .Params.location "link" .Params.Link "image" .Params.image)}}
+{{- range $index, $element := (.Site.AllPages) -}}
+  {{- if or (and ($element.IsDescendant $section) (and (not $element.Draft) (not $element.Params.private))) $section.IsHome -}}
+    {{ with $element.Params.company }}
+      {{- $.Scratch.Add "index" (dict "id" $index "company" $element.Date.UTC.Unix "description" $element.Description "company" $element.Params.company "location" $element.Params.location "link" $element.Params.Link "image" $element.Params.image)}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
-{{- $.Scratch.Get "index" | jsonify -}}
+{{- $.Scratch.Get "index" | jsonify -}}

layouts/partials/head/_index.html

@@ -7,7 +7,7 @@
 
   You should definitely contribute to this website!
 
-  https://github.com/FrancesCoronel/apprenticeships.me
+  https://github.com/FrancesCoronel/apprenticeships
 
   ©️ Apprenticeships.me
   -->

layouts/partials/head/favicons.html

@@ -34,16 +34,17 @@
 <link href="/images/favicons/96x96.png" rel="icon" sizes="96x96" type="image/png">
 <link href="/manifest.json?v=2" rel="manifest">
 {{ with .Site.Params.brand_color }}
-  <link rel="mask-icon" color="{{ . }}" href="/images/favicons/114x114.png">
+<link rel="mask-icon" color="{{ . }}" href="/images/favicons/114x114.png">
 {{ end }}
 <!-- <link rel="shortcut icon" href="/images/favicons/favicon.ico"> -->
 <meta content="/browserconfig.xml" name="msapplication-config">
 <meta content="/images/favicons/150x150.png" name="msapplication-square150x150logo">
 <meta content="/images/favicons/310x310.png" name="msapplication-square310x310logo">
 <meta content="/images/favicons/70x70.png" name="msapplication-square70x70logo">
 {{ with .Site.Params.brand_color }}
-  <meta name="msapplication-TileColor" content="{{ . }}">
+<meta name="msapplication-TileColor" content="{{ . }}">
 {{ end }}
 <meta content="/images/favicons/144x144.png" name="msapplication-TileImage">
 <meta content="/images/favicons/310x150.png" name="msapplication-wide310x150logo">
-{{ with .Site.Params.brand_color }}<meta name="theme-color" content="{{ . }}">{{ end }}
+{{ with .Site.Params.brand_color }}
+<meta name="theme-color" content="{{ . }}">{{ end }}

layouts/partials/head/meta-custom.html

@@ -41,9 +41,10 @@
   {{ end }}
 {{ end }}
 <!-- RSS -->
-{{ if .RSSLink }}
-  <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}">
-{{ end }}
+{{ with .OutputFormats.Get "rss" -}}
+{{ printf `
+<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
+{{ end -}}
 <!-- Alternative Output -->
 {{ range .AlternativeOutputFormats -}}
   <link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" href="{{ .Permalink | safeURL }}">

layouts/partials/home/contributors.html

@@ -9,13 +9,13 @@ <h2 class="border-b-2 border-green inline-block max-w-sm self-center">
         <p class="mt-12 mb-12">
           This site was made possible because of contributors like you.
         </p>
-        <ul class="list-reset flex flex-wrap justify-center" id="contributor-list">
+        <ul class="list-none flex flex-wrap justify-center" id="contributor-list">
           {{range .Site.Data.github }}
-            <li class="m-2 rounded-full shadow hover-shadow-lg transition">
-              <a href="{{.url}}" target="_blank" rel="noopener noreferrer">
-                <img class="w-24 h-24 rounded-full" src="{{ .avatar }}" alt="{{.user}}"/>
-              </a>
-            </li>
+          <li class="m-2 rounded-full shadow hover-shadow-lg transition">
+            <a href="{{.url}}" target="_blank" rel="noopener noreferrer">
+              <img class="w-24 h-24 rounded-full" src="{{ .avatar }}" alt="{{.user}}" />
+            </a>
+          </li>
           {{ end }}
         </ul>
       </div>

layouts/partials/home/form.html

@@ -1,9 +1,8 @@
 <section class="bg-green-lightest p-8 md-p-12 lg-p-16 xl-p-20" id="five">
   <div class="w-full max-w-sm mx-auto text-center">
     <h2 class="border-b-2 border-green inline-block max-w-sm self-center">Want to contribute?</h2>
-    <p class="mt-12 mb-12 text-left">Submit an apprenticeship below or <a class="font-bold text-green-dark hover-text-green-darker no-underline hover-underline transition"
-      href="https://github.com/FrancesCoronel/apprenticeships.me/issues/new/choose">create an issue on GitHub</a> to add one in.</p>
-      <p class="mt-12 mb-12 text-left">Submitting the form below will automatically create the issue on GitHub for you.</p>
+    <p class="mt-12 mb-12 text-left">Submit an apprenticeship below or <a class="font-bold text-green-dark hover-text-green-darker no-underline hover-underline transition" href="https://github.com/FrancesCoronel/apprenticeships/issues/new/choose">create an issue on GitHub</a> to add one in.</p>
+    <p class="mt-12 mb-12 text-left">Submitting the form below will automatically create the issue on GitHub for you.</p>
     <form class="gh-form bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4 text-left">
       <div class="mb-4">
         <label class="block text-grey-darker text-sm font-bold mb-2" for="title">

layouts/partials/home/hero.html

@@ -1,11 +1,11 @@
 <section class="p-8 md-p-12 lg-p-16 xl-p-20">
   <div class="max-w-2xl mx-auto">
     <div class="flex flex-wrap items-center">
-      <div class="max-w-md w-full md-w-1-2 px-2">
+      <div class="prose max-w-md w-full md-w-1-2 px-2">
         <h1 class="text-center lg-text-left mb-12 md-mb-0">Find a new career learning from the industry itself.</h1>
         <div class="text-center lg-text-left mt-8">
           <a href="https://www.producthunt.com/posts/apprenticeships-me?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-apprenticeships-me" target="_blank" rel="noopener">
-            <img alt="Apprenticeships.me - Find a new career learning from the industry itself. | Product Hunt Embed" height="54px" src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=153013&theme=light" style="width: 250px; height: 54px;" width="250px"/>
+            <img alt="Apprenticeships.me - Find a new career learning from the industry itself. | Product Hunt Embed" height="54px" src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=153013&theme=light" style="width: 250px; height: 54px;" width="250px" />
           </a>
         </div>
       </div>

layouts/partials/home/resources.html

@@ -1,7 +1,7 @@
 <section class="bg-green-lightest p-8 md-p-12 lg-p-16 xl-p-20" id="three">
   <div class="max-w-2xl mx-auto">
     <h2 class="border-b-2 border-green inline-block">Related resources</h2>
-    <ul class="list-reset mt-12">
+    <ul class="list-none mt-12">
       <li class="mt-6">
         <a class="text-green-dark hover-text-green-darker no-underline hover-underline transition" href="https://apprentice.at/" rel="noopener" target="_blank">
           <h3 class="font-bold">Apprentice.at</h3>
@@ -10,4 +10,4 @@ <h3 class="font-bold">Apprentice.at</h3>
       </li>
     </ul>
   </div>
-</section>
+</section>