ELEVATE-Project · kiranharidas187 · Jan 10, 2025 · Jan 10, 2025 · Jan 10, 2025 · Jan 10, 2025
diff --git a/.gitignore b/.gitignore
@@ -22,4 +22,5 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 .env-cmdrc
+.env
 .gitignore
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,17 +1,11 @@
 {
   "name": "shikshalokam-fe",
-  "homepage": "/mohini",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
     "@editorjs/editorjs": "^2.30.6",
     "@editorjs/header": "^2.8.8",
     "@editorjs/simple-image": "^1.6.0",
-    "@emotion/react": "^11.13.5",
-    "@emotion/styled": "^11.13.5",
-    "@hello-pangea/dnd": "^17.0.0",
-    "@mui/material": "^6.1.8",
-    "@mui/styled-engine-sc": "^6.1.8",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
@@ -23,23 +17,18 @@
     "jspdf": "^2.5.2",
     "moment": "^2.30.1",
     "react": "^18.3.1",
-    "react-audio-visualize": "^1.2.0",
-    "react-beautiful-dnd": "^13.1.1",
     "react-dom": "^18.3.1",
     "react-icons": "^5.3.0",
     "react-infinite-scroll-component": "^6.1.0",
     "react-markdown": "^9.0.1",
     "react-responsive": "^10.0.0",
     "react-router-dom": "^6.27.0",
     "react-scripts": "5.0.1",
-    "react-spring": "^9.7.4",
     "react-use": "^17.5.1",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.0",
     "serve": "^14.2.4",
-    "styled-components": "^6.1.13",
     "sweetalert2": "^11.14.4",
-    "swiper": "^11.1.15",
     "universal-cookie": "^7.2.1",
     "wavesurfer.js": "^7.8.8",
     "web-vitals": "^2.1.4"
@@ -48,7 +37,8 @@
     "dev": "env-cmd -e dev react-scripts start",
     "demo": "env-cmd -e demo react-scripts start",
     "prod": "env-cmd -e prod react-scripts start",
-    "build-prod": "env-cmd -e prod react-scripts build",
+    "build-prod": "env-cmd -e prod react-scripts build && npm run postbuild",
+    "postbuild": "cp -R /var/www/shikshalokam/static/* static/",
     "build-dev": "env-cmd -e dev react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
@@ -74,5 +64,6 @@
   "devDependencies": {
     "@svgr/webpack": "^8.0.1",
     "tailwindcss": "^3.3.2"
-  }
+  },
+  "proxy": "http://localhost:9000"
 }
diff --git a/pm2.config.json b/pm2.config.json
diff --git a/public/images/shikshagrahaLogo.png b/public/images/shikshagrahaLogo.png
diff --git a/public/images/shikshagrahaLogo1.png b/public/images/shikshagrahaLogo1.png
diff --git a/public/index.html b/public/index.html
@@ -48,7 +48,7 @@
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500&display=swap?family=Roboto:wght@300;400;500;700&display=swap?family=Montserrat&family=Open+Sans:wght@400;500;600;700&display=swap?family=Roboto+Slab:wght@500?family=Oswald:[email protected]&display=swap" rel="stylesheet">
 
