Release 1.4.0 (#215)

* SUL23-540: Updated robots.txt to disallow /all/ (#166) * Better automated tests & Gitpod by building a cloned site (#165) * Remove node cache to improve cache invalidation for config pages (#168) * SUL23-515 SUL23-541: Colors, fonts, word fixes to the toggles. (#169) * SUL23-515 SUL23-541: Colors, fonts, word fixes to the toggles. * Keyword search filter stubbed out (#156) * Keyword search filter stubbed out * SUL23-503: fixup to search box styles * fixup to styles * moved over the search cursor * Fix label * fixup to the button toggles --------- Co-authored-by: Jen Breese-Kauth <[email protected]> * SUL23-525: Updates to the display for Med breakpoint on Branches and Centers (#170) * SUL23-525: stashing work. * SUL23-525: using grid to get alignment and display for md view * Changed three tabular layouts to use the grid at the md breakpoint * fixup to comment * SUL23-438: Moved the location link and changed to Open or Closed until (#163) Co-authored-by: Mike Decker <[email protected]> * SUL23-479: added space (#176) * SUL23-549: places to study alignment (#172) * SUL23-549: places to study alignment * SUL23-570: adding the corrected times to the places to study table (#175) * SUL23-550: Move the condition so the td element remained even when empty (#171) * SUL23-550: Move the condition so the td elmement remained even when empty * fixup * SUL23-548 SUL23-553 SUL23-554 SUL23-555 SUL23-556 SUL23-547 (#173) * SUL23-548 SUL23-553 SUL23-554 SUL23-555 SUL23-556 SUL23-547 * fixup * fixup * fixup * SUL23-543: rounded corner * SUL23-557: adding aria-hidden and tabindex for a11y to photos on tabular data tables (#177) * SUL23-557: stashing work to ask about tomorrow * SUL23-557: fixup for the tabindex * fixup to branch page * SUL23-557: removed the link on the image in the study places * Adjust how library hours data is cached to reduce cache writes/reads (#178) * SUL23-503: search label font size (#180) * SUL23-570: changed address to size 16 (#179) * SUL23-580: nav fixup (#184) * SUL23-556: normal font and leading (#186) * SUL23-503 Add text reset button and no results display (#185) * SUL23-503 Add text reset button and no results display * SUL23-503: changed size, added padding and color * fixup after merge --------- Co-authored-by: Jen Breese-Kauth <[email protected]> Co-authored-by: Ian Monroe <[email protected]> * SUL23-577 SUL23-586: buttons and vertical centering on tables (#183) * SUL23-577 SUL23-586: buttons and vertical centering on tables * fixed the col spacing --------- Co-authored-by: Ian Monroe <[email protected]> * SUL23-576 SUL23-575 SUL23-574: fixed height of toggle and filters (#182) * SUL23-576 SUL23-575 SUL23-574: fixed height of toggle and filters * fixup to corner * SUL23-576: fixup * removed rounded idea * SUL23-591: added the th row=scope for a11y (#187) Co-authored-by: Ian Monroe <[email protected]> * Fix date formatting when the input is UTC * SUL23-551: sentence case for branches and places to study (#188) * SUL23-551: sentence case for branches and places to study * Sentence case for all locations * SUL23-482: set Todays hours title to h2 (#189) * SUL23-482: set Todays hours title to h2 * "Hours" needed to be sentence case * SUL23-587 SUL23-589 SUL23-590 (#190) * SUL23-587 SUL23-589 SUL23-590 * adding the correct padding after cell * SUL23-588: make the hover hug the phone and email * Moved to just lg for inline flex * fixup * SUL23-578: fixup to the margin-bottom and casing (#191) * SUL23-578: fixup to the margin-bottom and casing * adding the flex change from the parent branch * Fix date formatting when the input is UTC * SUL23-578: added the 2 digits to the closed until time and lowercase of until * fixup to the AM PM --------- Co-authored-by: Mike Decker <[email protected]> --------- Co-authored-by: Mike Decker <[email protected]> * SUL23-577: fixed button height. removed include not used (#192) * SUL23-587: updates to the people table (#193) * SUL23-587: updates to the people table * SUL23-440 Add "Load More" button on news lists over 30 items * Added missing fields for people teasers * SUL23-440 Adjusted "Load More" to "Load more" * SUL23-597 Fix "today" vs "tomorrow" vs "friday" next opening day * SUL23-597 Fix hour displays for next open date/time (#194) * Removed "Hours this week" text * SUL23-598: fixup up hover on branch name (#195) * SUL23-598: fixup up hover on branch name * fixup * SUL23-574: setting exact height (#196) * SUL23-580 SUL23-538: Added in the at to the time string (#197) * Handle empty response from api/library-hours if something fails * SUL23-585: Adding Donate now button to header (#198) * SUL23-585: Adding Donate now button to header * SUL23-585: button in header * fixup * changed Links to links * SUL23-585: Back to digital red (#201) * SUL23-571 Sort library options by title * SUL23-600 show closing minutes if they are not 00 (#202) * SUL-23-570: adding Hours this week for default (#203) * SUL23-603: removed padding-left on branch name (#205) * SUL23-604: tweaking the toggle spacing (#206) * SUL23-573: tightening up spacing (#199) * SUL23-573: tightening up spacing * fixup * fixup for the hover on email and phone * fixup * adjusting the top and bottom spacing and removed empty spacers * fixup * SUL23-608: changed the padding-left when the browser size is smaller (#207) * fixup for the extra space * fixup * SUL23-605: fine tuning the sul people page. (#204) * SUL23-605: fine tuning * src/ * asking for feedback * Fix on click handlers * fixup to the group classes * adding hover and active * Added checkmark visual indicator --------- Co-authored-by: Mike Decker <[email protected]> * SUL23-601: changed when focused to not be red with red underline (#208) * SUL23-601: changed when focused to not be red with red underline * fixup * SUL23-601: fixed the All to All specialists per slack rquest. * SUL23-609: fix to text in hours card on homepage (#209) * SUL23-609: fix to text in hours card on homepage * fixup * Sul23 611 Improve and simplify toggles (#210) * Add a clear cache button for preview environments * SUL23-610 add SDR as an oembed provider in the wysiwyg * Sul23 611 tweaks (#211) * SUL23-611: draft work for spacing on small screens * adjustments to the focus and toggles * tweaks * tweaks * fixup * fixup * fixup * fixup * Removed old eslint file * SUL23-614 SUL23-615: fixes for html validation (#213) * SUL23-615: footer link size (#212) * SUL23-617: changed to Expertise (#214) * Updated changelog --------- Co-authored-by: pookmish <[email protected]> Co-authored-by: Jen Breese <[email protected]> Co-authored-by: Mike Decker <[email protected]>
SU-SWS · Sep 11, 2024 · 7aed6ac · 7aed6ac
1 parent ce531d5
commit 7aed6ac
Show file tree

Hide file tree

Showing 196 changed files with 9,371 additions and 8,262 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -7,17 +7,23 @@
   },
   "extends": [
     "next/core-web-vitals",
+    "prettier",
     "plugin:deprecation/recommended"
   ],
   "rules": {
+    "prettier/prettier": ["error"],
     "@typescript-eslint/no-unused-vars": "off",
     "unused-imports/no-unused-imports": "error",
     "unused-imports/no-unused-vars": [
-      "warn",
+      "error",
       { "vars": "all", "varsIgnorePattern": "^_", "args": "after-used", "argsIgnorePattern": "^_" }
     ],
-    "no-console": ["error", { "allow": ["warn", "error"] }]
+    "no-console": ["error", { "allow": ["warn", "error"] }],
+    "no-restricted-syntax": [
+      "error",
+      "Literal[value=/text-m[\\d]/i]"
+    ]
   },
-  "plugins": ["unused-imports"],
-  "ignorePatterns": ["**/__generated__/**/*", "src/styles/tailwind/**"]
-}
+  "plugins": ["prettier", "unused-imports"],
+  "ignorePatterns": ["**/__generated__/**/*", "src/styles/**/*"]
+}
diff --git a/.github/workflows/build_lint.yml b/.github/workflows/build_lint.yml
@@ -2,34 +2,101 @@
 name: Build & Lint
 on: [push]
 jobs:
