Merge branch 'main' into nikhil-alexis/react

.eslintrc.json

@@ -38,5 +38,13 @@
       }
     ]
   },
-  "ignorePatterns": "src/**/*.d.ts"
+  "ignorePatterns": "src/**/*.d.ts",
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {
+        "no-undef": "off"
+      }
+    }
+  ]
 }

README.md

@@ -1,13 +1,18 @@
-# Nextra Docs
+# ACM Hack Website
 
-This is a template for creating documentation with [Nextra](https://nextra.site).
+**Check it out @ [hack.acmucsd.com](https://hack.acmucsd.com)!**
 
+Welcome to ACM Hack's main website! This website serves as an introduction to the Hack community, and provides information about our upcoming events and resources. It's also the primary host of our Hack School curriculum, which is a series of workshops designed to teach students the fundamentals of full-stack development and software engineering.
 
-[**Live Demo (https://hack-website-acmucsd.vercel.app/)**](https://hack-website-acmucsd.vercel.app/)
+The content on this website is accessible to anyone, regardless of acceptance to Hack School. Feel free to use this for ACM Projects, personal projects, or just to learn something new!
 
-## Local Development
+This project was bootstrapped with [Nextra](https://nextra.site) and deployed with [Vercel](https://vercel.com).
 
-Prerequisites
+## Contributing
+
+We welcome any contributions from the ACM community! If you have ideas for new content to add, feel free to contact us in the [ACM Discord](https://acmurl.com/discord) or [ACM Hack Discord](https://acmurl.com/hack-discord) by pinging the `@Hack` role, or directly opening up a pull request. If you notice any content errors or have suggestions for improvements, feel free to raise an issue on our repository. Make sure to follow the instructions below to set up your local environment for development.
+
+Prerequisites: 
 - Node v16.14.0 or higher
 - Yarn
 

package.json

@@ -23,7 +23,8 @@
     "nextra": "latest",
     "nextra-theme-docs": "latest",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "react-icons": "^4.11.0"
   },
   "devDependencies": {
     "@types/node": "18.11.10",
@@ -40,4 +41,4 @@
     "prettier": "^3.0.0",
     "typescript": "^4.9.3"
   }
-}
+}

pages/_meta.json

@@ -1,4 +1,13 @@
 {
-  "index": "ACM Hack",
-  "hack-school": "Hack School"
+  "index": {
+    "title": "ACM Hack",
+    "type": "page",
+    "theme": {
+      "layout": "raw"
+    }
+  },
+  "hack-school": {
+    "title": "Hack School",
+    "type": "page"
+  }
 }

pages/hack-school/_meta.json

@@ -1,7 +1,9 @@
 {
   "index": "Welcome to ACM Hack School!",
   "logistics": "Hack School Logistics",
-  "css": "Week 1: HTML & CSS",
-  "js": "Week 2: JavaScript",
+  "git-github": "Git/GitHub",
+  "html": "Week 1: HTML",
+  "css": "Week 1: CSS",
+  "js": "Week 2: JavaScript"
   "react": "Week 3: React"
 }