Merge pull request #120 from ms-club-sliit/feature/instruction-booklet

Added instructions page
ms-club-sliit · Jul 28, 2023 · e337dff · e337dff
2 parents ca1fa9a + b86b3d8
commit e337dff
Show file tree

Hide file tree

Showing 10 changed files with 41,106 additions and 7,908 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,6 +6,7 @@
 		"@headlessui/react": "^1.6.4",
 		"@heroicons/react": "^1.0.6",
 		"@hookform/resolvers": "^2.9.3",
+		"@tailwindcss/typography": "^0.5.9",
 		"@testing-library/jest-dom": "^5.14.1",
 		"@testing-library/react": "^13.0.0",
 		"@testing-library/user-event": "^13.2.1",
@@ -20,6 +21,7 @@
 		"react-hook-form": "^7.33.0",
 		"react-icons": "^4.4.0",
 		"react-loader-spinner": "^5.1.5",
+		"react-markdown": "^8.0.7",
 		"react-multi-carousel": "^2.8.0",
 		"react-portal": "^4.2.2",
 		"react-qr-code": "^2.0.7",
@@ -29,6 +31,8 @@
 		"react-share": "^4.4.0",
 		"react-spinners": "^0.13.3",
 		"react-vertical-timeline-component": "^3.5.2",
+		"rehype-raw": "^6.1.1",
+		"remark-gfm": "^3.0.1",
 		"styled-components": "^5.3.5",
 		"web-vitals": "^2.1.0",
 		"yup": "^0.32.11"

diff --git a/public/instructions.md b/public/instructions.md
diff --git a/src/PageRoutes.js b/src/PageRoutes.js
@@ -2,22 +2,22 @@ import { BrowserRouter, Routes, Route } from "react-router-dom";
 import { Home, Register } from "./views";
 import AwarenessSession from "./views/AwarenessSession";
 import TicketView from "./components/TicketView";
+import Instructions from "./views/Instructions";
 
 const PageRoutes = () => {
 	return (
-		<div>
-			<BrowserRouter>
-				<Routes>
-					<Route
-						path="/awareness-session/register"
-						element={<AwarenessSession />}
-					/>
-					<Route path="/team/register" element={<Register />} />
-					<Route path="/" element={<Home />} />
-					<Route path="/test" element={<TicketView number={1} isTeam/>} />
-				</Routes>
-			</BrowserRouter>
-		</div>
+		<BrowserRouter>
+			<Routes>
+				<Route
+					path="/awareness-session/register"
+					element={<AwarenessSession />}
+				/>
+				<Route path="/team/register" element={<Register />} />
+				<Route path="/" element={<Home />} />
+				<Route path="/test" element={<TicketView number={1} isTeam />} />
+				<Route path="/instructions" element={<Instructions />} />
+			</Routes>
+		</BrowserRouter>
 	);
 };
 

diff --git a/src/components/Navbar/index.jsx b/src/components/Navbar/index.jsx
@@ -107,7 +107,7 @@ const Header = () => {
 						</li>
 						<li className="text-base font-normal text-gray-500 hover:text-gray-900 mt-1 list-none cursor-pointer">
 							<a
-								href="https://bit.ly/minihackathon23Guideline"
+								href="/instructions"
 								target="_blank"
 								rel="noopener noreferrer"
 							>