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