Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Final product to main #143

Merged
merged 40 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
b1bfb76
update
qiwenkevin May 31, 2024
c5a7c3d
working unit tests
qiwenkevin May 31, 2024
37f6d92
Update sum_tests.js
qiwenkevin Jun 5, 2024
14c1e53
Merge branch 'main' into unit-test
qiwenkevin Jun 5, 2024
787f7e0
merge fixes
qiwenkevin Jun 5, 2024
eeb0547
merge fix
qiwenkevin Jun 5, 2024
00ab997
Update puppeteer.test.js
ChrisEdwardsCSE Jun 6, 2024
ad69c57
Removed blue outline around a button after button is clicked and keyb…
kainoaw Jun 6, 2024
5cee183
Finished tests for completed task list
NathanD0wd Jun 6, 2024
5d92346
Fixed bug where hovering over button would shift the whole row of but…
kainoaw Jun 6, 2024
cc7a908
Sped up hover scaling animation
kainoaw Jun 6, 2024
d223795
Fixed bug in next button where the function would stop incrementing t…
kainoaw Jun 6, 2024
cf4c79a
Added all the calendar puppeteer tests
Andrewphanguyen Jun 6, 2024
bcaac59
All Calendar Test Updated
Andrewphanguyen Jun 6, 2024
a6742f2
Added task shift from the homepage onto the calendar page
kainoaw Jun 6, 2024
8b461b7
Merge branch 'testing-integrate' into unit-test
qiwenkevin Jun 7, 2024
adb208d
homepage fix for unit test
qiwenkevin Jun 7, 2024
b668571
Cleaned up code styling on homepage.js
ChrisEdwardsCSE Jun 7, 2024
7a3d471
updated comments to further establish consistency in calendar.js
dklopstein Jun 7, 2024
40bc9f3
update github actions to new unit test
qiwenkevin Jun 7, 2024
cae8d37
Standardized styling in homepage.css
kainoaw Jun 7, 2024
56f1c4f
Merge branch 'homepage-front' of https://github.com/cse110-sp24-group…
kainoaw Jun 7, 2024
e2be9bf
Merge pull request #137 from cse110-sp24-group25/unit-test
BobbyYuuuu Jun 7, 2024
1fc590b
Standardized styling in calendar.css
kimseongah Jun 7, 2024
d50bc9c
Merge branch 'homepage-front' into testing-integrate
ChrisEdwardsCSE Jun 7, 2024
49eded1
Merge pull request #142 from cse110-sp24-group25/testing-integrate
ChrisEdwardsCSE Jun 7, 2024
1a94906
renamed trash-icon
ChrisEdwardsCSE Jun 7, 2024
9b0acc0
Fixed trash-icon renaming and interated with tests
ChrisEdwardsCSE Jun 7, 2024
68d87a6
Added highlight when hovering over calendar cell
kainoaw Jun 7, 2024
5ba24fe
unit test renaming
ChrisEdwardsCSE Jun 7, 2024
01d6cf7
Merge branch 'homepage-front' of https://github.com/cse110-sp24-group…
ChrisEdwardsCSE Jun 7, 2024
89ce3a7
Delete jsdom.config.json
ChrisEdwardsCSE Jun 7, 2024
4a5f93c
Update package.json for all tests
ChrisEdwardsCSE Jun 7, 2024
c7c2bf0
Update package.json
ChrisEdwardsCSE Jun 7, 2024
27a27d9
Standardized styling in calendar.css
kainoaw Jun 7, 2024
754f4c9
Merge branch 'homepage-front' of https://github.com/cse110-sp24-group…
kainoaw Jun 7, 2024
4460613
Create jsdom.config.json
ChrisEdwardsCSE Jun 7, 2024
c40dae2
Update package.json - file rename
ChrisEdwardsCSE Jun 7, 2024
5e55efd
update exports
ChrisEdwardsCSE Jun 7, 2024
dd530ba
fix homepage.js for unit testing
qiwenkevin Jun 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
run: npm install

