Merge pull request #437 from Sourabh782/otp

Implemented otp based login functionality #437
Bitbox-Connect · Nov 10, 2024 · c74cdb7 · c74cdb7
2 parents 078b5b1 + 557829c
commit c74cdb7
Show file tree

Hide file tree

Showing 14 changed files with 666 additions and 27 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -58,6 +58,7 @@
     "socket.io": "^4.7.5",
     "socket.io-client": "^4.8.1",
     "sort-by": "^0.0.2",
+    "twilio": "^5.3.5",
     "uuid": "^11.0.2",
     "yup": "^1.4.0"
   },

diff --git a/client/src/App.jsx b/client/src/App.jsx
@@ -37,8 +37,9 @@ import AOS from "aos";
 import "aos/dist/aos.css";
 import Collab from "./component/Collab";
 import CreateBlog from "./component/CreateBlog";
+import LoginOTP from "./component/LoginPhone";
 import UploadProject from "./component/UploadProject";
-import DiscussionForum from "./component/DiscussionForum";
+
 
 const Layout = ({ children, mode, setProgress, toggleMode, showAlert }) => {
   return (
@@ -120,6 +121,7 @@ function App() {
       <Cursor />
       <ProjectState>
         <ProfileState>
+        <Router>
           <LoadingBar color="blue" progress={progress} onLoaderFinished={() => setProgress(0)} />
           <div className="alert-container"> <Alert alert={alert} /> </div>
           <ProgressBar mode={mode} />
@@ -130,27 +132,32 @@ function App() {
               <Route exact path="/contributors" element={<Contributors mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path="/discussion" element={<Discussion mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path="/community" element={<Community mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+              <Route exact path="/ai" element={ <Ai mode={mode} setProgress={setProgress} showAlert={showAlert} /> } />
               <Route exact path="/about" element={<About mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path="/feedback" element={<Feedback mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path="/blog" element={<BlogPage mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path="/collab" element={<Collab mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path='/myproject' element={<MyProject mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path='/editprofile' element={<EditProfile mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path="/login" element={<Login mode={mode} setProgress={setProgress} showAlert={showAlert} loggedin={islogged} setloggedin={setloggedin} />} />
+              <Route exact path="/login-otp" element={<LoginOTP mode={mode} setProgress={setProgress} showAlert={showAlert} loggedin={islogged} setloggedin={setloggedin} />} />
               <Route exact path='/signup' element={<Signup mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path='/forgot-password' element={<ForgotPassword mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path='/reset-password' element={<ResetPassword mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path='/codeofconduct' element={<CodeOfConduct mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path='/contactus' element={<ContactUs mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+              <Route exact path='/myprofile' element={<MyProfile mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
+              <Route exact path='/feedback' element={<Feedback mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path='/privacypolicy' element={<PrivacyPolicy mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path='/termofuse' element={<TermOfUse mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path='/uploadProject' element={<UploadProject mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path='/createBlogPost' element={<CreateBlog />} />
+              <Route exact path="/faq" element={ <Faq mode={mode} setProgress={setProgress} showAlert={showAlert} /> } />
               <Route exact path='/read-more-blog/:id' element={<ReadMoreBlog mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
-              <Route exact path='/discussionForum' element={<DiscussionForum mode={mode} setProgress={setProgress} showAlert={showAlert} />} />
               <Route exact path='/*' element={<NotFound />} />
             </Routes>
           </Layout>
+        </Router>
         </ProfileState>
       </ProjectState>
     </div>