alu/cse110-fa22-group29
1
0
Fork 0
mirror of https://github.com/cse110-fa22-group29/cse110-fa22-group29.git synced 2024-12-27 09:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sprint-2' into sprint-2-css-review-details

Browse Source
This commit is contained in:
d7hernan 2022-11-20 22:49:51 -08:00
commit 4c5132c2b2
11 changed files with 385 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.htmlhintrc
View File

@ -1,4 +1,4 @@
{ {
"attr-value-not-empty": false, "attr-value-not-empty": false,
"space-tab-mixed-disabled": false "space-tab-mixed-disabled": "tab"
} }

5
.stylelintrc.json
View File

@ -1,4 +1,7 @@
{ {
"extends": "stylelint-config-standard", "extends": "stylelint-config-standard",
"ignore": ["inside-parens", "param", "value"] "ignore": ["inside-parens", "param", "value"],
"rules":{
"indentation": "tab"
}
} }

21
source/CreatePage.html
View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@ -17,23 +17,14 @@
<link rel="stylesheet" href="./static/CreatePage.css" /> <link rel="stylesheet" href="./static/CreatePage.css" />
<link rel="icon" href="./assets/images/icons/favicon.ico"> <link rel="icon" href="./assets/images/icons/favicon.ico">
<script src="./assets/scripts/CreatePage.js" type="module"></script> <script src="./assets/scripts/CreatePage.js" type="module"></script>
</head>
</head> <body>
<body>
<input type="button" value="Home" id="home-btn" onclick="window.location.assign('./index.html')"> <input type="button" value="Home" id="home-btn" onclick="window.location.assign('./index.html')">
<div class ="Top-Bar"> <div class ="top-bar">
<img src ="./assets/images/icons/Logo.png" alt="logo" /> <img src ="./assets/images/icons/Logo.png" alt="logo" />
<h1> Food Journal </h1> <h1> Food Journal </h1>
<!-- </div>
<form id="form">
<input type='search' id="seaching" name="searchBar" placeholder="Search journal...">
<button class="click" type="search">
Search
</button>
</form>
--->
</div>
<div class="journal-form"> <div class="journal-form">
<h1>New Entry </h1> <h1>New Entry </h1>
@ -92,6 +83,6 @@
<button type="submit" id="save-btn" value="Submit">Save Review</button> <button type="submit" id="save-btn" value="Submit">Save Review</button>
</form> </form>
</div> </div>
</body> </body>
</html> </html>

19
source/ReviewDetails.html
View File

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@ -15,17 +15,11 @@
<link rel="stylesheet" href="./static/ReviewDetails.css" /> <link rel="stylesheet" href="./static/ReviewDetails.css" />
<script src="assets/scripts/ReviewDetails.js" type="module"></script> <script src="assets/scripts/ReviewDetails.js" type="module"></script>
</head>
<body>
<div class ="Top-Bar">
<img src ="./assets/images/icons/Logo.png" alt="logo" />
<h1 style="font-family:'Lucida Sans'"> Food Journal </h1>
</div> </div>
<!--- meal --> <!--- meal -->
<div class = "meal-name"> <div class = "meal-name">
<h1 id="d-mealName"> default meal name </h1> <h1 id="d-mealName"> Cucumber Salad </h1>
</div> </div>
<div class = "meal-pics-and-tags"> <div class = "meal-pics-and-tags">
@ -33,15 +27,14 @@
<img src = https://images.pexels.com/photos/1640777/pexels-photo-1640777.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1, <img src = https://images.pexels.com/photos/1640777/pexels-photo-1640777.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1,
alt = "photo" width=40% height=40% id="d-mealImg"> alt = "photo" width=40% height=40% id="d-mealImg">
<h2 id="d-restaurant"> default comment </h2>
<div class = "tag-container", id="d-tags"> <div class = "tag-container", id="d-tags">
</div> </div>
</div> </div>
<div class = "stars-and-comments"> <div class = "stars-and-comments">
<img src = "./assets/images/icons/5-star.svg" width=10% height=10% id="d-rating"> <img src = "./assets/images/icons/5-star.svg" width=10% height=10% id="d-rating">
<p id="d-comments"> default comment </p> <p id = "d-comments"> The food was good </p>
</div> </div>
<main> <main>
@ -107,6 +100,6 @@
</fieldset> </fieldset>
<button type="submit" id="save-btn" value="Submit">Update Review</button> <button type="submit" id="save-btn" value="Submit">Update Review</button>
</form> </form>
</div>> </div>
</body> </body>
</html> </html>

