Merge pull request #3 from xreedev/day-3

Day 3
xreedev · Jul 26, 2024 · 820f907 · 820f907
2 parents 2aa7956 + 87841a4
commit 820f907
Show file tree

Hide file tree

Showing 18 changed files with 435 additions and 152 deletions.
diff --git a/assets/event-null-values.csv b/assets/event-null-values.csv
@@ -0,0 +1,11 @@
+eventid,eventname,start_date,end_date
+1,Event Alpha,2024-08-01,2024-08-05
+2,Event Beta,2024-08-10,2024-08-12
+3,Event Gamma,2024-08-15,2024-08-20
+4,Event Delta,2024-08-22,2024-08-25
+5,Event Epsilon,2024-08-28,2024-09-01
+6,Event Zeta,2024-09-05,2024-09-07
+7,Event Eta,2024-09-10,2024-09-15
+8,Event Theta,2024-09-18,2024-09-20
+9,Event Iota,2002-09-25,2002-09-27
+10,Event Kappa,,2024-10-05
diff --git a/assets/event-wrong-start.csv b/assets/event-wrong-start.csv
@@ -0,0 +1,11 @@
+eventid,eventname,start_date,end_date
+1,Event Alpha,2024-08-01,2024-08-05
+2,Event Beta,2024-08-10,2024-08-12
+3,Event Gamma,2024-08-15,2024-08-20
+4,Event Delta,2024-08-22,2024-08-25
+5,Event Epsilon,2024-08-28,2024-09-01
+6,Event Zeta,2024-09-05,2024-09-07
+7,Event Eta,2024-09-10,2024-09-15
+8,Event Theta,2024-09-18,2024-09-20
+9,Event Iota,2025-09-25,2025-09-27
+10,Event Kappa,2024-10-05,2024-10-01
diff --git a/assets/eventRepeat.csv b/assets/eventRepeat.csv
@@ -0,0 +1,12 @@
+eventid,eventname,start_date,end_date
+1,Event Alpha,2024-08-01,2024-08-05
+2,Event Beta,2024-08-10,2024-08-12
+3,Event Gamma,2024-08-15,2024-08-20
+4,Event Delta,2024-08-22,2024-08-25
+5,Event Epsilon,2024-08-28,2024-09-01
+6,Event Zeta,2024-09-05,2024-09-07
+7,Event Eta,2024-09-10,2024-09-15
+8,Event Theta,2024-09-18,2024-09-20
+9,Event Iota,2025-09-25,2025-09-27
+10,Event Kappa,2024-10-01,2024-10-05
+10,Event Sigma,2025-11-23,2025-11-24
diff --git a/assets/events.csv b/assets/events.csv
@@ -7,5 +7,5 @@ eventid,eventname,start_date,end_date
 6,Event Zeta,2024-09-05,2024-09-07
 7,Event Eta,2024-09-10,2024-09-15
 8,Event Theta,2024-09-18,2024-09-20