-  build-lint:
+  lint:
+    name: Lint & TS Check
     runs-on: ubuntu-latest
     container:
-      image: node:18
+      image: node:20
       env:
-        BUILD_COMPLETE: ${{ secrets.BUILD_COMPLETE }}
-        LIBGUIDE_CLIENT_ID: ${{ secrets.LIBGUIDE_CLIENT_ID }}
-        LIBGUIDE_CLIENT_SECRET: ${{ secrets.LIBGUIDE_CLIENT_SECRET }}
-        NEXT_PUBLIC_DRUPAL_BASE_URL: ${{ secrets.NEXT_PUBLIC_DRUPAL_BASE_URL }}
-        NEXT_PUBLIC_SITE_NAME: ${{ secrets.NEXT_PUBLIC_SITE_NAME }}
-        DRUPAL_BASIC_AUTH: ${{ secrets.DRUPAL_BASIC_AUTH }}
-        DRUPAL_BASIC_AUTH_ADMIN: ${{ secrets.DRUPAL_BASIC_AUTH_ADMIN }}
+        NEXT_PUBLIC_DRUPAL_BASE_URL: http://localhost
     steps:
       - uses: actions/checkout@v4
       - name: Restore Cache
         uses: actions/cache@v4
         with:
           path: |
             node_modules
