diff --git a/admin/meetings/07312024-midweek-meeting-3.md b/admin/meetings/07312024-midweek-meeting-3.md new file mode 100644 index 0000000..a3d8997 --- /dev/null +++ b/admin/meetings/07312024-midweek-meeting-3.md @@ -0,0 +1,15 @@ +# [Team Name]: Sprint 2 Review
07/31/2024 6:00pm - 7:00pm + +## Members Present +- Vinod +- Gowtham +- Tia + +## Next Meeting: Monday, August 5, 2024 +- Since a few of us have finals on Saturday, we're shifting the meeting back to Monday, August 5, 2024. + +## Check In +- More progress has been made with MongoDB. +- Landing Page officially done (for now) +- Other pages have been assigned. + - Please message in the Discord if you cannot work on your page! We'll adjust accordingly to help out! diff --git a/source/assets/images/extra-banana1-icon.png b/source/assets/images/extra-banana1-icon.png new file mode 100644 index 0000000..41ae38e Binary files /dev/null and b/source/assets/images/extra-banana1-icon.png differ diff --git a/source/assets/images/extra-banana2-icon.png b/source/assets/images/extra-banana2-icon.png new file mode 100644 index 0000000..cbe0c62 Binary files /dev/null and b/source/assets/images/extra-banana2-icon.png differ diff --git a/source/assets/images/extra-blueberry1-icon.png b/source/assets/images/extra-blueberry1-icon.png new file mode 100644 index 0000000..8435e90 Binary files /dev/null and b/source/assets/images/extra-blueberry1-icon.png differ diff --git a/source/assets/images/extra-blueberry2-icon.png b/source/assets/images/extra-blueberry2-icon.png new file mode 100644 index 0000000..6cb4c9d Binary files /dev/null and b/source/assets/images/extra-blueberry2-icon.png differ diff --git a/source/assets/images/extra-grape1-icon.png b/source/assets/images/extra-grape1-icon.png new file mode 100644 index 0000000..37cc633 Binary files /dev/null and b/source/assets/images/extra-grape1-icon.png differ diff --git a/source/assets/images/extra-grape2-icon.png b/source/assets/images/extra-grape2-icon.png new file mode 100644 index 0000000..c7d1a73 Binary files /dev/null and b/source/assets/images/extra-grape2-icon.png differ diff --git a/source/assets/images/extra-pineapple1-icon.png b/source/assets/images/extra-pineapple1-icon.png new file mode 100644 index 0000000..ac85e58 Binary files /dev/null and b/source/assets/images/extra-pineapple1-icon.png differ diff --git a/source/assets/images/extra-pineapple2-icon.png b/source/assets/images/extra-pineapple2-icon.png new file mode 100644 index 0000000..e755ef1 Binary files /dev/null and b/source/assets/images/extra-pineapple2-icon.png differ diff --git a/source/assets/images/extra-strawberry1-icon.png b/source/assets/images/extra-strawberry1-icon.png new file mode 100644 index 0000000..de78b11 Binary files /dev/null and b/source/assets/images/extra-strawberry1-icon.png differ diff --git a/source/assets/images/extra-strawberry2-icon.png b/source/assets/images/extra-strawberry2-icon.png new file mode 100644 index 0000000..7a6a553 Binary files /dev/null and b/source/assets/images/extra-strawberry2-icon.png differ diff --git a/source/assets/images/gradient-bg-img.png b/source/assets/images/gradient-bg-img.png new file mode 100644 index 0000000..3f0df75 Binary files /dev/null and b/source/assets/images/gradient-bg-img.png differ diff --git a/source/assets/images/grape-icon.png b/source/assets/images/grape-icon.png new file mode 100644 index 0000000..1fb9cc2 Binary files /dev/null and b/source/assets/images/grape-icon.png differ diff --git a/source/assets/images/pineapple-icon.png b/source/assets/images/pineapple-icon.png new file mode 100644 index 0000000..6e50684 Binary files /dev/null and b/source/assets/images/pineapple-icon.png differ diff --git a/source/css/index.css b/source/css/index.css index 856460e..c126b1a 100644 --- a/source/css/index.css +++ b/source/css/index.css @@ -1,8 +1,3 @@ -/*header>img{ - margin-left: 0px; - border-radius: 0px; -}*/ - .sign-up{ background-color: rgba(254, 153, 32, 0.80); padding: 7.5px; @@ -14,7 +9,7 @@ } -.links{ +.header-links{ padding-left: 50px; display: grid; grid-template-columns: 1fr 1fr 1fr; diff --git a/source/css/main.css b/source/css/main.css index 50d386d..e93cd3c 100644 --- a/source/css/main.css +++ b/source/css/main.css @@ -8,6 +8,16 @@ /*font-family: "Sulphur Point", sans-serif;*/ font-family: monospace; font-style: normal; + text-decoration: none; +} + +a { + color: black; +} + +a:visited { + color: black; + text-decoration: none; } html, @@ -54,20 +64,9 @@ header { padding-left: 100px; } - /* This handles the class of "back" buttons in the headers. Home button on project.html and back button on notes.html */ - .back { - &>i { - font-size: 2em; - font-weight: 700; - letter-spacing: 5px; - margin: 3px; - margin-left: 8px; - color: white; - } - - &:hover { - opacity: 60%; - } + #home-button-logo:hover{ + cursor:pointer; + opacity: 80%; } } @@ -75,4 +74,12 @@ header { body { padding-top: 120px; } +} + +.header-links{ + padding-left: 50px; + display: grid; + grid-template-columns: 1fr 1fr 1fr; + column-gap: 50px; + font-size: 165%; } \ No newline at end of file diff --git a/source/css/make-list.css b/source/css/make-list.css new file mode 100644 index 0000000..f23b2aa --- /dev/null +++ b/source/css/make-list.css @@ -0,0 +1,261 @@ + +/*Formatting for the text area*/ +/*#grocery-header{ + background: #FC9E5F; + border-radius: 10px; + + padding: 9px; + + color:rgb(128, 57, 9); + + margin: 10px; +} + +/*Changing the color of the text inside the text area +::placeholder{ + color:rgb(128, 57, 9); + font-size: 110%; + font-weight: bold; +}*/ + +.title{ + display: flex; + justify-content: space-between; /* Aligns text left and buttons right */ + align-items: center; /* Aligns text and buttons vertically at the same level */ + padding: 10px; /* Optional: Adds padding around the title */ +} + + +.list-name{ + margin:0; +} + +/*Formatting of the 'Add Item' and 'Finished with your list' buttons*/ +.next-page-buttons{ + background: #7C9E57; + border-radius: 30px; + + padding:10px; + margin:10px; + + font-size: 110%; + font-weight: bold; + + display:flex; + gap:10px; + +} + +/*Changing cursor visuals + opacity of 'add item' and 'finished with your list' buttons */ +.next-page-buttons:hover{ + cursor:pointer; + opacity: 80%; +} + +#editListBtn { + background-color: transparent; /* Dark Blue */ + border: none; + font-size: large; + + font-weight: bold; + cursor: pointer; +} + +.menuBTN { + background-color: #7c9e57; /* Green */ + border: none; + padding: 5px 18px; + text-align: center; + text-decoration: none; + /* display: inline-block; */ + font-size: 15px; + border-radius: 12px; + font-weight: bold; + cursor: pointer; + /* float: right; */ +} + +.menuBTN:hover { + background-color: #4f6834; /* Darker Green */ +} + +/*formatting for the entirety of the 3-column display*/ +.information-holder{ + display:grid; + grid-template-columns: 1fr 1fr 1fr; + + background-color: rgb(225, 228, 207); + + border-radius: 10px; + + margin: 10px; +} + +/*Including border between each column to determine placement - can take out if wanted*/ +.column1, .column2, .column3{ + border-style: solid; + border-color: rgb(213, 215, 200); + border-radius: 10px; +} + +/*Adjusting font weight/size of the list of items within 1st column*/ +.column1{ + #item-list{ + font-weight: bold; + font-size: 150% + } +} + +/*Overall formatting for 2nd column*/ +.column2{ + + /*Aligning the Name and Main Image to be in the center of the column*/ + .align-images-center{ + display: grid; + justify-content: center; + padding-bottom: 10px; + + img{ + border-radius: 10px; + + width:50%; + height:auto; + + justify-self: center; + } + } + + h2{ + margin: 10px; + font-size: 175%; + } + +} + +/*Formatting for the 3rd Column*/ +.column3{ + + /*Adjusting display of 'description' and 'nutrition facts' buttons*/ + .fact-buttons{ + display: flex; + justify-content: center; + margin:10px; + + button{ + border-style: none; + + font-size: 130%; + + background-color: rgb(206, 208, 192); + + font-weight: bold; + + padding: 10px; + + } + + #description-button{ + border-top-left-radius: 20px; + border-bottom-left-radius: 20px; + + background-color: rgb(173, 175, 161); /*keep this way so that when page loads, it looks like description button is automatically selected.*/ + } + + #nutrition-button{ + border-top-right-radius: 20px; + border-bottom-right-radius: 20px; + } + + button:hover{ + cursor: pointer; + opacity: 80%; + } + + + } + + #displayed-text{ + margin: 10px; + + font-size: 110%; + } + +} + +/*Formatting for the image slider in 2nd column*/ +.image-holder{ + display: flex; + + overflow:scroll; + width:auto; + height:auto; + border:1px solid rgb(241, 243, 227); + margin:10px; + background-color: rgb(241, 243, 227); + + border-radius: 10px; + + scroll-snap-type: x mandatory; + + /*Makes sure all images inside slider have rounded border + equal space between each item*/ + img{ + border-radius: 10px; + margin: 10px; + } +} + +/*Formatting for permanent scroller (1/4)*/ +.image-holder::-webkit-scrollbar{ + width:10px; + scrollbar-width: thin; +} + +/*Formatting for permanent scroller (2/4)*/ +.image-holder::-webkit-scrollbar-track{ + background-color:#f1f1f1; +} + +/*Formatting for permanent scroller (3/4)*/ +.image-holder::-webkit-scrollbar-thumb{ + background-color: #bec7b6; +} + +/*Formatting for permanent scroller (4/4)*/ +.image-holder::-webkit-scrollbar-thumb:hover{ + background-color: #3f7c4a; +} + +/*Making sure the images disappear once they "overflow"/are scrolled past + format of the actual image sizes*/ +.image-holder > img{ + display: flex; + + flex-shrink: 0; + width:20%; + height:auto; + + scroll-snap-align:auto; + scroll-behavior:auto; +} + +.extra-images:hover{ + cursor:pointer; +} + +.image-holder img{ + transition: 1s ease; +} + +.image-holder img:hover{ + -webkit-transform: scale(1.2); + -ms-transform: scale(1.2); + transform: scale(1.2); + transition: 1s ease; +} + + +.groceryItem:hover{ + cursor:pointer; + + background: transparent; + color: #69563b; +} \ No newline at end of file diff --git a/source/css/user-page.css b/source/css/user-page.css new file mode 100644 index 0000000..47baa8e --- /dev/null +++ b/source/css/user-page.css @@ -0,0 +1,145 @@ +#user-page { + background-image: url(../assets/images/gradient-bg-img.png); + background-size: cover; +} + +#user-details-emoji { + display: flex; + flex-direction: row; + align-content: space-between; + background-color: #fe9920; + width: 100vw; + padding-bottom: 8em; +} + +.emoji { + text-align: center; + font-size: 7rem; + position: relative; +} + +.user-links button, +.user-links button a { + color: #000000; + font-size: 1.5em; + font-weight: 600; + margin: 0em 1em; + text-decoration: none; + text-align: center; + height: 15rem; + padding: 3em 0; +} + +.user-greeting { + display: flex; + flex-direction: row; + font-weight: 800; + font-size: 2em; +} + +.emoji, +.user-greeting h1, +#user-details h3 { + white-space: nowrap; +} + +.user-greeting h1 { + margin-bottom: 0em; + margin: 2rem 5rem 0; +} + +#user-details h3 { + font-size: 1.5em; + font-weight: 400; + margin-top: 0em; + margin: 0em 3.5em; +} + +#user-details { + display: flex; + flex-direction: column; + align-items: flex-start; + position: relative; +} + +.user-links { + display: flex; + flex-direction: row; + margin: 2rem 2rem; + justify-content: space-evenly; + width: 96vw; +} + +#existing_grocery_list_container { + height: 15em; + overflow-y: auto; + margin-bottom: 3em; +} + +#existing_grocery_list { + display: none; + list-style-type: none; + font-size: 1.5em; + font-weight: 400; + height: auto; + padding: 0em 1.5em; +} + +#existing_grocery_list li { + padding: 0.5em 0em; +} + +.green-box { + display: flex; + flex-direction: column; + margin: 0em; + padding: 0; + background-color: #7c9e57; + border-radius: 2em; +} + +.interface-button { + flex-grow: 0.75; + height: auto; + background-color: #7c9e57; + border: none; + border-radius: 2em; +} + +.user-links button:hover { + background-color: #719150; +} + +.user-links button:focus:not(:focus-visible):not(.focus-visible) { + box-shadow: none; + outline: none; +} + +.user-links button:focus { + box-shadow: rgb(102, 132, 72) 0 0 3px; + outline: none; +} + +.user-links button:disabled { + border-color: rgba(27, 31, 35, 0.1); + color: rgba(255, 255, 255, 0.8); + cursor: default; +} + +.user-links button:active { + background-color: rgb(102, 132, 72); + box-shadow: rgba(20, 70, 32, 0.2) 0 1px 0 inset; +} + +.fade-out { + opacity: 0; + transform: scale(0.95); +} + +.bouncing-logo { + width: 7.5rem; + height: 7.5rem; + background-image: url(./assets/images/final-icon1.png); + position: absolute; + border-radius: 50%; +} diff --git a/source/index.html b/source/index.html index 00dea2e..4fa1cd8 100644 --- a/source/index.html +++ b/source/index.html @@ -10,10 +10,11 @@ +
- placeholder icon +

Go Go Grocery

-
-

WIREFRAME PAGE 5

- Create New List -
- View Existing List +
+
+
+
+

Hello, John Doe!

+
+
+ +

What would you like to do today?

+
+
+


+ \ No newline at end of file