my-profile pretty much done'

src/main/resources/static/css/explore.css

@@ -226,7 +226,7 @@ body, html {
   color: var(--dark-yellow);
   border: none;
   border-radius: 10px;
-  padding: 0 10px;
+  padding: 10px;
   height: 50px;
   font-size: 20px;
   font-family: 'Mali', cursive;

src/main/resources/static/css/my-profile.css

@@ -0,0 +1,398 @@
+/* =========================
+   Root Variables
+========================= */
+:root {
+  --dusty-red: #D43F3F;
+  --dusty-red-hover: #C73636;
+  --dark-yellow: #FFD27F;
+  --pale-yellow: #FFECB3;
+  --peach: #F5A96E;
+  --dark: #850000;
+}
+
+/* =========================
+   Global Styles
+========================= */
+.delius {
+  font-family: 'Delius Swash Caps', cursive;
+  font-weight: 400;
+  font-style: normal;
+}
+
+.mali-regular {
+  font-family: 'Mali', cursive;
+  font-weight: 400;
+  font-style: normal;
+}
+
+body, html {
+  height: 100vh;
+  margin: 0;
+  font-family: 'Mali', cursive;
+  background-color: var(--pale-yellow);
+  overflow: clip;
+}
+
+/* =========================
+   Layout Structure
+========================= */
+.body {
+  display: flex;
+  flex-direction: row;
+  height: 100%;
+}
+
+.body-left, .body-right {
+  position: sticky;
+  flex-grow: 0;
+  width: 400px;
+}
+
+.body-right {
+  width: 50%;
+}
+
+/* =========================
+   Header Styles
+========================= */
+.top-header {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 40px;
+  height: 60px;
+  padding: 10px 20px;
+  background-color: var(--dusty-red);
+  color: var(--dark-yellow);
+}
+
+.top-header .swirl {
+  height: 40px;
+  width: auto;
+  margin: 0 20px;
+}
+
+.site-name {
+  font-family: 'Delius Swash Caps', serif;
+  font-size: 2.5em;
+  font-weight: bold;
+  letter-spacing: 4px;
+  color: var(--dark-yellow);
+}
+
+/* =========================
+   Left Sidebar
+========================= */
+.sidebar-left {
+  overflow: hidden;
+  margin: 25px;
+  border-radius: 20px;
+  z-index: 10;
+  background-color: var(--peach);
+  color: var(--dark);
+  padding: 6px;
+  font-size: 1.75em;
+  font-weight: 900;
+  letter-spacing: 1.5px;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.sidebar-left ul {
+  list-style: none;
+  padding: 0;
+}
+
+.sidebar-left li {
+  margin-bottom: 7px;
+}
+
+.sidebar-left a {
+  color: var(--dark);
+  text-decoration: none;
+  transition: 0.1s ease;
+}
+
+.sidebar-left a:hover {
+  color: var(--dusty-red);
+}
+
+.sidebar-left .nav_icon {
+  background: none;
+  border: none;
+  padding: 0;
+  cursor: pointer;
+  height: 100px;
+  width: auto;
+  border-radius: 8px;
+  transition: transform 0.2s ease;
+}
+
+.sidebar-left .nav_icon:hover {
+  transform: scale(1.05);
+}
+
+/* =========================
+   Floating Create Icon
+========================= */
+.create_icon {
+  position: fixed;
+  bottom: 30px;
+  left: 55px;
+  z-index: 1000;
+  transition: transform 0.2s ease; 
+}
+
+.create_icon:hover {
+  transform: scale(1.02);
+}
+
+.create_icon img {
+  width: 150px;
+  height: auto;
+  border-radius: 10%;
+}
+
+/* =========================
+   Right Sidebar
+========================= */
+.sidebar-right {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
+  margin: 25px;
+  padding: 10px;
+  height: 75%;
+  border-radius: 20px;
+  z-index: 10;
+  background-color: var(--peach);
+  color: var(--dusty-red);
+  font-size: 1.4em;
+  font-weight: 900;
+  overflow: auto;
+  scrollbar-color: var(--dusty-red) transparent;
+  scrollbar-width: none; /* hid the scroll bar but you can scroll */
+}
+
+.sidebar-right p {
+  margin: 0 0 6px;
+  text-align: center;
+}
+
+.sidebar-right strong {
+  font-size: 1.2em;
+  color: var(--dark);
+  letter-spacing: 1px;
+}
+
+.profile-form {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  padding: 12px;
+  box-sizing: border-box;
+  color: var(--dusty-red);
+}
+
+.profile-form label {
+  font-size: 0.85em;
+  color: var(--dark);
+  font-weight: 700;
+  margin-bottom: 4px;
+  display: block;
+}
+
+.profile-form input[type="text"],
+.profile-form textarea {
+  width: 100%;
+  box-sizing: border-box;
+  background: var(--pale-yellow);
+  border: none;
+  border-radius: 8px;
+  padding: 6px 10px;
+  font-family: 'Mali', cursive;
+  font-size: 0.75em;
+  font-weight: 500;
+  color: var(--dusty-red);
+  resize: vertical;
+}
+
+.profile-form input[type="text"]:focus,
+.profile-form textarea:focus {
+  outline: 2px solid var(--dusty-red);
+}
+
+.profile-form button[type="submit"] {
+  background: var(--dusty-red);
+  color: var(--dark-yellow);
+  border: none;
+  border-radius: 8px;
+  padding: 8px 16px;
+  font-family: 'Mali', cursive;
+  font-size: 0.75em;
+  font-weight: 700;
+  cursor: pointer;
+  align-self: center;
+}
+
+.view-profile-btn {
+  background: var(--dusty-red);
+  color: var(--dark-yellow) !important;
+  border-radius: 8px;
+  padding: 6px 14px;
+  font-weight: 700;
+  font-size: 0.7em;
+  text-decoration: none !important;
+  display: inline-block;
+  margin-bottom: 16px;
+}
+
+.view-profile-btn:hover {
+  background: var(--dusty-red-hover);
+}
+
+.profile-form button[type="submit"]:hover {
+  background: var(--dusty-red-hover);
+}
+
+/* =========================
+   Main Content Area
+========================= */
+.main-content {
+  width: 80%;
+  flex-grow: 1;
+  /*display: flex; this line was breaking the searched results. They returned recipes would not load at the top of the page*/
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: flex-start;
+  overflow: auto;
+  scrollbar-color: var(--dusty-red) var(--pale-yellow);
+  height: auto;
+  color: var(--dusty-red);
+}
+
+/* =========================
+   Recipe Cards Layout
+========================= */
+.recipe-card {
+	padding-top: 20px;
+  margin-top: 35px;
+  width: 99.5%;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 35px;
+  justify-content: flex-start;
+  flex-direction: row;
+  height: fit-content;
+  padding-right: 10px;
+  overflow-y: auto;
+  flex: 1;
+  scrollbar-color: var(--dusty-red) var(--pale-yellow);
+}
+
+
+a {
+  text-decoration: none; 
+  color: var(--dark);
+}
+
+/* =========================
+   Individual Card (Folder Style)
+========================= */
+.card {
+  position: relative; /* needed for tab */
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  flex: 1 1 260px;
+  max-width: 400px;
+  max-height: 200px;
+  padding: 25px 20px 20px; /* extra space for tab */
+  border-radius: 12px;
+  background: var(--peach);
+}
+
+/* Folder Tab */
+.card::before {
+  content: "";
+  position: absolute;
+  top: -16px;
+  left: 0px;
+  width: 100px;
+  height: 28px;
+  background: var(--peach);
+  border-radius: 6px 6px 0 0;
+}
+
+.card-wrapper {
+  position: relative;
+  flex: 1 1 260px;
+  max-width: 400px;
+}
+
+.edit-link {
+  position: absolute;
+  top: -3px;
+  left: 12px;
+  background: var(--dusty-red);
+  color: var(--dark-yellow);
+  font-size: 0.8em;
+  font-weight: 700;
+  font-family: 'Mali', cursive;
+  padding: 2px 8px;
+  border-radius: 6px;
+  z-index: 10;
+}
+
+.edit-link:hover {
+  background: var(--dusty-red-hover);
+}
+/* =========================
+   Card Content
+========================= */
+.card .card-text {
+  height: 100%;
+  overflow: hidden; /* the scroll bars were difficult to look at, the user can just view the recipe*/
+  color: var(--dark);                
+  transition: 0.1s ease;          
+}
+
+.card .card-text:hover{
+  color: var(--dusty-red-hover);                
+}
+
+/* .card .card-text h2 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+} */
+
+.card .card-text p {
+  margin: 0 0 4px;
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+}
+
+/* =========================
+   Card Image
+========================= */
+.card img {
+  width: 100%;
+  height: 100px;
+  object-fit: cover;
+  border-radius: 8px;
+}
+
+/* =========================
+   Card Columns
+========================= */
+.card-left,
+.card-right {
+  flex-shrink: 0;
+  width: 50%;
+}

src/main/resources/templates/my-profile.html

@@ -5,7 +5,7 @@
     <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 rel="stylesheet" th:href="@{css/my-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>
@@ -16,109 +16,80 @@
     <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="body">
-    <div class="form-split">
 
-        <h1>My Profile</h1>
+    <!-- Left Navigation -->
-
+    <div class="body-left">
-        <nav>
+        <nav class="sidebar-left">
-            <a th:href="@{/}">Home</a> |
+            <ul>
-            <a th:href="@{/explore}">Explore</a> |
+                <li><a href="/">Home</a></li>
-            <a th:href="@{/my-profile}">Profile</a>
+                <li><a th:href="@{/explore}">Explore</a></li>
+                <li><a th:href="@{/my-profile}">Profile</a></li>
+                <li>
+                    <form th:action="@{/logout}" method="post">
+                        <input type="image" th:src="@{images/logout_icon.png}" alt="Logout button" class="nav_icon"/>
+                    </form>
+                </li>
+            </ul>
         </nav>
-
+        <a th:href="@{/create}" target="_blank" class="create_icon">
-        <br>
+            <img th:src="@{images/create_icon.png}" alt="Create New Recipe Icon (Red mixing bowl with a spoon and yellow addition symbol.)">
-
+        </a>
-        <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 class="rows">
-                <label for="displayName">Screen Name</label>
-                <input type="text" id="displayName" th:field="*{displayName}" maxlength="100">
     </div>
 
+    <!-- Main Content — recipes -->
+    <main class="main-content">
+
+        <h2>My Recipes</h2>
+
+        <p th:if="${#lists.isEmpty(profile.recipes)}">You have not created any recipes yet.</p>
+
+        <div class="recipe-card" th:unless="${#lists.isEmpty(profile.recipes)}">
+        	<th:block th:each="recipe : ${profile.recipes}">
+        	<div class="card-wrapper">
+        	<a th:href="@{/recipes/{id}(id=${recipe.id})}" class="card">
+            	<div class="card-text">
+               		<h2 th:text="${recipe.title}">Recipe Title</h2>
+               		<p th:text="${recipe.description}">Description</p>
+            	</div>
+            	<div class="card-right">
+                	<div th:if="${recipe.images != null and !#lists.isEmpty(recipe.images)}">
+                    	<img th:src="${recipe.images[0].imageUrl}" alt="Recipe Image">
+                	</div>
+                	<p th:text="${recipe.cost}">Cost</p>
+            	</div>
+        	</a>
+        	<a th:href="@{/recipes/{id}/edit(id=${recipe.id})}" class="edit-link">Edit</a>
+        	</div>
+    		</th:block>
+		</div>
+
+    </main>
+
+    <!-- Right Sidebar — profile info & edit -->
+    <div class="body-right">
+        <div class="sidebar-right">
+
+            <p><strong th:text="${profile.effectiveDisplayName}">Display Name</strong></p>
+            <p th:text="'@' + ${profile.username}">@username</p>
+            <a th:href="@{/users/{id}(id=${profile.id})}" class="view-profile-btn">View public profile</a>
+
+            <form th:action="@{/my-profile/update}" method="post" th:object="${updateProfileDto}" class="profile-form">
+                <div class="rows">
+                    <label for="displayName">Display Name</label>
+                    <input type="text" id="displayName" th:field="*{displayName}" maxlength="100">
+                </div>
                 <div class="rows">
                     <label for="bio">Bio</label>
                     <textarea id="bio" th:field="*{bio}" rows="6" maxlength="1000"></textarea>
                 </div>
-
+                <button type="submit">Save</button>
-            <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>
-
-            <p>
-                <strong>Author:</strong>
-                <a th:href="@{/users/{id}(id=${recipe.userDto.id})}"
-                   th:text="${recipe.userDto.effectiveDisplayName}">
-                    Author Name
-                </a>
-            </p>
-
-            <p th:text="${recipe.description}">Recipe description</p>
-
-            <a th:href="@{/recipes/{id}(id=${recipe.id})}">View Recipe</a>
-            <span> | </span>
-            <a th:href="@{/recipes/{id}/edit(id=${recipe.id})}">Edit Recipe</a>
-        </div>
-    </div>
 </body>
 </html>

src/main/resources/templates/public-profile.html

@@ -4,8 +4,8 @@
     <meta charset="UTF-8">
     <meta name="_csrf_header" th:content="${_csrf.headerName}"/>
     <meta name="_csrf" th:content="${_csrf.token}"/>
-    <title>Public Profile - Thyme Crunch</title>
+    <title>My Profile - Thyme Crunch</title>
-<!--<link rel="stylesheet" th:href="@{css/public-profile.css}">   -->
+    <link rel="stylesheet" th:href="@{css/my-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>
@@ -16,67 +16,80 @@
     <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="body">
-    <div class="form-split">
 
-        <h1 th:text="${profile.displayName != null and !#strings.isEmpty(profile.displayName) ? profile.displayName : profile.username}">
+    <!-- Left Navigation -->
-            Display Name
+    <div class="body-left">
-        </h1>
+        <nav class="sidebar-left">
-
+            <ul>
-        <nav>
+                <li><a href="/">Home</a></li>
-            <a th:href="@{/}">Home</a> |
+                <li><a th:href="@{/explore}">Explore</a></li>
-            <a th:href="@{/explore}">Explore</a> |
+                <li><a th:href="@{/my-profile}">Profile</a></li>
-            <a th:href="@{/my-profile}">Profile</a>
+                <li>
+                    <form th:action="@{/logout}" method="post">
+                        <input type="image" th:src="@{images/logout_icon.png}" alt="Logout button" class="nav_icon"/>
+                    </form>
+                </li>
+            </ul>
         </nav>
-
+        <a th:href="@{/create}" target="_blank" class="create_icon">
-        <br>
+            <img th:src="@{images/create_icon.png}" alt="Create New Recipe Icon (Red mixing bowl with a spoon and yellow addition symbol.)">
-
-        <p>
-            <strong>Username:</strong>
-            <span th:text="${profile.username}">username</span>
-        </p>
-
-        <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>
-
-        <h2>Recipes</h2>
-
-        <div th:if="${#lists.isEmpty(profile.recipes)}">
-            <p>This user has 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>
-                    <a th:href="@{/recipes/{id}(id=${recipe.id})}" th:text="${recipe.title}">Recipe Title</a>
-                </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>
+    </div>
 
-                <p th:text="${recipe.description}">Recipe description</p>
+    <!-- Main Content — recipes -->
+    <main class="main-content">
 
+        <h2>My Recipes</h2>
+
+        <p th:if="${#lists.isEmpty(profile.recipes)}">You have not created any recipes yet.</p>
+
+        <div class="recipe-card" th:unless="${#lists.isEmpty(profile.recipes)}">
+        	<th:block th:each="recipe : ${profile.recipes}">
+        	<div class="card-wrapper">
+        	<a th:href="@{/recipes/{id}(id=${recipe.id})}" class="card">
+            	<div class="card-text">
+               		<h2 th:text="${recipe.title}">Recipe Title</h2>
+               		<p th:text="${recipe.description}">Description</p>
+            	</div>
+            	<div class="card-right">
                 	<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;">
+                    	<img th:src="${recipe.images[0].imageUrl}" alt="Recipe Image">
+                	</div>
+                	<p th:text="${recipe.cost}">Cost</p>
+            	</div>
+        	</a>
+        	<a th:href="@{/recipes/{id}/edit(id=${recipe.id})}" class="edit-link">Edit</a>
+        	</div>
+    		</th:block>
 		</div>
 
-                <p>
+    </main>
-                    <a th:href="@{/recipes/{id}(id=${recipe.id})}">View Recipe</a>
+
-                </p>
+    <!-- Right Sidebar — profile info & edit -->
+    <div class="body-right">
+        <div class="sidebar-right">
+
+            <p><strong th:text="${profile.effectiveDisplayName}">Display Name</strong></p>
+            <p th:text="'@' + ${profile.username}">@username</p>
+            <p th:if="${profile.bio != null}" th:text="${profile.bio}">Bio goes here.</p>
+            <a th:href="@{/users/{id}(id=${profile.id})}" class="view-profile-btn">View public profile</a>
+
+            <form th:action="@{/my-profile/update}" method="post" th:object="${updateProfileDto}" class="profile-form">
+                <div class="rows">
+                    <label for="displayName">Display Name</label>
+                    <input type="text" id="displayName" th:field="*{displayName}" maxlength="100">
+                </div>
+                <div class="rows">
+                    <label for="bio">Bio</label>
+                    <textarea id="bio" th:field="*{bio}" rows="6" maxlength="1000"></textarea>
+                </div>
+                <button type="submit">Save</button>
+            </form>
+
         </div>
     </div>
 
-    </div>
 </div>
 
 </body>