-          key: 2.x-${{ hashFiles('package.json') }}-${{ hashFiles('yarn.lock') }}
+            .next
+          key: lint-${{ hashFiles('package.json') }}-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            2.x-${{ hashFiles('package.json') }}-${{ hashFiles('yarn.lock') }}
-            2.x-${{ hashFiles('package.json') }}-
-            2.x-
+            lint-${{ hashFiles('package.json') }}-${{ hashFiles('yarn.lock') }}
+            lint-${{ hashFiles('package.json') }}-
       - name: Lint
         run: |
           yarn
+          yarn next telemetry disable
           yarn lint
-      - name: Build
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    container:
+      image: pookmish/drupal8ci:latest
+      env:
+        BUILD_PAGES: 100
+        BUILD_COMPLETE: 'true'
+        LIBGUIDE_CLIENT_ID: ${{ secrets.LIBGUIDE_CLIENT_ID }}
+        LIBGUIDE_CLIENT_SECRET: ${{ secrets.LIBGUIDE_CLIENT_SECRET }}
+        STANFORD_ENCRYPT: ${{ secrets.STANFORD_ENCRYPT }}
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_DATABASE: drupal
+          MYSQL_USER: drupal
+          MYSQL_PASSWORD: drupal
+          MYSQL_ROOT_PASSWORD: drupal
+        ports:
+          - 33306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    steps:
+      - name: Install SSH key
+        uses: shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.SSH_KEY }}
+          name: id_rsa
+          known_hosts: ${{ secrets.KNOWN_HOSTS }}
+          if_key_exists: fail
+      - uses: actions/checkout@v4
+        with:
+          repository: "SU-SWS/ace-stanfordlagunita"
+      - uses: actions/checkout@v4
+        with:
+          path: frontend
+      - name: Restore Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            vendor
+            docroot/core
+            docroot/libraries
+            docroot/modules/contrib
+            frontend/node_modules
+          key: build-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          restore-keys: |
+            build-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            build-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            build-${{ hashFiles('blt/blt.yml') }}-
+      - name: Sync Site
+        run: |
+          git config --system --add safe.directory '*' &&
+          mysql -h mysql -P 3306 -u root -pdrupal -e 'SET GLOBAL max_allowed_packet=67108864;' &&
+          rm -rf /var/www/html &&
+          ln -snf $GITHUB_WORKSPACE /var/www/html &&
+          mkdir -p docroot/sites/default/files &&
+          chmod -R 777 docroot/sites/default/files/ &&
+          rm -rf docroot/sites/library/files &&
+          ln -sL ../default/files/ docroot/sites/library/files &&
+          apachectl stop && apachectl start &&
+          composer install -n &&
+          blt drupal:sync --site=library -n &&
+          drush sqlq 'truncate config_pages__su_site_algolia_id'
+      - name: Build Frontend
         run: |
+          cd $GITHUB_WORKSPACE/frontend &&
+          cp .env.example .env.local &&
+          sed -i -r "s|NEXT_PUBLIC_DRUPAL_BASE_URL.*|NEXT_PUBLIC_DRUPAL_BASE_URL=http://localhost|g" .env.local &&
+          cd $GITHUB_WORKSPACE &&
+          drush su-next-connect >> $GITHUB_WORKSPACE/frontend/.env.local &&
+          cd $GITHUB_WORKSPACE/frontend &&
+          yarn &&
           yarn build
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -19,7 +19,7 @@ ports:
     visibility: public
   - name: frontend
     description: NextJS frontend
