credenz · devrajshetake · Oct 22, 2022 · Oct 22, 2022 · Oct 22, 2022 · Oct 22, 2022
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nth_frontend",
-  "homepage": "localhost",
+  "homepage": "https://nth-ctd.netlify.app/",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
@@ -14,7 +14,7 @@
     "react-dom": "^18.2.0",
     "react-redux": "^8.0.2",
     "react-router-dom": "^6.3.0",
-    "react-scripts": "5.0.1",
+    "react-scripts": "^5.0.1",
     "react-toastify": "^9.0.8",
     "redux": "^4.2.0",
     "web-vitals": "^2.1.4"

diff --git a/client/public/_redirects b/client/public/_redirects
@@ -0,0 +1 @@
+/*  /index.html  200
diff --git a/client/public/favicon.ico b/client/public/favicon.ico
diff --git a/client/public/index.html b/client/public/index.html
@@ -2,14 +2,19 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="%PUBLIC_URL%/nth-logo.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"
+      content="PISB's annual tech fest credenz tech days, Network Treasure Hunt event-Decrypt the Encrypted! Start Hunting."
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <meta
+      name="keyword"
+      content="pisb,credenz,credenz tech days,ctd,CTD,pune,college,college event,tech fest,contest,computer science,coding,programming,event,annual event,competition,pcsb,pict,xenia,csi,pulzion,pasc,debsoc,ieee,acm,college club,event website"
+    />
+    <meta name="author" content="PISB Web Team" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/nth-logo.ico" />
     <!--
       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/

diff --git a/client/public/logo192.png b/client/public/logo192.png
diff --git a/client/public/logo512.png b/client/public/logo512.png
diff --git a/client/public/manifest.json b/client/public/manifest.json
@@ -3,17 +3,17 @@
   "name": "Create React App Sample",
   "icons": [
     {
-      "src": "favicon.ico",
+      "src": "nth-logo.ico",
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/x-icon"
     },
     {
-      "src": "logo192.png",
+      "src": "nth-logo.ico",
       "type": "image/png",
       "sizes": "192x192"
     },
     {
-      "src": "logo512.png",
+      "src": "nth-logo.ico",
       "type": "image/png",
       "sizes": "512x512"
     }

diff --git a/client/public/nth-logo.ico b/client/public/nth-logo.ico
diff --git a/client/public/r2d2.png b/client/public/r2d2.png
diff --git a/client/src/App.css b/client/src/App.css
@@ -8,14 +8,14 @@
 } */
 * {font-size: 13px;}
 .margin-br{
-  height: 84vh;
+  height: 85vh;
     margin: 20px;
     border-radius: 25px;
   border: 2px solid #ffffff;
   /* opacity: 0.5 %; */
   /* z-index: ; */
-  /* display: block;
-  overflow: auto; */
+  display: block;
+  overflow: auto;
     /* background-color: rgba(0, 0, 0, 0.551); */
     /* background-color: #090a0f; */
 

diff --git a/client/src/App.js b/client/src/App.js
@@ -16,6 +16,8 @@ import toast, { ToastUtils } from "./utils/toastifyContainer";
 import Leaderboard from './pages/Leaderboard/Leaderboard';
 import Team from './pages/Team/Team';
 import Contact from './pages/Contact/Contact';
+import ErrorPage from './pages/404/ErrorPage';
+import Feedback from './pages/Feedback/Feedback';
 function App() {
   return (
     <>
@@ -33,8 +35,10 @@ function App() {
       <Route path="/instructions" element={<Instructions toast={{ container: <ToastUtils />, toast }} />} />
       <Route path="/question/:ans" element={<Question toast={{ container: <ToastUtils />, toast }}/>} /> 
       <Route path="/question" element={<Question toast={{ container: <ToastUtils />, toast }}/>} /> 
-      <Route path="/question/ronald" element={<Harry toast={{ container: <ToastUtils />, toast }}/>} /> 
+      <Route path="/question/dementors" element={<Harry toast={{ container: <ToastUtils />, toast }}/>} /> 
       <Route path="/leaderboard" element = {<Leaderboard toast={{ container: <ToastUtils />, toast }}/>} />
+      <Route path="/feedback" element = {<Feedback toast={{ container: <ToastUtils />, toast }}/>} />
+      <Route path="*" element={<ErrorPage />} />
       </Routes>
       </div>
       <Footer />

diff --git a/client/src/api/requests.js b/client/src/api/requests.js
@@ -1,11 +1,9 @@
 import axios from "axios";
 
-const host = window.location.host
 const hostname = window.location.hostname
-const port = host.split(':')[1]
 let url = ""
-if(port == "3000") url = "http://localhost:8000/api"
-else url = `http://${hostname}/api`
+if(hostname === "localhost") url = "http://localhost:8000/api"
+else url = `https://admin.nth.pictieee.in/api`
 const backend = axios.create({
     baseURL: url
   });
@@ -17,13 +15,15 @@ const user = () => backend.get( `/auth/users/me/`, {headers: { "content-type": "
 const extrahint= () => backend.post( `/question/extra-hint/`,null, {headers: { "content-type": "application/json", Authorization:`Token ${localStorage.getItem("auth-token")}` }} );
 const leaderboard = () => backend.get( `/leaderboard/`, {headers: { "content-type": "application/json"}} );
 const time=() => backend.get( `/timer/`, {headers: { "content-type": "application/json"}} );
+const feedback = (data) => backend.post( `/auth/feedback/`, data,{headers: { "content-type": "application/json" }} );
 const Requests = {
     login,
     register,
     userquestion,
     user,
     extrahint,
     leaderboard,
-    time
+    time,
+    feedback
   };
   export default Requests;
diff --git a/client/src/assets/nth-logo-starwars.png b/client/src/assets/nth-logo-starwars.png
diff --git a/client/src/assets/team/bhakti.png b/client/src/assets/team/bhakti.png
diff --git a/client/src/assets/team/devraj.png b/client/src/assets/team/devraj.png
diff --git a/client/src/assets/team/harsh.png b/client/src/assets/team/harsh.png
diff --git a/client/src/assets/team/mrunal.png b/client/src/assets/team/mrunal.png
diff --git a/client/src/assets/team/omkar.png b/client/src/assets/team/omkar.png
diff --git a/client/src/assets/team/safiya.png b/client/src/assets/team/safiya.png
diff --git a/client/src/assets/team/vansh.png b/client/src/assets/team/vansh.png
diff --git a/client/src/assets/team/vidhi.png b/client/src/assets/team/vidhi.png
diff --git a/client/src/components/Footer/Footer.js b/client/src/components/Footer/Footer.js
@@ -21,18 +21,15 @@ const Footer = () => {
             </Col>
             <Col lg={4} md={12} sm={12}>
             <div >
-              <a href="https://www.instagram.com/pisbcredenz/" target="_blank">
+              <a href="https://www.instagram.com/nth__live/" target="_blank" rel="noopener noreferrer">
                 {/* <i className="fab fa-instagram  instagram"></i> */}
                 <i class="nes-icon instagram me-5 ms-5"></i>
               </a>
-              <a
-                href="https://www.linkedin.com/company/pisbieee/"
-                target="_blank"
-              >
+              <a href="https://www.linkedin.com/company/pisbieee/" target="_blank" rel="noopener noreferrer" >
                 {/* <i className="fab fa-linkedin-in  linkedin"></i> */}
                 <i class="nes-icon linkedin  me-5"></i>
               </a>
-              <a href="https://www.facebook.com/pictieee/" target="_blank">
+              <a href="https://www.facebook.com/pictieee/" target="_blank" rel="noopener noreferrer">
                 {/* <i className="fab fa-facebook-f  facebook"></i> */}
                 <i class="nes-icon facebook me-5"></i>
               </a>
@@ -43,11 +40,6 @@ const Footer = () => {
       </div>
     );
   // }
-
-  return null;
-
-
-
 };
 
 export default Footer;
diff --git a/client/src/components/Loader/Loader.js b/client/src/components/Loader/Loader.js
@@ -2,7 +2,7 @@ import './Loader.css'
 const Loader = () => {
     return (
         <div class='layout'>
-        {console.log('in loader')}
+        {/* {console.log('in loader')} */}
             <div class='position'>
 
                 <div class="loader">

diff --git a/client/src/components/Navbar/Navbar.js b/client/src/components/Navbar/Navbar.js
diff --git a/client/src/components/Timer/Timer.js b/client/src/components/Timer/Timer.js
@@ -1,77 +1,71 @@
 
-import {useState,useEffect} from 'react';
+import { useState, useEffect } from 'react';
 import Requests from '../../api/requests';
 import { Link } from 'react-router-dom';
 import './Timer.css'
-const Timer=(props)=>{
-    // Unix timestamp (in seconds) to count down to
-    const [day,setDay]=useState(props.format.day) ;
-    const [hour,setHour]=useState(props.format.hour);
-    const [minutes,setMinutes]=useState(props.format.minutes);
-    const [seconds,setSeconds]=useState(props.format.seconds);
+const Timer = (props) => {
+    // Unix timestamp (in miliseconds) to count down to
+    const [day, setDay] = useState(props.format.day);
+    const [hour, setHour] = useState(props.format.hour);
+    const [minutes, setMinutes] = useState(props.format.minutes);
+    const [seconds, setSeconds] = useState(props.format.seconds);
     // console.log(props)
-    const fetchTime= async()=>{
+    const fetchTime = async () => {
         await Requests.time()
-        .then((res)=>
-            {
-                console.log(res)
+            .then((res) => {
+                // console.log(res)
                 props.fetchTimeHome();
             }
-            
-        )
-        .catch((err)=>console.log(err))
+
+            )
+            .catch((err) => console.log(err))
 
     }
-    // useEffect(()=>{
-    //     fetchTime();
-    // },[eventDate])
-    useEffect(()=>{
-        // var test = new Date(Date.UTC(2022, 9, 28));
-        // let props.time=1666999800000;
-        // const props.time=1666174920000
-        let curr=props.time;
-        // var test = new Date();
-        // console.log(test);
-        // console.log(test.getDay(),test.getDate(),test.getTime())
-        // let start=new Date(eventDate);
-        // console.log(start);
-        // var date = new Date(1324339200000);
-        // var dateToStr = date.toUTCString().split(' ');
-        // var cleanDate = dateToStr[2] + ' ' + dateToStr[1] ;
-        // console.log(cleanDate);
-        // console.log('i useeffet',curr);      
-        // if(curr==undefined) return;
-        curr-=Date.now();
+    useEffect(() => {
+        let curr = props.time;
+        curr -= Date.now();
         // console.log(curr);      
-        if(curr<=0){
+        if (curr <= 0) {
             fetchTime();
             return;
         }
         // fetchTime();
-        const interval= setInterval(() => {
+        const interval = setInterval(() => {
             curr--;
-            let cal=Math.floor((curr / 1000) % 60);
+            let cal = Math.floor((curr / 1000) % 60);
             // console.log('In interval here',eventDate, seconds,minutes,hour,day, cal);
-            setSeconds( cal<10 ? '0'+cal.toString():cal.toString() ) ;
-            cal=Math.floor((curr / (1000 * 60)) % 60);
-            setMinutes( cal<10 ? '0'+cal.toString():cal.toString() ) ;
-            cal=Math.floor((curr / (1000 * 60 * 60)) % 24);
-            setHour( cal<10 ? '0'+cal.toString():cal.toString() ) ;
-            cal=Math.floor((curr)/(1000*60*60*24));
-            setDay( cal<10 ? '0'+cal.toString():cal.toString() ) ;
-          }, 1000);
-          return () => clearInterval(interval);
-    },[day,hour,minutes,seconds,day])
-    return(
+            setSeconds(cal < 10 ? '0' + cal.toString() : cal.toString());
+            cal = Math.floor((curr / (1000 * 60)) % 60);
+            setMinutes(cal < 10 ? '0' + cal.toString() : cal.toString());
+            cal = Math.floor((curr / (1000 * 60 * 60)) % 24);
+            setHour(cal < 10 ? '0' + cal.toString() : cal.toString());
+            cal = Math.floor((curr) / (1000 * 60 * 60 * 24));
+            setDay(cal < 10 ? '0' + cal.toString() : cal.toString());
+        }, 1000);
+        return () => clearInterval(interval);
+    }, [day, hour, minutes, seconds]) // eslint-disable-line react-hooks/exhaustive-deps
+    return (
         <div className='timer'>
             {/* <p class="mr-3 ml-2 mt-3 mb-2" style={{color:'yellow',fontSize:'15px'}}>Hunt Begins In  </p> */}
-            <p class=" mr-3 ml-2 mt-3 mb-2 " className='format' style={{color:'yellow'}}>Days   Hours   Minutes    Seconds</p>
-            <p class="mr-3 ml-2 mt-3 mb-2" className='date' style={{color:'yellow'}}>{day}:{hour}:{minutes}:{seconds}</p>
-            <Link to="/instructions">
-            <button className="mr-3 ml-2 mt-2 mb-2 inst-btn">
-              Instructions
-            </button>
-            </Link>
+            <p class=" mr-3 ml-2 mt-3 mb-2 " className='format' style={{ color: 'yellow' }}>Days   Hours   Minutes    Seconds</p>
+            <p class="mr-3 ml-2 mt-3 mb-2" className='date' style={{ color: 'yellow' }}>{day}:{hour}:{minutes}:{seconds}</p>
+            {
+                props.display === 'start'
+                    ?
+                    <Link to={props.loginStatus === true ? "/instructions" : "/login"}>
+
+                        <button className="mr-3 ml-2 mt-2 mb-2 hunt-button ">
+                            Start Hunting
+                        </button>
+                    </Link>
+                    :
+                    <Link to="/instructions">
+                        <button className="mr-3 ml-2 mt-2 mb-2 inst-btn">
+                            Instructions
+                        </button>
+                    </Link>
+            }
+
         </div>
     )
 }

diff --git a/client/src/pages/404/ErrorPage.css b/client/src/pages/404/ErrorPage.css
@@ -0,0 +1,37 @@
+.error-page{
+    font-family: 'Press Start 2P', cursive;
+    color: white;
+    margin: 7% auto;
+    text-align: center;
+}
+
+.error-page h1{
+    color: red;
+    text-align: center;
+    font-size: 700%;
+}
+.error-page h2{
+    margin-top: 3%;
+    font-size:350%;
+}
+.error-page h3{
+    font-size: 200%;
+    margin: 4.5% 1% 1.5%;
+}
+
+@media screen and (max-width:1000px) {
+    .error-page{
+        margin: 17% auto;
+    }
+    .error-page h1{
+        font-size: 500%;
+    }
+    .error-page h2{
+        margin-top: 15%;
+        font-size:250%;
+    }
+    .error-page h3{
+        margin-top: 13%;
+        font-size: 150%;
+    }
+}