-    <title>Shikshalokam</title>
+    <title>Shikshagraha</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/sample.env b/sample.env
diff --git a/sample.env-cmdrc b/sample.env-cmdrc
diff --git a/server.js b/server.js
diff --git a/src/components/Login.jsx b/src/components/Login.jsx
@@ -24,7 +24,6 @@ const login_api_url = `/api/login/`;
 function Login({ type, variant }) {
   const navigate = useNavigate();
   const [firstName, setFirstName] = useState("");
-  const [emailId, setEmailId] = useState("");
   const [userLanguage, setUserLanguage] = useState("");
   const [userState, setUserState] = useState("");
   const [userDistrict, setUserDistrict] = useState("");
@@ -64,8 +63,6 @@ function Login({ type, variant }) {
     localStorage.removeItem('timerStart');
     localStorage.removeItem('showHomepage');
     localStorage.removeItem('model');
-    localStorage.removeItem('has_accepted_tnc');
-    localStorage.removeItem('flow');
 
     cookies.remove("profileid", {
       path: "/",
@@ -128,10 +125,6 @@ function Login({ type, variant }) {
     setUserBlock(e.target.value);
   };
 
-  const handleEmailChange = (e) => {
-    setEmailId(e.target.value);
-  };
-
   const handleNameChange = (e) => {
     setFirstName(e.target.value);
   };
@@ -179,7 +172,8 @@ function Login({ type, variant }) {
 
     const body = {
       first_name: firstName,
-      email: emailId,
+      email: phoneNumberField + "@shikshalokam.org",
+      phone: phoneNumberField,
       preferred_route: userLanguage,
       company: "shikshalokamstaging",
       password: "grit@123",
@@ -210,7 +204,7 @@ function Login({ type, variant }) {
       url: login_api_url,
       method: "POST",
       data: {
-        email: emailId,
+        email: body.email,
         password: "grit@123",
       },
     });
@@ -225,7 +219,6 @@ function Login({ type, variant }) {
       localStorage.setItem('access_token', JSON.stringify(response?.data?.access_token));
       localStorage.setItem('company', JSON.stringify(response?.data?.company));
       localStorage.setItem('state', JSON.stringify(response?.data?.state));
-      localStorage.setItem('flow', 'login');
       cookies.set("profileid", JSON.stringify(response?.data?.id), {
         path: "/",
       });
@@ -243,16 +236,22 @@ function Login({ type, variant }) {
   };
 
   return (
-    <div className="container max-w-full md mt-0 mx-auto grid md:grid-cols-2 justify-center h-screen">
+    <div className="container max-w-full md mt-0 mx-auto grid md:grid-cols-2 h-screen">
       <div className="px-5 hidden sm:block">
           <div className="flex">
             <img
-              src="https://mohini-static.shikshalokam.org/fe-images/PNG/Shikshalokam/shikshalokam-logo.png"
+              src="./images/shikshagrahaLogo.png"
               className="h-[100px] w-[200px] object-contain aspect-auto align-top object-[center_center] relative ml-0"
               alt="shikshalokam_logo"
             />
           </div>
-
+          <div>
+          <div className="text-left sm:text-2xl text-md text-slate-700">
+                <b>Share Your Impact Story Easily</b>
+              </div>
+          <p className="pt-4 pb-4">MItra is an AI-powered multi lingual, voice-enabled chatbot that helps education leaders (teachers, school leaders, community leaders, parent, youth leaders, etc.) reflect and share their micro-improvement journeys towards improving schools. Through guided prompts, MItra enables leaders to share their highlights, challenges and impact of their school improvement efforts, compiling responses into an inspiring and meaningful story.
+          </p>
+          </div>
         <img
           src="https://mohini-static.shikshalokam.org/fe-images/PNG/Shikshalokam/[email protected]"
           width="500"
@@ -266,10 +265,10 @@ function Login({ type, variant }) {
           <div className="w-[100%]">
 
                 <div className="flex p-2 mx-auto px-auto items-center justify-center">
-                 <img
-                  src="https://static-media.gritworks.ai/fe-images/PNG/Shikshalokam/shikshalokam_logo_pdf.png"
-                  className="h-[60px] w-[auto] mt-6 mb-2 object-fill aspect-auto align-top object-[center_center] relative ml-2"
-                  alt="grit_Logo"
+                  <img
+                  src="./images/shikshagrahaLogo.png"
+                  className="h-[100px] w-[200px] object-contain aspect-auto align-top object-[center_center] relative ml-0"
+                  alt="shikshalokam_logo"
                 />
               </div>
           </div>
@@ -278,7 +277,7 @@ function Login({ type, variant }) {
 
             <>
               <div className="text-center sm:text-2xl text-md pt-10 text-slate-700">
-                <b>Welcome to ShikshaLokam!!</b>
+                <b>Welcome</b>
               </div>
             </>
           <div className="p-2 text-center">
@@ -300,15 +299,16 @@ function Login({ type, variant }) {
               </>
 
                 <>
-                  <FormData layOut={1} isRequired={true}  labelName="E-mail ID" id="emailID" inputType="email" inputName="email"
+                  <FormData layOut={1} isRequired={true}  labelName="Phone Number" id="phnNumID" inputType="text" inputName="phoneNumber"
                     labelDivClass="text-left text-slate-700 mt-6 ml-[7%] md:ml-[18%]"
                     inputClass="bg-white text-slate-600 rounded-md p-3 mt-1 outline outline-slate-300 outline-1 outline-offset w-[95%] md:w-[65%]"
-                    inputOnChange={handleEmailChange}
-                    inputValue = {emailId}
+                    inputOnChange={handlePhoneChange}
+                    fieldError={fieldError}
+                    inputValue = {phoneNumberField}
                   />
                   <FormData layOut={2} labelName="language" id="languageID" selectID="languageID" selectName="language"
-                    selectOptions={[{label:'English', value:'en'}
-                    ,{label:'Hindi', value:'hi'}
+                    selectOptions={[{label:'English', value:'/'}
+                    ,{label:'Hindi', value:'/hindi'}
                   ]}  
                     labelDivClass="text-left text-slate-700 mt-6 ml-[7%] md:ml-[18%]"
                     selectValue = {userLanguage}
@@ -351,8 +351,8 @@ function Login({ type, variant }) {
                 )}
                 <button
                   id="demo"
-                  className=" p-3 mt-6 mb-2 px-5 py-3 bg-mira-red-original hover:bg-mira-red-original text-white rounded-md"
-                  style={{backgroundColor: "#c3234a"}}
+                  className=" p-3 mt-6 mb-2 px-5 py-3 text-white rounded-md"
+                  style={{backgroundColor: "#572E91"}}
                   type="submit"
                 >
                   Let's Get Started

diff --git a/src/components/TnC/privacyPolicy.jsx b/src/components/TnC/privacyPolicy.jsx