merge conflict fix package-lock

HackRU · Oct 4, 2023 · 7fdcdb7 · 7fdcdb7
2 parents 137756c + 027e68e
commit 7fdcdb7
Show file tree

Hide file tree

Showing 33 changed files with 17,047 additions and 31,368 deletions.
diff --git a/.github/workflows/dev-deploy.yml b/.github/workflows/dev-deploy.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
     code-quality:
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-latest
 
         strategy:
             fail-fast: true
@@ -25,7 +25,7 @@ jobs:
             - run: npm install
             - run: npm run lint
     deploy:
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-latest
 
         strategy:
             fail-fast: true

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
         "react-icons": "^4.7.1",
         "react-motion": "^0.5.2",
         "react-particles": "^2.8.0",
-        "react-router-dom": "^4.3.1",
+        "react-router-dom": "^5.3.0",
         "react-scripts": "^3.4.3",
         "react-scroll-parallax": "^1.3.5",
         "react-scrollable-anchor": "^0.6.1",
@@ -52,7 +52,7 @@
         "typescript": "^4.9.0"
     },
     "scripts": {
-        "tailwind-watch": "npx tailwindcss -i ./src/index.css -o ./public/tailwind-output.css --watch",
+        "tailwind-watch": "npx tailwindcss -i ./src/index.css -o ./public/tailwind-output-f23.css --watch",
         "start": "env-cmd development react-scripts start",
         "build-dev": "env-cmd build-dev react-scripts build",
         "build-prod": "env-cmd build-prod react-scripts build",

diff --git a/public/index-s23.css → public/index-f23.css b/public/index-s23.css → public/index-f23.css
@@ -52,7 +52,8 @@ body::-webkit-scrollbar {
 }
 html, body {
     overflow-x: hidden;
-    min-width: 380px;
+    min-width: 320px;
+    width: auto !important;
 }
 body {
     font-family: var(--text-font) !important;

diff --git a/public/index.html b/public/index.html
@@ -16,16 +16,16 @@
 <head>
     <meta charset="utf-8">
     <meta property="og:url" content="https://www.hackru.org/" />
-    <meta property="og:title" content="HackRU Spring 2023" />
+    <meta property="og:title" content="HackRU Fall 2023" />
     <meta property="og:description" content="Get hyped for the best Hackathon that Rutgers has to offer!" />
     <meta property="og:image" content="./assets/fb-banner-upper.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="Find out more about HackRU Spring 2023.">
+    <meta name="description" content="Find out more about HackRU Fall 2023.">
     <link rel="icon" href="%PUBLIC_URL%/assets/icons/blue_hackru.png">
     <link rel="shortcut icon" href="%PUBLIC_URL%/assets/icons/blue_hackru.png">
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <link rel="stylesheet" href="%PUBLIC_URL%/index-s23.css">
-    <link rel="stylesheet" href="%PUBLIC_URL%/tailwind-output.css">
+    <link rel="stylesheet" href="%PUBLIC_URL%/index-f23.css">
+    <link rel="stylesheet" href="%PUBLIC_URL%/tailwind-output-f23.css">
     <title id="title">HackRU</title>
 </head>
 

diff --git a/public/manifest.json b/public/manifest.json
@@ -1,6 +1,6 @@
 {
     "short_name": "HackRU",
-    "name": "HackRU Spring 2019",
+    "name": "HackRU Fall 2023",
     "icons": [
         {
             "src": "./assets/icons/red_hackru.png",

diff --git a/public/resources/waiver.pdf b/public/resources/waiver.pdf