-9,Event Iota,2024-09-25,2024-09-27
-10,Event Kappa,2024-10-01,2024-10-05
+9,Event Iota,2002-09-25,2002-09-27
+10,Event Kappa,2024-10-01,2024-10-05
diff --git a/assets/incorrectDate.csv b/assets/incorrectDate.csv
@@ -0,0 +1,11 @@
+eventid,eventname,start_date,end_date
+1,Event Alpha,2024-08-01,2024-08-05
+2,Event Beta,2024-08-10,2024-08-12
+3,Event Gamma,2024-08-15,2024-08-20
+4,Event Delta,2024-08-22,2024-08-25
+5,Event Epsilon,2024-08-28,2024-09-01
+6,Event Zeta,2024-09-05,2024-09-07
+7,Event Eta,2024-09-10,2024-09-15
+8,Event Theta,2024-09-18,2024-09-20
+9,Event Iota,2025-09-25,2025-09-27
+10,Event Kappa,2024-10-01,Gayatri
diff --git a/assets/overlap.csv b/assets/overlap.csv
@@ -0,0 +1,11 @@
+eventid,eventname,start_date,end_date
+1,Event Alpha,2024-08-01,2024-08-05
+2,Event Beta,2024-08-10,2024-08-12
+3,Event Gamma,2024-08-15,2024-08-20
+4,Event Delta,2024-08-22,2024-08-25
+5,Event Epsilon,2024-08-28,2024-09-01
+6,Event Zeta,2024-09-05,2024-09-07
+7,Event Eta,2024-09-10,2024-09-15
+8,Event Theta,2024-09-10,2024-09-15
+9,Event Iota,2002-09-27,2002-09-27
+10,Event Kappa,2024-10-01,2024-09-20
diff --git a/assets/task-null-values.csv b/assets/task-null-values.csv
@@ -0,0 +1,27 @@
+eventid,task_name
+1,Prepare Presentation
+1,Review Budget
+1,Coordinate Meeting
+2,Design Brochure
+2,Update Website
+3,Plan Event
+3,Arrange Catering
+,Send Invitations
+4, 
+4,Conduct Survey
+5,Write Report
+5,Analyze Data
+5,Prepare Slides
+6,Research Market Trends
+6,Create Social Media Content
+7,Organize Workshop
+7,Manage Registrations
+8,Compile Feedback
+8,Draft Proposal
+8,Review Contracts
+9,Schedule Interviews
+9,Train New Employees
+9,Set Up Equipment
+10,Develop Training Materials
+10,Test Software
+10,Monitor Performance
diff --git a/assets/tasks-wrong.csv b/assets/tasks-wrong.csv
@@ -0,0 +1,27 @@
+eventid,task_name
+1,Prepare Presentation
+1,Review Budget
+1,Coordinate Meeting
+2,Design Brochure
+2,Update Website
+3,Plan Event
+3,Arrange Catering
+3,Send Invitations
+4,Develop Marketing Strategy
+4,Conduct Survey
+5,Write Report
+5,Analyze Data
+5,Prepare Slides
+6,Research Market Trends
+6,Create Social Media Content
+7,Organize Workshop
+7,Manage Registrations
+8,Compile Feedback
+8,Draft Proposal
+8,Review Contracts
+90,Schedule Interviews
+9,Train New Employees
+9,Set Up Equipment
+10,Develop Training Materials
+10,Test Software
+10,Monitor Performance
diff --git a/css/events.css b/css/events.css
@@ -1,2 +1,21 @@
-@import url('./header.css');
-@import url('./table.css');
+@import url("./header.css");
+@import url("./table.css");
+:root {
+  --primary-color: #03045e; /* Fresh green for primary actions */
+  --secondary-color: #00b4d8; /* Vibrant teal for secondary actions */
+  --background-color: #ffffff; /* Very light gray for background */
+  --text-color: #0077b6; /* Dark gray for text */
+  --border-color: #90e0ef; /* Light gray for borders */
+  --highlight-color: #a2d2ff; /* Bright yellow for highlights and alerts */
+}
+.events-container {
+  width: 100%;
+}
+
+.action-button {
+  width: 100px;
+  height: 25px;
+  border-radius: 20px;
+  background-color: var(--primary-color);
+  color: var(--background-color);
+}
diff --git a/css/header.css b/css/header.css
@@ -1,11 +1,17 @@
+@import url("https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap");
 :root {
-  --new-black: #1f2833; /* Dark blueish black */
-  --light-orange: #66ffcc; /* Turquoise */
-  --new-white: #eef5db; /* Pale greenish white */
-  --light-brown: #9a8c98; /* Dusty lavender */
-  --background-color: #e0e0e0;
+  --primary-color: #03045e; /* Fresh green for primary actions */
+  --secondary-color: #00b4d8; /* Vibrant teal for secondary actions */
+  --background-color: #ffffff; /* Very light gray for background */
+  --text-color: #0077b6; /* Dark gray for text */
+  --border-color: #90e0ef; /* Light gray for borders */
+  --highlight-color: #a2d2ff; /* Bright yellow for highlights and alerts */
 }
 
