Merge branch 'main' of https://github.com/ieeeucsd/ieeeucsd.org

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/firebase.yml

@@ -2,7 +2,7 @@ name: deploy-production
 
 on:
     push:
-        branches: [firebase]
+        branches: [main]
 
 jobs:
     build-and-deploy:

.github/workflows/main.yml

@@ -1,39 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: build-page-branch
-
-# Controls when the workflow will run
-on:
-    push:
-        branches: [main]
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-    # This workflow contains a single job called "build"
-    build:
-        # The type of runner that the job will run on
-        runs-on: ubuntu-latest
-        # Steps represent a sequence of tasks that will be executed as part of the job
-        steps:
-            # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-            - uses: actions/checkout@v2
-            - uses: actions/setup-node@v3
-              with:
-                  node-version: 16
-
-            # Builds the react site for github pages
-            - name: Build Static Pages
-              run: |
-                  npm ci
-                  npm run build
-                  mv CNAME build/public
-                  mv build/public docs
-                  echo "# DO NOT MANUALLY PUSH TO THIS BRANCH, ANY WORK DONE WILL BE ERASED. ITS WORK COMES FROM MASTER AND IT WILL BE REWRITTEN THE NEXT TIME AN ACTION OCCURS ON THE MASTER BRANCH" > README.md
-                  git config --global user.name 'github-actions[bot]'
-                  git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-                  git stash
-                  git checkout -b page
-                  git stash pop
-                  git add .
-                  git commit -m "Deploy Site"
-                  git push origin page --force

package.json

@@ -29,7 +29,7 @@
     "@babel/core": "^7.19.6",
     "@babel/preset-env": "^7.19.4",
     "@babel/preset-react": "^7.14.5",
-    "@types/react": "^18.0.22",
+    "@types/react": "^18.0.23",
     "@typescript-eslint/eslint-plugin": "^5.41.0",
     "@typescript-eslint/parser": "^5.41.0",
     "babel-loader": "^8.2.3",