- name: Unit Test
run: npm test ./testing/sum_tests.test.js
run: npm run test-unit
5 changes: 5 additions & 0 deletions jsdom.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"transform": {},
"testEnvironment": "jsdom",
"verbose": true
}
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
"globals": "^15.2.0",
"jest": "^29.7.0",
"jest-puppeteer": "^10.0.1",
"puppeteer": "^22.10.0"
"puppeteer": "^22.10.0",
"jest-environment-jsdom": "^29.7.0"
},
"scripts": {
"test": "jest --maxWorkers=1"
"test": "jest --maxWorkers=1 testing/puppeteer.test.js",
"test-unit": "node --experimental-vm-modules node_modules/jest/bin/jest.js --config=jsdom.config.json testing/unit.test.js"
},
"type": "module",
"jest": {
Expand All @@ -21,11 +23,11 @@
"jest-puppeteer": {
"launch": {
"headless": true,
"slowMo": 25,
"slowMo": 1,
"defaultViewport": null
}
},
"dependencies": {
"jsdoc": "^4.0.3"
}
}
}
161 changes: 88 additions & 73 deletions source/calendar/calendar.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* ********** Start of Universal Styling ********** */

* {
margin: 0;
box-sizing: border-box;
Expand All @@ -24,35 +26,44 @@ main {
overflow: hidden;
height: 100%;
position: relative;

}

/* Remove background for all buttons */
/* Universal background color for buttons to clear */
button {
background-color: rgba(0,0,0,0);
border: rgba(0,0,0,1);
}

/* Remove outline around focused button */
button:focus {
outline: none;
}

/* Change mouse cursor when hovering over button */
button:hover {
cursor: pointer;
}

/* Remove background for all select boxes */
select {
background-color: rgba(0,0,0,0);
border: rgba(0,0,0,1);
appearance: none;
}

/* TASK LIST */
/* Start of task list */

/* ********** End of Universal Styling **** */

/* ********** Start of Task List ********** */

.task-list {
flex: 0 0 18%;
max-width: 17rem; /* Prevents task list expanding with long task names */
max-width: 17rem;
height:100%;
margin: 5px;
padding: 1%;
border-radius: 15px;
background-color: white;
box-shadow: 3px 3px 3px lightgrey;

/* Set size of task area to be relative to list */
position: relative;
}

Expand All @@ -63,20 +74,8 @@ select {
bottom: 0;
width: 88%;
overflow: auto;

/* Hide scroll-bars for Firefox, Edge */
-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */
}

/* Hides task list when page reaches certain size */
@media (max-width: 800px) {
.task-list {
display: none;
}
.journal-past-wrap .task-list {
display: block;
}
-ms-overflow-style: none;
scrollbar-width: none;
}

/* Formatting for the task list header */
Expand All @@ -96,21 +95,14 @@ select {
cursor: pointer;
}

/* Wrap for task name and checkbox */
/* .task-list .input-wrap {
display: flex;
justify-content: flex-start;
} */

/* Styling for task name */
.task-list .task-name {
width: max(10em, 12vw);
resize: none; /* Prevents user from resizing */
overflow: hidden; /* Hides scrollbar */
resize: none;
overflow: hidden;
margin-top: -4px;
height: 24px;
max-height: 108px;
/* Hide background and border */
background-color: rgba(0, 0, 0, 0);
border: rgba(0, 0, 0, 0);
}
Expand All @@ -137,8 +129,7 @@ select {
overflow: hidden;
word-wrap: break-word;
text-align: left;
list-style-type: none; /* Get rid of li bullet points */
/* Set max height */
list-style-type: none;
transition: max-height 0.5s ease-in;
max-height: 4em;
}
Expand Down Expand Up @@ -178,23 +169,22 @@ select {
content: attr(placeholder);
pointer-events: none;
display: block;

color: rgb(97, 97, 97)
}

/* Positioning for trash icon */
.fas.fa-trash-alt {
position: absolute; /* Positioning relative to the nearest positioned ancestor */
top: 2px; /* Distance from the top edge of the li */
right: 2px; /* Distance from the right edge of the li */
.trash-icon {
position: absolute;
top: 2px;
right: 2px;
width: 18px;
height: 18px;
cursor: pointer;
}

/* Display buttons when hovering or actively editing */
.task:hover .color-buttons {
opacity: 1; /* Brings the buttons back into view */
opacity: 1;
}

/* Checkbox appearance */
Expand Down Expand Up @@ -224,20 +214,19 @@ select {

/* Default set up for color buttons */
.color-buttons {
opacity: 0; /* Hide buttons */
transition: opacity 0.3s ease; /* Transition for buttons reappearing */
max-height: 5em; /* Enough max-height to show the content */
display: flex; /* Lays out the buttons in a row */
justify-content: space-around; /* Spaces buttons evenly */
margin-top: 5px; /* Space from the description */
opacity: 0;
transition: opacity 0.3s ease;
max-height: 5em;
display: flex;
justify-content: space-around;
margin-top: 5px;
}

/* Size of each color button */
.color-button {
width: 15px; /* Uniform button size */
height: 15px; /* Uniform button size */
border-radius: 100%; /* Makes the buttons circular */

width: 15px;
height: 15px;
border-radius: 100%;
border: solid grey 1px;

&#purple {
Expand All @@ -261,13 +250,14 @@ select {
}
}

/* ********** End of task list ********** */
/* ********** End of Task List ********** */

/* ********** Start of top bar ********** */
/* ********** Start of Top Bar ********** */

/* Container of prev/next buttons, current date, and homepage-calendar buttons */
.top-bar {
position: relative;
height: 65px;

}

.date-header-wrap {
Expand All @@ -276,20 +266,17 @@ select {
height: 100%;
width: min(70em, 100%);
width: 100%;

display: grid;
grid-template-columns: 1fr 1fr;
}

/* Next, Prev, and Header organization */
/* Container of prev/next buttons, current date */
.date-header {
display: grid;
grid-template-columns: 1fr 8fr;
margin-left: 1.1em;

position: absolute;
bottom: 0;

width: 50%;
max-width: 40em;
}
Expand All @@ -299,7 +286,7 @@ select {
background-color: var(--secondary-color);
}

/* Calendar date header */
/* Container of the previous and next day buttons*/
.date-header-text {
width: 100%;
margin-top: auto;
Expand Down Expand Up @@ -340,11 +327,6 @@ select {
padding-right: 0em;
}

/* Add cursor when hovering over buttons */
button:hover {
cursor: pointer;
}

/* Jump header that contains the month and year */
.jump-header {
display: flex;
Expand Down Expand Up @@ -439,7 +421,6 @@ button:hover {
.date-header-buttons {
display: grid;
grid-template-columns: 1.2em 1fr;

margin-top: auto;
margin-bottom: min(0.6em, 14%);
margin-left: 0.4em;
Expand All @@ -450,10 +431,7 @@ button:hover {
.prev-date-btn {
width: 2em;
height: 2em;

border-radius: 4em;

/* Add button image */
background-image: url('../icons/left-icon.png');
background-size: 14px 14px;
background-repeat: no-repeat;
Expand All @@ -464,15 +442,10 @@ button:hover {
/* Goto next month button */
.next-date-btn {
float: left;

width: 2em;
height: 2em;

margin-left: 0.4em;

border-radius: 4em;

/* Add button image */
background-image: url('../icons/right-icon.png');
background-size: 14px 14px;
background-repeat: no-repeat;
Expand Down Expand Up @@ -549,7 +522,6 @@ tbody td {
padding-top: 1px;
}

/* Calendar date */
td .cell-date {
position: absolute;
left: 5px;
Expand Down Expand Up @@ -624,6 +596,12 @@ td .productivity-icon {
left: 0;
}

/* Highlight boxes when hovering over specific calendar cell */
.a-link:hover {
background-color: skyblue;
opacity: 0.3;
}

/* Media query to handle window resizing */
@media (max-height: 500px) {
.task-ul {
Expand All @@ -637,5 +615,42 @@ td .productivity-icon {
}
}

/* ********** End of Calendar ********** */
/* ********** End of Calendar Table ********** */

/* ********** Start of Responsiveness ********** */

@media (max-width: 740px) {
main {
overflow-x: scroll;
}

.task-list {
flex: 0 0 25%;
z-index: 100000;
transition: transform 0.3s ease;
transform: translateX(-88%);
}

.task-list.active {
transform: translateX(0%);
}

.task-wrapper {
display: none;
}

.task-wrapper.active {
display: block;
}

.full-calendar {
position: absolute;
left: 5%;
bottom: 0;
top: 0;
right: 0;
}
}

/* ********** End of Responsiveness ********** */

Loading
Loading