UI updates

me3zaAKAgoat · Mar 26, 2024 · e8fc79b · e8fc79b
1 parent cc6def5
commit e8fc79b
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 34 deletions.
diff --git a/backend/admin/mongo.js b/backend/admin/mongo.js
@@ -23,16 +23,16 @@ mongoose.connect(process.env.MONGODB_URI, {
 });
 
 // Replace 'YourModel' with the name of your Mongoose model
-User.collection.dropIndex(
-	{ email: 1 },
-	function (err, result) {
-		if (err) {
-			console.error('Error dropping index:', err);
-		} else {
-			console.log('Index successfully dropped');
-		}
-	}
-)
+// User.collection.dropIndex(
+// 	{ email: 1 },
+// 	function (err, result) {
+// 		if (err) {
+// 			console.error('Error dropping index:', err);
+// 		} else {
+// 			console.log('Index successfully dropped');
+// 		}
+// 	}
+// )
 // User.collection.drop(function (err) {
 // 	if (err && err.message !== 'ns not found') {
 // 		console.error('Error dropping collection:', err);

diff --git a/backend/index.ts b/backend/index.ts
@@ -32,5 +32,5 @@ mongoose
 		});
 	})
 	.catch((error: any) => {
-		logger.error('coudlnt connect to db', error);
+		logger.error('server startup failed', error);
 	});
diff --git a/frontend/src/components/CycleNotes.tsx b/frontend/src/components/CycleNotes.tsx
@@ -31,7 +31,7 @@ const NotesContainer = ({
 
 	return (
 		<textarea
-			className="placeholder-tertiary  mt-2 w-[80%] h-[85%] bg-secondary border-[0.5px] border-tertiary rounded-xl p-4 text-primary-content font-semibold resize-none focus:outline-none focus:ring-4 focus:ring-tertiary transition-all"
+			className="placeholder-quaternary  mt-2 w-[80%] h-[85%] bg-secondary border-[0.5px] border-tertiary p-4 text-primary-content font-semibold resize-none focus:outline-none focus:ring-4 focus:ring-tertiary transition-all"
 			spellCheck="false"
 			value={notes || ''}
 			placeholder="Anything you write here will be saved automatically. Write things you want to remember for this cycle!"

diff --git a/frontend/src/components/HUD.tsx b/frontend/src/components/HUD.tsx
@@ -40,7 +40,7 @@ function HUD({
 	console.log(endDate);
 
 	return (
-		<div className="w-[600px] z-10 bg-secondary h-[70%] border-[0.5px] border-tertiary rounded-xl p-2 px-4 flex items-center justify-between">
+		<div className="w-[600px] z-10 bg-secondary h-[70%] border-[0.5px] border-tertiary p-2 px-4 flex items-center justify-between">
 			<div className="flex">
 				<h1 className="flex justify-center items-center font-bold mr-2">
 					Completion:

diff --git a/frontend/src/components/TaskCard.tsx b/frontend/src/components/TaskCard.tsx
@@ -68,7 +68,7 @@ function TaskCard({
 
 	return (
 		<div
-			className={`transition-all hover:shadow-lg hover:shadow-tertiary bg-secondary mb-6 w-full border-[0.5px] border-tertiary rounded-xl overflow-hidden flex flex-col border-l-4 ${
+			className={`transition-all hover:shadow-lg hover:shadow-tertiary bg-secondary mb-6 w-full border-[0.5px] border-tertiary overflow-hidden flex flex-col border-l-4 ${
 				priorityColor[task?.priority!]
 			}`}
 		>
@@ -130,7 +130,7 @@ function TaskCard({
 					<label htmlFor="completion" className="text-sm font-normal mb-2">
 						Completion:
 					</label>
-					<div className="flex justify-between w-full mb-2 gap-6">
+					<div className="flex items-center justify-between w-full mb-2 gap-6">
 						<input
 							className="w-full task-slider"
 							type="range"

diff --git a/frontend/src/index.css b/frontend/src/index.css
@@ -25,7 +25,7 @@
 }
 
 .main-input {
-	@apply bg-primary placeholder-tertiary rounded-[2px] mb-2 mt-2 px-4 py-2 border border-solid border-tertiary drop-shadow-2xl;
+	@apply bg-primary placeholder-quaternary rounded-[2px] mb-2 mt-2 px-4 py-2 border border-solid border-tertiary drop-shadow-2xl;
 }
 
 .main-button {
@@ -60,7 +60,7 @@
 	}
 	.avatar {
 		div {
-			border: 1px solid theme('colors.primary-content');
+			border: 1px solid theme('colors.accent');
 			transition-delay: 25ms;
 			transition-duration: 30ms;
 			transition-timing-function: ease-in-out;
@@ -69,7 +69,7 @@
 		div:hover,
 		.active-profile-button {
 			outline-offset: 2px;
-			outline: theme('colors.primary-content') solid 1.5px;
+			outline: theme('colors.accent') solid 1.5px;
 		}
 	}
 }
@@ -87,7 +87,7 @@
 		margin: 2px 0px 10px;
 		background-color: theme('colors.tertiary');
 		border: 1px solid theme('colors.tertiary');
-		border-radius: 8px;
+		/* border-radius: 8px; */
 	}
 }
 
@@ -160,26 +160,16 @@
 }
 
 .task-slider {
+	height: 9px;
 	accent-color: theme(colors.accent);
 	border-radius: 50px;
 	background-color: theme(colors.tertiary);
 }
 
-@-moz-document url-prefix() {
-	.task-slider {
-		overflow: hidden;
-	}
-}
-
-@media screen and (-webkit-min-device-pixel-ratio: 0) {
-	.task-slider::-webkit-progress-bar {
-		overflow: visible;
-	}
-}
 
 .task-slider::-moz-range-thumb {
-	width: 11px;
-	height: 11px;
+	width: 12px;
+	height: 12px;
 	background: theme(colors.primary);
 	cursor: pointer;
 	border-radius: 50%;
@@ -188,6 +178,7 @@
 
 .task-slider::-moz-range-progress {
 	height: 100%;
+	border-radius: 50px;
 	background-color: theme(colors.accent);
 }
 

diff --git a/frontend/src/pages/Register.tsx b/frontend/src/pages/Register.tsx
@@ -67,7 +67,7 @@ const Register = () => {
 					className="flex flex-col justify-between items-center w-full h-full"
 					onSubmit={handleSubmit}
 				>
-					<div className="mt-8 flex flex-col items-center justify-center">
+					<div className=" mt-8 flex flex-col items-center justify-center">
 						<input
 							className="main-input"
 							type="text"

diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
@@ -27,9 +27,13 @@ export default {
 
 				error: '#b82323',
 
-				tertiary: '#404040',
+				tertiary: '#242424',
 
 				'tertiary-content': '#b4b4b4',
+
+				quaternary: '#363636',
+
+				'quaternary-content': '#b4b4b4',
 			},
 			border: {
 				radius: '4px',