+a {
+  color: inherit;
+  text-decoration: none;
+}
 * {
   margin: 0;
   padding: 0;
@@ -14,28 +20,28 @@
 
 body,
 html {
-  background-color: var(--background-color);
   height: 100%;
-  font-family: monospace;
+  font-family: "Open Sans", sans-serif;
 }
 
 .page-container {
+  background-color: #ffffff;
   text-align: center;
   padding: 1%;
   position: relative;
 }
 
 .title-header {
-  font-family: Georgia, "Times New Roman", Times, serif, Courier, monospace;
-  font-size: 2.3rem;
+  font-family: monospace;
+  font-size: 2rem;
   font-weight: bold;
-  color: var(--new-black);
+  color: var(--text-color);
 }
 
 .todo-header {
   width: 100%;
-  background-color: var(--new-black);
-  color: var(--light-orange);
+  background-color: var(--primary-color);
+  color: var(--background-color);
   padding: 2%;
 }
 
@@ -44,7 +50,7 @@ html {
   font-size: large;
   font-weight: bold;
   width: 80%;
-  max-width: 600px;
+  /* max-width: 600px; */
   border-radius: 5px;
 }
 
@@ -54,7 +60,7 @@ html {
   border-radius: 20px;
   left: 50%;
   transform: translate(-50%, 50%);
-  background-color: #32e0c4;
+  background-color: var(--highlight-color);
   font-size: 15px;
   font-weight: bold;
   border: none;

diff --git a/css/styles.css b/css/styles.css
@@ -1,11 +1,18 @@
 @import url("./header.css");
-
+:root {
+  --primary-color: #03045e; /* Fresh green for primary actions */
+  --secondary-color: #00b4d8; /* Vibrant teal for secondary actions */
+  --background-color: #ffffff; /* Very light gray for background */
+  --text-color: #0077b6; /* Dark gray for text */
+  --border-color: #90e0ef; /* Light gray for borders */
+  --highlight-color: #a2d2ff; /* Bright yellow for highlights and alerts */
+}
 .upload-csv-div {
-  background-color: var(--new-black);
+  background-color: var(--primary-color);
   border-radius: 10px;
-  border: 5px solid var(--light-orange);
-  color: var(--light-brown);
-  padding: 10px;
+  border: 5px solid var(--secondary-color);
+  color: var(--highlight-color);
+  padding: 20px;
 }
 
 .warning-popup {
@@ -14,27 +21,30 @@
   border-radius: 20px;
   left: 50%;
   transform: translate(-50%, 50%);
-  background-color: #32e0c4;
-  font-size: 15px;
+  background-color: var(--highlight-color);
   font-weight: bold;
   border: none;
 }
 
+.contents-div {
+  max-width: 600px;
+}
+
 .input-file {
-  background-color: var(--new-black);
+  background-color: var(--background-color);
   margin: 5% auto;
-  border: 1px solid var(--light-brown);
+  border: 1px solid var(--text-color);
   padding: 8% 5%;
   width: 90%;
   max-width: 400px;
-  color: var(--new-white);
+  color: var(--text-color);
   cursor: pointer;
 }
 
 .submit-csv-button {
-  background-color: var(--light-orange);
+  background-color: var(--highlight-color);
   border-radius: 20px;
-  border: 1px solid var(--new-white);
+  border: 1px solid var(--border-color);
   width: 50%;
   max-width: 200px;
   height: 30px;
@@ -43,11 +53,11 @@
 }
 
 .goto-button {
-  background-color: var(--new-black);
+  background-color: var(--highlight-color);
   border-radius: 5px;
-  border: 2px solid var(--light-orange);
+  border: 2px solid var(--text-color);
   width: 50%;
-  color: var(--light-orange);
+  color: var(--text-color);
   max-width: 200px;
   height: 35px;
   font-weight: bold;
@@ -56,14 +66,12 @@
 }
 
 .submit-csv-button:hover {
-  background-color: var(--new-white);
-  border: 1px solid var(--light-orange);
+  background-color: var(--secondary-color);
+  border: 1px solid var(--secondary-color);
 }
 
 .goto-button:hover {
-  background-color: var(--new-white);
-  border: 3px solid var(--new-black);
-  color: var(--new-black);
+  background-color: var(--background-color);
 }
 
 .csv-type-select {
@@ -75,17 +83,18 @@
 
 .csv-type-label {
   font-size: 15px;
-  color: #e0e0e0;
+  color: var(--background-color);
   font-family: Arial, Helvetica, sans-serif;
 }
 
 .close-btn {
   width: 90px;
   margin-top: 5px;
-  background-color: red;
-  color: #32e0c4;
+  background-color: var(--background-color);
+  color: var(--text-color);
   font-weight: bold;
-  border: 1px solid red;
+  font-size: 10px;
+  border: 1px solid var(--text-color);
   border-radius: 20px;
   padding: 5px;
   text-align: center;