Merge branch 'master' of github.com:eisbuk/EisBuk into feature/approvals

eisbuk · Jul 11, 2023 · ea2c72b · ea2c72b
2 parents 5d3572d + 7c8c210
commit ea2c72b
Show file tree

Hide file tree

Showing 42 changed files with 603 additions and 492 deletions.
diff --git a/.github/workflow.templates/vitest-matrix.yml b/.github/workflow.templates/vitest-matrix.yml
@@ -0,0 +1,37 @@
+#! YAML library files must be named *.lib.yml
+#@ load("setup.lib.yml", "checkout")
+#@ load("cache.lib.yml", "cache_node")
+#@ load("rush.lib.yml", "rush_add_path", "rush_update", "rush_build")
+
+#! You can run this workflow bu pushing to a branch with the name
+#! cypress-matrix/<anything>
+
+name: VitestMatrix
+
+"on":
+  push:
+    branches:
+      - "vitest-matrix/**"
+  schedule:
+    - cron: "30 5 * * 1,3"
+
+jobs:
+  test-v18:
+    name: Run tests
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        dummy1: [1, 2, 3, 4, 5, 6]
+        dummy2: [1, 2, 3, 4, 5, 6]
+    steps:
+      -  #@ checkout()
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "18"
+      -  #@ cache_node()
+      -  #@ rush_add_path()
+      -  #@ rush_update()
+      -  #@ rush_build()
+      - name: Run tests
+        run: cd packages/client && rushx test:emulators:ci
diff --git a/.github/workflows/vitest-matrix.yml b/.github/workflows/vitest-matrix.yml
@@ -0,0 +1,54 @@
+name: VitestMatrix
+"on":
+  push:
+    branches:
+    - vitest-matrix/**
+  schedule:
+  - cron: 30 5 * * 1,3
+jobs:
+  test-v18:
+    name: Run tests
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        dummy1:
+        - 1
+        - 2
+        - 3
+        - 4
+        - 5
+        - 6
+        dummy2:
+        - 1
+        - 2
+        - 3
+        - 4
+        - 5
+        - 6
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
+        fetch-depth: 1
+    - uses: actions/setup-node@v2
+      with:
+        node-version: "18"
+    - name: Cache node modules and firebase emulators
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.rush
+          ~/.pnpm-store
+          common/temp
+          **/node_modules
+          ~/.cache/firebase/emulators
+        key: ${{ runner.os }}-modules-emulators-node18-v1-${{ hashFiles('**/pnpm-lock.yaml') }}
+    - name: Add rush directory to PATH
+      run: echo PATH=$PWD/common/scripts/:$PATH >> $GITHUB_ENV
+    - name: Install and build packages
+      run: rush update
+    - name: Build packages
+      run: rush build
+    - name: Run tests
+      run: cd packages/client && rushx test:emulators:ci
diff --git a/packages/client/public/fonts/fredoka/fredoka_variable.ttf b/packages/client/public/fonts/fredoka/fredoka_variable.ttf
diff --git a/packages/client/public/index.html b/packages/client/public/index.html
@@ -13,7 +13,7 @@
     />
     <link href="/app/bundle.css" rel="stylesheet" />
     <link rel="manifest" href="/manifest.json" />
