etc404/thymecrunch
1
0
Fork 0
mirror of https://gitlab.com/etc404/software-engineering-project.git synced 2026-05-10 20:52:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed merge issues.

Browse Source
This commit is contained in:
etc404
2026-03-11 19:57:12 -06:00
parent 22235f38b3
commit 988fb067fe
2 changed files with 1 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
demo/src/main/resources/templates/create-account.html
-12
View File
@@ -1,29 +1,17 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<<<<<<< HEAD
<meta charset="UTF-8">
<title>Create Thyme Crunch Account</title>
<link rel="stylesheet" th:href="@{static/css/create-account.css}">
=======
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Create Thyme Crunch Account</title> <title>Create Thyme Crunch Account</title>
<link rel="stylesheet" th:href="@{css/create-account.css}"> <link rel="stylesheet" th:href="@{css/create-account.css}">
>>>>>>> 738c6970dde9507734a43ead0f3e9aadd5b41e23
</head> </head>
<body> <body>
<header class="top-header"> <header class="top-header">
<<<<<<< HEAD
<img src="static/images/header_left.png" alt="Violin f-hole shape to the left of header." class="swirl">
<h1 class="site-name">Thyme Crunch</h1>
<img src="static/images/header_right.png" alt="Violin f-hole shape to the right of header." class="swirl">
=======
<img th:src="@{images/header_left.png}" alt="Violin f-hole shape to the left of header." class="swirl"> <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> <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"> <img th:src="@{images/header_right.png}" alt="Violin f-hole shape to the right of header." class="swirl">
</header> </header>
>>>>>>> 738c6970dde9507734a43ead0f3e9aadd5b41e23
<!-- Main Content --> <!-- Main Content -->
<main class="main-content"> <main class="main-content">
demo/src/main/resources/templates/home.html
+1 -38
View File
@@ -1,57 +1,21 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<<<<<<< HEAD
<meta charset="UTF-8">
<title>Thyme Crunch Home</title>
<link rel="stylesheet" th:href="@{/css/home.css}">
=======
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Thyme Crunch Home</title> <title>Thyme Crunch Home</title>
<link rel="stylesheet" th:href="@{css/home.css}"> <link rel="stylesheet" th:href="@{css/home.css}">
>>>>>>> 738c6970dde9507734a43ead0f3e9aadd5b41e23
</head> </head>
<body> <body>
<header class="top-header"> <header class="top-header">
<<<<<<< HEAD
<img src="static/images/header_left.png" alt="Violin f-hole shape to the left of header." class="swirl">
<h1 class="site-name">Thyme Crunch</h1>
<img src="static/images/header_right.png" alt="Violin f-hole shape to the right of header." class="swirl">
</header>
=======
<img th:src="@{images/header_left.png}" alt="Violin f-hole shape to the left of header." class="swirl"> <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> <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"> <img th:src="@{images/header_right.png}" alt="Violin f-hole shape to the right of header." class="swirl">
</header> </header>
>>>>>>> 738c6970dde9507734a43ead0f3e9aadd5b41e23
<div class="container"> <div class="container">
<!--Navigation Bar --> <!--Navigation Bar -->
<nav class="sidebar-left"> <nav class="sidebar-left">
<<<<<<< HEAD
<ul>
<li><a href="#">Home</a></li>
<li><a href="#">Explore</a></li>
<li><a href="#">Profile</a></li>
<li><a href="#">Saved</a></li>
<li>
<form action="/logout" method="post">
<button type="submit" class="nav_icon">
<img src="static/images/logout_icon.png" alt="Log Out Icon">
</button>
</li>
</ul>
</nav>
</nav>
<a href="#" target="_blank" class="create_icon">
<img src="static/images/create_icon.png" alt="Description of the icon">
</a>
=======
<ul> <ul>
<li><a href="#">Home</a></li> <li><a href="#">Home</a></li>
<li><a href="#">Explore</a></li> <li><a href="#">Explore</a></li>
@@ -67,9 +31,8 @@
<a href="#" target="_blank" class="create_icon"> <a href="#" target="_blank" class="create_icon">
<img src="images/create_icon.png" alt="Description of the icon"> <img th:src="@{images/create_icon.png}" alt="Description of the icon">
</a> </a>
>>>>>>> 738c6970dde9507734a43ead0f3e9aadd5b41e23
<!-- Main Content --> <!-- Main Content -->
<main class="main-content"> <main class="main-content">