1
source/assets/scripts/ReviewCard.js
View File

@ -36,6 +36,7 @@ class ReviewCard extends HTMLElement {
row-gap: 5px; row-gap: 5px;
padding: 0 16px 16px 16px; padding: 0 16px 16px 16px;
width: 178px; width: 178px;
margin: 8px 8px 8px 8px;
} }
div.rating { div.rating {

2
source/assets/scripts/main.e2e.test.js
View File

@ -22,7 +22,7 @@ describe("test App end to end", async () => {
browser = await puppeteer.launch({args: root ? ["--no-sandbox"] : undefined}); browser = await puppeteer.launch({args: root ? ["--no-sandbox"] : undefined});
page = await browser.newPage(); page = await browser.newPage();
try{ try{
await page.goto("http://localhost:8080", {timeout: 1000}); await page.goto("http://localhost:8080", {timeout: 2000});
await console.log(`✔ connected to localhost webserver as ${root ? "root" : "user"}`); await console.log(`✔ connected to localhost webserver as ${root ? "root" : "user"}`);
} }
catch (error) { catch (error) {

52
source/index.html
View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@ -15,45 +15,41 @@
<!-- <link rel="stylesheet" href="/static/reset.css" /> --> <!-- <link rel="stylesheet" href="/static/reset.css" /> -->
<link rel="stylesheet" href="./static/homepage.css" /> <link rel="stylesheet" href="./static/homepage.css" />
<script src="assets/scripts/main.js" type="module"></script> <script src="assets/scripts/main.js" type="module"></script>
</head> </head>
<main> <body>
<header> <header>
<div class="Top-Bar" style="display: flex; justify-content: center;"> <div class="top-bar">
<img src ="./assets/images/icons/Logo.png" style="align-self: center;" alt="logo" /> <img src ="./assets/images/icons/Logo.png" alt="logo" />
<h1 style="font-family:'Lucida Sans';"> Food Journal </h1> <h1> Food Journal </h1>
<img src ="./assets/images/icons/Logo.png" style="align-self: center;" alt="logo" /> <img src ="./assets/images/icons/Logo.png" alt="logo" />
</div> </div>
</header> </header>
<body> <main>
<div class="body-container">
<!--
For mobile: + flex-direction: column-reverse;"
~ width: 100% for all divs
-->
<div style="display: flex; max-height: 100%; ">
<div style="width: 20%;"></div> <div style="width: 20%;"></div>
<div style="width: 60%;"> <div style="width: 60%;">
<div style="display: flex; flex-direction: row; justify-content: center;"> <div class="search-bar">
<img src ="./assets/images/icons/Grouppink.png" alt="CREATE" style="align-self: center;" id="create-btn" onclick="window.location.assign('./CreatePage.html')"></img> <form id="form">
<input type="search" id="searching" name="searchBar" placeholder="Search journal...">
<button class="click" type="search"> Search
</button>
<div class="Filter-box">
</div>
</form>
</div>
<div class="center-display">
<img src ="./assets/images/icons/Grouppink.png" alt="CREATE" style="opacity: 100%;" id="create-btn" onclick="window.location.assign('./CreatePage.html')"/>
<h2 id="recent-reviews-text"> Recent Reviews </h2> <h2 id="recent-reviews-text"> Recent Reviews </h2>
<img src ="./assets/images/icons/Grouppink.png" alt="" style="align-self: center; opacity:0;"></img> <img src ="./assets/images/icons/Grouppink.png" style="opacity:0;"/>
</div> </div>
<div class="review-container" id="review-container"></div> <div class="review-container" id="review-container"></div>
</div> </div>
<div style="width: 20%;"> <div style="width: 20%;">
<form id="form" style="">
<input type='search' id="seaching" name="searchBar" placeholder="Search journal...">
<button class="click" type="search">
Search
</button>
<div class="Filter-box"></div>
</form>
</div> </div>
</div> </div>
</main>
</body> </body>
</main>
</html> </html>

19
source/static/CreatePage.css
View File

@ -1,27 +1,30 @@
/* CreatePage.css */ /* CreatePage.css */
body{ body {
background-color: #13323b; background-color: #13323b;
} }
h1 { h1 {
text-align: center; text-align: center;
} }
.Top-Bar{
.top-bar {
margin-top: -8cm; margin-top: -8cm;
} }
.Top-Bar > img{
.top-bar > img {
position: relative; position: relative;
top: 7.85cm; top: 7.85cm;
} }
.Top-Bar > h1{
.top-bar > h1 {
position: relative; position: relative;
top: 2.2cm; top: 2.2cm;
font-size: 3cm; font-size: 3cm;
color: #EAA9BC color: #eaa9bc;
} }
.Top-Bar > form{
.top-bar > form {
position: relative; position: relative;
left: 32cm; left: 32cm;
} }
@ -32,7 +35,7 @@ h1 {
display: block; display: block;
margin: auto; margin: auto;
color: #ccb3bb; color: #ccb3bb;
border: 3px solid rgb(7, 0, 0); border: 3px solid rgb(7 0 0);
background-color: #b52754; background-color: #b52754;
} }

21
source/static/ReviewDetails.css
View File

@ -1,27 +1,30 @@
/* ReviewDetails.css */ /* ReviewDetails.css */
body{ body {
background-color: #13323b; background-color: #13323b;
} }
h1 { h1 {
text-align: center; text-align: center;
} }
.Top-Bar{
.top-bar {
margin-top: -8cm; margin-top: -8cm;
} }
.Top-Bar > img{
.top-bar > img {
position: relative; position: relative;
top: 7.85cm; top: 7.85cm;
} }
.Top-Bar > h1{
.top-bar > h1 {
position: relative; position: relative;
top: 2.2cm; top: 2.2cm;
font-size: 3cm; font-size: 3cm;
color: #EAA9BC color: #eaa9bc;
} }
.Top-Bar > form{
.top-bar > form {
position: relative; position: relative;
left: 32cm; left: 32cm;
} }
@ -32,7 +35,7 @@ h1 {
display: none; display: none;
margin: auto; margin: auto;
color: #ccb3bb; color: #ccb3bb;
border: 3px solid rgb(7, 0, 0); border: 3px solid rgb(7 0 0);
background-color: #b52754; background-color: #b52754;
} }
@ -41,7 +44,7 @@ h1 {
margin: left; margin: left;
width: 50%; width: 50%;
border: 3px; border: 3px;
color: rgb(228, 119, 119); color: rgb(228 119 119);
text-align: left; text-align: left;
} }

65
source/static/homepage.css
View File

@ -1,57 +1,68 @@
/* homepage.css */ /* homepage.css */
/* Color*/ /* Color*/
body{ body{
/*background-color: #97a5bd*/ /*background-color: #97a5bd*/
background-color: #E3E3EC; background-color: #E3E3EC;
} }
.Top-Bar{
.top-bar {
display: flex;
justify-content: center;
} }
.Top-Bar > img{
.top-bar > img {
position: relative; position: relative;
align-self: center;
padding-left: 2.5%;
padding-right: 2.5%;
} }
.Top-Bar > h1{
.top-bar > h1 {
position: relative; position: relative;
text-align: center; text-align: center;
/*color: #E4C3D2;*/ color: #e4c3d2;
color: #8284D0; font-size: 6rem;
font-size: 100px;
font-family: 'Lucida Sans';
} }
.Top-Bar > form{
position: relative; .body-container {
float: right; display: flex;
max-height: 100%;
} }
.Review-boxes {
position: relative; .center-display {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
}
.search-bar {
display: flex;
justify-content: center;
} }
#recent-reviews-text { #recent-reviews-text {
font-family: 'Lucida Sans';
text-align: center; text-align: center;
font-size: 80px; font-size: 4rem;
/*Color: #E4C3D2;*/ color: #e4c3d2;
color: #8284D0;
}
.Review-boxes > input {
position: relative;
} }
img#create-btn { img#create-btn {
position: relative; position: relative;
align-self: center;
padding-left: 2.5%;
padding-right: 2.5%;
} }
.Filter-box{ .review-container {
background: #e4d9e9;
position: absolute;
border: 5px solid #99a2c2;
}
.review-container{
display: flex; display: flex;
position: relative; position: relative;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center;
} }
.review-container > div { .review-container > div {
background-color: #f1f1f1; background-color: #f1f1f1;
text-align: center; text-align: center;
} }