From b5a636dd509c72e34492c15427c22d2ec01e2216 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Jul 2022 21:34:18 +0000 Subject: [PATCH 01/44] Bump terser from 5.11.0 to 5.14.2 Bumps [terser](https://github.com/terser/terser) from 5.11.0 to 5.14.2. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/commits) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 95 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index a5432703ae..8d408d996d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2497,6 +2497,19 @@ "@hapi/hoek": "^9.0.0" } }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz", @@ -2505,15 +2518,32 @@ "node": ">=6.0.0" } }, + "node_modules/@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.11", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz", "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz", - "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==", + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", + "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" @@ -11585,13 +11615,13 @@ } }, "node_modules/terser": { - "version": "5.11.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.11.0.tgz", - "integrity": "sha512-uCA9DLanzzWSsN1UirKwylhhRz3aKPInlfmpGfw8VN6jHsAtu8HJtIpeeHHK23rxnE/cDc+yvmq5wqkIC6Kn0A==", + "version": "5.14.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", + "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", "dependencies": { + "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", "commander": "^2.20.0", - "source-map": "~0.7.2", "source-map-support": "~0.5.20" }, "bin": { @@ -11664,14 +11694,6 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, - "node_modules/terser/node_modules/source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "engines": { - "node": ">= 8" - } - }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -15055,20 +15077,44 @@ "@hapi/hoek": "^9.0.0" } }, + "@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "requires": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, "@jridgewell/resolve-uri": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz", "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==" }, + "@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==" + }, + "@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "requires": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, "@jridgewell/sourcemap-codec": { "version": "1.4.11", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz", "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==" }, "@jridgewell/trace-mapping": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz", - "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==", + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", + "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", "requires": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" @@ -21759,13 +21805,13 @@ "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" }, "terser": { - "version": "5.11.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.11.0.tgz", - "integrity": "sha512-uCA9DLanzzWSsN1UirKwylhhRz3aKPInlfmpGfw8VN6jHsAtu8HJtIpeeHHK23rxnE/cDc+yvmq5wqkIC6Kn0A==", + "version": "5.14.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", + "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", "requires": { + "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", "commander": "^2.20.0", - "source-map": "~0.7.2", "source-map-support": "~0.5.20" }, "dependencies": { @@ -21773,11 +21819,6 @@ "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" } } }, From 9cd73f83c719160e1d11c8049b9240fac80eca0a Mon Sep 17 00:00:00 2001 From: gregdyke Date: Sat, 29 Oct 2022 10:34:47 +0100 Subject: [PATCH 02/44] Fix starter kit link There is no longer mongo vs postgres branches -> only link to the main project --- docs/finalproject/prep.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/finalproject/prep.md b/docs/finalproject/prep.md index c0dbbd12ec..dbbd4322c9 100644 --- a/docs/finalproject/prep.md +++ b/docs/finalproject/prep.md @@ -28,12 +28,9 @@ All trainees should make sure that they are comfortable with their roles and wha ## Starter Projects -Here is a starter project that trainees can fork to get started: +Here is a [starter project for Postgres/Express/React/Node](https://github.com/CodeYourFuture/cyf-final-project-starter-kit/). -- Starter project for [Mongo/Express/React/Node](https://github.com/CodeYourFuture/cyf-final-project-starter-kit) -- Starter project for [Postgres/Express/React/Node](https://github.com/CodeYourFuture/cyf-final-project-starter-kit/tree/postgres) (this is a branch of the above project) - -Documentation can be found [here](https://github.com/textbook/starter-kit/wiki) for both of the above projects +Documentation can be found [here](https://github.com/textbook/starter-kit/wiki). If you need help for any of these projects, you can find help in this Slack channel: [`#cyf-full-stack-starter-kit`](https://codeyourfuture.slack.com/archives/C021ATWS9A5) From 83909b78511d9fcc307232b567e201409092ad2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Nov 2022 09:51:19 +0000 Subject: [PATCH 03/44] Bump minimatch, recursive-readdir and serve-handler Bumps [minimatch](https://github.com/isaacs/minimatch), [recursive-readdir](https://github.com/jergason/recursive-readdir) and [serve-handler](https://github.com/zeit/serve-handler). These dependencies needed to be updated together. Updates `minimatch` from 3.0.4 to 3.1.2 - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2) Updates `recursive-readdir` from 2.2.2 to 2.2.3 - [Release notes](https://github.com/jergason/recursive-readdir/releases) - [Changelog](https://github.com/jergason/recursive-readdir/blob/master/CHANGELOG.md) - [Commits](https://github.com/jergason/recursive-readdir/commits/v2.2.3) Updates `serve-handler` from 6.1.3 to 6.1.5 - [Release notes](https://github.com/zeit/serve-handler/releases) - [Commits](https://github.com/zeit/serve-handler/compare/6.1.3...6.1.5) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect - dependency-name: recursive-readdir dependency-type: indirect - dependency-name: serve-handler dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 74 +++++++++++------------------------------------ 1 file changed, 17 insertions(+), 57 deletions(-) diff --git a/package-lock.json b/package-lock.json index a5432703ae..8353df5474 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10311,25 +10311,14 @@ } }, "node_modules/recursive-readdir": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", - "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz", + "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==", "dependencies": { - "minimatch": "3.0.4" + "minimatch": "^3.0.5" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/recursive-readdir/node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" + "node": ">=6.0.0" } }, "node_modules/regenerate": { @@ -11041,31 +11030,20 @@ } }, "node_modules/serve-handler": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.3.tgz", - "integrity": "sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w==", + "version": "6.1.5", + "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.5.tgz", + "integrity": "sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg==", "dependencies": { "bytes": "3.0.0", "content-disposition": "0.5.2", "fast-url-parser": "1.1.3", "mime-types": "2.1.18", - "minimatch": "3.0.4", + "minimatch": "3.1.2", "path-is-inside": "1.0.2", "path-to-regexp": "2.2.1", "range-parser": "1.2.0" } }, - "node_modules/serve-handler/node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/serve-handler/node_modules/path-to-regexp": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz", @@ -20782,21 +20760,11 @@ } }, "recursive-readdir": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", - "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz", + "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==", "requires": { - "minimatch": "3.0.4" - }, - "dependencies": { - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - } + "minimatch": "^3.0.5" } }, "regenerate": { @@ -21346,28 +21314,20 @@ } }, "serve-handler": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.3.tgz", - "integrity": "sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w==", + "version": "6.1.5", + "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.5.tgz", + "integrity": "sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg==", "requires": { "bytes": "3.0.0", "content-disposition": "0.5.2", "fast-url-parser": "1.1.3", "mime-types": "2.1.18", - "minimatch": "3.0.4", + "minimatch": "3.1.2", "path-is-inside": "1.0.2", "path-to-regexp": "2.2.1", "range-parser": "1.2.0" }, "dependencies": { - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, "path-to-regexp": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz", From 2bdc161e36675d36e4cef06f5df3a4b98e75384b Mon Sep 17 00:00:00 2001 From: tomdaly Date: Tue, 15 Nov 2022 10:40:27 +0000 Subject: [PATCH 04/44] docs: add react module minutes 2022-11-07 --- docs/contributing/react/minutes.md | 34 ++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/docs/contributing/react/minutes.md b/docs/contributing/react/minutes.md index 4ae931ab17..ea00531707 100644 --- a/docs/contributing/react/minutes.md +++ b/docs/contributing/react/minutes.md @@ -4,6 +4,35 @@ title: React Module Syllabus Team Minutes sidebar_label: Team Minutes --- +## 2022-11-07 + +Present: Ali, Tom + +## Agenda Items +- Ali leaving the React module team (@Ali) + - Ali is planning to leave the React module syllabus team (as he originally planned), though will still be around in CYF to help + - His role was to set up the team and get the ball rolling, which has been successful + - All of the team are free to join the Global Syllabus team meeting +- Team time/task progress - something's not working (@Tom) + - Not everyone in attendance at regular meetings, and often rescheduled + - Few agenda points and not much work in progress on the board + - This not a problem with the individuals in the team! It is a symptom of the team's setup + - The Global Syllabus team generally has enough work on so that everyone has a task assigned, meaning there are always agenda point for the regular meeting + - The React module is generally complete and only needs a few improvements, with no specific deadlines, so tickets are not always in progress + - No specific feedback from module coordinators to update the module - does this mean the module is good, or is there just no feedback? + - Even if there was enough work (i.e. feedback to re-write the whole module, which is unlikely), would it take 4 people more than 1 month? + - Maybe the team needs restructuring & re-focussing. Current 'TODO' work could be completed in less than 1 month, will the team have no purpose after this? +- How can we get feedback for the module? + - Cape Town towards end of module instruction, Birmingham and Manchester starting in November, London in March + - A good opportunity to get feedback from module coordinators + +### Action Items +- Ali: reach out/refer us to city coordinators who can tell us who the most recent module instructor was, to get feedback +- Ali: discuss with Global Syllabus team re above agenda items +- Tom: create ticket to update module coordinator page to 'keep notes on questions & feedback and submit tickets at end of teaching' + +--- + ## 2022-10-17 - React Syllabus Attendees: @@ -11,7 +40,7 @@ Attendees: - Alex - Zach - Tom -- + ### 3 => 4 Week - Alex introduced the concept of separating course into 4 - Presentational components -> state -> syncronosity -> forms @@ -58,6 +87,7 @@ Attendees: - Internal push for more testing - open call for TDD - Alex to join call on 1st of November +--- ## 2022-09-12 @@ -94,7 +124,7 @@ Present: Ali, Alex, Tom, Sharlu - Alex: convert lessons into a single .md file to find 'splitting points' - All: discuss sync/async suitable 'splitting points' in the 3 week course for updating to a 4 week course (#468) - +--- ## 2022-08-01 From d8128d84fdb9446f35c7567199c14a61661473bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Nov 2022 01:17:46 +0000 Subject: [PATCH 05/44] Bump loader-utils from 1.4.0 to 1.4.2 Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.2. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md) - [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.2) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index a5432703ae..5286d21f44 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6189,9 +6189,9 @@ } }, "node_modules/file-loader/node_modules/loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -7991,9 +7991,9 @@ } }, "node_modules/loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -10013,9 +10013,9 @@ } }, "node_modules/react-dev-utils/node_modules/loader-utils": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz", - "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", + "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==", "engines": { "node": ">= 12.13.0" } @@ -12277,9 +12277,9 @@ } }, "node_modules/url-loader/node_modules/loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -17831,9 +17831,9 @@ }, "dependencies": { "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -19130,9 +19130,9 @@ "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==" }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -20558,9 +20558,9 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "loader-utils": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz", - "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", + "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==" }, "locate-path": { "version": "6.0.0", @@ -22234,9 +22234,9 @@ }, "dependencies": { "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", From 883a681f7c0ddab882a184184dc3add77daa7d80 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Wed, 23 Nov 2022 12:09:53 +0000 Subject: [PATCH 06/44] Add checklist of pre-tasks for Final Project We have identified that a checklist of the Final Project tasks that must be done way before this module would be handy for PROMs and Volunteers. So I have added this here. PS: I will review the rest of the page too, so will have a second PR soon. Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/prep.md | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/docs/finalproject/prep.md b/docs/finalproject/prep.md index c0dbbd12ec..bda2218040 100644 --- a/docs/finalproject/prep.md +++ b/docs/finalproject/prep.md @@ -4,9 +4,35 @@ title: Final Project Preparation sidebar_label: Preparation --- +## Checklist to organise Final Projects +Getting the Final Projects ready is not a task that can be done a week before the module. A lot of decisions have to be made beforehand, so this high-level list of the steps Volunteers and PROM (Programme Managers) should do in order to get everything ready for Final Projects. It also has the main links of important documents. + +**When you are on the React Module** +- [ ] Must review the trainee’s performance and make [readiness for Final Projects decision](https://docs.google.com/document/d/1jMxqI0L7IKFENCQ8Lw-D1lhnj3c3RZI_WK808wG4YJM/edit?usp=sharing) +- [ ] Identify trainees that will be filling in roles such as UI/UX Designer, Tester or Product Delivery +- [ ] Ask internally and externally for possible ideas of charities that could be part of Final Projects. The form used should be [this](https://forms.gle/Gn85Kdna6QB2Qfcp9). +- [ ] Start recruiting Tech Lead, Product Managers and UI/UX Designer for Final Projects. See the role descriptions [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles). + +**When you are on the NodeJS Module** +- [ ] Review the project ideas with Tech Leads and Product Managers defining technical feasibility and scope size. You might have to have volunteers clarify some information with the charities +- [ ] Identify which of the Ideas will be used as a final project. + Send feedback to all charities if they have been chosen or not. + For the chosen ones, clarify the [role](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/product-owner) and who will be the Product Owner from their Charity. +- [ ] Onboard the volunteers with the standard process +- [ ] Use [this template](https://docs.google.com/spreadsheets/d/16vSSJgzCZJKF-2pwuBTkKjJJJ9i1CGRqMbYB-HEO5mo/edit?usp=sharing) to identify the projects that will be used and who will be on which team +- [ ] Let volunteers choose which project they would like to be on + +**When you are on SQL Module** +- [ ] Trainees must have finalised the Full Stack assessment +- [ ] Must review the trainee’s performance and identify the ones going to Final Projects +- [ ] Identify trainees that are close in performance and allocate them to the same project. We encourage trainees to work with different people, so try to mix the teams up. Don’t forget to update the spreadsheet. +- [ ] Have a meeting with all volunteers to go through the details of the final project (presentation to be created with expectation, escalation process, type of support, overview of the trainees per team, etc) +- [ ] Introduce all teams and people in it and create all Slack groups +- [ ] A day before the first Saturday of Final Projects, send the project briefing to the team + ## Project Submissions -Some trainees may have some ideas about projects that they would like to complete for their Final Project. Before the Final Project starts, ideas should be gathered and fully specified before the start of the first week. +As mentioned above, before the Final Project starts ideas should be gathered and fully specified before the start of the first week. The form used to receive these ideas is [this](https://forms.gle/Gn85Kdna6QB2Qfcp9). A good project should From 6400da2f3fca2c60c8c94ed6063b94c5edde158e Mon Sep 17 00:00:00 2001 From: Mitch Lloyd Date: Thu, 24 Nov 2022 09:12:03 +0000 Subject: [PATCH 07/44] fix: add first step to start dev server --- docs/react/week-1/lesson.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/react/week-1/lesson.md b/docs/react/week-1/lesson.md index 58febc04b4..41251c552a 100644 --- a/docs/react/week-1/lesson.md +++ b/docs/react/week-1/lesson.md @@ -160,14 +160,15 @@ In this exercise we replace the placeholder React app with our own. It should lo Complete the following steps: -1. In the `pokedex` React app that you just created, open the `src/App.js` file. -2. Delete everything in the file except the line containing `export default App`. You should see an error in your terminal and in your web browser - don't panic! We're going to remake the `App` component ourselves. -3. Import the React variable from the React package. -4. Create a function named `App`, which will be our component. -5. Within the `App` function, return a `

` element with the text "Welcome to the Pokedex". What do you see in your web browser? -6. Create a `
` element that _wraps around_ the `

` you just created. -7. Below the `

` element (but within the `
`), create an `` element. Then make its `src` attribute equal to `https://assets.pokemon.com/assets/cms2/img/pokedex/full/016.png`. What do you expect to see in your web browser? -8. Now create a `
` element to wrap both the `

` element **and** the `` element. +1. First off, head to the root of your `pokedex` repo and start the app using `npm start`. +2. In the `pokedex` React app that you just created, open the `src/App.js` file. +3. Delete everything in the file except the line containing `export default App`. You should see an error in your terminal and in your web browser - don't panic! We're going to remake the `App` component ourselves. +4. Import the React variable from the React package. +5. Create a function named `App`, which will be our component. +6. Within the `App` function, return a `

` element with the text "Welcome to the Pokedex". What do you see in your web browser? +7. Create a `
` element that _wraps around_ the `

` you just created. +8. Below the `

` element (but within the `
`), create an `` element. Then make its `src` attribute equal to `https://assets.pokemon.com/assets/cms2/img/pokedex/full/016.png`. What do you expect to see in your web browser? +9. Now create a `
` element to wrap both the `

` element **and** the `` element. ::: @@ -387,7 +388,7 @@ function MentorsList() { } ``` -Here we have added a `key` prop to the `li` element. The `key` prop has a special meaning in React because it is used internally to keep track of which element in the list is which. A documentation page explaining in more depth is in the further reading section. +Here we have added a `key` prop to the `li` element. The `key` prop has a special meaning in React because it is used internally to keep track of which element in the list is which. A documentation page explaining in more depth is in the further reading section. ## Importing/Exporting Components From 211476cacf9c1b98010e4cce93eb7cab07d28d8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Nov 2022 21:48:30 +0000 Subject: [PATCH 08/44] Bump nth-check and @slorber/static-site-generator-webpack-plugin Bumps [nth-check](https://github.com/fb55/nth-check) and [@slorber/static-site-generator-webpack-plugin](https://github.com/slorber/static-site-generator-webpack-plugin). These dependencies needed to be updated together. Updates `nth-check` from 1.0.2 to 2.0.1 - [Release notes](https://github.com/fb55/nth-check/releases) - [Commits](https://github.com/fb55/nth-check/compare/v1.0.2...v2.0.1) Updates `@slorber/static-site-generator-webpack-plugin` from 4.0.1 to 4.0.7 - [Release notes](https://github.com/slorber/static-site-generator-webpack-plugin/releases) - [Changelog](https://github.com/slorber/static-site-generator-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/slorber/static-site-generator-webpack-plugin/commits/4.0.7) --- updated-dependencies: - dependency-name: nth-check dependency-type: indirect - dependency-name: "@slorber/static-site-generator-webpack-plugin" dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 478 +++------------------------------------------- 1 file changed, 31 insertions(+), 447 deletions(-) diff --git a/package-lock.json b/package-lock.json index df45f13f8c..4582faa850 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2873,117 +2873,16 @@ } }, "node_modules/@slorber/static-site-generator-webpack-plugin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.1.tgz", - "integrity": "sha512-PSv4RIVO1Y3kvHxjvqeVisk3E9XFoO04uwYBDWe217MFqKspplYswTuKLiJu0aLORQWzuQjfVsSlLPojwfYsLw==", - "dependencies": { - "bluebird": "^3.7.1", - "cheerio": "^0.22.0", - "eval": "^0.1.4", - "url": "^0.11.0", - "webpack-sources": "^1.4.3" - } - }, - "node_modules/@slorber/static-site-generator-webpack-plugin/node_modules/cheerio": { - "version": "0.22.0", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", - "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", - "dependencies": { - "css-select": "~1.2.0", - "dom-serializer": "~0.1.0", - "entities": "~1.1.1", - "htmlparser2": "^3.9.1", - "lodash.assignin": "^4.0.9", - "lodash.bind": "^4.1.4", - "lodash.defaults": "^4.0.1", - "lodash.filter": "^4.4.0", - "lodash.flatten": "^4.2.0", - "lodash.foreach": "^4.3.0", - "lodash.map": "^4.4.0", - "lodash.merge": "^4.4.0", - "lodash.pick": "^4.2.1", - "lodash.reduce": "^4.4.0", - "lodash.reject": "^4.4.0", - "lodash.some": "^4.4.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/@slorber/static-site-generator-webpack-plugin/node_modules/css-select": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", - "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.7.tgz", + "integrity": "sha512-Ug7x6z5lwrz0WqdnNFOMYrDQNTPAprvHLSh6+/fmml3qUiz6l5eq+2MzLKWtn/q5K5NpSiFsZTP/fck/3vjSxA==", "dependencies": { - "boolbase": "~1.0.0", - "css-what": "2.1", - "domutils": "1.5.1", - "nth-check": "~1.0.1" - } - }, - "node_modules/@slorber/static-site-generator-webpack-plugin/node_modules/css-what": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", - "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==", + "eval": "^0.1.8", + "p-map": "^4.0.0", + "webpack-sources": "^3.2.2" + }, "engines": { - "node": "*" - } - }, - "node_modules/@slorber/static-site-generator-webpack-plugin/node_modules/dom-serializer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", - "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", - "dependencies": { - "domelementtype": "^1.3.0", - "entities": "^1.1.1" - } - }, - "node_modules/@slorber/static-site-generator-webpack-plugin/node_modules/domelementtype": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" - }, - "node_modules/@slorber/static-site-generator-webpack-plugin/node_modules/domhandler": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", - "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", - "dependencies": { - "domelementtype": "1" - } - }, - "node_modules/@slorber/static-site-generator-webpack-plugin/node_modules/domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", - "dependencies": { - "dom-serializer": "0", - "domelementtype": "1" - } - }, - "node_modules/@slorber/static-site-generator-webpack-plugin/node_modules/entities": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", - "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" - }, - "node_modules/@slorber/static-site-generator-webpack-plugin/node_modules/htmlparser2": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", - "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", - "dependencies": { - "domelementtype": "^1.3.1", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^3.1.1" - } - }, - "node_modules/@slorber/static-site-generator-webpack-plugin/node_modules/nth-check": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", - "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", - "dependencies": { - "boolbase": "~1.0.0" + "node": ">=14" } }, "node_modules/@svgr/babel-plugin-add-jsx-attribute": { @@ -4110,11 +4009,6 @@ "node": ">=8" } }, - "node_modules/bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" - }, "node_modules/body-parser": { "version": "1.19.2", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz", @@ -5936,10 +5830,11 @@ } }, "node_modules/eval": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/eval/-/eval-0.1.6.tgz", - "integrity": "sha512-o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ==", + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/eval/-/eval-0.1.8.tgz", + "integrity": "sha512-EzV94NYKoO09GLXGjXj9JIlXijVck4ONSr5wiCWDvhsvj5jxSrzTmRU/9C1DyB6uToszLs8aifA6NQ7lEQdvFw==", "dependencies": { + "@types/node": "*", "require-like": ">= 0.1.1" }, "engines": { @@ -8060,16 +7955,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, - "node_modules/lodash.assignin": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", - "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=" - }, - "node_modules/lodash.bind": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz", - "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=" - }, "node_modules/lodash.curry": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz", @@ -8080,66 +7965,16 @@ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" }, - "node_modules/lodash.defaults": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" - }, - "node_modules/lodash.filter": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz", - "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=" - }, - "node_modules/lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" - }, "node_modules/lodash.flow": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz", "integrity": "sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o=" }, - "node_modules/lodash.foreach": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", - "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" - }, - "node_modules/lodash.map": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", - "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=" - }, "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=" }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" - }, - "node_modules/lodash.pick": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", - "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" - }, - "node_modules/lodash.reduce": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz", - "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=" - }, - "node_modules/lodash.reject": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz", - "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=" - }, - "node_modules/lodash.some": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", - "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=" - }, "node_modules/lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -10716,7 +10551,7 @@ "node_modules/require-like": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz", - "integrity": "sha1-rW8wwTvs15cBDEaK+ndcDAprR/o=", + "integrity": "sha512-oyrU88skkMtDdauHDuKVrgR+zuItqr6/c//FXzvmxRGMexSDc6hNvJInGW3LL46n+8b50RykrvwSUIIQH2LQ5A==", "engines": { "node": "*" } @@ -11280,11 +11115,6 @@ "node": ">= 6.3.0" } }, - "node_modules/source-list-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", - "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==" - }, "node_modules/source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -12241,15 +12071,6 @@ "node": ">=6" } }, - "node_modules/url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dependencies": { - "punycode": "1.3.2", - "querystring": "0.2.0" - } - }, "node_modules/url-loader": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz", @@ -12336,20 +12157,6 @@ "node": ">=4" } }, - "node_modules/url/node_modules/punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" - }, - "node_modules/url/node_modules/querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", - "engines": { - "node": ">=0.4.x" - } - }, "node_modules/use-composed-ref": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.2.1.tgz", @@ -12919,20 +12726,11 @@ } }, "node_modules/webpack-sources": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", - "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", - "dependencies": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - } - }, - "node_modules/webpack-sources/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", "engines": { - "node": ">=0.10.0" + "node": ">=10.13.0" } }, "node_modules/webpack/node_modules/mime-db": { @@ -12971,14 +12769,6 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/webpack/node_modules/webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/webpackbar": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/webpackbar/-/webpackbar-5.0.2.tgz", @@ -15302,113 +15092,13 @@ "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" }, "@slorber/static-site-generator-webpack-plugin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.1.tgz", - "integrity": "sha512-PSv4RIVO1Y3kvHxjvqeVisk3E9XFoO04uwYBDWe217MFqKspplYswTuKLiJu0aLORQWzuQjfVsSlLPojwfYsLw==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.7.tgz", + "integrity": "sha512-Ug7x6z5lwrz0WqdnNFOMYrDQNTPAprvHLSh6+/fmml3qUiz6l5eq+2MzLKWtn/q5K5NpSiFsZTP/fck/3vjSxA==", "requires": { - "bluebird": "^3.7.1", - "cheerio": "^0.22.0", - "eval": "^0.1.4", - "url": "^0.11.0", - "webpack-sources": "^1.4.3" - }, - "dependencies": { - "cheerio": { - "version": "0.22.0", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", - "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", - "requires": { - "css-select": "~1.2.0", - "dom-serializer": "~0.1.0", - "entities": "~1.1.1", - "htmlparser2": "^3.9.1", - "lodash.assignin": "^4.0.9", - "lodash.bind": "^4.1.4", - "lodash.defaults": "^4.0.1", - "lodash.filter": "^4.4.0", - "lodash.flatten": "^4.2.0", - "lodash.foreach": "^4.3.0", - "lodash.map": "^4.4.0", - "lodash.merge": "^4.4.0", - "lodash.pick": "^4.2.1", - "lodash.reduce": "^4.4.0", - "lodash.reject": "^4.4.0", - "lodash.some": "^4.4.0" - } - }, - "css-select": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", - "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", - "requires": { - "boolbase": "~1.0.0", - "css-what": "2.1", - "domutils": "1.5.1", - "nth-check": "~1.0.1" - } - }, - "css-what": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", - "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==" - }, - "dom-serializer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", - "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", - "requires": { - "domelementtype": "^1.3.0", - "entities": "^1.1.1" - } - }, - "domelementtype": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" - }, - "domhandler": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", - "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", - "requires": { - "domelementtype": "1" - } - }, - "domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", - "requires": { - "dom-serializer": "0", - "domelementtype": "1" - } - }, - "entities": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", - "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" - }, - "htmlparser2": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", - "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", - "requires": { - "domelementtype": "^1.3.1", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^3.1.1" - } - }, - "nth-check": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", - "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", - "requires": { - "boolbase": "~1.0.0" - } - } + "eval": "^0.1.8", + "p-map": "^4.0.0", + "webpack-sources": "^3.2.2" } }, "@svgr/babel-plugin-add-jsx-attribute": { @@ -16296,11 +15986,6 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" }, - "bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" - }, "body-parser": { "version": "1.19.2", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz", @@ -17631,10 +17316,11 @@ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, "eval": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/eval/-/eval-0.1.6.tgz", - "integrity": "sha512-o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ==", + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/eval/-/eval-0.1.8.tgz", + "integrity": "sha512-EzV94NYKoO09GLXGjXj9JIlXijVck4ONSr5wiCWDvhsvj5jxSrzTmRU/9C1DyB6uToszLs8aifA6NQ7lEQdvFw==", "requires": { + "@types/node": "*", "require-like": ">= 0.1.1" } }, @@ -19186,16 +18872,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, - "lodash.assignin": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", - "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=" - }, - "lodash.bind": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz", - "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=" - }, "lodash.curry": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz", @@ -19206,66 +18882,16 @@ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" }, - "lodash.defaults": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" - }, - "lodash.filter": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz", - "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=" - }, - "lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" - }, "lodash.flow": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz", "integrity": "sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o=" }, - "lodash.foreach": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", - "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" - }, - "lodash.map": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", - "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=" - }, "lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=" }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" - }, - "lodash.pick": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", - "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" - }, - "lodash.reduce": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz", - "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=" - }, - "lodash.reject": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz", - "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=" - }, - "lodash.some": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", - "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=" - }, "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -21105,7 +20731,7 @@ "require-like": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz", - "integrity": "sha1-rW8wwTvs15cBDEaK+ndcDAprR/o=" + "integrity": "sha512-oyrU88skkMtDdauHDuKVrgR+zuItqr6/c//FXzvmxRGMexSDc6hNvJInGW3LL46n+8b50RykrvwSUIIQH2LQ5A==" }, "requires-port": { "version": "1.0.0", @@ -21544,11 +21170,6 @@ "resolved": "https://registry.npmjs.org/sort-css-media-queries/-/sort-css-media-queries-2.0.4.tgz", "integrity": "sha512-PAIsEK/XupCQwitjv7XxoMvYhT7EAfyzI3hsy/MyDgTvc+Ft55ctdkctJLOy6cQejaIC+zjpUL4djFVm2ivOOw==" }, - "source-list-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", - "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==" - }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -22203,27 +21824,6 @@ } } }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - }, - "dependencies": { - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" - }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" - } - } - }, "url-loader": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz", @@ -22449,11 +22049,6 @@ "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" } - }, - "webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==" } } }, @@ -22693,20 +22288,9 @@ } }, "webpack-sources": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", - "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", - "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==" }, "webpackbar": { "version": "5.0.2", From 005dae2731300f26e09a6238055f5b9813b3c8ee Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 28 Nov 2022 14:40:19 +0000 Subject: [PATCH 09/44] Updating Sally's suggestions + link Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/prep.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/finalproject/prep.md b/docs/finalproject/prep.md index 386f6b855c..dc351e989a 100644 --- a/docs/finalproject/prep.md +++ b/docs/finalproject/prep.md @@ -9,7 +9,7 @@ Getting the Final Projects ready is not a task that can be done a week before th **When you are on the React Module** - [ ] Must review the trainee’s performance and make [readiness for Final Projects decision](https://docs.google.com/document/d/1jMxqI0L7IKFENCQ8Lw-D1lhnj3c3RZI_WK808wG4YJM/edit?usp=sharing) -- [ ] Identify trainees that will be filling in roles such as UI/UX Designer, Tester or Product Delivery +- [ ] If you haven't yet, make sure you dentify trainees that will be filling in roles such as UI/UX Designer, Tester or Product Delivery - [ ] Ask internally and externally for possible ideas of charities that could be part of Final Projects. The form used should be [this](https://forms.gle/Gn85Kdna6QB2Qfcp9). - [ ] Start recruiting Tech Lead, Product Managers and UI/UX Designer for Final Projects. See the role descriptions [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles). @@ -23,10 +23,10 @@ Getting the Final Projects ready is not a task that can be done a week before th - [ ] Let volunteers choose which project they would like to be on **When you are on SQL Module** -- [ ] Trainees must have finalised the Full Stack assessment +- [ ] Trainees' must have completed up to Level 300 of the Full Stack assessment by week 3 of the module before Final Projects and finalised - [ ] Must review the trainee’s performance and identify the ones going to Final Projects - [ ] Identify trainees that are close in performance and allocate them to the same project. We encourage trainees to work with different people, so try to mix the teams up. Don’t forget to update the spreadsheet. -- [ ] Have a meeting with all volunteers to go through the details of the final project (presentation to be created with expectation, escalation process, type of support, overview of the trainees per team, etc) +- [ ] Have a meeting with all volunteers and trainees to go through the details of the final project (presentation to be created with expectation, escalation process, type of support, overview of the trainees per team, etc). Don't forget to record it and share the recording with all the participants. - [ ] Introduce all teams and people in it and create all Slack groups - [ ] A day before the first Saturday of Final Projects, send the project briefing to the team @@ -48,9 +48,9 @@ All code should be done _in public on the trainees' Githubs_, unless there is a Before class starts volunteer and trainee teams should have been assigned. -You can find a template for organising the teams [here](https://docs.google.com/spreadsheets/d/13WGRmeUZoCZfPV3joO4q69GLIaAiYFnrh9WmZ51FrE8/edit#gid=0) +You can find a template for organising the teams[here](https://docs.google.com/spreadsheets/d/16vSSJgzCZJKF-2pwuBTkKjJJJ9i1CGRqMbYB-HEO5mo/edit?usp=sharing). **Repos must be logged on this spreadsheet so everyone can see what is happening during the module.** -All trainees should make sure that they are comfortable with their roles and what they will be required to do. More information about roles can be found [here](./roles) +All trainees should make sure that they are comfortable with their roles and what they will be required to do. More information about roles can be found [here](https://app.gitbook.com/o/-LcSabThbCRVBSHYbXg4/s/-MLT3gO-UutAs-bJiUtk/volunteers/teams-1/cyf-products-final-projects/roles) ## Starter Projects From 9ea23f74d990436a14089f7890aa262799585e9b Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 28 Nov 2022 14:47:22 +0000 Subject: [PATCH 10/44] Update prep.md Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/prep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/prep.md b/docs/finalproject/prep.md index dc351e989a..5dc9169e26 100644 --- a/docs/finalproject/prep.md +++ b/docs/finalproject/prep.md @@ -50,7 +50,7 @@ Before class starts volunteer and trainee teams should have been assigned. You can find a template for organising the teams[here](https://docs.google.com/spreadsheets/d/16vSSJgzCZJKF-2pwuBTkKjJJJ9i1CGRqMbYB-HEO5mo/edit?usp=sharing). **Repos must be logged on this spreadsheet so everyone can see what is happening during the module.** -All trainees should make sure that they are comfortable with their roles and what they will be required to do. More information about roles can be found [here](https://app.gitbook.com/o/-LcSabThbCRVBSHYbXg4/s/-MLT3gO-UutAs-bJiUtk/volunteers/teams-1/cyf-products-final-projects/roles) +All trainees should make sure that they are comfortable with their roles and what they will be required to do. More information about roles can be found [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles) ## Starter Projects From 7dd88eb4d366022c54444396c6d43b33869dc098 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 28 Nov 2022 14:50:50 +0000 Subject: [PATCH 11/44] Update links and missing info Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/intro.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/finalproject/intro.md b/docs/finalproject/intro.md index 29b3ac11a7..829cc716f9 100644 --- a/docs/finalproject/intro.md +++ b/docs/finalproject/intro.md @@ -38,12 +38,12 @@ The final projects form the final module of the course, comprising four weeks fo Ideally, the project team would consist of the following: - Four CYF trainees; -- Three volunteer mentors, forming a [balanced team](https://www.youtube.com/watch?v=Z_Q4Q8rCVpU); and -- A product owner. +- Two volunteer mentors ([Tech Lead](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/tech-lead) and [Product Manager](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/product-manager), forming a [balanced team](https://www.youtube.com/watch?v=Z_Q4Q8rCVpU); and +- A [product owner](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/product-owner). The mentor group would include an engineer (responsible for unblocking technical/architectural issues, _not_ an extra developer), designer (responsible for user research and UI/UX) and product manager (responsible for prioritisation and alignment with the product owner’s goals). This gives an opportunity to bring in volunteers from the broader tech community, and exposes the trainees to the roles they could be collaborating with in employment. -For more information on roles [click here](./roles.md) +For more information on roles [click here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles) The product owner would either be a representative from the partner organisation or someone at CYF, depending on the project. It’s important that they are able to engage at least twice a week with the team, and have the authority to make decisions that let the team keep moving. @@ -51,7 +51,7 @@ The product owner would either be a representative from the partner organisation We’re going to run the final projects in weekly “sprints”, planning out what we’re going to do as teams and as individuals. Each week will therefore look something like: -- **Daily standup**: post a daily message in the team Slack channel to let the rest of the team know what you’re working on, what progress you’ve made (even, and perhaps _especially_, if it’s none so far) and share anything that’s blocking you. Set a time for this and stick to it. Afterwards, post a team summary in the main class channel. +- **Daily standup**: post a daily message in the team Slack channel to let the rest of the team know what you’re working on, what progress you’ve made (even, and perhaps _especially_, if it’s none so far) and share anything that’s blocking you. Set a time for this and stick to it. Don't forget to also read your team members updates and try to help them if they are blocked. Afterwards, post a team summary in the main class channel. - **Mid-week check-in**: you should have at least one Slack call with the whole team and a mentor during the week to sync on progress, escalate any blockers and make sure that you’re still heading in the right direction. - **Classes**: we’ll continue to meet on class days where we will be spending time on: From 8574b5e74ef87c6e57574122ac6ab66528ef1046 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 28 Nov 2022 16:35:18 +0000 Subject: [PATCH 12/44] Updating the roles Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/roles.md | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/docs/finalproject/roles.md b/docs/finalproject/roles.md index ff9d5d9a75..5d8ddbd314 100644 --- a/docs/finalproject/roles.md +++ b/docs/finalproject/roles.md @@ -11,39 +11,33 @@ These roles should in total create a [balanced team](https://www.youtube.com/wat ## Volunteer Roles ### Product Manager // Scrum Master +Full role description is [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/product-manager) -**Time Commitment**: One day a week plus 2-4 hours during the week - -Scrum Masters are expected to coordinate the team and make sure everyone knows what they are working on. They can provide support in - +Your main role is to coordinate the team and make sure everyone knows what they are working on. They can provide support in: - Scheduling meetings -- Working with the team to create and update tasks on Trello +- Working with the team to create and update tasks on Github Projects - Introducing and enforcing Agile practices (e.g. sprint planning, retros) -### Technical Assistant - -**Time Commitment**: One day a week plus 2-4 hours during the week - -Teaching assistant provide technical support to the trainees as they are developing their projects. They can provide support in +### Technical Lead +Full role description and commitment is [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/tech-lead) +The TL provide technical support to the trainees as they are developing their projects. They can provide support in: - Architecture of the application - Helping to solve specific implementation problems - Helping to solve specific bugs or errors - Providing overview of the entire project ### UI/UX Designer - _UI/UX Designers are spread across multiple teams_ +Full role description is [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/ui-ux-designer). -UI/UX'ers will provide their expertise in supporting the UI/UX trainees in each team. The can provide support in - +UI/UX'ers will provide their expertise in supporting the UI/UX trainees in each team. For example: - Developing simple UI for the applications - Providing support on answering UX issues - Giving advice on how to better design an application to our teams ## Trainee Roles - Trainees join Final Projects in their graduation role and stay with one team. These are updated in [Graduation Roles](https://docs.google.com/document/d/1HHjftKmMqAT8zaxQubj5ixBrJqVcwLLNrAFLXGcn4N4/edit?usp=sharing) but usually include: - Full Stack Developer From 01c0c5dfdaf417cc88119486601fc5005061acf6 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Tue, 29 Nov 2022 11:37:22 +0000 Subject: [PATCH 13/44] Update docs/finalproject/intro.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/intro.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/intro.md b/docs/finalproject/intro.md index 829cc716f9..1af7693b24 100644 --- a/docs/finalproject/intro.md +++ b/docs/finalproject/intro.md @@ -37,7 +37,7 @@ The final projects form the final module of the course, comprising four weeks fo Ideally, the project team would consist of the following: -- Four CYF trainees; +- Three or four CYF trainees; - Two volunteer mentors ([Tech Lead](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/tech-lead) and [Product Manager](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/product-manager), forming a [balanced team](https://www.youtube.com/watch?v=Z_Q4Q8rCVpU); and - A [product owner](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/product-owner). From 1f3d0fdc2199d83c544e7217fcab455be654e599 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Tue, 29 Nov 2022 11:37:47 +0000 Subject: [PATCH 14/44] Update docs/finalproject/intro.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/intro.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/intro.md b/docs/finalproject/intro.md index 1af7693b24..a9f6ce3029 100644 --- a/docs/finalproject/intro.md +++ b/docs/finalproject/intro.md @@ -43,7 +43,7 @@ Ideally, the project team would consist of the following: The mentor group would include an engineer (responsible for unblocking technical/architectural issues, _not_ an extra developer), designer (responsible for user research and UI/UX) and product manager (responsible for prioritisation and alignment with the product owner’s goals). This gives an opportunity to bring in volunteers from the broader tech community, and exposes the trainees to the roles they could be collaborating with in employment. -For more information on roles [click here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles) +[More information on volunteer roles](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles) The product owner would either be a representative from the partner organisation or someone at CYF, depending on the project. It’s important that they are able to engage at least twice a week with the team, and have the authority to make decisions that let the team keep moving. From 712d94a14ff70df2a68244540cdef03c7eb18da0 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Tue, 29 Nov 2022 11:37:59 +0000 Subject: [PATCH 15/44] Update docs/finalproject/intro.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/intro.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/intro.md b/docs/finalproject/intro.md index a9f6ce3029..0d11d3a59a 100644 --- a/docs/finalproject/intro.md +++ b/docs/finalproject/intro.md @@ -51,7 +51,7 @@ The product owner would either be a representative from the partner organisation We’re going to run the final projects in weekly “sprints”, planning out what we’re going to do as teams and as individuals. Each week will therefore look something like: -- **Daily standup**: post a daily message in the team Slack channel to let the rest of the team know what you’re working on, what progress you’ve made (even, and perhaps _especially_, if it’s none so far) and share anything that’s blocking you. Set a time for this and stick to it. Don't forget to also read your team members updates and try to help them if they are blocked. Afterwards, post a team summary in the main class channel. +- **Daily standup**: post a daily message in the team Slack channel to let the rest of the team know what you’re working on, what progress you’ve made (even, and perhaps _especially_, if it’s none so far) and share anything that’s blocking you. Set a time for this and stick to it. Don't forget to also read your team members updates and try to help them when they are blocked. Afterwards, post a team summary in the main class channel. - **Mid-week check-in**: you should have at least one Slack call with the whole team and a mentor during the week to sync on progress, escalate any blockers and make sure that you’re still heading in the right direction. - **Classes**: we’ll continue to meet on class days where we will be spending time on: From a5a2d2a0063381adbbfe2ebab75521045be4cfed Mon Sep 17 00:00:00 2001 From: MitchLloyd Date: Tue, 29 Nov 2022 12:40:07 +0000 Subject: [PATCH 16/44] Update docs/react/week-1/lesson.md Co-authored-by: Sally McGrath Signed-off-by: MitchLloyd --- docs/react/week-1/lesson.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/react/week-1/lesson.md b/docs/react/week-1/lesson.md index 41251c552a..00b0a2a0a0 100644 --- a/docs/react/week-1/lesson.md +++ b/docs/react/week-1/lesson.md @@ -388,7 +388,9 @@ function MentorsList() { } ``` -Here we have added a `key` prop to the `li` element. The `key` prop has a special meaning in React because it is used internally to keep track of which element in the list is which. A documentation page explaining in more depth is in the further reading section. +Here we have added a `key` prop to the `li` element. The `key` prop has a special meaning in React. React uses `key` to keep track of each element in the list. + +The [React documentation](https://reactjs.org/docs/lists-and-keys.html) and [React learning book](https://beta.reactjs.org/learn/rendering-lists#keeping-list-items-in-order-with-key) explain this in more depth. ## Importing/Exporting Components From 42efd9839f742df1b849a890e981c0f6973d0ffe Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Thu, 1 Dec 2022 11:07:50 +0000 Subject: [PATCH 17/44] Updating stand-up and github projects Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/week-1/lesson.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/finalproject/week-1/lesson.md b/docs/finalproject/week-1/lesson.md index 7298e3069f..013cd185c4 100644 --- a/docs/finalproject/week-1/lesson.md +++ b/docs/finalproject/week-1/lesson.md @@ -72,7 +72,7 @@ _A note for PMs_ - don't forget to create your own copy of the presentation and _Led by trainees_ -Project Management boards are a tool that you can use to help you organise how you work. +Project Management boards are a tool that you can use to help you organise how you work. There are many tools in the market, but we use Github Projects. Create a copy of this Project Board to manage your work - [Project Board](https://github.com/orgs/CodeYourFuture/projects/13) @@ -88,6 +88,8 @@ _Facilitated by Tech Assistants_ Every day you should post a message in the team's Slack channel to let the rest of the team know what you’re working on, what progress you’ve made (even, and perhaps _especially_, if it’s none so far) and share anything that’s blocking you. +Don't forget to also read your team mates updates. This way you can understand what is happening in the team and support anyone that needs it. + Set a time for this and stick to it. Afterwards, post a team summary in the main class channel. From 08c481d7c608cadcee021f30259d38060e41b453 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Thu, 1 Dec 2022 11:12:13 +0000 Subject: [PATCH 18/44] Added explanation and extra info to title Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/week-3/lesson.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/finalproject/week-3/lesson.md b/docs/finalproject/week-3/lesson.md index cdb961f0af..973d942dac 100644 --- a/docs/finalproject/week-3/lesson.md +++ b/docs/finalproject/week-3/lesson.md @@ -4,9 +4,9 @@ title: Final Project - Week 3 sidebar_label: Lesson --- -See [Week 2](../week-2/lesson) for instructions for this week +See [Week 2](../week-2/lesson) for instructions for this week. You are working as a team to deliver a product, so will continue using that format through the Final Projects -### Check In +### Check In: how is the contribuitions of all team members so far? It's important to evaluate our contributions to the group. Here's what we expect: From d1267d48bf1cddfa4daa72805814d20968b48c0a Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Thu, 1 Dec 2022 11:15:47 +0000 Subject: [PATCH 19/44] Added some meat and remineder Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/week-4/lesson.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/week-4/lesson.md b/docs/finalproject/week-4/lesson.md index fafd0a7a4e..647502c17a 100644 --- a/docs/finalproject/week-4/lesson.md +++ b/docs/finalproject/week-4/lesson.md @@ -4,4 +4,4 @@ title: Final Project - Week 4 sidebar_label: Lesson --- -See [Week 2](../week-2/lesson) for instructions for this week +See [Week 2](../week-2/lesson) for instructions for this week. And make sure to check in again on the contribuitions per team members, as detailed on Week 3 [Week 3](../week-3/lesson) From 1d2b86632988c409f8445fda00d1137f6ad9b6ba Mon Sep 17 00:00:00 2001 From: Mitch Lloyd Date: Thu, 1 Dec 2022 22:43:51 +0000 Subject: [PATCH 20/44] add first draft of minutes --- docs/contributing/minutes.md | 52 ++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/docs/contributing/minutes.md b/docs/contributing/minutes.md index 0319eb71ae..9991720ad8 100644 --- a/docs/contributing/minutes.md +++ b/docs/contributing/minutes.md @@ -16,6 +16,58 @@ Attendees: --- +## 2022-11-24 + +Attendees: + +### ❗Actions from last time + +- Open a ticket to add the Bandit to the terminal lesson (Sally) [] +- + +### 📝 Agenda points + +#### Feedback from flipped classroom Q & A + +- [Here's a link to the notes from the Q&A session](https://docs.google.com/document/d/122t689Qpe_UbrrhW1xvpN88arM_I8ZGcoIAE9hd7ESs/edit) with Shaun and Zachee re flipped classroom in S Africa +- Much more official doing work ahead of time +- Here's what we're doing in class +- Recap Q & A session +- Better thought of as really well thought out prep work to make the NW + +#### Brief talk through Saturday flipped classroom presentation + +- Ask trainees how long they've spent on the prep work in a given week +- Say you're with someone who's slightly more advanced in a grup - empower someone +- Alternatively leave it vague who is strong - difference of ability + if 1 person is useEffect and 1 person is struggling the whole of React + -> if both people are tyring to learn the same thing then it makes sense for the `useEffect` people +- but with less you know specifically -> more mixed ability +- frustrated at different levels +- Careful people aren't doing the minimal amount of work +- If we assume people are learnign different things then groups don't matter massively +- normalise the differentiation + +peer 2 peer - providing verbal explanations + +- explain how React works +- how and what the code is doing +- less advanced trainee is getting a better explanation + +#### Video recording volunteers + +- Lo-fi recordings done with volunteers +- Greg, very interested - at some point in the future making some videos when he gains capacity +- Will, observe something beforehand to see how it works + +#### Say hi to Will + +- Will mentor in 2nd LDN class in 2018 + +### ❗Actions + +--- + ## 2022-11-10 ### ❗ Actions from last time From 9f13513faeb6660c7e37694c5062294b1f83f284 Mon Sep 17 00:00:00 2001 From: Mitch Lloyd Date: Fri, 2 Dec 2022 09:57:13 +0000 Subject: [PATCH 21/44] update to wording in minutes --- docs/contributing/minutes.md | 41 +++++++++++++++++------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/docs/contributing/minutes.md b/docs/contributing/minutes.md index 9991720ad8..349e55f6fd 100644 --- a/docs/contributing/minutes.md +++ b/docs/contributing/minutes.md @@ -30,42 +30,39 @@ Attendees: #### Feedback from flipped classroom Q & A - [Here's a link to the notes from the Q&A session](https://docs.google.com/document/d/122t689Qpe_UbrrhW1xvpN88arM_I8ZGcoIAE9hd7ESs/edit) with Shaun and Zachee re flipped classroom in S Africa -- Much more official doing work ahead of time -- Here's what we're doing in class -- Recap Q & A session -- Better thought of as really well thought out prep work to make the NW +- Greg likes to think of flipped classroom more as really well thought out prep work that makes the Saturday class run more smoothly #### Brief talk through Saturday flipped classroom presentation -- Ask trainees how long they've spent on the prep work in a given week -- Say you're with someone who's slightly more advanced in a grup - empower someone -- Alternatively leave it vague who is strong - difference of ability - if 1 person is useEffect and 1 person is struggling the whole of React - -> if both people are tyring to learn the same thing then it makes sense for the `useEffect` people -- but with less you know specifically -> more mixed ability -- frustrated at different levels -- Careful people aren't doing the minimal amount of work -- If we assume people are learnign different things then groups don't matter massively -- normalise the differentiation +- Some discussion around the grouping of trainees on a Saturday: -peer 2 peer - providing verbal explanations + - Ask trainees how long they've spent on the prep work in a given week + - Said you're going to be with someone who's slightly more advanced in a group + - Could alternatively leave it vague who is strong: difference of ability + if 1 person is struggling with `useEffect` and 1 person is struggling the whole of React + -> if both people are trying to learn the same thing then it makes sense for the `useEffect` people + - but with less you know specifically -> more mixed ability + - Could potentially get more frustration with people working at different levels + - Careful people aren't doing the minimal amount of work + - If we assume people are learning different things then groups don't matter massively + - normalise the differentiation -- explain how React works -- how and what the code is doing -- less advanced trainee is getting a better explanation +- peer-2-peer collaboration will work better if trainees provide verbal explanations of how their ode works #### Video recording volunteers - Lo-fi recordings done with volunteers -- Greg, very interested - at some point in the future making some videos when he gains capacity -- Will, observe something beforehand to see how it works +- Greg, very interested in helping with recordings - at some point in the future making some videos when he gains capacity +- Will to observe something beforehand to see how it works -#### Say hi to Will +#### Welcome to Will -- Will mentor in 2nd LDN class in 2018 +- Will was previously a mentor in 2nd LDN class in 2018 ### ❗Actions +- [] Mitch and Will to catch up on a module PR later this week + --- ## 2022-11-10 From 36fb7cb05f8a8c9a7a8b2d168c1b3f31a3a126a2 Mon Sep 17 00:00:00 2001 From: Mitch Lloyd Date: Fri, 2 Dec 2022 09:57:57 +0000 Subject: [PATCH 22/44] further tweaks --- docs/contributing/minutes.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/contributing/minutes.md b/docs/contributing/minutes.md index 349e55f6fd..d3a46482d2 100644 --- a/docs/contributing/minutes.md +++ b/docs/contributing/minutes.md @@ -23,7 +23,6 @@ Attendees: ### ❗Actions from last time - Open a ticket to add the Bandit to the terminal lesson (Sally) [] -- ### 📝 Agenda points From 413abff3f44ac36cb35a530e19648aa09b3af7a5 Mon Sep 17 00:00:00 2001 From: Mitch Lloyd Date: Fri, 2 Dec 2022 11:11:05 +0000 Subject: [PATCH 23/44] make minutes somewhat comprehensible --- docs/contributing/minutes.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/docs/contributing/minutes.md b/docs/contributing/minutes.md index d3a46482d2..e824ee8f9b 100644 --- a/docs/contributing/minutes.md +++ b/docs/contributing/minutes.md @@ -28,25 +28,23 @@ Attendees: #### Feedback from flipped classroom Q & A -- [Here's a link to the notes from the Q&A session](https://docs.google.com/document/d/122t689Qpe_UbrrhW1xvpN88arM_I8ZGcoIAE9hd7ESs/edit) with Shaun and Zachee re flipped classroom in S Africa -- Greg likes to think of flipped classroom more as really well thought out prep work that makes the Saturday class run more smoothly +- [Here's a link to the notes from the Q&A session](https://docs.google.com/document/d/122t689Qpe_UbrrhW1xvpN88arM_I8ZGcoIAE9hd7ESs/edit) with Shaun and Zacheé re flipped classroom in S Africa +- Greg likes to think of flipped classroom more as having really well thought out prep work that makes the Saturday class run more smoothly #### Brief talk through Saturday flipped classroom presentation - Some discussion around the grouping of trainees on a Saturday: - Ask trainees how long they've spent on the prep work in a given week - - Said you're going to be with someone who's slightly more advanced in a group - - Could alternatively leave it vague who is strong: difference of ability - if 1 person is struggling with `useEffect` and 1 person is struggling the whole of React - -> if both people are trying to learn the same thing then it makes sense for the `useEffect` people - - but with less you know specifically -> more mixed ability + - May need to say in advance that someone in their group is going to be slightly/considerably more advanced than them + - Very important to normalise the differentiation + - Alternatively leave it vague who is strong/weak before grouping up trainees + - If 2 people are trying to learn the same thing, say `useEffect`, then it makes sense for the `useEffect` people to work together + - In general, the less they know specifically -> more mixed ability becomes possible - Could potentially get more frustration with people working at different levels - - Careful people aren't doing the minimal amount of work - If we assume people are learning different things then groups don't matter massively - - normalise the differentiation -- peer-2-peer collaboration will work better if trainees provide verbal explanations of how their ode works +- Peer-2-peer collaboration will work better if trainees provide verbal explanations of how their code works #### Video recording volunteers @@ -56,6 +54,7 @@ Attendees: #### Welcome to Will +- Welcome to Will who's joining on syllabus! 🎉 - Will was previously a mentor in 2nd LDN class in 2018 ### ❗Actions From 0159a873e16b6df17c943ef92b8e188ce18f9e18 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:18:57 +0000 Subject: [PATCH 24/44] Update docs/finalproject/week-1/lesson.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/week-1/lesson.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/week-1/lesson.md b/docs/finalproject/week-1/lesson.md index 013cd185c4..7d2bee5be3 100644 --- a/docs/finalproject/week-1/lesson.md +++ b/docs/finalproject/week-1/lesson.md @@ -88,7 +88,7 @@ _Facilitated by Tech Assistants_ Every day you should post a message in the team's Slack channel to let the rest of the team know what you’re working on, what progress you’ve made (even, and perhaps _especially_, if it’s none so far) and share anything that’s blocking you. -Don't forget to also read your team mates updates. This way you can understand what is happening in the team and support anyone that needs it. +Don't forget to also read your teammates updates. This way you can understand what is happening in the team and support each other. Set a time for this and stick to it. From e44bd1e5f14e403247860c8076c2150743ec4d98 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:19:09 +0000 Subject: [PATCH 25/44] Update docs/finalproject/week-1/lesson.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/week-1/lesson.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/week-1/lesson.md b/docs/finalproject/week-1/lesson.md index 7d2bee5be3..011aaf753c 100644 --- a/docs/finalproject/week-1/lesson.md +++ b/docs/finalproject/week-1/lesson.md @@ -90,7 +90,7 @@ Every day you should post a message in the team's Slack channel to let the rest Don't forget to also read your teammates updates. This way you can understand what is happening in the team and support each other. -Set a time for this and stick to it. +Set a time for this and stick to it. Put it in your calendar. Afterwards, post a team summary in the main class channel. From 3d2fc83155e5c6b735b4f6abe6ef5850c3700227 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:21:13 +0000 Subject: [PATCH 26/44] Update docs/finalproject/week-4/lesson.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/week-4/lesson.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/finalproject/week-4/lesson.md b/docs/finalproject/week-4/lesson.md index 647502c17a..18561baced 100644 --- a/docs/finalproject/week-4/lesson.md +++ b/docs/finalproject/week-4/lesson.md @@ -4,4 +4,6 @@ title: Final Project - Week 4 sidebar_label: Lesson --- -See [Week 2](../week-2/lesson) for instructions for this week. And make sure to check in again on the contribuitions per team members, as detailed on Week 3 [Week 3](../week-3/lesson) +See [Week 2](../week-2/lesson) for instructions for this week. + +Make sure to check in again on the contributions per team members, as detailed on Week 3 [Week 3](../week-3/lesson) From 68bb7bc8f82a438cc7e138203444b3c801a2a10b Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:22:20 +0000 Subject: [PATCH 27/44] Update docs/finalproject/week-3/lesson.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/week-3/lesson.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/week-3/lesson.md b/docs/finalproject/week-3/lesson.md index 973d942dac..cb4cac5bb3 100644 --- a/docs/finalproject/week-3/lesson.md +++ b/docs/finalproject/week-3/lesson.md @@ -6,7 +6,7 @@ sidebar_label: Lesson See [Week 2](../week-2/lesson) for instructions for this week. You are working as a team to deliver a product, so will continue using that format through the Final Projects -### Check In: how is the contribuitions of all team members so far? +### Check In: how are the contributions of all team members so far? It's important to evaluate our contributions to the group. Here's what we expect: From 161c1fbef1535f9b8231046370c8a51a27b4627b Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:28:10 +0000 Subject: [PATCH 28/44] Update docs/finalproject/prep.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/prep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/prep.md b/docs/finalproject/prep.md index 5dc9169e26..e30b661b42 100644 --- a/docs/finalproject/prep.md +++ b/docs/finalproject/prep.md @@ -9,7 +9,7 @@ Getting the Final Projects ready is not a task that can be done a week before th **When you are on the React Module** - [ ] Must review the trainee’s performance and make [readiness for Final Projects decision](https://docs.google.com/document/d/1jMxqI0L7IKFENCQ8Lw-D1lhnj3c3RZI_WK808wG4YJM/edit?usp=sharing) -- [ ] If you haven't yet, make sure you dentify trainees that will be filling in roles such as UI/UX Designer, Tester or Product Delivery +- [ ] If you haven't yet, make sure you identify trainees that will be filling in roles such as UI/UX Designer, Tester or Product Delivery - [ ] Ask internally and externally for possible ideas of charities that could be part of Final Projects. The form used should be [this](https://forms.gle/Gn85Kdna6QB2Qfcp9). - [ ] Start recruiting Tech Lead, Product Managers and UI/UX Designer for Final Projects. See the role descriptions [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles). From ef81bc58a0249ccf2cdd74c81d35e9b69fbf263b Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:28:39 +0000 Subject: [PATCH 29/44] Update docs/finalproject/prep.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/prep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/prep.md b/docs/finalproject/prep.md index e30b661b42..bf842ab85b 100644 --- a/docs/finalproject/prep.md +++ b/docs/finalproject/prep.md @@ -23,7 +23,7 @@ Getting the Final Projects ready is not a task that can be done a week before th - [ ] Let volunteers choose which project they would like to be on **When you are on SQL Module** -- [ ] Trainees' must have completed up to Level 300 of the Full Stack assessment by week 3 of the module before Final Projects and finalised +- [ ] Trainees must have completed up to Level 300 of the [Full Stack Assessment](https://github.com/CodeYourFuture/Table-of-Contents) by week 3 of the module before Final Projects. - [ ] Must review the trainee’s performance and identify the ones going to Final Projects - [ ] Identify trainees that are close in performance and allocate them to the same project. We encourage trainees to work with different people, so try to mix the teams up. Don’t forget to update the spreadsheet. - [ ] Have a meeting with all volunteers and trainees to go through the details of the final project (presentation to be created with expectation, escalation process, type of support, overview of the trainees per team, etc). Don't forget to record it and share the recording with all the participants. From 1ae0c03a8d82532ef18724961a3714219faeeba3 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:29:31 +0000 Subject: [PATCH 30/44] Update docs/finalproject/prep.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/prep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/prep.md b/docs/finalproject/prep.md index bf842ab85b..cd12c909d7 100644 --- a/docs/finalproject/prep.md +++ b/docs/finalproject/prep.md @@ -10,7 +10,7 @@ Getting the Final Projects ready is not a task that can be done a week before th **When you are on the React Module** - [ ] Must review the trainee’s performance and make [readiness for Final Projects decision](https://docs.google.com/document/d/1jMxqI0L7IKFENCQ8Lw-D1lhnj3c3RZI_WK808wG4YJM/edit?usp=sharing) - [ ] If you haven't yet, make sure you identify trainees that will be filling in roles such as UI/UX Designer, Tester or Product Delivery -- [ ] Ask internally and externally for possible ideas of charities that could be part of Final Projects. The form used should be [this](https://forms.gle/Gn85Kdna6QB2Qfcp9). +- [ ] Ask internally and externally for possible ideas of charities that could be part of Final Projects. The form used should be the [Final Project Proposals form](https://forms.gle/Gn85Kdna6QB2Qfcp9). - [ ] Start recruiting Tech Lead, Product Managers and UI/UX Designer for Final Projects. See the role descriptions [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles). **When you are on the NodeJS Module** From c43415378b04991f1c5c840e3ba197039fd0fe0b Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:29:58 +0000 Subject: [PATCH 31/44] Update docs/finalproject/prep.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/prep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/prep.md b/docs/finalproject/prep.md index cd12c909d7..716d5cf25a 100644 --- a/docs/finalproject/prep.md +++ b/docs/finalproject/prep.md @@ -11,7 +11,7 @@ Getting the Final Projects ready is not a task that can be done a week before th - [ ] Must review the trainee’s performance and make [readiness for Final Projects decision](https://docs.google.com/document/d/1jMxqI0L7IKFENCQ8Lw-D1lhnj3c3RZI_WK808wG4YJM/edit?usp=sharing) - [ ] If you haven't yet, make sure you identify trainees that will be filling in roles such as UI/UX Designer, Tester or Product Delivery - [ ] Ask internally and externally for possible ideas of charities that could be part of Final Projects. The form used should be the [Final Project Proposals form](https://forms.gle/Gn85Kdna6QB2Qfcp9). -- [ ] Start recruiting Tech Lead, Product Managers and UI/UX Designer for Final Projects. See the role descriptions [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles). +- [ ] Start recruiting Tech Lead, Product Managers and UI/UX Designer for Final Projects. See the [role descriptions](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles). **When you are on the NodeJS Module** - [ ] Review the project ideas with Tech Leads and Product Managers defining technical feasibility and scope size. You might have to have volunteers clarify some information with the charities From 52f8a41a6ba8aeab829363e974936f73e60d062a Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:30:14 +0000 Subject: [PATCH 32/44] Update docs/finalproject/prep.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/prep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/prep.md b/docs/finalproject/prep.md index 716d5cf25a..13aa188cca 100644 --- a/docs/finalproject/prep.md +++ b/docs/finalproject/prep.md @@ -48,7 +48,7 @@ All code should be done _in public on the trainees' Githubs_, unless there is a Before class starts volunteer and trainee teams should have been assigned. -You can find a template for organising the teams[here](https://docs.google.com/spreadsheets/d/16vSSJgzCZJKF-2pwuBTkKjJJJ9i1CGRqMbYB-HEO5mo/edit?usp=sharing). +Please make a copy of this [template spreadsheet](https://docs.google.com/spreadsheets/d/16vSSJgzCZJKF-2pwuBTkKjJJJ9i1CGRqMbYB-HEO5mo/edit?usp=sharing) to organise the teams and track the progress of the projects. **Repos must be logged on this spreadsheet so everyone can see what is happening during the module.** All trainees should make sure that they are comfortable with their roles and what they will be required to do. More information about roles can be found [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles) From 3d613dbbf43f33ceac009e3051a845b8a876b685 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:30:29 +0000 Subject: [PATCH 33/44] Update docs/finalproject/prep.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/prep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/prep.md b/docs/finalproject/prep.md index 13aa188cca..43fc52db9a 100644 --- a/docs/finalproject/prep.md +++ b/docs/finalproject/prep.md @@ -50,7 +50,7 @@ Before class starts volunteer and trainee teams should have been assigned. Please make a copy of this [template spreadsheet](https://docs.google.com/spreadsheets/d/16vSSJgzCZJKF-2pwuBTkKjJJJ9i1CGRqMbYB-HEO5mo/edit?usp=sharing) to organise the teams and track the progress of the projects. **Repos must be logged on this spreadsheet so everyone can see what is happening during the module.** -All trainees should make sure that they are comfortable with their roles and what they will be required to do. More information about roles can be found [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles) +All trainees should make sure that they are comfortable with their roles and what they will be required to do. More [information about roles](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles). ## Starter Projects From cfd87ee54a3f55876fcaac625a407295a7196e8f Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:30:50 +0000 Subject: [PATCH 34/44] Update docs/finalproject/prep.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/prep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/prep.md b/docs/finalproject/prep.md index 43fc52db9a..7330ed2a9f 100644 --- a/docs/finalproject/prep.md +++ b/docs/finalproject/prep.md @@ -26,7 +26,7 @@ Getting the Final Projects ready is not a task that can be done a week before th - [ ] Trainees must have completed up to Level 300 of the [Full Stack Assessment](https://github.com/CodeYourFuture/Table-of-Contents) by week 3 of the module before Final Projects. - [ ] Must review the trainee’s performance and identify the ones going to Final Projects - [ ] Identify trainees that are close in performance and allocate them to the same project. We encourage trainees to work with different people, so try to mix the teams up. Don’t forget to update the spreadsheet. -- [ ] Have a meeting with all volunteers and trainees to go through the details of the final project (presentation to be created with expectation, escalation process, type of support, overview of the trainees per team, etc). Don't forget to record it and share the recording with all the participants. +- [ ] Have a meeting with all volunteers and trainees to go through the details of the final project (presentation to be created with expectation, escalation process, type of support, overview of the trainees per team, etc). Don't forget to record it and share the recording with all the participants, with their consent. - [ ] Introduce all teams and people in it and create all Slack groups - [ ] A day before the first Saturday of Final Projects, send the project briefing to the team From 56a1384a7dffeb5e60d4cfb974d60b340d1be2d5 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 12:08:16 +0000 Subject: [PATCH 35/44] Update docs/finalproject/roles.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/roles.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/roles.md b/docs/finalproject/roles.md index 5d8ddbd314..488b93cb01 100644 --- a/docs/finalproject/roles.md +++ b/docs/finalproject/roles.md @@ -19,7 +19,7 @@ Your main role is to coordinate the team and make sure everyone knows what they - Introducing and enforcing Agile practices (e.g. sprint planning, retros) ### Technical Lead -Full role description and commitment is [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/tech-lead) +Full [role description for Tech Lead](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/tech-lead) (TL) The TL provide technical support to the trainees as they are developing their projects. They can provide support in: - Architecture of the application From 8ac6027ff44978c4c92fe9f8b34e8c71f7e15cb5 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 12:08:35 +0000 Subject: [PATCH 36/44] Update docs/finalproject/roles.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/roles.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/roles.md b/docs/finalproject/roles.md index 488b93cb01..179e688892 100644 --- a/docs/finalproject/roles.md +++ b/docs/finalproject/roles.md @@ -21,7 +21,7 @@ Your main role is to coordinate the team and make sure everyone knows what they ### Technical Lead Full [role description for Tech Lead](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/tech-lead) (TL) -The TL provide technical support to the trainees as they are developing their projects. They can provide support in: +The TL provides technical support to the trainees as they are developing their projects. They can provide support in: - Architecture of the application - Helping to solve specific implementation problems - Helping to solve specific bugs or errors From 9d4585fd6f38b3714b461f292c203d29325ea766 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 12:08:56 +0000 Subject: [PATCH 37/44] Update docs/finalproject/roles.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/roles.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/roles.md b/docs/finalproject/roles.md index 179e688892..66e3f2f84c 100644 --- a/docs/finalproject/roles.md +++ b/docs/finalproject/roles.md @@ -27,7 +27,7 @@ The TL provides technical support to the trainees as they are developing their p - Helping to solve specific bugs or errors - Providing overview of the entire project -### UI/UX Designer +### User Interface/ User Experience (UI/UX) Designer _UI/UX Designers are spread across multiple teams_ Full role description is [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/ui-ux-designer). From 1af83feafbdb6947436828a24f85bc14daa01de6 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 12:09:07 +0000 Subject: [PATCH 38/44] Update docs/finalproject/roles.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/roles.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/roles.md b/docs/finalproject/roles.md index 66e3f2f84c..65d152e3e9 100644 --- a/docs/finalproject/roles.md +++ b/docs/finalproject/roles.md @@ -29,7 +29,7 @@ The TL provides technical support to the trainees as they are developing their p ### User Interface/ User Experience (UI/UX) Designer _UI/UX Designers are spread across multiple teams_ -Full role description is [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/ui-ux-designer). +Full [role description for UI/UX designer](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/ui-ux-designer). UI/UX'ers will provide their expertise in supporting the UI/UX trainees in each team. For example: - Developing simple UI for the applications From 5e142fc14a1c5193654b727b71c4f036415c91d1 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 12:09:32 +0000 Subject: [PATCH 39/44] Update docs/finalproject/roles.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/roles.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/roles.md b/docs/finalproject/roles.md index 65d152e3e9..164a68ac86 100644 --- a/docs/finalproject/roles.md +++ b/docs/finalproject/roles.md @@ -31,7 +31,7 @@ The TL provides technical support to the trainees as they are developing their p _UI/UX Designers are spread across multiple teams_ Full [role description for UI/UX designer](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/ui-ux-designer). -UI/UX'ers will provide their expertise in supporting the UI/UX trainees in each team. For example: +UI/UXers will provide their expertise in supporting the UI/UX trainees in each team. For example: - Developing simple UI for the applications - Providing support on answering UX issues - Giving advice on how to better design an application to our teams From adc45fe2fbb7db01bb947090f23b0279da483d93 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 12:09:44 +0000 Subject: [PATCH 40/44] Update docs/finalproject/roles.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/roles.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/roles.md b/docs/finalproject/roles.md index 164a68ac86..ff55ca54de 100644 --- a/docs/finalproject/roles.md +++ b/docs/finalproject/roles.md @@ -10,7 +10,7 @@ These roles should in total create a [balanced team](https://www.youtube.com/wat ## Volunteer Roles -### Product Manager // Scrum Master +### Product Manager / Scrum Master Full role description is [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/product-manager) Your main role is to coordinate the team and make sure everyone knows what they are working on. They can provide support in: From e2b563a24d36125518acdd3a3ae0fe5092e0f717 Mon Sep 17 00:00:00 2001 From: Sally McGrath Date: Mon, 5 Dec 2022 07:53:39 -0500 Subject: [PATCH 41/44] Update docs/finalproject/prep.md plural possessive Signed-off-by: Sally McGrath --- docs/finalproject/prep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/prep.md b/docs/finalproject/prep.md index 7330ed2a9f..f69825adac 100644 --- a/docs/finalproject/prep.md +++ b/docs/finalproject/prep.md @@ -24,7 +24,7 @@ Getting the Final Projects ready is not a task that can be done a week before th **When you are on SQL Module** - [ ] Trainees must have completed up to Level 300 of the [Full Stack Assessment](https://github.com/CodeYourFuture/Table-of-Contents) by week 3 of the module before Final Projects. -- [ ] Must review the trainee’s performance and identify the ones going to Final Projects +- [ ] Must review the trainees' performance and identify the ones going to Final Projects - [ ] Identify trainees that are close in performance and allocate them to the same project. We encourage trainees to work with different people, so try to mix the teams up. Don’t forget to update the spreadsheet. - [ ] Have a meeting with all volunteers and trainees to go through the details of the final project (presentation to be created with expectation, escalation process, type of support, overview of the trainees per team, etc). Don't forget to record it and share the recording with all the participants, with their consent. - [ ] Introduce all teams and people in it and create all Slack groups From a2d1e0e764d10da15cea08e2387448c4b62084f6 Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 13:41:06 +0000 Subject: [PATCH 42/44] Update roles.md Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/roles.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/roles.md b/docs/finalproject/roles.md index ff55ca54de..3992dd88c5 100644 --- a/docs/finalproject/roles.md +++ b/docs/finalproject/roles.md @@ -11,7 +11,7 @@ These roles should in total create a [balanced team](https://www.youtube.com/wat ## Volunteer Roles ### Product Manager / Scrum Master -Full role description is [here](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/product-manager) +Full [role description of roles](https://docs.codeyourfuture.io/volunteers/teams-1/cyf-products-final-projects/roles/product-manager) Your main role is to coordinate the team and make sure everyone knows what they are working on. They can provide support in: - Scheduling meetings From 559e007d17f00d3ad898725d46c08ba125238ddd Mon Sep 17 00:00:00 2001 From: KFK <80272258+kfklein15@users.noreply.github.com> Date: Mon, 5 Dec 2022 13:41:51 +0000 Subject: [PATCH 43/44] Update docs/finalproject/week-4/lesson.md Co-authored-by: Sally McGrath Signed-off-by: KFK <80272258+kfklein15@users.noreply.github.com> --- docs/finalproject/week-4/lesson.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/finalproject/week-4/lesson.md b/docs/finalproject/week-4/lesson.md index 18561baced..90dda1d320 100644 --- a/docs/finalproject/week-4/lesson.md +++ b/docs/finalproject/week-4/lesson.md @@ -6,4 +6,4 @@ sidebar_label: Lesson See [Week 2](../week-2/lesson) for instructions for this week. -Make sure to check in again on the contributions per team members, as detailed on Week 3 [Week 3](../week-3/lesson) +Make sure to check in again on the contributions per team members, as detailed on [Week 3](../week-3/lesson) From 72c9ae12f1f7085b351022af805568dd016cc3f8 Mon Sep 17 00:00:00 2001 From: Sally McGrath Date: Mon, 2 Jan 2023 18:13:53 +0000 Subject: [PATCH 44/44] updated html css coursework from boiler - checked links - bumped up hours after feedback - cleaned up that weirdness where week 2 was the module project and week 3 was set on week 4 --- docs/html-css/week-1/homework.md | 31 +++++++++++++++++++++++++++---- docs/html-css/week-2/homework.md | 29 ++++++++++++++++++++++++++--- docs/html-css/week-3/homework.md | 21 ++++++++++++++++++--- docs/html-css/week-4/homework.md | 28 +++++++++++++++++++++++----- 4 files changed, 94 insertions(+), 15 deletions(-) diff --git a/docs/html-css/week-1/homework.md b/docs/html-css/week-1/homework.md index cbb598514b..cab1f877f4 100644 --- a/docs/html-css/week-1/homework.md +++ b/docs/html-css/week-1/homework.md @@ -14,12 +14,35 @@ Is your Google Classroom, not here! Teachers and trainees, make sure you check y Fork then clone the [HTML/CSS week 1 coursework](https://github.com/CodeYourFuture/HTML-CSS-Coursework-Week1), and follow the instructions in the `README.md` file. -### 2) Complete Flexbox Froggy game (3 hours) +### 2) Begin the module project (6 hours) -Complete the [Flexbox Froggy game](https://flexboxfroggy.com) to get practise on flexbox. +The module project spans the whole module. Your task is to re-create a design from scratch, using your HTML and CSS skills, and improve it over this module. You have four weeks to develop this project, so plan your time wisely. + +You'll find all instructions in this repository: +[https://github.com/CodeYourFuture/HTML-CSS-Module-Project](https://github.com/CodeYourFuture/HTML-CSS-Module-Project) + +Before you start, make sure you **fork** the repository to your Github account. Open a pull request to submit your coursework. + +### 3) CSS Grid (3 hours) + +1. Complete this [Scrimba course on CSS Grid](https://scrimba.com/learn/cssgrid) +2. Don't just watch the videos! You won't really learn anything that way. Interact with the code and type it out. +3. Take a screenshot of your progress on your dashboard https://scrimba.com/dashboard?tab=enrolled and submit this + +### 4) Prepare for the next class (1 hour) + +You need to prepare for every class. + +The syllabus is a sample/guide lesson, so you might do something different in class, but the broad learning objectives will be similar. Read the learning objectives. What other reading can you do to prepare for class? Is there any code to checkout from github? + +CYF trainees must always come to class **with questions**. ## Stretch coursework -### 3) CSS Diner game (3 hours) +### 1) Complete Flexbox Froggy game + +Complete the [Flexbox Froggy game](https://flexboxfroggy.com) to practise using flexbox. + +### 2) CSS Diner game -Complete the [CSS Diner game](https://flukeout.github.io) to get practise on advanced CSS selectors. +Complete the [CSS Diner game](https://flukeout.github.io) to practise using advanced CSS selectors. diff --git a/docs/html-css/week-2/homework.md b/docs/html-css/week-2/homework.md index ea149c83d9..b8c542d0e2 100644 --- a/docs/html-css/week-2/homework.md +++ b/docs/html-css/week-2/homework.md @@ -10,18 +10,41 @@ Is your Google Classroom, not here! Teachers and trainees, make sure you check y ## Mandatory coursework -## 1) Forms, Data, Validation, and Devtools 🔑 +### 1) Forms, Data, Validation, and Devtools 🔑 (4 hours) Design a form to collect your data. Choose form controls to help you validate the inputs. Evaluate your work with Devtools. https://github.com/CodeYourFuture/HTML-CSS-Challenges/tree/main/Form-Controls +For this project, you will need to make decisions yourself and explore your own code with Devtools. What blockers will you encounter? How will you get help to solve them? Come to class with questions. + ### 2) Complete the Bikes For Refugees project -Use flexbox to complete the [Bikes For Refugees project](https://github.com/CodeYourFuture/bikes-for-refugees). +Use flexbox to complete the [Bikes For Refugees project](https://github.com/CodeYourFuture/bikes-for-refugees) if you did not complete this in class. + +### 3) Design Basics (1.5 hours) + +Take this free introduction to UX/UI on Scrimba: https://scrimba.com/learn/design + +### 4) Module Project (8 hours) + +https://github.com/CodeYourFuture/HTML-CSS-Module-Project/tree/master/level-2 + +#### Submitting your work + +- Create a new branch for level 2 +- Remember to commit and push your code often. +- Once you're ready to submit your work for review, do a final push and create a Pull Request. + Note: If you've added your code to the same branch you were using last week, then it will just update your original Pull Request and you won't need a new PR. + +### 5) Prepare for next class (.5 hours) + +You need to prepare for every class. + +The syllabus is a sample lesson, so you might do something different in class, but the broad learning objectives will be similar. Read the learning objectives. What other reading can you do to prepare for class? Is there any code to checkout from github? ## Stretch coursework -### 3) Complete the Zoo CSS challenge (stretch) +### 1) Complete the Zoo CSS challenge Use flexbox to complete the [Zoo CSS challenge](https://github.com/CodeYourFuture/HTML-CSS-Challenges). diff --git a/docs/html-css/week-3/homework.md b/docs/html-css/week-3/homework.md index 7a0bb7e06a..5b1728444e 100644 --- a/docs/html-css/week-3/homework.md +++ b/docs/html-css/week-3/homework.md @@ -10,11 +10,16 @@ Is your Google Classroom, not here! Teachers and trainees, make sure you check y ## Mandatory coursework -### 1) 🔑 Create a Karma clone webpage (4 hours) +### 1) 🔑 Cakes and Co (10 hours) -Fork then clone the [HTML/CSS week 2 coursework](https://github.com/CodeYourFuture/HTML-CSS-Coursework-Week2), and follow the instructions in the `README.md` file. +Follow the instructions in this repo to create your own Cakes company website. -### 2) Code review +- Fork then clone https://github.com/CodeYourFuture/HTML-CSS-Coursework-Week3 +- Follow the instructions in the `README.md` file. + +### 2) Module Project: Code review (3 hours) + +https://github.com/CodeYourFuture/HTML-CSS-Module-Project Learning to read and review other people's code is a key skill for a developer. When you join a new team, you will usually also join an existing codebase, and you will need to be able to read it. If you've never looked at code written by other people, you will find this really challenging (it's already hard!). @@ -23,3 +28,13 @@ Learning to read and review other people's code is a key skill for a developer. 3. Complete a code review for a colleague on their Karma project. You don't need to have completed the entire project to get code review. You can ask for help with something specific. + +### 3) Module Project: Responsive (3 hours) + +Work through Level 3 and make your Karma clone responsive. + +### 4) Prepare for next class (0.5 hours) + +You need to prepare for every class. + +The syllabus is a sample lesson, so you might do something different in class, but the broad learning objectives will be similar. Read the learning objectives. What other reading can you do to prepare for class? Is there any code to checkout from github? diff --git a/docs/html-css/week-4/homework.md b/docs/html-css/week-4/homework.md index 8410fb15d4..53b31e7094 100644 --- a/docs/html-css/week-4/homework.md +++ b/docs/html-css/week-4/homework.md @@ -8,11 +8,21 @@ sidebar_label: Coursework Is your Google Classroom, not here! Teachers and trainees, make sure you check your Google Classroom for latest updates. -### 1) 🔑 Create a Cakes Co webpage (4 hours) +### 1) 🔑 Recreate a design (10 hours) -Fork then clone the [HTML/CSS week 3 coursework](https://github.com/CodeYourFuture/HTML-CSS-Coursework-Week3), and follow the instructions in the `README.md` file. +Choose one of the designs listed in the readme. Re-create the design to perfection, using CSS Grid, and media queries to make the site fully responsive. -## 2) Prepare for the next class (2 hours) +https://github.com/CodeYourFuture/HTML-CSS-Coursework-Week4 + +### 2) Record a Goose (3 hours) + +A mission of discovery for you. + +1. Go to https://record-a-goose.onrender.com/ +2. Using Devtools, Lighthouse, and the WAVE accessibility plugin, find all the ways this app is broken +3. How would you fix the problems? Discuss in the channel (in threads, please!) + +### 3) Prepare for the next class (2 hours) Next lesson, we will be going back to learning about JavaScript. @@ -27,7 +37,7 @@ You should always prepare for class and not passively wait for things to be expl You should **always read through the next lesson**, in preparation for class. For JS-1 you need to complete this prep: https://syllabus.codeyourfuture.io/js-core-1/preparation -## 3) Join Codewars +### 4) Join Codewars Join Codewars https://www.codewars.com/join @@ -37,4 +47,12 @@ You will complete at least three kata a week, every week, for the rest of the co 2. Link your account with Github, and join the CodeYourFuture clan, so we can find you on the clan board here: https://www.codewars.com/users/CodeYourFuture/following). 3. Add your Codewars name to the Trainee Info form for your class. It should be the same as your Github name. -By the _end_ of JS1, you will have completed nine kata, three for each week in the module. Codewars is not just to practice JavaScript, it's to practice time management and study skills, so don't put this off. +By the _end_ of JS1, you will have completed at least nine kata. Codewars is not just to practice JavaScript, it's to practice time management and study skills, so don't put this off. + +### 4) Read Intro To Tests + +https://syllabus.codeyourfuture.io/guides/intro-to-tests + +Make sure you read all of this guide - it will be very helpful in getting you to understand tests and helping you with setting up your homework repos. + +Make notes on what you learn.