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

2024-12-26 17:09:09 +00:00 · 2022-11-20 22:49:51 -08:00 · 2022-11-20 22:49:51 -08:00 · 4c5132c2b2
commit 4c5132c2b2
parent 49f85d5468 069aff88af
11 changed files with 385 additions and 384 deletions
--- a/.htmlhintrc
+++ b/.htmlhintrc
@ -1,4 +1,4 @@
 {
  "attr-value-not-empty": false,
-  "space-tab-mixed-disabled": false
+  "space-tab-mixed-disabled": "tab"
 }
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@ -1,4 +1,7 @@
 {
 	"extends": "stylelint-config-standard",
-	"ignore": ["inside-parens", "param", "value"]
+	"ignore": ["inside-parens", "param", "value"],
+	"rules":{
+		"indentation": "tab"
+	}
 }
--- a/source/CreatePage.html
+++ b/source/CreatePage.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">

-<head>
+	<head>
 		<meta charset="UTF-8" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
@ -17,23 +17,14 @@
 		<link rel="stylesheet" href="./static/CreatePage.css" />
 		<link rel="icon" href="./assets/images/icons/favicon.ico">
 		<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')">
-  <div class ="Top-Bar">
+		<div class ="top-bar">
 			<img src ="./assets/images/icons/Logo.png" alt="logo" />
 			<h1> Food Journal </h1>
-    <!--
-    <form id="form">
-        <input type='search' id="seaching" name="searchBar" placeholder="Search journal...">
-        <button class="click" type="search">
-            Search
-        </button>
-    </form>
-    --->
-</div>
+		</div>
 		<div class="journal-form">
 			<h1>New Entry </h1>

@ -92,6 +83,6 @@
 			<button type="submit" id="save-btn" value="Submit">Save Review</button>
 			</form>
 		</div> 
-</body>
+	</body>

 </html>
--- a/source/ReviewDetails.html
+++ b/source/ReviewDetails.html
@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
+	<head>
 		<meta charset="UTF-8" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
@ -15,17 +15,11 @@
  <link rel="stylesheet" href="./static/ReviewDetails.css" />
  <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>

 		<!--- meal -->
 		<div class = "meal-name">
-    <h1 id="d-mealName"> default meal name </h1>
+			<h1 id="d-mealName"> Cucumber Salad </h1>
 		</div> 
 			
 		<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, 
 			alt = "photo" width=40% height=40% id="d-mealImg">

-    <h2 id="d-restaurant"> default comment </h2>
-
 			<div class = "tag-container", id="d-tags">
+			
 			</div>
 		</div>

 		<div class = "stars-and-comments">
 			<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>

 		<main>
@ -107,6 +100,6 @@
 			</fieldset>
 			<button type="submit" id="save-btn" value="Submit">Update Review</button>
 			</form>
-  </div>>
-</body>
+		</div>
+	</body>
 </html>