-    <title>EisBuk</title>
+    <title>Booking App</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/packages/client/src/controllers/Layout.tsx b/packages/client/src/controllers/Layout.tsx
@@ -0,0 +1,66 @@
+import React from "react";
+import { useSelector } from "react-redux";
+
+import { LinkItem, Layout, UserAvatarProps } from "@eisbuk/ui";
+import { PrivateRoutes } from "@eisbuk/shared/ui";
+import i18n, { NavigationLabel } from "@eisbuk/translations";
+import { ClipboardList, Users, DocumentDuplicate, Cog } from "@eisbuk/svg";
+
+import BirthdayMenu from "@/controllers/BirthdayMenu";
+import { NotificationsContainer } from "@/features/notifications/components/index";
+
+import { getIsAdmin } from "@/store/selectors/auth";
+import { getOrgDisplayName } from "@/store/selectors/orgInfo";
+
+interface Props {
+  user?: UserAvatarProps;
+  additionalButtons?: JSX.Element;
+  children?: React.ReactNode[] | React.ReactNode;
+}
+
+const LayoutController: React.FC<Props> = (params) => {
+  const isAdmin = useSelector(getIsAdmin);
+
+  const displayName = useSelector(getOrgDisplayName);
+  const logo = displayName ? (
+    <h1 className="font-fredoka font-semibold text-3xl text-white">
+      {displayName}
+    </h1>
+  ) : null;
+
+  return (
+    <Layout
+      {...params}
+      logo={logo}
+      isAdmin={isAdmin}
+      adminLinks={adminLinks}
+      Notifications={NotificationsContainer}
+      additionalAdminContent={<BirthdayMenu />}
+    />
+  );
+};
+
+const adminLinks: LinkItem[] = [
+  {
+    Icon: ClipboardList,
+    label: i18n.t(NavigationLabel.Attendance),
+    slug: PrivateRoutes.Root,
+  },
+  {
+    Icon: DocumentDuplicate,
+    label: i18n.t(NavigationLabel.Slots),
+    slug: PrivateRoutes.Slots,
+  },
+  {
+    Icon: Users,
+    label: i18n.t(NavigationLabel.Athletes),
+    slug: PrivateRoutes.Athletes,
+  },
+  {
+    Icon: Cog,
+    label: i18n.t(NavigationLabel.OrganizationSettings),
+    slug: PrivateRoutes.AdminPreferences,
+  },
+];
+
+export default LayoutController;
diff --git a/packages/client/src/data/navigation.ts b/packages/client/src/data/navigation.ts
diff --git a/packages/client/src/main.css b/packages/client/src/main.css
@@ -5,6 +5,14 @@
 @import "tailwindcss/utilities";
 @import "../../ui/dist/style.css";
 
+@font-face {
+  font-family: "Fredoka One";
+  src: url("/fonts/fredoka/fredoka_variable.ttf") format("truetype");
+  font-weight: 300 700;
+  font-style: normal;
+  font-display: swap;
+}
+
 .center-absolute {
   @apply absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2;
 }
