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

trying to fix

Browse Source
This commit is contained in:
kaipher7
2026-03-11 19:38:28 -06:00
parent 6f24d3692a 738c6970dd
commit 22235f38b3
7 changed files with 114 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
demo/src/main/resources/templates/create-account.html
+38 -30
View File
@@ -1,50 +1,58 @@
<!DOCTYPE html>
<html lang="en">
<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">
<title>Create Thyme Crunch Account</title>
<link rel="stylesheet" th:href="@{css/create-account.css}">
>>>>>>> 738c6970dde9507734a43ead0f3e9aadd5b41e23
</head>
<body>
<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">
<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>
>>>>>>> 738c6970dde9507734a43ead0f3e9aadd5b41e23
</header>
<!-- Main Content -->
<main class="main-content">
<div class="login-box">
<!-- Main Content -->
<main class="main-content">
<div class="login-box">
<h2>Create Account</h2>
<form id="createUserForm">
<form id="createUserForm">
<div class="rows">
<label for="username">Username</label>
<input type="text" id="username" required>
</div>
<div class="rows">
<label for="email">Email</label>
<input type="email" id="email" required>
</div>
<div class="rows">
<label for="password">Password</label>
<input type="password" id="password" required>
</div>
<div class="rows">
<label for="confirmPassword">Confirm Password</label>
<input type="password" id="confirmPassword" required>
</div>
<p id="passwordError"></p>
<div class="rows">
<label for="username">Username</label>
<input type="text" id="username" required>
</div>
<div class="rows">
<label for="email">Email</label>
<input type="email" id="email" required>
</div>
<div class="rows">
<label for="password">Password</label>
<input type="password" id="password" required>
</div>
<div class="rows">
<label for="confirmPassword">Confirm Password</label>
<input type="password" id="confirmPassword" required>
</div>
<p id="passwordError"></p>
<button type="submit">Create</button>
</form>
</div>
</main>
</div>
<button type="submit">Create</button>
</form>
</div>
</main>
</body>
</html>