Hudi304 · Hudi304 · Jan 16, 2022 · Jan 16, 2022 · Jan 20, 2022 · Jan 20, 2022
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,12 +1,13 @@
 {
-    "homepage": "https://hudi304.github.io/clujwho23",
-    "name": "clujwho23",
+    "homepage": ".",
+    "name": "clujwho",
     "version": "0.1.0",
     "private": false,
     "dependencies": {
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
-        "@mui/icons-material": "^5.1.1",
+        "@heroicons/react": "^1.0.6",
+        "@mui/icons-material": "^5.3.1",
         "@mui/material": "^5.0.2",
         "@reduxjs/toolkit": "^1.6.0",
         "@testing-library/jest-dom": "^5.12.0",
@@ -23,11 +24,16 @@
         "lodash": "^4.17.21",
         "material-ui-icons": "^1.0.0-beta.36",
         "prettier": "^2.3.1",
+        "qrcode.react": "^3.0.0",
         "react": "^17.0.2",
+        "react-color-palette": "^6.2.0",
+        "react-color-picker": "^4.0.2",
         "react-dom": "^17.0.2",
+        "react-helmet": "^6.1.0",
         "react-intersection-observer": "^8.32.1",
+        "react-qr-code": "^2.0.3",
         "react-redux": "^7.2.4",
-        "react-router-dom": "^5.2.0",
+        "react-router-dom": "^6.2.2",
         "react-scripts": "^4.0.3",
         "react-swipeable-views": "^0.14.0",
         "redux-saga": "^1.1.3",
@@ -40,7 +46,7 @@
     "scripts": {
         "predeploy": "npm run build",
         "deploy": "gh-pages -d build",
-        "start": "react-scripts start",
+        "start": "react-scripts --openssl-legacy-provider start",
         "build": "react-scripts build",
         "test": "react-scripts test",
         "eject": "react-scripts eject"
@@ -64,6 +70,7 @@
         ]
     },
     "devDependencies": {
+        "@types/react-helmet": "^6.1.5",
         "@types/react-router-dom": "^5.1.7",
         "@typescript-eslint/eslint-plugin": "^3.9.0",
         "@typescript-eslint/parser": "^3.9.0",

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -6,40 +6,22 @@
   <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#000000" />
-  <meta name="description" content="Web site created using create-react-app" />
+  <meta name="description"
+    content="Cluj World Health Organization is the first student-led organisation in Eastern Europe whose mission is to educate students and professionals on health issues." />
   <meta name="apple-mobile-web-app-capable" content="yes" />
 
   <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-  <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
+
   <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-  <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
+  <meta name="google-site-verification" content="79cXqfnHwQNmbh_rsrixFkX5fIgPbfFbhjsqvQ16VxM" />
 
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-  <title>React App</title>
+  <title>ClujWHO</title>
 </head>
 
 <body>
   <noscript>You need to enable JavaScript to run this app.</noscript>
   <div id="root"></div>
-  <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
 
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
 </body>
 
 </html>
diff --git a/secrets.json b/secrets.json
@@ -0,0 +1,12 @@
+{
+  "type": "service_account",
+  "project_id": "molten-acumen-335611",
+  "private_key_id": "9a4e4d1a5a3407be7f02e3972b38064d7d8f0219",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC2KHgOQgq9WHPK\nUIDTocINJwbTEA9zXRHpHMP2Qz6a6hRY9aY01/C2+qCnB70+vke+yRnNVhEtRwcp\nsCkQShI+7g5Vo0yw5Dr3vyiyETx7DaSTUZZZFfAlD9lkdkjbfwrsuVFBRw0NGNtq\nDcFjvIB+KO1LM3RGlXF7aO+6eeWU+QHnhT2EH+TRZd07iGA/BeTL+d9Q5Z3hSHVN\nySRRYI1Ffr7ydTedAMW0u7x5xkU8O21amRa17AyYL+KG7KEPpEaycjPWxlsnilLq\nIniTWF/ZpgwreCEB/11Sd7ymyimO0HZHRSq4F6Izo/5Igxh+gpN3dzzebzp+tNpE\nMutmwUQrAgMBAAECggEACOcTbwb1RWnERvgGQ9GdDU2B/ODFEItU68K3JRsGPUYB\ndpOS6vQ+1IKNRXyQWDeug/mKJEn3jvHwvK3aY+xq1d6GntLbVa3h3+fc0k8bWJxD\nFdwf7/ytfvI2Wr2ZM/kSjJ1GBl21mpVDa/x+HiTBVukjJ9C89xIouLJZPRDmEpC/\nucKqYJyToy07FgJumamAfa4p9JiePsMCWPM3/qn4+xtb8kal3j5NWtpv81nLVadF\nYXO9JL8iWm8kOH01j1J+n2Z8WxhBl+FkhtQYtnAAitpPvB9Hh/HGI4zPiI+5ohe1\nUYX5j594jcME2cTO5HuJgx2EEAfG62bfe0buhWkvCQKBgQDvV+LxOfOiqTE3JIVd\nKilQer9wrC8eFg9hSYuQQtaSZGEcfLQXySS2oupM8uapia/KWLt0LsZ/VffXsaMv\nDC+BVBN2Cxnlou38lbnL7oHnAee6c3oQperkvFjyliz0tL1QTprjm5Q05mnW8bBp\n+3W3gpcYmTmzIS69QacDPOOa/wKBgQDC1cbkhlwxjWa9pglHAqFsLisyFFKGjp6T\nBVBx8CuJdZbgblqRpknodBAIXEs2ZYd6WPl7Kn3H9UqczkyO+9vg84BoyfJCMfgj\nes2TlazAtPzahAo9f9ytOytpKn04iwBpurMkiTV8Y4929iQSjgupJugKQEQ9LjmN\n7py1EGSy1QKBgCJkJYb2Bc0ktJ6wz70AVulqieGdzDNthg47rCMxh3WHmPCn9pTI\nYU8g/7vI114bG7heoajjI8CeULucmc8j2BukQhufIrx9eebmeMkV33KbMnn3J94G\niUcOzVUmQRV0dxN4CAeWjmg/h4vMNMY1zMduq1lsgv77UKT/LwlnEWlvAoGACYQp\nh8XsQNtYNlEiyN4fBkqm/3YwpbPXmPS8fiQt7DPbH7EkKVMG7xykH9RqNAj3eglY\nfiSQKjEX6NrGsIEqty0Ni5C5jXQlW45G9jtsSalNZFroqSJSo/9s2mEh5p4bcg6V\na2ZsP1wZiMTy9BkOBsAIu19yNc7JLt6Ftu5LDNUCgYEAxlxfZB9BESf6qsJCkZU2\nAoVx3BQco8bu4tSJs2J9346sPqLXAz8ulEnaNHv1PxECaCPN4Mf8ZVIxyLBoWvAS\nNuPFKMuw3emR8S4GWWFyfQNl8/7qmlHKuyD2eWZFns5UJ7hGvaaxHECByVc00gcu\nzyOhzFc5yE46tvWluvDjl0E=\n-----END PRIVATE KEY-----\n",
+  "client_email": "clujwho-notifications@molten-acumen-335611.iam.gserviceaccount.com",
+  "client_id": "106340644725848258260",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/clujwho-notifications%40molten-acumen-335611.iam.gserviceaccount.com"
+}
diff --git a/src/App.css b/src/App.css
@@ -4,3 +4,36 @@
   grid-template-rows: repeat(4, auto);
   background-color: #FFFFFF;
 }
+
+/* Hide scrollbar for Chrome, Safari and Opera */
+/* body::-webkit-scrollbar {
+  display: none;
+} */
+.app{
+  overflow: hidden;
+  width: 100vw;
+}
+
+
+/* Hide scrollbar for Chrome, Safari and Opera */
+body::-webkit-scrollbar {
+    display: none;
+}
+
+/* Hide scrollbar for IE, Edge and Firefox */
+.app {
+  -ms-overflow-style: none;  /* IE and Edge */
+  scrollbar-width: none;  /* Firefox */
+}
+
+body{
+  overflow: visible;
+  -ms-overflow-style: none;  /* IE and Edge */
+  scrollbar-width: none; 
+}
+
+@-moz-document url-prefix() { /* Disable scrollbar Firefox */
+  html{
+    scrollbar-width: none;
+  }
+}
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,6 +1,6 @@
 import './App.css'
 
-import { BrowserRouter, HashRouter, Route, Switch } from 'react-router-dom'
+// import { HashRouter, BrowserRouter, Route, Redirect } from 'react-router-dom'
 import { AboutUs } from './pages/about_us/about-us-component'
 import { ApplyNow } from './pages/appy-now/apply-now-page'
 import { Committees } from './pages/committees/committees-component'
@@ -10,63 +10,29 @@ import { OurTeam } from './pages/our-team/our-team-component'
 import { Resources } from './pages/resources/resources-component'
 import { Sponsors } from './pages/sponsors/sponsors-component'
 import { Schedule } from './pages/schedule/schedule-coponent'
+import { HomePage2 } from './pages/home/home-component'
+import { QrCodeGeneratorTool } from './pages/qr-code-generator/qr-code-generator'
+
+import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom'
 
 function App(): JSX.Element {
   return (
-    <div>
-      {/* <BrowserRouter>
-        <Route path={'/'} component={MainPage} />
-      </BrowserRouter> */}
-
-      {/* <BrowserRouter>
-        <Route exact path="/clujwho23/">
-          <HomePage />
-        </Route>
-
-        <Route path="/clujwho23/apply_now/">
-          <ApplyNow />
-        </Route>
-
-        <Route path="/clujwho23/about_us/">
-          <AboutUs />
-        </Route>
-
-        <Route path="/clujwho23/schedule/">
-          <Schedule />
-        </Route>
-
-        <Route path="/clujwho23/committees/">
-          <Committees />
-        </Route>
-
-        <Route path="/clujwho23/our_team/">
-          <OurTeam />
-        </Route>
-
-        <Route path="/clujwho23/resources/">
-          <Resources />
-        </Route>
-
-        <Route path="/clujwho23/contact/">
-          <Contact />
-        </Route>
-
-        <Route path="/clujwho23/sponsors/">
-          <Sponsors />
-        </Route>
-      </BrowserRouter> */}
-
-      <HashRouter>
-        <Route exact path="/" component={HomePage} />
-        <Route path="/apply_now" component={ApplyNow} />
-        <Route path="/about_us" component={AboutUs} />
-        <Route path="/schedule" component={Schedule} />
-        <Route path="/committees" component={Committees} />
-        <Route path="/our_team" component={OurTeam} />
-        <Route path="/resources" component={Resources} />
-        <Route path="/contact" component={Contact} />
-        <Route path="/sponsors" component={Sponsors} />
-      </HashRouter>
+    <div className="app">
+      <BrowserRouter>
+        <Routes>
+          <Route path="/home" element={<HomePage2 />} />
+          <Route path="/apply_now" element={<ApplyNow />} />
+          <Route path="/about_us" element={<AboutUs />} />
+          <Route path="/qr_code" element={<QrCodeGeneratorTool />} />
+          <Route path="/schedule" element={<Schedule />} />
+          <Route path="/committees" element={<Committees />} />
+          <Route path="/our_team" element={<OurTeam />} />
+          <Route path="/resources" element={<Resources />} />
+          <Route path="/contact" element={<Contact />} />
+          <Route path="/sponsors" element={<Sponsors />} />
+          <Route path="*" element={<Navigate replace to="/home" />} />
+        </Routes>
+      </BrowserRouter>
     </div>
   )
 }

diff --git a/src/assets/ClujWho/Catedrala.jfif b/src/assets/ClujWho/Catedrala.jfif
diff --git a/src/assets/ClujWho/Catedrala.jpg b/src/assets/ClujWho/Catedrala.jpg
diff --git a/src/assets/ClujWho/Catedrala.png b/src/assets/ClujWho/Catedrala.png
diff --git a/src/assets/ClujWho/Catedrala1080p_logo.png b/src/assets/ClujWho/Catedrala1080p_logo.png
diff --git a/src/assets/ClujWho/Catedrala1080p_logo.xcf b/src/assets/ClujWho/Catedrala1080p_logo.xcf
diff --git a/src/assets/ClujWho/ClujWHO_sigla.svg b/src/assets/ClujWho/ClujWHO_sigla.svg
diff --git a/src/assets/ClujWho/ClujWHOsiglaSquare.png b/src/assets/ClujWho/ClujWHOsiglaSquare.png