mirror of
https://gitlab.com/etc404/software-engineering-project.git
synced 2026-05-10 20:52:58 +00:00
explore visual tweaks
This commit is contained in:
kaipher7
@@ -174,24 +174,10 @@ body, html {
|
||||
scrollbar-width: none; /* hid the scroll bar but you can scroll through filters */
|
||||
}
|
||||
|
||||
.sidebar-right ul {
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.sidebar-right li {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
.sidebar-right a {
|
||||
color: var(--dusty-red);
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
#filter-form h3 {
|
||||
color: var(--dusty-red-hover);
|
||||
font-size: 0.9em;
|
||||
margin: 4px 0 8px;
|
||||
margin: 8px 0 10px;
|
||||
}
|
||||
|
||||
#filter-form label {
|
||||
@@ -200,7 +186,7 @@ body, html {
|
||||
gap: 4px;
|
||||
font-size: 0.75em;
|
||||
color: var(--dusty-red);
|
||||
margin-bottom: 2px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
#filter-form input[type="checkbox"] {
|
||||
|
||||
@@ -2,11 +2,14 @@
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="_csrf_header" th:content="${_csrf.headerName}"/>
|
||||
<meta name="_csrf" th:content="${_csrf.token}"/>
|
||||
<title>Thyme Crunch Home</title>
|
||||
<link rel="stylesheet" th:href="@{css/explore.css}">
|
||||
<link href="https://fonts.googleapis.com/css2?family=Delius+Swash+Caps&family=Mali:ital,wght@0,200;0,300;0,400;0,500;0,600;0,700;1,200;1,300;1,400;1,500;1,600;1,700" rel="stylesheet">
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<header class="top-header">
|
||||
@@ -75,18 +78,18 @@
|
||||
|
||||
<label>
|
||||
<input type="checkbox" name="prepTime" value="15"><15 min
|
||||
</label><br>
|
||||
</label>
|
||||
<label>
|
||||
<input type="checkbox" name="prepTime" value="30">15~30 min
|
||||
</label><br>
|
||||
</label>
|
||||
|
||||
<label>
|
||||
<input type="checkbox" name="prepTime" value="60">30~60 min
|
||||
</label><br>
|
||||
</label>
|
||||
|
||||
<label>
|
||||
<input type="checkbox" name="prepTime" value="240">1~4 hours
|
||||
</label><br>
|
||||
</label>
|
||||
|
||||
<label>
|
||||
<input type="checkbox" name="prepTime" value="241">4+ hours
|
||||
@@ -95,18 +98,18 @@
|
||||
|
||||
<label>
|
||||
<input type="checkbox" name="cookTime" value="15"><15 min
|
||||
</label><br>
|
||||
</label>
|
||||
<label>
|
||||
<input type="checkbox" name="cookTime" value="30">15~30 min
|
||||
</label><br>
|
||||
</label>
|
||||
|
||||
<label>
|
||||
<input type="checkbox" name="cookTime" value="60">30~60 min
|
||||
</label><br>
|
||||
</label>
|
||||
|
||||
<label>
|
||||
<input type="checkbox" name="cookTime" value="120">1~2 hours
|
||||
</label><br>
|
||||
</label>
|
||||
|
||||
<label>
|
||||
<input type="checkbox" name="cookTime" value="121">2+ hours
|
||||
@@ -115,15 +118,15 @@
|
||||
|
||||
<label>
|
||||
<input type="checkbox" name="price" value="1"> $
|
||||
</label><br>
|
||||
</label>
|
||||
|
||||
<label>
|
||||
<input type="checkbox" name="price" value="2"> $$
|
||||
</label><br>
|
||||
</label>
|
||||
|
||||
<label>
|
||||
<input type="checkbox" name="price" value="3"> $$$
|
||||
</label><br>
|
||||
</label>
|
||||
|
||||
<label>
|
||||
<input type="checkbox" name="price" value="4"> $$$$
|
||||
@@ -230,5 +233,6 @@
|
||||
}
|
||||
})();
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -2,42 +2,105 @@
|
||||
<html lang="en" xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>My Profile</title>
|
||||
<meta name="_csrf_header" th:content="${_csrf.headerName}"/>
|
||||
<meta name="_csrf" th:content="${_csrf.token}"/>
|
||||
<title>My Profile - Thyme Crunch</title>
|
||||
<!--<link rel="stylesheet" th:href="@{css/create-recipe.css}"> -->
|
||||
<link href="https://fonts.googleapis.com/css2?family=Delius+Swash+Caps&family=Mali:ital,wght@0,200;0,300;0,400;0,500;0,600;0,700;1,200;1,300;1,400;1,500;1,600;1,700" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<header class="top-header">
|
||||
<img th:src="@{images/header_left.png}" alt="Violin f-hole shape to the left of header." class="swirl">
|
||||
<h1 class="site-name">Thyme Crunch</h1>
|
||||
<img th:src="@{images/header_right.png}" alt="Violin f-hole shape to the right of header." class="swirl">
|
||||
</header>
|
||||
|
||||
<div class="form-wrap">
|
||||
<div class="form-split">
|
||||
|
||||
<h1>My Profile</h1>
|
||||
|
||||
<p><strong>Username:</strong> <span th:text="${profile.username}">username</span></p>
|
||||
<nav>
|
||||
<a th:href="@{/}">Home</a> |
|
||||
<a th:href="@{/explore}">Explore</a> |
|
||||
<a th:href="@{/my-profile}">Profile</a>
|
||||
</nav>
|
||||
|
||||
<br>
|
||||
|
||||
<p>
|
||||
<strong>Username:</strong>
|
||||
<span th:text="${profile.username}">username</span>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<strong>Public Profile:</strong>
|
||||
<a th:href="@{/users/{id}(id=${profile.id})}">View my public profile</a>
|
||||
</p>
|
||||
|
||||
<h2>Edit Profile</h2>
|
||||
|
||||
<form th:action="@{/my-profile/update}" method="post" th:object="${updateProfileDto}">
|
||||
<div>
|
||||
<label for="displayName">Screen Name</label><br>
|
||||
<div class="rows">
|
||||
<label for="displayName">Screen Name</label>
|
||||
<input type="text" id="displayName" th:field="*{displayName}" maxlength="100">
|
||||
</div>
|
||||
|
||||
<br>
|
||||
|
||||
<div>
|
||||
<label for="bio">Bio</label><br>
|
||||
<textarea id="bio" th:field="*{bio}" rows="6" cols="50" maxlength="1000"></textarea>
|
||||
<div class="rows">
|
||||
<label for="bio">Bio</label>
|
||||
<textarea id="bio" th:field="*{bio}" rows="6" maxlength="1000"></textarea>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
|
||||
<button type="submit">Save Profile</button>
|
||||
</form>
|
||||
|
||||
<br>
|
||||
|
||||
<h2>My Recipes</h2>
|
||||
|
||||
<div th:if="${#lists.isEmpty(profile.recipes)}">
|
||||
<p>You have not created any recipes yet.</p>
|
||||
</div>
|
||||
|
||||
<div th:unless="${#lists.isEmpty(profile.recipes)}">
|
||||
<div th:each="recipe : ${profile.recipes}" class="recipe-block" style="margin-bottom: 20px;">
|
||||
<h3 th:text="${recipe.title}">Recipe Title</h3>
|
||||
|
||||
<p>
|
||||
<strong>Author:</strong>
|
||||
<a th:href="@{/users/{id}(id=${recipe.userDto.id})}"
|
||||
th:text="${recipe.userDto.displayName != null and !#strings.isEmpty(recipe.userDto.displayName) ? recipe.userDto.displayName : recipe.userDto.username}">
|
||||
Author Name
|
||||
</a>
|
||||
</p>
|
||||
|
||||
<p th:text="${recipe.description}">Recipe description</p>
|
||||
|
||||
<p>
|
||||
<strong>Prep:</strong> <span th:text="${recipe.prepTimeMinutes}">0</span> min |
|
||||
<strong>Cook:</strong> <span th:text="${recipe.cookTimeMinutes}">0</span> min |
|
||||
<strong>Servings:</strong> <span th:text="${recipe.servings}">0</span> |
|
||||
<strong>Cost:</strong> <span th:text="${recipe.cost}">0</span>
|
||||
</p>
|
||||
|
||||
<div th:if="${recipe.images != null and !#lists.isEmpty(recipe.images)}">
|
||||
<img th:src="${recipe.images[0].imageUrl}" alt="Recipe Image" style="max-width: 200px;">
|
||||
</div>
|
||||
|
||||
<p>
|
||||
<a th:href="@{/recipes/{id}(id=${recipe.id})}">View Recipe</a>
|
||||
|
|
||||
<a th:href="@{/recipes/{id}/edit(id=${recipe.id})}">Edit Recipe</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
<div th:unless="${#lists.isEmpty(profile.recipes)}">
|
||||
<div th:each="recipe : ${profile.recipes}" style="margin-bottom: 20px; border: 1px solid #ccc; padding: 10px;">
|
||||
<h3 th:text="${recipe.title}">Recipe Title</h3>
|
||||
|
||||
@@ -2,10 +2,26 @@
|
||||
<html lang="en" xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Explore Recipes</title>
|
||||
<meta name="_csrf_header" th:content="${_csrf.headerName}"/>
|
||||
<meta name="_csrf" th:content="${_csrf.token}"/>
|
||||
<title>Public Profile - Thyme Crunch</title>
|
||||
<!--<link rel="stylesheet" th:href="@{css/public-profile.css}"> -->
|
||||
<link href="https://fonts.googleapis.com/css2?family=Delius+Swash+Caps&family=Mali:ital,wght@0,200;0,300;0,400;0,500;0,600;0,700;1,200;1,300;1,400;1,500;1,600;1,700" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
<h1>Explore Recipes</h1>
|
||||
|
||||
<header class="top-header">
|
||||
<img th:src="@{images/header_left.png}" alt="Violin f-hole shape to the left of header." class="swirl">
|
||||
<h1 class="site-name">Thyme Crunch</h1>
|
||||
<img th:src="@{images/header_right.png}" alt="Violin f-hole shape to the right of header." class="swirl">
|
||||
</header>
|
||||
|
||||
<div class="form-wrap">
|
||||
<div class="form-split">
|
||||
|
||||
<h1 th:text="${profile.displayName != null and !#strings.isEmpty(profile.displayName) ? profile.displayName : profile.username}">
|
||||
Display Name
|
||||
</h1>
|
||||
|
||||
<nav>
|
||||
<a th:href="@{/}">Home</a> |
|
||||
@@ -13,65 +29,29 @@
|
||||
<a th:href="@{/my-profile}">Profile</a>
|
||||
</nav>
|
||||
|
||||
<form id="search-form" th:action="@{/explore}" method="get">
|
||||
<input type="text" id="site-search" name="q" th:value="${q}" placeholder="Search recipes">
|
||||
<button type="submit">Search</button>
|
||||
<br>
|
||||
|
||||
<h3>Prep Time</h3>
|
||||
<label>
|
||||
<input type="checkbox" name="prepTime" value="15"> <15 min
|
||||
</label><br>
|
||||
<label>
|
||||
<input type="checkbox" name="prepTime" value="30"> 15~30 min
|
||||
</label><br>
|
||||
<label>
|
||||
<input type="checkbox" name="prepTime" value="60"> 30~60 min
|
||||
</label><br>
|
||||
<label>
|
||||
<input type="checkbox" name="prepTime" value="240"> 1~4 hours
|
||||
</label><br>
|
||||
<label>
|
||||
<input type="checkbox" name="prepTime" value="241"> 4+ hours
|
||||
</label>
|
||||
<p>
|
||||
<strong>Username:</strong>
|
||||
<span th:text="${profile.username}">username</span>
|
||||
</p>
|
||||
|
||||
<h3>Cook Time</h3>
|
||||
<label>
|
||||
<input type="checkbox" name="cookTime" value="15"> <15 min
|
||||
</label><br>
|
||||
<label>
|
||||
<input type="checkbox" name="cookTime" value="30"> 15~30 min
|
||||
</label><br>
|
||||
<label>
|
||||
<input type="checkbox" name="cookTime" value="60"> 30~60 min
|
||||
</label><br>
|
||||
<label>
|
||||
<input type="checkbox" name="cookTime" value="120"> 1~2 hours
|
||||
</label><br>
|
||||
<label>
|
||||
<input type="checkbox" name="cookTime" value="121"> 2+ hours
|
||||
</label>
|
||||
<h2>Bio</h2>
|
||||
<p th:if="${profile.bio != null and !#strings.isEmpty(profile.bio)}" th:text="${profile.bio}">
|
||||
Bio text
|
||||
</p>
|
||||
<p th:unless="${profile.bio != null and !#strings.isEmpty(profile.bio)}">
|
||||
This user has not added a bio yet.
|
||||
</p>
|
||||
|
||||
<h3>Price</h3>
|
||||
<label>
|
||||
<input type="checkbox" name="price" value="1"> $
|
||||
</label><br>
|
||||
<label>
|
||||
<input type="checkbox" name="price" value="2"> $$
|
||||
</label><br>
|
||||
<label>
|
||||
<input type="checkbox" name="price" value="3"> $$$
|
||||
</label><br>
|
||||
<label>
|
||||
<input type="checkbox" name="price" value="4"> $$$$
|
||||
</label>
|
||||
</form>
|
||||
<h2>Recipes</h2>
|
||||
|
||||
<div th:if="${#lists.isEmpty(recipes)}">
|
||||
<p>No recipes found.</p>
|
||||
<div th:if="${#lists.isEmpty(profile.recipes)}">
|
||||
<p>This user has not created any recipes yet.</p>
|
||||
</div>
|
||||
|
||||
<div th:unless="${#lists.isEmpty(recipes)}">
|
||||
<div th:each="recipe : ${recipes}" style="margin-bottom: 20px; border: 1px solid #ccc; padding: 10px;">
|
||||
<div th:unless="${#lists.isEmpty(profile.recipes)}">
|
||||
<div th:each="recipe : ${profile.recipes}" class="recipe-block" style="margin-bottom: 20px;">
|
||||
<h3>
|
||||
<a th:href="@{/recipes/{id}(id=${recipe.id})}" th:text="${recipe.title}">Recipe Title</a>
|
||||
</h3>
|
||||
@@ -86,110 +66,18 @@
|
||||
|
||||
<p th:text="${recipe.description}">Recipe description</p>
|
||||
|
||||
<p>
|
||||
<strong>Prep:</strong> <span th:text="${recipe.prepTimeMinutes}">0</span> min |
|
||||
<strong>Cook:</strong> <span th:text="${recipe.cookTimeMinutes}">0</span> min |
|
||||
<strong>Servings:</strong> <span th:text="${recipe.servings}">0</span> |
|
||||
<strong>Cost:</strong> <span th:text="${recipe.cost}">0</span>
|
||||
</p>
|
||||
|
||||
<div th:if="${recipe.images != null and !#lists.isEmpty(recipe.images)}">
|
||||
<img th:src="${recipe.images[0].imageUrl}" alt="Recipe Image" style="max-width: 200px;">
|
||||
</div>
|
||||
|
||||
<p><a th:href="@{/recipes/{id}(id=${recipe.id})}">View Recipe</a></p>
|
||||
<p>
|
||||
<a th:href="@{/recipes/{id}(id=${recipe.id})}">View Recipe</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
(function () {
|
||||
const input = document.getElementById('site-search');
|
||||
const tags = [];
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
</div>
|
||||
</div>
|
||||
|
||||
params.getAll('prices').forEach(p => {
|
||||
const cb = document.querySelector(`input[name="price"][value="${p}"]`);
|
||||
if (cb) cb.checked = true;
|
||||
});
|
||||
|
||||
params.getAll('cookTime').forEach(p => {
|
||||
const cb = document.querySelector(`input[name="cookTime"][value="${p}"]`);
|
||||
if (cb) cb.checked = true;
|
||||
});
|
||||
|
||||
params.getAll('prepTime').forEach(p => {
|
||||
const cb = document.querySelector(`input[name="prepTime"][value="${p}"]`);
|
||||
if (cb) cb.checked = true;
|
||||
});
|
||||
|
||||
params.getAll('tags').forEach(addChip);
|
||||
|
||||
input.addEventListener('keydown', (e) => {
|
||||
if ((e.key === ' ' || e.key === 'Enter') && input.value.includes('#')) {
|
||||
const val = input.value + ' ';
|
||||
const match = val.match(/(^|\s)(#\w+)(\s)/);
|
||||
if (match) {
|
||||
e.preventDefault();
|
||||
addChip(match[2].substring(1));
|
||||
input.value = val.replace(match[0], '');
|
||||
input.value += ' ';
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
document.querySelectorAll('input[name="price"]').forEach(cb => {
|
||||
cb.addEventListener('change', submitSearch);
|
||||
});
|
||||
|
||||
document.querySelectorAll('input[name="cookTime"]').forEach(cb => {
|
||||
cb.addEventListener('change', submitSearch);
|
||||
});
|
||||
|
||||
document.querySelectorAll('input[name="prepTime"]').forEach(cb => {
|
||||
cb.addEventListener('change', submitSearch);
|
||||
});
|
||||
|
||||
document.getElementById('search-form').addEventListener('submit', (e) => {
|
||||
e.preventDefault();
|
||||
submitSearch();
|
||||
});
|
||||
|
||||
function addChip(tag) {
|
||||
if (tags.includes(tag)) return;
|
||||
tags.push(tag);
|
||||
|
||||
const chip = document.createElement('span');
|
||||
chip.className = 'tag-chip';
|
||||
chip.innerHTML = `#${tag} <button type="button" aria-label="Remove ${tag}">×</button>`;
|
||||
|
||||
chip.querySelector('button').addEventListener('click', () => {
|
||||
chip.remove();
|
||||
tags.splice(tags.indexOf(tag), 1);
|
||||
submitSearch();
|
||||
});
|
||||
|
||||
input.insertAdjacentElement('afterend', chip);
|
||||
}
|
||||
|
||||
function submitSearch() {
|
||||
const cleanedQuery = input.value.replace(/#\w+/g, '').trim();
|
||||
const out = new URLSearchParams();
|
||||
|
||||
if (cleanedQuery) out.set('q', cleanedQuery);
|
||||
tags.forEach(t => out.append('tags', t));
|
||||
|
||||
document.querySelectorAll('input[name="price"]:checked')
|
||||
.forEach(cb => out.append('prices', cb.value));
|
||||
|
||||
document.querySelectorAll('input[name="cookTime"]:checked')
|
||||
.forEach(cb => out.append('cookTime', cb.value));
|
||||
|
||||
document.querySelectorAll('input[name="prepTime"]:checked')
|
||||
.forEach(cb => out.append('prepTime', cb.value));
|
||||
|
||||
window.location.href = '/explore?' + out.toString();
|
||||
}
|
||||
})();
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user