Merge branch 'bog-changes-s23-merged' of https://github.com/gt-schedu…

…ler/website into sophia/204-compare-functionality
gt-scheduler · Oct 20, 2023 · 6ccf3d4 · 6ccf3d4
2 parents 499c970 + ef99fd6
commit 6ccf3d4
Show file tree

Hide file tree

Showing 59 changed files with 1,618 additions and 661 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -10,4 +10,4 @@ Resolves #[ticket-number]
 
 
 ### How to Test
-<!-- Describe how to test your code. -->
+<!-- Describe how to test your code. -->
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -9,7 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+          cache: 'yarn'
 
       - name: Install
         run: yarn install --frozen-lockfile
@@ -29,7 +34,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+          cache: 'yarn'
 
       - name: Install
         run: yarn install --frozen-lockfile
@@ -59,7 +69,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+          cache: 'yarn'
 
       - name: Install
         run: yarn install --frozen-lockfile

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           # Fetch all history for Sentry to properly create the release

diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
     "@sentry/react": "^6.12.0",
     "@sentry/tracing": "^6.12.0",
     "@types/lodash": "^4.14.192",
+    "@types/react-map-gl": "^6.1.3",
     "axios": "^0.21.4",
     "cheerio": "^1.0.0-rc.3",
     "copy-to-clipboard": "^3.3.1",
@@ -30,7 +31,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-firebaseui": "^5.0.2",
-    "react-map-gl": "^5.2.10",
+    "react-map-gl": "5.2.11",
     "react-overlays": "^5.1.1",
     "react-resize-panel": "^0.3.5",
     "react-router-dom": "^6.8.1",

diff --git a/public/bitsOfGood.png b/public/bitsOfGood.png
diff --git a/public/bitsOfGood.svg b/public/bitsOfGood.svg
diff --git a/public/drag_event_blocks.png b/public/drag_event_blocks.png
diff --git a/public/event_blocks.png b/public/event_blocks.png
diff --git a/src/components/ActionRow/index.tsx b/src/components/ActionRow/index.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { Tooltip as ReactTooltip } from 'react-tooltip';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
 import { classes } from '../../utils/misc';
@@ -11,6 +12,7 @@ export type Action = {
   icon: FontAwesomeProps['icon'];
   styling?: React.CSSProperties;
   id?: string;
+  tooltip?: string;
   onMouseEnter?: () => void;
   onMouseLeave?: () => void;
 } & Omit<ButtonProps, 'children'>;
@@ -40,19 +42,34 @@ export default function ActionRow({
             .flatMap((action) => (action != null ? [action] : []))
             .map(
               (
-                { icon, styling, id, onMouseEnter, onMouseLeave, ...rest },
+                {
+                  icon,
+                  styling,
+                  id,
+                  tooltip,
+                  onMouseEnter,
+                  onMouseLeave,
+                  ...rest
+                },
                 i
               ) => (
-                <Button className="action" {...rest} key={i}>
-                  <FontAwesomeIcon
-                    fixedWidth
-                    style={styling}
-                    icon={icon}
-                    id={id}
-                    onMouseEnter={onMouseEnter}
-                    onMouseLeave={onMouseLeave}
-                  />
-                </Button>
+                <>
+                  <Button className="action" {...rest} key={i}>
+                    <FontAwesomeIcon
+                      fixedWidth
+                      style={styling}
+                      icon={icon}
+                      id={id}
+                      onMouseEnter={onMouseEnter}
+                      onMouseLeave={onMouseLeave}
+                    />
+                  </Button>
+                  {tooltip && (
+                    <ReactTooltip anchorId={id} variant="dark" place="left">
+                      {tooltip}
+                    </ReactTooltip>
+                  )}
+                </>
               )
             )}
         </div>