Merge pull request #17 from aanu2021/main

Signing off from final year project
sanam2405 · Jan 9, 2024 · a38037f · a38037f
2 parents fcf21b7 + a766a4d
commit a38037f
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 32 deletions.
diff --git a/backend/models/model.js b/backend/models/model.js
@@ -3,34 +3,14 @@ const mongoose = require('mongoose')
 const { ObjectId } = mongoose.Schema.Types
 
 const userSchema = new mongoose.Schema({
-	name: {
-		type: String,
-		required: true,
-	},
-	username: {
-		type: String,
-		required: true,
-	},
-	email: {
-		type: String,
-		required: true,
-	},
-	password: {
-		type: String,
-		required: true,
-	},
-	Photo: {
-		type: String,
-	},
-	age: {
-		type: String,
-	},
-	gender: {
-		type: String,
-	},
-	college: {
-		type: String,
-	},
+	name: { type: String, required: true },
+	username: { type: String, required: true },
+	email: { type: String, required: true },
+	password: { type: String, required: true },
+	Photo: { type: String },
+	age: { type: String },
+	gender: { type: String },
+	college: { type: String },
 	friends: [{ type: ObjectId, ref: 'user' }],
 })
 

diff --git a/frontend/src/components/FriendsCard.jsx b/frontend/src/components/FriendsCard.jsx
@@ -59,11 +59,11 @@ function FriendsCard({
 									{user.college ? user.college : '〰〰〰'}
 								</div>
 								<div className='gitDetail'>
-									<span>Following</span>
+									<span>Gender</span>
 									{user.gender ? user.gender : '〰〰〰'}
 								</div>
 								<div className='gitDetail'>
-									<span>Followers</span>
+									<span>Age</span>
 									{user.age ? user.age : '〰〰〰'}
 								</div>
 							</div>

diff --git a/frontend/src/styles/UserCard.css b/frontend/src/styles/UserCard.css
@@ -66,8 +66,8 @@
 }
 
 .container .card_item .college-field-2 {
-	margin-right: 0.2rem;
-	margin-top: 1.7rem;
+	margin-right: 0.5rem;
+	margin-top: 0.1rem;
 }
 
 .detail-box {

diff --git a/presentation/assets/Commit.gif b/presentation/assets/Commit.gif
diff --git a/presentation/assets/Commit_Speed.gif b/presentation/assets/Commit_Speed.gif
diff --git a/presentation/assets/FriendsPage.gif b/presentation/assets/FriendsPage.gif
diff --git a/presentation/assets/FriendsPage_Speed.gif b/presentation/assets/FriendsPage_Speed.gif
diff --git a/presentation/assets/Landing_Speed.gif b/presentation/assets/Landing_Speed.gif
diff --git a/presentation/assets/Landing_gif.gif b/presentation/assets/Landing_gif.gif
diff --git a/presentation/assets/Login_Speed.gif b/presentation/assets/Login_Speed.gif
diff --git a/presentation/assets/Login_gif.gif b/presentation/assets/Login_gif.gif
diff --git a/presentation/assets/Map_Speed.gif b/presentation/assets/Map_Speed.gif
diff --git a/presentation/assets/Map_gif.gif b/presentation/assets/Map_gif.gif