mirror of
				https://github.com/cse110-fa22-group29/cse110-fa22-group29.git
				synced 2025-10-30 19:46:49 +00:00 
			
		
		
		
	Merge branch 'sprint-2' into sprint-2-css-review-details
This commit is contained in:
		| @@ -1,4 +1,4 @@ | ||||
| { | ||||
|   "attr-value-not-empty": false, | ||||
|   "space-tab-mixed-disabled": false | ||||
|   "space-tab-mixed-disabled": "tab" | ||||
| } | ||||
|   | ||||
| @@ -1,4 +1,7 @@ | ||||
| { | ||||
| 	"extends": "stylelint-config-standard", | ||||
| 	"ignore": ["inside-parens", "param", "value"] | ||||
| 	"ignore": ["inside-parens", "param", "value"], | ||||
| 	"rules":{ | ||||
| 		"indentation": "tab" | ||||
| 	} | ||||
| } | ||||
| @@ -1,97 +1,88 @@ | ||||
| <!DOCTYPE html> | ||||
| <html lang="en"> | ||||
|  | ||||
| <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" /> | ||||
|   <title>Food Journal</title> | ||||
| 	<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" /> | ||||
| 		<title>Food Journal</title> | ||||
|  | ||||
|   <!-- Recipe Card Custom Element --> | ||||
|   <script src="assets/scripts/ReviewCard.js" type="module"></script> | ||||
| 		<!-- Recipe Card Custom Element --> | ||||
| 		<script src="assets/scripts/ReviewCard.js" type="module"></script> | ||||
|  | ||||
|  | ||||
|   <!-- Main Stylesheets & Scripts --> | ||||
|   <!-- Temporarily commented out reset.css due to furthur discussion needed on the values of the default config--> | ||||
|   <!-- <link rel="stylesheet" href="/static/reset.css" /> --> | ||||
|   <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> | ||||
| 		<!-- Main Stylesheets & Scripts --> | ||||
| 		<!-- Temporarily commented out reset.css due to furthur discussion needed on the values of the default config--> | ||||
| 		<!-- <link rel="stylesheet" href="/static/reset.css" /> --> | ||||
| 		<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> | ||||
| 		<input type="button" value="Home" id="home-btn" onclick="window.location.assign('./index.html')"> | ||||
| 		<div class ="top-bar"> | ||||
| 			<img src ="./assets/images/icons/Logo.png" alt="logo" /> | ||||
| 			<h1> Food Journal </h1> | ||||
| 		</div> | ||||
| 		<div class="journal-form"> | ||||
| 			<h1>New Entry </h1> | ||||
|  | ||||
| <body> | ||||
|   <input type="button" value="Home" id="home-btn" onclick="window.location.assign('./index.html')"> | ||||
|   <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 class="journal-form"> | ||||
|     <h1>New Entry </h1> | ||||
| 			<form id="new-food-entry"> | ||||
| 			<fieldset> | ||||
| 				<legend>Pic:</legend> | ||||
| 				Choose Input type: | ||||
| 			<select id="select" name="select"> | ||||
| 				<option value="file">File Upload</option> | ||||
| 				<option value="url">From an URL</option> | ||||
| 			</select> | ||||
| 			<label for="mealImage" id="source"> | ||||
| 				Source: | ||||
| 				<input type="file" accept="image/*" id="mealImg" name="mealImg"> | ||||
| 				</label> | ||||
| 				<label for="image-alt"> | ||||
| 				Alt Text: | ||||
| 				<input type="text" id="imgAlt" name="imgAlt"> | ||||
| 				</label> | ||||
| 			</fieldset> | ||||
| 			<fieldset> | ||||
| 				<legend> Meal: </legend> | ||||
| 				<label for="Meal: ">Meal: | ||||
| 				<input type="text" id="mealName" name="mealName" required> | ||||
| 				</label> | ||||
| 				<label for="comments">Comments: | ||||
| 				<br> | ||||
| 				<textarea name="comments" id="comments"></textarea> | ||||
| 				</label> | ||||
| 			</fieldset> | ||||
| 			<fieldset class="rating"> | ||||
| 			<legend> Rating: </legend> | ||||
| 			<input type="radio" id="s5" name="rating" value="5"/> <label for="s5" id="s5-select"> 5 stars </label> | ||||
| 			<input type="radio" id="s4" name="rating" value="4"/> <label for="s4" id="s4-select"> 4 stars </label> | ||||
| 			<input type="radio" id="s3" name="rating" value="3"/> <label for="s3" id="s3-select"> 3 stars </label> | ||||
| 			<input type="radio" id="s2" name="rating" value="2"/> <label for="s2" id="s2-select"> 2 stars </label> | ||||
| 			<input type="radio" id="s1" name="rating" value="1"/> <label for="s1" id="s1-select"> 1 star </label> | ||||
| 			</fieldset> | ||||
|  | ||||
|     <form id="new-food-entry"> | ||||
|       <fieldset> | ||||
|         <legend>Pic:</legend> | ||||
|         Choose Input type: | ||||
|       <select id="select" name="select"> | ||||
|         <option value="file">File Upload</option> | ||||
|         <option value="url">From an URL</option> | ||||
|       </select> | ||||
|       <label for="mealImage" id="source"> | ||||
|           Source: | ||||
|           <input type="file" accept="image/*" id="mealImg" name="mealImg"> | ||||
|         </label> | ||||
|         <label for="image-alt"> | ||||
|           Alt Text: | ||||
|           <input type="text" id="imgAlt" name="imgAlt"> | ||||
|         </label> | ||||
|       </fieldset> | ||||
|       <fieldset> | ||||
|         <legend> Meal: </legend> | ||||
|         <label for="Meal: ">Meal: | ||||
|           <input type="text" id="mealName" name="mealName" required> | ||||
|         </label> | ||||
|         <label for="comments">Comments: | ||||
|           <br> | ||||
|           <textarea name="comments" id="comments"></textarea> | ||||
|         </label> | ||||
|       </fieldset> | ||||
|     <fieldset class="rating"> | ||||
|       <legend> Rating: </legend> | ||||
|       <input type="radio" id="s5" name="rating" value="5"/> <label for="s5" id="s5-select"> 5 stars </label> | ||||
|       <input type="radio" id="s4" name="rating" value="4"/> <label for="s4" id="s4-select"> 4 stars </label> | ||||
|       <input type="radio" id="s3" name="rating" value="3"/> <label for="s3" id="s3-select"> 3 stars </label> | ||||
|       <input type="radio" id="s2" name="rating" value="2"/> <label for="s2" id="s2-select"> 2 stars </label> | ||||
|       <input type="radio" id="s1" name="rating" value="1"/> <label for="s1" id="s1-select"> 1 star </label> | ||||
|     </fieldset> | ||||
|  | ||||
|       <fieldset> | ||||
|         <legend>Other Info:</legend> | ||||
|         <label for="restaurant"> | ||||
|           Restaurant: | ||||
|           <input type="text" id="restaurant" name="restaurant" required> | ||||
|         </label> | ||||
|         <label for="tag-form"> | ||||
|           Tags: | ||||
|           <input type="text" id="tag-form" name="tag-form"> | ||||
|           <div class='tag-container' id="tag-container-form"> | ||||
|         </div> | ||||
|         <button type="button" id="tag-add-btn">Add Tag</button> | ||||
|       </label> | ||||
| 			<fieldset> | ||||
| 				<legend>Other Info:</legend> | ||||
| 				<label for="restaurant"> | ||||
| 				Restaurant: | ||||
| 				<input type="text" id="restaurant" name="restaurant" required> | ||||
| 				</label> | ||||
| 				<label for="tag-form"> | ||||
| 				Tags: | ||||
| 				<input type="text" id="tag-form" name="tag-form"> | ||||
| 				<div class='tag-container' id="tag-container-form"> | ||||
| 				</div> | ||||
| 				<button type="button" id="tag-add-btn">Add Tag</button> | ||||
| 			</label> | ||||
|  | ||||
|  | ||||
|       </fieldset> | ||||
|       <button type="submit" id="save-btn" value="Submit">Save Review</button> | ||||
|     </form> | ||||
|   </div>  | ||||
| </body> | ||||
| 			</fieldset> | ||||
| 			<button type="submit" id="save-btn" value="Submit">Save Review</button> | ||||
| 			</form> | ||||
| 		</div>  | ||||
| 	</body> | ||||
|  | ||||
| </html> | ||||
| @@ -1,10 +1,10 @@ | ||||
| <!DOCTYPE html> | ||||
| <html lang="en"> | ||||
| <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" /> | ||||
|   <title>Food Journal</title> | ||||
| 	<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" /> | ||||
| 		<title>Food Journal</title> | ||||
|  | ||||
|   <!-- Recipe Card Custom Element --> | ||||
|   <script src="assets/scripts/ReviewCard.js" type="module"></script> | ||||
| @@ -15,98 +15,91 @@ | ||||
|   <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> | ||||
|  | ||||
|   </div> | ||||
| 		<!--- meal --> | ||||
| 		<div class = "meal-name"> | ||||
| 			<h1 id="d-mealName"> Cucumber Salad </h1> | ||||
| 		</div>  | ||||
| 			 | ||||
|   <!--- meal --> | ||||
|   <div class = "meal-name"> | ||||
|     <h1 id="d-mealName"> default meal name </h1> | ||||
|   </div>  | ||||
| 		<div class = "meal-pics-and-tags"> | ||||
| 			<!-- image source -->  | ||||
| 			<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"> | ||||
|  | ||||
|   <div class = "meal-pics-and-tags"> | ||||
|     <!-- image source -->  | ||||
|     <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"> | ||||
| 			<div class = "tag-container", id="d-tags"> | ||||
| 			 | ||||
|     <h2 id="d-restaurant"> default comment </h2> | ||||
| 			</div> | ||||
| 		</div> | ||||
|  | ||||
|     <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"> The food was good </p> | ||||
| 		</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> | ||||
|   </div> | ||||
| 		<main> | ||||
| 			<input type="button" value="Home" id="home-btn" onclick="window.location.assign('./index.html')"> | ||||
| 			<button type="button" id="update-btn">Update</button> | ||||
| 			<button type="button" id="delete-btn" class="danger">Delete</button> | ||||
| 		</main> | ||||
|  | ||||
|   <main> | ||||
|     <input type="button" value="Home" id="home-btn" onclick="window.location.assign('./index.html')"> | ||||
|     <button type="button" id="update-btn">Update</button> | ||||
|     <button type="button" id="delete-btn" class="danger">Delete</button> | ||||
|   </main> | ||||
| 		<div class = journal-form id="update-form-div"> | ||||
| 			<form id="update-food-entry"> | ||||
| 			<fieldset> | ||||
| 				<legend>Pic:</legend> | ||||
| 				Choose Input type: | ||||
| 				<select id="select" name="select"> | ||||
| 				<option value="file">File Upload</option> | ||||
| 				<option value="url">From an URL</option> | ||||
| 				</select> | ||||
| 				<label for="mealImage" id="source"> | ||||
| 				Source: | ||||
| 				<input type="file" accept="image/*" id="mealImg" name="mealImg"> | ||||
| 				</label> | ||||
| 				<label for="image-alt"> | ||||
| 				Alt Text: | ||||
| 				<input type="text" id="imgAlt" name="imgAlt"> | ||||
| 				</label> | ||||
| 			</fieldset> | ||||
| 			<fieldset> | ||||
| 		 | ||||
|   <div class = journal-form id="update-form-div"> | ||||
|     <form id="update-food-entry"> | ||||
|       <fieldset> | ||||
|         <legend>Pic:</legend> | ||||
|         Choose Input type: | ||||
|         <select id="select" name="select"> | ||||
|           <option value="file">File Upload</option> | ||||
|           <option value="url">From an URL</option> | ||||
|         </select> | ||||
|         <label for="mealImage" id="source"> | ||||
|           Source: | ||||
|           <input type="file" accept="image/*" id="mealImg" name="mealImg"> | ||||
|         </label> | ||||
|         <label for="image-alt"> | ||||
|           Alt Text: | ||||
|           <input type="text" id="imgAlt" name="imgAlt"> | ||||
|         </label> | ||||
|       </fieldset> | ||||
|       <fieldset> | ||||
| 				<legend> Meal: </legend> | ||||
| 				<label for="Meal: ">Meal: | ||||
| 				<input type="text" id="mealName" name="mealName" required> | ||||
| 				</label> | ||||
| 				<label for="comments">Comments:  | ||||
| 				<br> | ||||
| 				<textarea name="comments" id="comments"></textarea> | ||||
| 				</label> | ||||
| 			</fieldset> | ||||
| 			 | ||||
|         <legend> Meal: </legend> | ||||
|         <label for="Meal: ">Meal: | ||||
|           <input type="text" id="mealName" name="mealName" required> | ||||
|         </label> | ||||
|         <label for="comments">Comments:  | ||||
|           <br> | ||||
|           <textarea name="comments" id="comments"></textarea> | ||||
|         </label> | ||||
|       </fieldset> | ||||
| 			<fieldset class="rating"> | ||||
| 				<legend> Rating: </legend> | ||||
| 				<input type="radio" id="s5" name="rating" value="5"/> <label for="s5" id="s5-select"> 5 stars </label> | ||||
| 				<input type="radio" id="s4" name="rating" value="4"/> <label for="s4" id="s4-select"> 4 stars </label> | ||||
| 				<input type="radio" id="s3" name="rating" value="3"/> <label for="s3" id="s3-select"> 3 stars </label> | ||||
| 				<input type="radio" id="s2" name="rating" value="2"/> <label for="s2" id="s2-select"> 2 stars </label> | ||||
| 				<input type="radio" id="s1" name="rating" value="1"/> <label for="s1" id="s1-select"> 1 star </label> | ||||
| 			</fieldset> | ||||
|  | ||||
|       <fieldset class="rating"> | ||||
|         <legend> Rating: </legend> | ||||
|         <input type="radio" id="s5" name="rating" value="5"/> <label for="s5" id="s5-select"> 5 stars </label> | ||||
|         <input type="radio" id="s4" name="rating" value="4"/> <label for="s4" id="s4-select"> 4 stars </label> | ||||
|         <input type="radio" id="s3" name="rating" value="3"/> <label for="s3" id="s3-select"> 3 stars </label> | ||||
|         <input type="radio" id="s2" name="rating" value="2"/> <label for="s2" id="s2-select"> 2 stars </label> | ||||
|         <input type="radio" id="s1" name="rating" value="1"/> <label for="s1" id="s1-select"> 1 star </label> | ||||
|       </fieldset> | ||||
| 			<fieldset> | ||||
| 				<legend>Other Info:</legend> | ||||
| 				<label for="restaurant"> | ||||
| 				Restaurant: | ||||
| 				<input type="text" id="restaurant" name="restaurant" required> | ||||
| 				</label> | ||||
| 				<label for="tag-form"> | ||||
| 				Tags: | ||||
| 				<input type="text" id="tag-form" name="tag-form"> | ||||
| 				<div class='tag-container' id="tag-container-form"> | ||||
| 		 | ||||
|       <fieldset> | ||||
|         <legend>Other Info:</legend> | ||||
|         <label for="restaurant"> | ||||
|           Restaurant: | ||||
|           <input type="text" id="restaurant" name="restaurant" required> | ||||
|         </label> | ||||
|         <label for="tag-form"> | ||||
|           Tags: | ||||
|           <input type="text" id="tag-form" name="tag-form"> | ||||
|           <div class='tag-container' id="tag-container-form"> | ||||
| 				</div> | ||||
| 				<button type="button" id="tag-add-btn">Add Tag</button> | ||||
| 				</label> | ||||
| 		 | ||||
|           </div> | ||||
|           <button type="button" id="tag-add-btn">Add Tag</button> | ||||
|         </label> | ||||
|    | ||||
|       </fieldset> | ||||
|       <button type="submit" id="save-btn" value="Submit">Update Review</button> | ||||
|       </form> | ||||
|   </div>> | ||||
| </body> | ||||
| 			</fieldset> | ||||
| 			<button type="submit" id="save-btn" value="Submit">Update Review</button> | ||||
| 			</form> | ||||
| 		</div> | ||||
| 	</body> | ||||
| </html> | ||||
|   | ||||
| @@ -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 { | ||||
|   | ||||
| @@ -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) { | ||||
| @@ -39,7 +39,7 @@ describe("test App end to end", async () => { | ||||
|  | ||||
| 	describe("test CRUD on simple inputs and default image", () => { | ||||
|  | ||||
| 	  describe("test create 1 new review", async () => { | ||||
| 		describe("test create 1 new review", async () => { | ||||
| 			it("create 1 new review", async () => { | ||||
| 				// Click the button to create a new review | ||||
| 				let create_btn = await page.$("#create-btn"); | ||||
|   | ||||
| @@ -1,59 +1,55 @@ | ||||
|  | ||||
| <!DOCTYPE html> | ||||
| <html lang="en"> | ||||
| <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" /> | ||||
| 	<title>Food Journal</title> | ||||
| 	<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" /> | ||||
| 		<title>Food Journal</title> | ||||
|  | ||||
| 	<!-- Recipe Card Custom Element --> | ||||
| 	<script src="assets/scripts/ReviewCard.js" type="module"></script> | ||||
| 		<!-- Recipe Card Custom Element --> | ||||
| 		<script src="assets/scripts/ReviewCard.js" type="module"></script> | ||||
|  | ||||
| 	<!-- Main Stylesheets & Scripts -->  | ||||
| 	<!-- Temporarily commented out reset.css due to furthur discussion needed on the values of the default config--> | ||||
| 	<!-- <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> | ||||
| 	<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> | ||||
| 	</header> | ||||
|   	<body> | ||||
| 		<!-- Main Stylesheets & Scripts -->  | ||||
| 		<!-- Temporarily commented out reset.css due to furthur discussion needed on the values of the default config--> | ||||
| 		<!-- <link rel="stylesheet" href="/static/reset.css" /> --> | ||||
| 		<link rel="stylesheet" href="./static/homepage.css" /> | ||||
| 		<script src="assets/scripts/main.js" type="module"></script> | ||||
| 	</head> | ||||
| 	<body> | ||||
| 		<header> | ||||
| 			<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> | ||||
| 		<main> | ||||
| 			<div class="body-container"> | ||||
| 				<div style="width: 20%;"></div> | ||||
| 				<div style="width: 60%;"> | ||||
| 					<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"> | ||||
| 								 | ||||
| 		<!-- | ||||
| 			For mobile: + flex-direction: column-reverse;" | ||||
| 						~ width: 100% for all divs | ||||
| 		--> | ||||
| 		<div style="display: flex; max-height: 100%; "> | ||||
| 			<div style="width: 20%;"></div> | ||||
| 							</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" style="opacity:0;"/> | ||||
| 						 | ||||
| 			<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> | ||||
| 					<h2 id="recent-reviews-text"> Recent Reviews </h2> | ||||
| 					<img src ="./assets/images/icons/Grouppink.png" alt="" style="align-self: center; opacity:0;"></img> | ||||
| 					</div> | ||||
|  | ||||
| 					<div class="review-container" id="review-container"></div> | ||||
| 				</div> | ||||
| 				<div style="width: 20%;"> | ||||
| 				</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> | ||||
|   	</body> | ||||
| </main> | ||||
| 		</main> | ||||
| 	</body> | ||||
| </html> | ||||
|   | ||||
| @@ -1,78 +1,81 @@ | ||||
| /* CreatePage.css */ | ||||
|  | ||||
| body{ | ||||
|   background-color: #13323b; | ||||
| body { | ||||
| 	background-color: #13323b; | ||||
| } | ||||
|  | ||||
| h1 { | ||||
|   text-align: center; | ||||
| 	text-align: center; | ||||
| } | ||||
| .Top-Bar{ | ||||
|   margin-top: -8cm; | ||||
| } | ||||
| .Top-Bar > img{ | ||||
|   position: relative; | ||||
|   top: 7.85cm; | ||||
| } | ||||
| .Top-Bar > h1{ | ||||
|   position: relative; | ||||
|   top: 2.2cm; | ||||
|   font-size: 3cm; | ||||
|   color: #EAA9BC  | ||||
|  | ||||
| .top-bar { | ||||
| 	margin-top: -8cm; | ||||
| } | ||||
| .Top-Bar > form{ | ||||
|   position: relative; | ||||
|   left: 32cm; | ||||
|  | ||||
| .top-bar > img { | ||||
| 	position: relative; | ||||
| 	top: 7.85cm; | ||||
| } | ||||
|  | ||||
| .top-bar > h1 { | ||||
| 	position: relative; | ||||
| 	top: 2.2cm; | ||||
| 	font-size: 3cm; | ||||
| 	color: #eaa9bc; | ||||
| } | ||||
|  | ||||
| .top-bar > form { | ||||
| 	position: relative; | ||||
| 	left: 32cm; | ||||
| } | ||||
|  | ||||
| .journal-form { | ||||
|   font-size: 120%; | ||||
|   width: 50%; | ||||
|   display: block; | ||||
|   margin: auto; | ||||
|   color: #ccb3bb; | ||||
|   border: 3px solid rgb(7, 0, 0); | ||||
|   background-color: #b52754; | ||||
| 	font-size: 120%; | ||||
| 	width: 50%; | ||||
| 	display: block; | ||||
| 	margin: auto; | ||||
| 	color: #ccb3bb; | ||||
| 	border: 3px solid rgb(7 0 0); | ||||
| 	background-color: #b52754; | ||||
| } | ||||
|  | ||||
| .hidden, | ||||
| .rating:not(:checked) > input { /* Hide radio circles while star rating */ | ||||
|   display: none; | ||||
| 	display: none; | ||||
| } | ||||
|  | ||||
| /* Unchecked stars */ | ||||
| .rating:not(:checked) > label { | ||||
|   /* Make stars line up sideways and not vertically */ | ||||
|   float: right; | ||||
| 	/* Make stars line up sideways and not vertically */ | ||||
| 	float: right; | ||||
|  | ||||
|   /* Hide label text */ | ||||
|   width: 1em; | ||||
|   overflow: hidden; | ||||
|   white-space: nowrap; | ||||
| 	/* Hide label text */ | ||||
| 	width: 1em; | ||||
| 	overflow: hidden; | ||||
| 	white-space: nowrap; | ||||
|  | ||||
|   /* Star default color and size */ | ||||
|   font-size: 200%; | ||||
|   line-height: 1.2; | ||||
|   color: #b3b3cc; | ||||
| 	/* Star default color and size */ | ||||
| 	font-size: 200%; | ||||
| 	line-height: 1.2; | ||||
| 	color: #b3b3cc; | ||||
| } | ||||
|  | ||||
| .rating > label:active { | ||||
|   position: relative; | ||||
| 	position: relative; | ||||
| } | ||||
|  | ||||
| .rating:not(:checked) > label::before { | ||||
|   content: "★"; | ||||
| 	content: "★"; | ||||
| } | ||||
|  | ||||
| /* Checked star color */ | ||||
| .rating > input:checked ~ label { | ||||
|   color: #ffbf00; | ||||
| 	color: #ffbf00; | ||||
| } | ||||
|  | ||||
| .rating:not(:checked) > label:hover, | ||||
| .rating:not(:checked) > label:hover ~ label { | ||||
|   color: orangered; | ||||
| 	color: orangered; | ||||
| } | ||||
|  | ||||
| .rating > input:checked + label:hover, | ||||
| @@ -80,5 +83,5 @@ h1 { | ||||
| .rating > input:checked + label:hover ~ label, | ||||
| .rating > input:checked ~ label:hover ~ label, | ||||
| .rating > label:hover ~ input:checked ~ label { | ||||
|   color: orangered; | ||||
| 	color: orangered; | ||||
| } | ||||
| @@ -1,87 +1,90 @@ | ||||
| /* ReviewDetails.css */ | ||||
|  | ||||
| body{ | ||||
|   background-color: #13323b; | ||||
| body { | ||||
| 	background-color: #13323b; | ||||
| } | ||||
|  | ||||
| h1 { | ||||
|   text-align: center; | ||||
| 	text-align: center; | ||||
| } | ||||
| .Top-Bar{ | ||||
|   margin-top: -8cm; | ||||
| } | ||||
| .Top-Bar > img{ | ||||
|   position: relative; | ||||
|   top: 7.85cm; | ||||
| } | ||||
| .Top-Bar > h1{ | ||||
|   position: relative; | ||||
|   top: 2.2cm; | ||||
|   font-size: 3cm; | ||||
|   color: #EAA9BC  | ||||
|  | ||||
| .top-bar { | ||||
| 	margin-top: -8cm; | ||||
| } | ||||
| .Top-Bar > form{ | ||||
|   position: relative; | ||||
|   left: 32cm; | ||||
|  | ||||
| .top-bar > img { | ||||
| 	position: relative; | ||||
| 	top: 7.85cm; | ||||
| } | ||||
|  | ||||
| .top-bar > h1 { | ||||
| 	position: relative; | ||||
| 	top: 2.2cm; | ||||
| 	font-size: 3cm; | ||||
| 	color: #eaa9bc; | ||||
| } | ||||
|  | ||||
| .top-bar > form { | ||||
| 	position: relative; | ||||
| 	left: 32cm; | ||||
| } | ||||
|  | ||||
| .journal-form { | ||||
|   font-size: 120%; | ||||
|   width: 50%; | ||||
|   display: none; | ||||
|   margin: auto; | ||||
|   color: #ccb3bb; | ||||
|   border: 3px solid rgb(7, 0, 0); | ||||
|   background-color: #b52754; | ||||
| 	font-size: 120%; | ||||
| 	width: 50%; | ||||
| 	display: none; | ||||
| 	margin: auto; | ||||
| 	color: #ccb3bb; | ||||
| 	border: 3px solid rgb(7 0 0); | ||||
| 	background-color: #b52754; | ||||
| } | ||||
|  | ||||
| .meal-name { | ||||
|   font-size: 150%; | ||||
|   margin: left; | ||||
|   width: 50%; | ||||
|   border: 3px; | ||||
|   color: rgb(228, 119, 119); | ||||
|   text-align: left; | ||||
| 	font-size: 150%; | ||||
| 	margin: left; | ||||
| 	width: 50%; | ||||
| 	border: 3px; | ||||
| 	color: rgb(228 119 119); | ||||
| 	text-align: left; | ||||
| } | ||||
|  | ||||
| .hidden, | ||||
| .rating:not(:checked) > input { /* Hide radio circles while star rating */ | ||||
|   display: none; | ||||
| 	display: none; | ||||
| } | ||||
|  | ||||
| /* Unchecked stars */ | ||||
| .rating:not(:checked) > label { | ||||
|   /* Make stars line up sideways and not vertically */ | ||||
|   float: right; | ||||
| 	/* Make stars line up sideways and not vertically */ | ||||
| 	float: right; | ||||
|  | ||||
|   /* Hide label text */ | ||||
|   width: 1em; | ||||
|   overflow: hidden; | ||||
|   white-space: nowrap; | ||||
| 	/* Hide label text */ | ||||
| 	width: 1em; | ||||
| 	overflow: hidden; | ||||
| 	white-space: nowrap; | ||||
|  | ||||
|   /* Star default color and size */ | ||||
|   font-size: 200%; | ||||
|   line-height: 1.2; | ||||
|   color: #b3b3cc; | ||||
| 	/* Star default color and size */ | ||||
| 	font-size: 200%; | ||||
| 	line-height: 1.2; | ||||
| 	color: #b3b3cc; | ||||
| } | ||||
|  | ||||
| .rating > label:active { | ||||
|   position: relative; | ||||
| 	position: relative; | ||||
| } | ||||
|  | ||||
| .rating:not(:checked) > label::before { | ||||
|   content: "★"; | ||||
| 	content: "★"; | ||||
| } | ||||
|  | ||||
| /* Checked star color */ | ||||
| .rating > input:checked ~ label { | ||||
|   color: #ffbf00; | ||||
| 	color: #ffbf00; | ||||
| } | ||||
|  | ||||
| .rating:not(:checked) > label:hover, | ||||
| .rating:not(:checked) > label:hover ~ label { | ||||
|   color: orangered; | ||||
| 	color: orangered; | ||||
| } | ||||
|  | ||||
| .rating > input:checked + label:hover, | ||||
| @@ -89,5 +92,5 @@ h1 { | ||||
| .rating > input:checked + label:hover ~ label, | ||||
| .rating > input:checked ~ label:hover ~ label, | ||||
| .rating > label:hover ~ input:checked ~ label { | ||||
|   color: orangered; | ||||
| 	color: orangered; | ||||
| } | ||||
| @@ -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{ | ||||
|     position: relative; | ||||
|  | ||||
| .top-bar > img { | ||||
| 	position: relative; | ||||
| 	align-self: center; | ||||
| 	padding-left: 2.5%; | ||||
| 	padding-right: 2.5%; | ||||
| } | ||||
| .Top-Bar > h1{ | ||||
|     position: relative; | ||||
|     text-align: center; | ||||
|     /*color: #E4C3D2;*/ | ||||
|     color: #8284D0; | ||||
|     font-size: 100px; | ||||
|     font-family: 'Lucida Sans'; | ||||
|  | ||||
| .top-bar > h1 { | ||||
| 	position: relative; | ||||
| 	text-align: center; | ||||
| 	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; | ||||
| 	text-align: center; | ||||
| 	font-size: 4rem; | ||||
| 	color: #e4c3d2; | ||||
| } | ||||
|  | ||||
| img#create-btn { | ||||
|     position: relative; | ||||
| 	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{ | ||||
|     display: flex; | ||||
|     position: relative; | ||||
|     flex-wrap: wrap; | ||||
| .review-container { | ||||
| 	display: flex; | ||||
| 	position: relative; | ||||
| 	flex-wrap: wrap; | ||||
| 	justify-content: center; | ||||
| } | ||||
|  | ||||
| .review-container > div { | ||||
|     background-color: #f1f1f1; | ||||
|     text-align: center; | ||||
|   } | ||||
| 	background-color: #f1f1f1; | ||||
| 	text-align: center; | ||||
| } | ||||
|   | ||||
| @@ -69,17 +69,17 @@ time, | ||||
| mark, | ||||
| audio, | ||||
| video { | ||||
|   margin: 0; | ||||
|   padding: 0; | ||||
|   border: 0; | ||||
|   outline: 0; | ||||
|   font-size: 100%; | ||||
|   vertical-align: baseline; | ||||
|   background: transparent; | ||||
| 	margin: 0; | ||||
| 	padding: 0; | ||||
| 	border: 0; | ||||
| 	outline: 0; | ||||
| 	font-size: 100%; | ||||
| 	vertical-align: baseline; | ||||
| 	background: transparent; | ||||
| } | ||||
|  | ||||
| body { | ||||
|   line-height: 1; | ||||
| 	line-height: 1; | ||||
| } | ||||
|  | ||||
| article, | ||||
| @@ -93,66 +93,66 @@ hgroup, | ||||
| menu, | ||||
| nav, | ||||
| section { | ||||
|   display: block; | ||||
| 	display: block; | ||||
| } | ||||
|  | ||||
| nav ul { | ||||
|   list-style: none; | ||||
| 	list-style: none; | ||||
| } | ||||
|  | ||||
| blockquote, | ||||
| q { | ||||
|   quotes: none; | ||||
| 	quotes: none; | ||||
| } | ||||
|  | ||||
| blockquote::before, | ||||
| blockquote::after, | ||||
| q::before, | ||||
| q::after { | ||||
|   content: ""; | ||||
|   content: none; | ||||
| 	content: ""; | ||||
| 	content: none; | ||||
| } | ||||
|  | ||||
| a { | ||||
|   margin: 0; | ||||
|   padding: 0; | ||||
|   font-size: 100%; | ||||
|   vertical-align: baseline; | ||||
|   background: transparent; | ||||
| 	margin: 0; | ||||
| 	padding: 0; | ||||
| 	font-size: 100%; | ||||
| 	vertical-align: baseline; | ||||
| 	background: transparent; | ||||
| } | ||||
|  | ||||
| table { | ||||
|   border-collapse: collapse; | ||||
|   border-spacing: 0; | ||||
| 	border-collapse: collapse; | ||||
| 	border-spacing: 0; | ||||
| } | ||||
|  | ||||
| input, | ||||
| select { | ||||
|   vertical-align: middle; | ||||
| 	vertical-align: middle; | ||||
| } | ||||
|  | ||||
| img, | ||||
| fieldset, | ||||
| object { | ||||
|   border: none; | ||||
| 	border: none; | ||||
| } | ||||
|  | ||||
| *, | ||||
| *::after, | ||||
| *::before { | ||||
|   box-sizing: border-box; | ||||
| 	box-sizing: border-box; | ||||
| } | ||||
|  | ||||
| button, | ||||
| label { | ||||
|   cursor: pointer; | ||||
| 	cursor: pointer; | ||||
| } | ||||
|  | ||||
| html, | ||||
| body { | ||||
|   height: 100%; | ||||
| 	height: 100%; | ||||
| } | ||||
|  | ||||
| form { | ||||
|   border: solid; | ||||
| 	border: solid; | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user