diff --git a/packages/client/src/pages/admin_preferences/PreviewField.tsx b/packages/client/src/pages/admin_preferences/PreviewField.tsx
@@ -21,7 +21,7 @@ const PreviewField: React.FC<PreviewFieldProps> = ({ name, ...props }) => {
     organizationName: "Organization Name",
     name: "Saul",
     surname: "Goodman",
-    bookingsLink: "https://eisbuk.it/saul",
+    bookingsLink: "https://ice.it/saul",
     bookingsMonth: "April",
     extendedBookingsDate: "06/04",
     icsFile: "icsFile.ics",

diff --git a/packages/client/src/pages/admin_preferences/index.tsx b/packages/client/src/pages/admin_preferences/index.tsx
@@ -9,22 +9,24 @@ import i18n, {
   ValidationMessage,
   useTranslation,
 } from "@eisbuk/translations";
-import { Layout, Button, ButtonColor, ButtonSize, TabItem } from "@eisbuk/ui";
+import {
+  Button,
+  ButtonColor,
+  ButtonSize,
+  TabItem,
+  LayoutContent,
+} from "@eisbuk/ui";
 import { Cog, Mail } from "@eisbuk/svg";
 
+import Layout from "@/controllers/Layout";
 import AdminsField from "./AdminsField";
-import BirthdayMenu from "@/controllers/BirthdayMenu";
-import AthletesApproval from "@/controllers/AthletesApproval";
-import { NotificationsContainer } from "@/features/notifications/components";
 
 import { updateOrganization } from "@/store/actions/organizationOperations";
 import { getOrganizationSettings } from "@/store/selectors/app";
 import { getLocalAuth } from "@/store/selectors/auth";
 
 import { isEmpty } from "@/utils/helpers";
 
-import { adminLinks } from "@/data/navigation";
-
 import EmailTemplateSettings from "./views/EmailTemplateSettings";
 import GeneralSettings from "./views/GeneralSettings";
 
@@ -56,12 +58,6 @@ const OrganizationSettings: React.FC = () => {
 
   const organization = useSelector(getOrganizationSettings);
   const userAuthInfo = useSelector(getLocalAuth);
-  const additionalAdminContent = (
-    <React.Fragment>
-      <BirthdayMenu />
-      <AthletesApproval />
-    </React.Fragment>
-  );
   const { t } = useTranslation();
 
   const handleSubmit = (
@@ -104,56 +100,52 @@ const OrganizationSettings: React.FC = () => {
   );
 
   return (
-    <Layout
-      isAdmin
-      adminLinks={adminLinks}
-      Notifications={NotificationsContainer}
-      additionalAdminContent={additionalAdminContent}
-      additionalButtons={additionalButtons}
-    >
-      <div className="content-container pt-[44px] px-[71px] pb-8 md:pt-[62px]">
-        <Formik
-          {...{ initialValues }}
-          onSubmit={(values, actions) => handleSubmit(values, actions)}
-          validationSchema={OrganizationValidation}
-        >
-          {({ isSubmitting, isValidating, handleReset }) => (
-            <div className="md:px-11">
-              {view === Views.GeneralSettings && (
-                <AdminsField currentUser={currentUser} />
-              )}
-
-              <Form>
-                {view === Views.EmailTemplates ? (
-                  <EmailTemplateSettings />
-                ) : (
-                  <GeneralSettings />
+    <Layout additionalButtons={additionalButtons}>
+      <LayoutContent>
+        <div className="pt-[44px] px-[71px] pb-8 md:pt-[62px]">
+          <Formik
+            {...{ initialValues }}
+            onSubmit={(values, actions) => handleSubmit(values, actions)}
+            validationSchema={OrganizationValidation}
+          >
+            {({ isSubmitting, isValidating, handleReset }) => (
+              <div className="md:px-11">
+                {view === Views.GeneralSettings && (
+                  <AdminsField currentUser={currentUser} />
                 )}
 
-                <div className="py-4 flex justify-end items-center gap-2">
-                  <Button
-                    onClick={handleReset}
-                    disabled={isSubmitting || isValidating}
-                    className="!text-cyan-500"
-                    size={ButtonSize.MD}
-                  >
-                    {t(ActionButton.Reset)}
-                  </Button>
-                  <Button
-                    disabled={isSubmitting || isValidating}
-                    color={ButtonColor.Primary}
-                    size={ButtonSize.MD}
-                    aria-label={"save"}
-                    type="submit"
-                  >
-                    {t(ActionButton.Save)}
-                  </Button>
-                </div>
-              </Form>
-            </div>
-          )}
-        </Formik>
-      </div>
+                <Form>
+                  {view === Views.EmailTemplates ? (
+                    <EmailTemplateSettings />
+                  ) : (
+                    <GeneralSettings />
+                  )}
+
+                  <div className="py-4 flex justify-end items-center gap-2">
+                    <Button
+                      onClick={handleReset}
+                      disabled={isSubmitting || isValidating}
+                      className="!text-cyan-500"
+                      size={ButtonSize.MD}
+                    >
+                      {t(ActionButton.Reset)}
+                    </Button>
+                    <Button
+                      disabled={isSubmitting || isValidating}
+                      color={ButtonColor.Primary}
+                      size={ButtonSize.MD}
+                      aria-label={"save"}
+                      type="submit"
+                    >
+                      {t(ActionButton.Save)}
+                    </Button>
+                  </div>
+                </Form>
+              </div>
+            )}
+          </Formik>
+        </div>
+      </LayoutContent>
     </Layout>
   );
 };