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

User page progress #12

Merged
merged 21 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
81cd1cd
finished meeting notes + started user page css (this isn't finished y…
tirani427 Aug 1, 2024
68dd5e7
Merge branch 'main' of https://github.com/acmucsd-projects/su24a-hack…
tirani427 Aug 10, 2024
926bf34
current make-list code html/css
tirani427 Aug 10, 2024
6ea733d
updated user-page.html + make-list.html (including make-list.js and m…
tirani427 Aug 10, 2024
a8b2a1e
experimenting with overlay
jonathan-ty Aug 13, 2024
cd04f64
Rename gradient-background.png to source/assets/images/gradient-backg…
jonathan-ty Aug 13, 2024
29e3df2
Delete source/assets/images/gradient-background.png
jonathan-ty Aug 13, 2024
e0cf27d
gradient-bg-img.png
jonathan-ty Aug 13, 2024
4fbfff8
Delete source/assets/images/gradient-bg-img.png
jonathan-ty Aug 13, 2024
9e53935
Add files via upload
jonathan-ty Aug 13, 2024
66b9fad
Delete source/assets/images/gradient-bg-img-2.png
jonathan-ty Aug 13, 2024
fda6733
Add files via upload
jonathan-ty Aug 13, 2024
7b99690
completed user page!
jonathannnty Aug 13, 2024
9ef4e7d
final touches
jonathannnty Aug 13, 2024
6fce41a
added functionality to the make-list page (wireframe page 6) (not fin…
tirani427 Aug 17, 2024
4143c26
added some animations for images + allowed for selection of images in…
tirani427 Aug 17, 2024
a0b9c23
bouncing logo and redesign!
jonathannnty Aug 20, 2024
4f19dd0
polish
jonathannnty Aug 20, 2024
513b6ca
fixed webpage dimension issue + redundancies in user-page.css
jonathannnty Aug 20, 2024
ec0d04c
Merge branch 'user-page' of https://github.com/acmucsd-projects/su24a…
jonathannnty Aug 20, 2024
1b84ca7
Finished user-page!
jonathannnty Sep 4, 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
15 changes: 15 additions & 0 deletions admin/meetings/07312024-midweek-meeting-3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# [Team Name]: Sprint 2 Review <br> 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!
Binary file added source/assets/images/extra-banana1-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/assets/images/extra-banana2-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/assets/images/extra-blueberry1-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/assets/images/extra-blueberry2-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/assets/images/extra-grape1-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/assets/images/extra-grape2-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/assets/images/extra-pineapple1-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/assets/images/extra-pineapple2-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/assets/images/extra-strawberry1-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/assets/images/extra-strawberry2-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/assets/images/gradient-bg-img.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/assets/images/grape-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/assets/images/pineapple-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 1 addition & 6 deletions source/css/index.css
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -14,7 +9,7 @@

}

.links{
.header-links{
padding-left: 50px;
display: grid;
grid-template-columns: 1fr 1fr 1fr;
Expand Down
35 changes: 21 additions & 14 deletions source/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -54,25 +64,22 @@ 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%;
}
}

@media screen and (max-width: 768px) {
body {
padding-top: 120px;
}
}

.header-links{
padding-left: 50px;
display: grid;
grid-template-columns: 1fr 1fr 1fr;
column-gap: 50px;
font-size: 165%;
}
261 changes: 261 additions & 0 deletions source/css/make-list.css
Original file line number Diff line number Diff line change
@@ -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;
}
Loading