Merge pull request #279 from php-school/home-page-copy

Update some copy, reimplement slack invite

Author: AydinHassan

.docker/files/php-school-fpm/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.1-fpm AS prod
+FROM php:8.3-fpm AS prod
 
 RUN apt-get -qq update && apt-get install -qqy git zlib1g-dev libzip-dev \
 	&& rm -rf /var/lib/apt/lists/* \

.github/workflows/php.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.1, 8.2]
+        php: [8.2, 8.3]
 
     name: PHP ${{ matrix.php }}
     steps:

app/config.php

@@ -44,6 +44,7 @@
 use PhpSchool\Website\Action\Online\ComposerPackageAdd;
 use PhpSchool\Website\Action\Online\RunExercise;
 use PhpSchool\Website\Action\Online\VerifyExercise;
+use PhpSchool\Website\Action\SlackInvite;
 use PhpSchool\Website\Action\StudentLogin;
 use PhpSchool\Website\Action\SubmitWorkshop;
 use PhpSchool\Website\Action\TrackDownloads;
@@ -232,14 +233,21 @@
     SubmitWorkshop::class => \DI\factory(function (ContainerInterface $c): SubmitWorkshop {
         return new SubmitWorkshop(
             $c->get(FormHandlerFactory::class)->create(
-                new SubmitWorkshopInputFilter(new Client, $c->get(WorkshopRepository::class))
+                new SubmitWorkshopInputFilter(new Client(), $c->get(WorkshopRepository::class))
             ),
-            new WorkshopCreator(new WorkshopComposerJsonInputFilter, $c->get(WorkshopRepository::class)),
+            new WorkshopCreator(new WorkshopComposerJsonInputFilter(), $c->get(WorkshopRepository::class)),
             $c->get(EmailNotifier::class),
             $c->get(LoggerInterface::class)
         );
     }),
 
+    SlackInvite::class => function (ContainerInterface $c): SlackInvite {
+        return new SlackInvite(
+            $c->get('guzzle'),
+            $c->get('config')['slackInviteApiToken']
+        );
+    },
+
     Github::class => function (ContainerInterface $c): Github {
         return new Github([
             'clientId' => $c->get('config')['github']['clientId'],
@@ -320,6 +328,10 @@
         );
     },
 
+    'guzzle' => function (ContainerInterface $c): \GuzzleHttp\Client {
+        return new \GuzzleHttp\Client();
+    },
+
     'guzzle.packagist' => function (ContainerInterface $c) {
         return new \GuzzleHttp\Client(['headers' => ['User-Agent' => 'PHP School: phpschool.team@gmail.com']]);
     },
@@ -618,7 +630,8 @@ public function parse($markdown): string
             'clientSecret' => $_ENV['GITHUB_CLIENT_SECRET'],
         ],
 
-        'jwtSecret' => $_ENV['JWT_SECRET']
+        'jwtSecret' => $_ENV['JWT_SECRET'],
+        'slackInviteApiToken' => $_ENV['SLACK_INVITE_API_TOKEN'],
     ],
 
     //slim settings

assets/app.js

@@ -60,7 +60,7 @@ const docRoutes = [].concat(
 
 const routes = [
   { path: "/", component: Home, meta: { layout: MainLayout } },
-  { path: "/online", component: Dashboard, meta: { layout: CompactLayout } },
+  { path: "/online/:workshop?", component: Dashboard, meta: { layout: CompactLayout } },
   {
     path: "/online/editor/:workshop/:exercise",
     component: ExerciseEditor,

assets/components/Online/ExerciseVerify.vue

@@ -39,8 +39,6 @@ const enableRateLimitError = () => {
 };
 
 const runSolution = async () => {
-  currentAction.value = "run";
-
   if (loadingRun.value) {
     return;
   }
@@ -81,8 +79,6 @@ const runSolution = async () => {
 };
 
 const verifySolution = () => {
-  currentAction.value = "verify";
-
   if (loadingVerify.value) {
     return;
   }
@@ -183,16 +179,25 @@ const verifySolution = () => {
         >
           <MenuItems class="absolute -right-3 -top-2 z-40 w-[168px] origin-top-right -translate-y-full rounded-md bg-gradient-to-r from-pink-600 to-purple-500 px-3 text-left">
             <MenuItem v-if="currentAction === 'verify'">
-              <button class="flex h-[48px] w-full flex-1 items-center justify-start rounded px-4 text-sm text-white" @click.stop="runSolution" :disabled="loadingRun">
+              <button
+                @click.stop="
+                  currentAction = 'run';
+                  runSolution();
+                "
+                class="flex h-[48px] w-full flex-1 items-center justify-start rounded px-4 text-sm text-white"
+                :disabled="loadingRun"
+              >
                 <span>Run</span>
                 <CommandLineIcon class="ml-2 h-5 w-5" />
               </button>
             </MenuItem>
             <MenuItem v-if="currentAction === 'run'">
               <button
-                v-if="currentAction === 'run'"
+                @click.stop="
+                  currentAction = 'verify';
+                  verifySolution();
+                "
                 class="flex h-[48px] w-full flex-1 items-center justify-start rounded px-4 text-sm text-white"
-                @click.stop="verifySolution"
                 :disabled="loadingVerify"
               >
                 <span>Verify</span>

assets/components/Online/WorkshopExerciseSelectionList.vue

@@ -2,26 +2,41 @@
 import { CheckCircleIcon, CommandLineIcon } from "@heroicons/vue/24/solid";
 import { ArrowRightCircleIcon } from "@heroicons/vue/24/outline";
 import ExerciseEntry from "./ExerciseEntry.vue";
-import { ref } from "vue";
+import { ref, watch } from "vue";
 import Alert from "./SiteAlert.vue";
 
 import { useStudentStore } from "../../stores/student";
 const studentStore = useStudentStore();
 
 import { useWorkshopStore } from "../../stores/workshops";
+import { useRoute } from "vue-router";
 const workshopStore = useWorkshopStore();
 
 const selectedWorkshop = ref(null);
 
 const showNotLoggedInError = ref(false);
 
+const route = useRoute();
+
 const notLoggedIn = () => {
   showNotLoggedInError.value = true;
 };
 
 const selectWorkshop = (workshopCode) => {
   selectedWorkshop.value = workshopStore.workshops.find((workshop) => workshop.code === workshopCode);
+
+  history.pushState({}, null, "/online/" + workshopCode);
 };
+
+watch(
+  () => route.params,
+  (toParams) => {
+    if (toParams.workshop) {
+      selectedWorkshop.value = workshopStore.workshops.find((workshop) => workshop.code === toParams.workshop);
+    }
+  },
+  { immediate: true },
+);
 </script>
 
 <template>

assets/components/Website/Docs/BundledCheck.vue

@@ -12,8 +12,9 @@ defineProps({
   compatible: {
     type: Array,
     validator(value) {
-      return ["CLI, CGI"].includes(value);
+      return value.every((v) => ["CLI", "CGI"].includes(v));
     },
+    default: () => ["CLI", "CGI"],
   },
   registered: {
     type: Boolean,

assets/components/Website/Docs/DocTitle.vue

@@ -1,5 +1,6 @@
 <script setup>
 import { computed } from "vue";
+import { PencilSquareIcon } from "@heroicons/vue/24/outline";
 
 const props = defineProps({
   id: {
@@ -24,38 +25,15 @@ const slug = computed(() => {
 <template>
   <h2 :id="id" class="relative mb-4 flex items-center border-b border-gray-600 pb-1 pt-2 font-mono text-2xl">
     <span class="text-[#e91e63]">{{ title }}</span>
-    <a class="ml-2 inline-block !text-gray-300 hover:!text-gray-200 hover:underline" :href="'#' + slug">#</a>
+    <a class="ml-2 inline-block !text-gray-300 hover:text-gray-200 hover:underline" :href="'#' + slug">#</a>
     <a
       v-if="file"
       title="Edit this page on GitHub!"
       target="_blank"
-      class="ml-2 inline-block fill-current !text-gray-300 hover:!text-gray-200"
+      class="ml-2 inline-block fill-current !text-gray-300 hover:!text-[#e91e63]"
       :href="'https://www.github.com/php-school/phpschool.io/tree/master/assets/components/Website/Docs/Sections/' + file"
     >
-      <svg
-        class="h-4 w-4"
-        version="1.1"
-        id="Capa_1"
-        xmlns="http://www.w3.org/2000/svg"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-        x="0px"
-        y="0px"
-        width="612px"
-        height="612px"
-        viewBox="0 0 612 612"
-        style="enable-background: new 0 0 612 612"
-        xml:space="preserve"
-      >
-        <g>
-          <g id="New_x5F_Post">
-            <g>
-              <path
-                d="M545.062,286.875c-15.854,0-28.688,12.852-28.688,28.688v239.062h-459v-459h239.062c15.854,0,28.688-12.852,28.688-28.688S312.292,38.25,296.438,38.25H38.25C17.136,38.25,0,55.367,0,76.5v497.25C0,594.883,17.136,612,38.25,612H535.5c21.114,0,38.25-17.117,38.25-38.25V315.562C573.75,299.727,560.917,286.875,545.062,286.875z M605.325,88.95L523.03,6.655C518.556,2.18,512.684,0,506.812,0s-11.743,2.18-16.218,6.675l-318.47,318.45v114.75h114.75l318.45-318.45c4.494-4.495,6.675-10.366,6.675-16.237C612,99.297,609.819,93.445,605.325,88.95z M267.75,382.5H229.5v-38.25L506.812,66.938l38.25,38.25L267.75,382.5z"
-              />
-            </g>
-          </g>
-        </g>
-      </svg>
+      <PencilSquareIcon class="h-5 w-5"></PencilSquareIcon>
     </a>
     <a href="#app" class="absolute right-0 text-xs hover:underline">^ TOP</a>
   </h2>

assets/components/Website/Docs/Sections/Tutorial/TutorialHome.vue

@@ -14,15 +14,15 @@ import ContentHeader from "../../ContentHeader.vue";
 
   <ContentHeader id="tutorial-sections">Tutorial Sections</ContentHeader>
 
-  <h3>
+  <h3 class="mb-2">
     <router-link to="/docs/tutorial/creating-your-own-workshop">1. Creating your own workshop</router-link>
   </h3>
   <p>Learn how to create and setup your very own workshop.</p>
-  <h3>
+  <h3 class="mb-2">
     <router-link to="/docs/tutorial/modify-theme">2. Modifying the theme of your workshop</router-link>
   </h3>
   <p>Customise the look and feel of your workshop, personalise to your brand or subject.</p>
-  <h3>
+  <h3 class="mb-2">
     <router-link to="/docs/tutorial/creating-an-exercise">3. Creating an exercise</router-link>
   </h3>
   <p>Create the first exercise for your workshop.</p>

assets/components/Website/Docs/contents.js

@@ -29,7 +29,7 @@ const docs = [
         path: "",
         title: "Documentation Home",
         component: DocHome,
-        file: "Index.vue",
+        file: "DocHome.vue",
       },
     ],
   },
@@ -41,7 +41,7 @@ const docs = [
         path: "",
         title: "Workshop Tutorial",
         component: TutorialHome,
-        file: "Tutorial/Index.vue",
+        file: "Tutorial/TutorialHome.vue",
       },
       {
         path: "creating-your-own-workshop",
@@ -71,7 +71,7 @@ const docs = [
         path: "",
         title: "Reference Documentation",
         component: ReferenceHome,
-        file: "Reference/Index.vue",
+        file: "Reference/ReferenceHome.vue",
       },
       {
         path: "container",
@@ -101,7 +101,7 @@ const docs = [
         path: "results",
         title: "Results & Renderers",
         component: Results,
-        file: "Reference/Results.vue",
+        file: "Reference/CheckResults.vue",
       },
       {
         path: "exercise-checks",
@@ -137,7 +137,7 @@ const docs = [
         path: "events",
         title: "Events",
         component: Events,
-        file: "Reference/Events.vue",
+        file: "Reference/ExerciseEvents.vue",
       },
       {
         path: "creating-listener-checks",