--- a/source/assets/scripts/ReviewCard.js
+++ b/source/assets/scripts/ReviewCard.js
@ -36,6 +36,7 @@ class ReviewCard extends HTMLElement {
        row-gap: 5px;
        padding: 0 16px 16px 16px;
        width: 178px;
+		margin: 8px 8px 8px 8px;
      }
    
      div.rating {
--- a/source/assets/scripts/main.e2e.test.js
+++ b/source/assets/scripts/main.e2e.test.js
@ -22,7 +22,7 @@ describe("test App end to end", async () => {
 		browser = await puppeteer.launch({args: root ? ["--no-sandbox"] : undefined});
 		page = await browser.newPage();
 		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"}`);
 		}
 		catch (error) {
--- a/source/index.html
+++ b/source/index.html
@ -1,7 +1,7 @@

 <!DOCTYPE html>
 <html lang="en">
-<head>
+	<head>
 		<meta charset="UTF-8" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<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/homepage.css" />
 		<script src="assets/scripts/main.js" type="module"></script>
-</head>
-<main>
+	</head>
+	<body>
 		<header>
-		<div class="Top-Bar" style="display: flex; justify-content: center;">
-			<img src ="./assets/images/icons/Logo.png" style="align-self: center;" alt="logo" />
-			<h1 style="font-family:'Lucida Sans';"> Food Journal </h1>
-			<img src ="./assets/images/icons/Logo.png" style="align-self: center;" alt="logo" />
+			<div class="top-bar">
+				<img src ="./assets/images/icons/Logo.png" alt="logo" />
+				<h1> Food Journal </h1>
+				<img src ="./assets/images/icons/Logo.png" alt="logo" />
 			</div>
 		</header>
-  	<body>
-
-		<!--
-			For mobile: + flex-direction: column-reverse;"
-						~ width: 100% for all divs
-		-->
-		<div style="display: flex; max-height: 100%; ">
+		<main>
+			<div class="body-container">
 				<div style="width: 20%;"></div>
-
 				<div style="width: 60%;">
-				<div style="display: flex; flex-direction: row; justify-content: center;">		
-					<img src ="./assets/images/icons/Grouppink.png" alt="CREATE" style="align-self: center;" id="create-btn" onclick="window.location.assign('./CreatePage.html')"></img>
+					<div class="search-bar">
+						<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>
-					<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 class="review-container" id="review-container"></div>
 				</div>
-
 				<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>
+		</main>
 	</body>
-</main>
 </html>
--- a/source/static/CreatePage.css
+++ b/source/static/CreatePage.css
@ -1,27 +1,30 @@
 /* CreatePage.css */

-body{
+body {
 	background-color: #13323b;
 }

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

--- a/source/static/ReviewDetails.css
+++ b/source/static/ReviewDetails.css
@ -1,27 +1,30 @@
 /* ReviewDetails.css */

-body{
+body {
 	background-color: #13323b;
 }

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

@ -41,7 +44,7 @@ h1 {
 	margin: left;
 	width: 50%;
 	border: 3px;
-  color: rgb(228, 119, 119);
+	color: rgb(228 119 119);
 	text-align: left;
 }

--- a/source/static/homepage.css
+++ b/source/static/homepage.css
@ -1,57 +1,68 @@
 /* homepage.css */
+
 /* Color*/
 body{
    /*background-color: #97a5bd*/
    background-color: #E3E3EC;
 }
-.Top-Bar{
+
+.top-bar {
+	display: flex;
+	justify-content: center;
 }
-.Top-Bar > img{
+
+.top-bar > img {
 	position: relative;
+	align-self: center;
+	padding-left: 2.5%;
+	padding-right: 2.5%;
 }
-.Top-Bar > h1{
+
+.top-bar > h1 {
 	position: relative;
 	text-align: center;
-    /*color: #E4C3D2;*/
-    color: #8284D0;
-    font-size: 100px;
-    font-family: 'Lucida Sans';
+	color: #e4c3d2;
+	font-size: 6rem;
 }
-.Top-Bar > form{
-    position: relative;
-    float: right;
+
+.body-container {
+	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 {
-    font-family: 'Lucida Sans';
 	text-align: center;
-    font-size: 80px;
-    /*Color: #E4C3D2;*/
-    color: #8284D0;
-
-}
-.Review-boxes > input {
-    position: relative;
+	font-size: 4rem;
+	color: #e4c3d2;
 }

 img#create-btn {
 	position: relative;
+	align-self: center;
+	padding-left: 2.5%;
+	padding-right: 2.5%;
 }

-.Filter-box{
-    background: #e4d9e9;
-    position: absolute;
-    border: 5px solid #99a2c2;
-}
-.review-container{
+.review-container {
 	display: flex;
 	position: relative;
 	flex-wrap: wrap;
+	justify-content: center;
 }
+
 .review-container > div {
 	background-color: #f1f1f1;
 	text-align: center;
-  }
+}