From adf6752a1b52667d20ba1f7e3bb155e2fb3f41e3 Mon Sep 17 00:00:00 2001 From: Zawadi Brown Date: Sun, 26 Jan 2025 13:26:55 -0500 Subject: [PATCH 1/8] z changes pt.1 --- index.html | 17 +++++++--------- script.js | 1 - style.css | 57 ++++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 47 insertions(+), 28 deletions(-) diff --git a/index.html b/index.html index 8cb1a3b..a3582af 100644 --- a/index.html +++ b/index.html @@ -9,19 +9,16 @@ - -
- -
- +
-
-

Group 5's Calendar

+
+

Group 5's Calendar

+
-
+

diff --git a/script.js b/script.js index 19fed48..ec952a3 100644 --- a/script.js +++ b/script.js @@ -236,7 +236,6 @@ document.addEventListener("DOMContentLoaded", () => { if (isCurrentMonth) renderTasks(formattedDate); } } - // Add Date to Calendar function addDate(day, classes, formattedDate) { const dateElement = document.createElement("div"); diff --git a/style.css b/style.css index 43fd85b..cd743c2 100644 --- a/style.css +++ b/style.css @@ -66,7 +66,16 @@ background-color: #ffffff; color: black; } - +/* Hamburger */ +.dark-mode .dropdown-menu{ +background-color: var(--darktask); +} +.dark-mode .dropdown-item{ + color: white; +} +.dark-mode .dropdown-item:hover{ + background-color: black; +} /* Body Styling */ body { font-family: Arial, sans-serif; @@ -84,6 +93,11 @@ body { h1 { font-size: 45px; font-family: Cambria, Cochin, Georgia, Times, 'Times New Roman', serif ; + padding-right: 20px; +} + +header{ + margin-bottom: 0px; } h1, @@ -99,11 +113,20 @@ h1, font-family: Georgia, 'Times New Roman', Times, serif; } +/* Hamburger Button */ #hamburgerButton { font-family: Georgia, 'Times New Roman', Times, serif; font-weight: bold; } - +.dropdown-menu{ +background-color: pink; +} +.dropdown-item{ + color: black; +} +.dropdown-item:hover{ + background-color: white; +} /* Header Styling */ header { display: flex; @@ -114,7 +137,6 @@ header { border: solid 2.5px black; background-color: rgb(38, 51, 155); box-shadow: 4px 6px 8px black; - float: right; margin-right: 20px; border-radius: 50%; width: 40px; @@ -165,7 +187,8 @@ header { } /* Month View - Default */ -/* Default Date Styling */ +/*Date Styling */ +/* diiferent view styling */ .date { position: relative; background-color: var(--Lightbg); @@ -176,7 +199,17 @@ header { justify-content: space-between; padding: 5px; cursor: pointer; - width: 150px; +} + +.week-view .date { + height: 400px; +} +.day-view .date { + height: 400px; +} +/* Changes the width of the date box in the day view */ +.date.active{ + width: 100%; } .date .add-task-btn { @@ -184,7 +217,7 @@ header { opacity: 0; position: absolute; top: 50%; - left: 50%; + left:50%; transform: translate(-50%, -50%); width: 50px; height: 50px; @@ -203,8 +236,6 @@ header { transition: opacity 0.3s ease-in-out, transform 0.3s ease-in-out; } - - /* Show Add Task Button on Hover */ .date:hover .add-task-btn { visibility: visible; @@ -212,7 +243,6 @@ header { transform: translate(-50%, -50%) scale(1.1); } - /* Current Day Highlight */ .date.current-day { border: 2px solid black; @@ -227,10 +257,6 @@ header { opacity: 0.5; } -/* Changes the width of the date box in the day view */ -.date.active{ - width: 100%; -} /* Task Styles */ .task-item { @@ -252,10 +278,6 @@ header { max-height: 150px; padding: 5px; } -/* .tasks{ - overflow: show; -} */ - .task-item.urgent { background-color: rgb(243, 191, 191); color: rgb(255, 33, 33); @@ -316,6 +338,7 @@ button:disabled { cursor: not-allowed; opacity: 0.6; } + .btn { background-color: pink; color: var(--lighttxt); From 56be7cbe2e08bf52226ef0d028ba5c5cb798cff8 Mon Sep 17 00:00:00 2001 From: JMcdonald99 Date: Sun, 26 Jan 2025 19:14:08 -0500 Subject: [PATCH 2/8] edited readme and accessories --- ProjectOne | 1 + README.md | 13 +++++++------ index.html | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) create mode 160000 ProjectOne diff --git a/ProjectOne b/ProjectOne new file mode 160000 index 0000000..adf6752 --- /dev/null +++ b/ProjectOne @@ -0,0 +1 @@ +Subproject commit adf6752a1b52667d20ba1f7e3bb155e2fb3f41e3 diff --git a/README.md b/README.md index 03c100b..cbd10f3 100644 --- a/README.md +++ b/README.md @@ -2,18 +2,19 @@ First Project for Software Developer Bootcamp ## Description -Our project is a calendar that helps keep track and check off tasks throughout the month with leveling urgency. Another thing this project does is help be a good study guide. -Our motivation for this was to create a simple and easy way to organize the tasks that you have the upcoming weeks and to help motivate the importance of studying. -This project helps solve the problem of when a task should be completed meaning setting how urgent a task is to get done will put it, it also solves the annoyance of having to study with a feature to add flash cards which will earn you points. +Our project is a calendar that helps keep track and check off tasks throughout the month with leveling urgency. +Our motivation for this was to create a simple and easy way to organize the tasks that you have the upcoming weeks. +This project helps solve the problem of when a task should be completed meaning setting how urgent a task is to get done will put it. -## Usage -To use this calendar +## To use this calendar 1. Click on the date/day that you want to add a task to 2. Click add task and type out the task you would like to 3. Decide how urgent that task is then click enter 4. To check off a task simply click it and it’ll be taken off the task list +5. The View hamburger trop down allows you change the view between Month, Week, and Day +6. Clicking the next/prev arrows will shift through months, weeks, days +7. Clicking the today button will bring you to the current date in the view you are in -Flash cards coming soon ## Credits Phoebe Ferguson-Phobeferg diff --git a/index.html b/index.html index 8cb1a3b..f51a6d5 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,7 @@
@@ -46,7 +46,7 @@

-
+