-    port: 3000
+    port: 3000-3004
     onOpen: ignore
     visibility: public
   - port: 8002-9999
@@ -39,16 +39,21 @@ tasks:
       export PREVIEW_URL=${NEXT_PUBLIC_DRUPAL_BASE_URL#"https://"} &&
       blt blt:telemetry:disable --no-interaction &&
       blt settings &&
-      blt drupal:install --site=library -n &&
+      echo 'ssh: {options: "-o StrictHostKeyChecking=no"}' > drush/local.drush.yml &&
+      if [[ ! -z $SSH_PRIVATE_KEY ]]; then
+        echo $SSH_PRIVATE_KEY | base64 -d > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa &&
+        blt drupal:sync --site=library -n || blt drupal:install --site=library -n
+      else
+        blt drupal:install --site=library -n
+      fi &&
       drush @library.local cset system.theme default stanford_profile_admin_theme -y &&
       cd /workspace/front &&
-      yarn install
+      yarn
     command: |
       cp .env.example .env.local &&
       gp ports await 3306 &&
       eval $(gp env -e APACHE_DOCROOT_IN_REPO=../back/docroot) &&
       cd /workspace/back &&
-      find docroot -name 'local.drush.yml' | xargs rm &&
       export NEXT_PUBLIC_DRUPAL_BASE_URL=`gp url 8001` &&
       export PREVIEW_URL=${NEXT_PUBLIC_DRUPAL_BASE_URL#"https://"} &&
       echo "<?php \$sites['$PREVIEW_URL'] = 'library';" > docroot/sites/local.sites.php &&
@@ -58,7 +63,6 @@ tasks:
       drush @library.local uli --uri=$NEXT_PUBLIC_DRUPAL_BASE_URL &&
       drush @library.local uli --uri=$NEXT_PUBLIC_DRUPAL_BASE_URL | xargs gp preview --external &&
       git config core.fileMode false &&
-      echo 'Connecting Drupal to Frontend' &&
       drush @library.local su-next-connect "$(gp url 3000)" >> /workspace/front/.env.local &&
       cd /workspace/front &&
       yarn install &&
@@ -70,18 +74,18 @@ tasks:
       gp url 3000 | xargs gp preview --external
   - name: SSH Keys
     before: |
+      code --add /workspace/back &&
       mkdir -p ~/.ssh
-      if [[ ! -z $SSH_PUBLIC_KEY  ]]; then
-          echo $SSH_PUBLIC_KEY | base64 -d > ~/.ssh/id_rsa.pub && chmod 644 ~/.ssh/id_rsa.pub
-          git remote set-url origin $(echo $GITPOD_WORKSPACE_CONTEXT | jq -r .repository.cloneUrl | sed -E 's|^.*.com/(.*)$|[email protected]:\1|')
-      fi
       if [[ ! -z $SSH_PRIVATE_KEY ]]; then
-          echo $SSH_PRIVATE_KEY | base64 -d > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
+          echo $SSH_PRIVATE_KEY | base64 -d > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa &&
+          git remote set-url origin $(echo $GITPOD_WORKSPACE_CONTEXT | jq -r .repository.cloneUrl | sed -E 's|^.*.com/(.*)$|[email protected]:\1|') &&
+          cd /workspace/back && git remote set-url origin [email protected]:SU-SWS/ace-stanfordlagunita.git
       fi
       if [[ ! -z $GITCONFIG ]]; then
           echo $GITCONFIG | base64 -d > ~/.gitconfig && chmod 644 ~/.gitconfig
       fi
 
 vscode:
   extensions:
-    - bradlc.vscode-tailwindcss
+    - bradlc.vscode-tailwindcss
+    - esbenp.prettier-vscode
diff --git a/.prettierrc b/.prettierrc
@@ -2,9 +2,9 @@
   "arrowParens": "avoid",
   "bracketSameLine": false,
   "bracketSpacing": false,
-  "printWidth": 500,
+  "printWidth": 120,
   "semi": false,
-  "singleAttributePerLine": true,
+  "singleAttributePerLine": false,
   "singleQuote": false,
   "tabWidth": 2,
   "trailingComma": "es5",