Merge pull request #49 from dhrumilp12/testing

Testing
dhrumilp12 · Sep 3, 2024 · cb4905e · cb4905e
2 parents 29bc38c + d4aae9d
commit cb4905e
Show file tree

Hide file tree

Showing 24 changed files with 1,283 additions and 1,440 deletions.
diff --git a/client/src/App.jsx b/client/src/App.jsx
@@ -8,7 +8,7 @@ import UserProfile from './Components/userProfile';
 import Sidebar from './Components/sideBar';
 import Navbar from './Components/navBar';
 import ChatLogManager from './Components/chatLogManager';
-import ChatInterface from './Components/chatInterface';
+
 import MoodLogging from './Components/moodLogging';
 import MoodLogs from './Components/moodLogs';
 import CheckInForm from './Components/checkInForm';
@@ -31,13 +31,8 @@ function App() {
 
             <Layout>
                 <Routes>
-                    <Route path="/" element={<ProtectedRoute>{user?.userId ? <ChatComponent /> : <ChatInterface />}
-                  </ProtectedRoute>} />
-                  <Route path="/chat" element={
-                  <ProtectedRoute>
-                    <ChatInterface />
-                  </ProtectedRoute>
-                } />
+                    <Route path="/" element={<ProtectedRoute> <ChatComponent /> </ProtectedRoute>} />
+
                     <Route path="/reset_password/:token" element={<ResetPassword />} />
                     <Route path="/request_reset" element={<RequestPasswordReset />} />
                     <Route path="/auth" element={<AuthComponent />} />

diff --git a/client/src/Assets/Styles/MoodLogging.css b/client/src/Assets/Styles/MoodLogging.css
@@ -1,34 +1,32 @@
 .mood-logging-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    min-height: 100vh;
-    font-family: 'Arial', sans-serif;
-
-
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  min-height: 100vh;
+  font-family: "Arial", sans-serif;
 }
 
 .mood-logging {
-    width: 90%;
-    max-width: 500px;
-    background-color: white;
-    padding: 25px;
-    border-radius: 10px;
-    box-shadow: 0 10px 25px rgba(0,0,0,0.1);
-    transition: box-shadow 0.3s ease-in-out;
+  width: 90%;
+  max-width: 500px;
+  background-color: white;
+  padding: 25px;
+  border-radius: 10px;
+  box-shadow: 0 10px 25px rgba(0, 0, 0, 0.1);
+  transition: box-shadow 0.3s ease-in-out;
 }
 
 .mood-logging:hover {
-    box-shadow: 0 20px 45px rgba(0,0,0,0.15);
+  box-shadow: 0 20px 45px rgba(0, 0, 0, 0.15);
 }
 
 .input-group {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
 
-input[type="text"] {
+/* input[type="text"] {
     padding: 12px 20px;
     margin: 10px 0;
     border: 2px solid #ccc;
@@ -41,35 +39,34 @@ input[type="text"] {
 input[type="text"]:focus {
     border-color: #007BFF;
     outline: none;
-}
+} */
 
 .submit-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    background-color: #007BFF;
-    color: white;
-    padding: 12px 20px;
-    border: none;
-    border-radius: 5px;
-    cursor: pointer;
-    font-size: 18px;
-    margin-top: 20px;
-    transition: background-color 0.3s ease-in-out;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  background-color: #007bff;
+  color: white;
+  padding: 12px 20px;
+  border: none;
+  border-radius: 5px;
+  cursor: pointer;
+  font-size: 18px;
+  margin-top: 20px;
+  transition: background-color 0.3s ease-in-out;
 }
 
 .submit-button:hover {
-    background-color: #0056b3;
+  background-color: #0056b3;
 }
 
-
 .message {
-    text-align: center;
-    margin-top: 15px;
-    padding: 10px;
-    font-size: 16px;
-    color: #2c3e50;
-    border-radius: 5px;
-    background-color: #e0e0e0;
-}
+  text-align: center;
+  margin-top: 15px;
+  padding: 10px;
+  font-size: 16px;
+  color: #2c3e50;
+  border-radius: 5px;
+  background-color: #e0e0e0;
+}
diff --git a/client/src/Assets/Styles/MoodLogs.css b/client/src/Assets/Styles/MoodLogs.css
@@ -1,43 +1,43 @@
-.mood-logs {
+/* .mood-logs {
     max-width: 600px;
     margin: 50px auto;
     padding: 20px;
     box-shadow: 0 4px 8px rgba(0,0,0,0.1);
     border-radius: 8px;
     background-color: white;
-}
+} */
 
 h2 {
-    display: flex;
-    align-items: center; /* This aligns the icon with the text vertically */
-    font-size: 24px; /* Adjust text size as needed */
+  display: flex;
+  align-items: center; /* This aligns the icon with the text vertically */
+  font-size: 24px; /* Adjust text size as needed */
 }
 
 .icon-large {
-    font-size: 40px; /* or any other size */
-    margin-right: 7px; /* Adds space between the icon and the text */
+  font-size: 40px; /* or any other size */
+  margin-right: 7px; /* Adds space between the icon and the text */
 }
 
 .mood-logs h2 {
-    text-align: center;
-    color: #333;
+  text-align: center;
+  color: #333;
 }
 
 ul {
-    list-style-type: none;
-    padding: 0;
+  list-style-type: none;
+  padding: 0;
 }
 
 li {
-    padding: 10px;
-    border-bottom: 1px solid #ccc;
+  padding: 10px;
+  border-bottom: 1px solid #ccc;
 }
 
 li:last-child {
-    border-bottom: none;
+  border-bottom: none;
 }
 
 .error {
-    color: red;
-    text-align: center;
+  color: red;
+  text-align: center;
 }