Skip to content

133 refactory users microservice 11 #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leonard1thecoder merged 6 commits into from
Mar 4, 2026
Merged

133 refactory users microservice 11 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
911c261
add aa html structure
leonard1thecoder Mar 4, 2026
5061679
add aa html structure
leonard1thecoder Mar 4, 2026
8799f72
add aa html structure
leonard1thecoder Mar 4, 2026
8c93fc0
add aa html structure
leonard1thecoder Mar 4, 2026
c3ca674
add aa html structure
leonard1thecoder Mar 4, 2026
16ecfd2
add aa html structure
leonard1thecoder Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 98 additions & 57 deletions users_microservice/src/main/resources/static/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,30 @@
--light-green: #81c784;
--focus-green: #4caf50;
--pink: #ff69b4;
--light-grey: #f8f9fa;
--medium-grey: #e9ecef;
--light-grey: #1e1e1e;
--medium-grey: #2a2a2a;
--text-light: #e0e0e0;
--text-muted: #a0a0a0;
--nav-height: 70px;
}

* {
box-sizing: border-box;
}

body {
background-color: #ffffff;
color: #111111;
background-color: #0a0a0a;
color: var(--text-light);
font-family: 'Space Grotesk', system-ui, sans-serif;
line-height: 1.6;
scroll-behavior: smooth;
padding-top: var(--nav-height);
margin: 0;
}

h1, h2, h3, h4 {
color: white;
font-weight: 700;
}

section {
Expand All @@ -32,46 +44,65 @@ section {
background-color: var(--light-grey);
margin: 0 auto 2rem auto;
max-width: 1400px;
color: var(--text-light);
}

.section-medium {
background-color: var(--medium-grey);
}

.card {
background-color: #ffffff;
background-color: #111111;
border: 2px solid var(--pink) !important;
border-radius: 10px;
color: var(--text-light);
transition: transform 0.2s ease, box-shadow 0.2s ease;
}

.card h4 {
color: white;
}

.card p {
color: var(--text-muted);
}

.card:hover {
transform: translateY(-6px);
box-shadow: 0 12px 24px rgba(255,105,180,0.25);
box-shadow: 0 12px 24px rgba(255, 105, 180, 0.25);
}

.feature-img {
max-height: 160px;
object-fit: cover;
border-radius: 8px;
border: 1px solid var(--pink);
margin-bottom: 1.25rem;
width: 100%;
}

.btn-black,
.btn-primary-custom {
background-color: var(--black);
color: #ffffff;
border: 2px solid var(--black);
background-color: white;
color: var(--black);
border: 2px solid white;
font-weight: 600;
transition: all 0.3s ease;
}

.btn-black:hover,
.btn-primary-custom:hover {
background-color: var(--light-orange);
color: #222222;
border-color: var(--light-orange);
background-color: var(--dark-orange);
color: white;
border-color: var(--dark-orange);
transform: translateY(-2px);
box-shadow: 0 8px 20px rgba(255,183,77,0.4);
box-shadow: 0 8px 20px rgba(230, 81, 0, 0.4);
}

.btn-login {
background-color: #ffffff;
color: var(--dark-grey);
border: 2px solid var(--dark-grey);
background-color: transparent;
color: var(--text-light);
border: 2px solid var(--text-light);
font-weight: 500;
transition: all 0.3s ease;
padding: 0.375rem 1rem;
Expand All @@ -86,19 +117,19 @@ section {

.btn-learn-more {
background-color: var(--light-orange);
color: white;
color: var(--black);
border: 2px solid var(--focus-green);
font-weight: 600;
transition: all 0.3s ease;
box-shadow: 0 4px 12px rgba(129, 199, 132, 0.25);
box-shadow: 0 4px 12px rgba(129, 199, 132, 0.3);
}

.btn-learn-more:hover {
background-color: #ff9800;
border-color: #388e3c;
color: white;
transform: translateY(-3px) scale(1.05);
box-shadow: 0 12px 28px rgba(76, 175, 80, 0.35);
box-shadow: 0 12px 28px rgba(76, 175, 80, 0.4);
}

.btn-learn-more:focus {
Expand All @@ -107,7 +138,7 @@ section {
}

.nav-link {
color: var(--black) !important;
color: white !important;
font-weight: 500;
position: relative;
padding-bottom: 0.6rem;
Expand All @@ -116,7 +147,7 @@ section {

.nav-link:hover,
.nav-link.active {
color: var(--black) !important;
color: var(--light-orange) !important;
}

.nav-link::after {
Expand All @@ -126,7 +157,7 @@ section {
left: 5%;
width: 0;
height: 3px;
background-color: var(--light-green);
background-color: var(--light-orange);
border-radius: 3px;
transition: width 0.35s ease, left 0.35s ease;
}
Expand All @@ -137,30 +168,9 @@ section {
left: 5%;
}

.form-control:focus,
.form-control:active {
border-color: var(--focus-green) !important;
box-shadow: 0 0 0 0.25rem rgba(76, 175, 80, 0.25) !important;
outline: none;
}

.form-label {
transition: color 0.2s ease;
}

.form-group:focus-within .form-label {
color: var(--focus-green) !important;
font-weight: 500;
}

h1, h2, h3, h4 {
font-weight: 700;
color: var(--black);
}

nav {
border-bottom: 3px solid var(--pink);
background-color: #ffffff;
background-color: #111111;
}

.hero {
Expand All @@ -170,21 +180,19 @@ nav {
border-bottom: 4px solid var(--pink);
margin-bottom: 3rem;
padding: 5rem 0 4rem;
background-color: #fff;
background-color: #0a0a0a;
}

.hero-text h1 {
color: var(--dark-orange);
font-size: 4.5rem;
line-height: 1.1;
color: var(--light-orange);
}

.hero-img img {
max-width: 100%;
height: auto;
border-radius: 16px;
border: 3px solid var(--pink);
box-shadow: 0 12px 32px rgba(0,0,0,0.15);
box-shadow: 0 12px 32px rgba(0, 0, 0, 0.6);
}

@media (max-width: 991px) {
Expand All @@ -197,17 +205,50 @@ nav {
}
}

.feature-img {
max-height: 160px;
object-fit: cover;
border-radius: 8px;
border: 1px solid var(--pink);
margin-bottom: 1.25rem;
/* Form styling in dark mode */
.form-control {
background-color: #222;
color: white;
border: 1px solid #444;
}

.form-control:focus {
border-color: var(--focus-green) !important;
box-shadow: 0 0 0 0.25rem rgba(76, 175, 80, 0.25) !important;
background-color: #222;
color: white;
}

.form-label {
color: var(--text-light);
}

.form-group:focus-within .form-label {
color: var(--focus-green) !important;
}

/* Footer */
footer {
background-color: var(--light-grey);
background-color: #111111;
border-top: 4px solid var(--pink);
color: var(--text-muted);
padding: 3rem 0 2rem;
color: var(--black);
}

footer p {
color: var(--text-muted);
}

footer a {
color: var(--light-orange);
}

/* Extra spacing helpers */
.py-5 {
padding-top: 3rem !important;
padding-bottom: 3rem !important;
}

.mt-5 {
margin-top: 3rem !important;
}
13 changes: 0 additions & 13 deletions users_microservice/src/main/resources/templates/home/forgot-password.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,19 +110,6 @@
</head>
<body>

<!-- Navbar -->
<nav class="navbar navbar-expand-lg fixed-top">
<div class="container">
<a class="navbar-brand fw-bold" href="registration.html">Alcohol Agent</a>
<div class="collapse navbar-collapse justify-content-end">
<ul class="navbar-nav">
<li class="nav-item"><a class="nav-link" href="registration.html">Register</a></li>
<li class="nav-item"><a class="nav-link" href="login.html">Login</a></li>
<li class="nav-item"><a class="nav-link active" href="forgot-password.html">Forgot Password</a></li>
</ul>
</div>
</div>
</nav>

<!-- Hero -->
<section class="hero">
Expand Down
6 changes: 3 additions & 3 deletions users_microservice/src/main/resources/templates/home/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<a href="#pricing" class="nav-link">Pricing</a>
<a href="#contact" class="nav-link">Contact</a>
<a href="#pricing" class="btn btn-black px-4">Get Started</a>
<a href="login.html" class="btn btn-login btn-sm">Login</a>
<a href="/login" class="btn btn-login btn-sm">Login</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -139,15 +139,15 @@ <h2 class="text-center display-5 fw-bold mb-5">Pricing Plans</h2>
<h4>Free</h4>
<div class="fs-1 fw-bold my-3">R0</div>
<p class="mb-4">Basic tracking & awareness tools</p>
<a href="registration.html" class="btn btn-black w-100">Start Free</a>
<a href="/sign-up" class="btn btn-black w-100">Start Free</a>
</div>
</div>
<div class="col-md-5 col-lg-4">
<div class="card h-100 p-4 text-center border-3 border-pink">
<h4>Premium</h4>
<div class="fs-1 fw-bold my-3">R49<span class="fs-5">/mo</span></div>
<p class="mb-4">Advanced insights • Reports • No ads</p>
<a href="registration.html" class="btn btn-black w-100">Try 14 days free</a>
<a href="/sign-up" class="btn btn-black w-100">Try 14 days free</a>
</div>
</div>
</div>
Expand Down
7 changes: 3 additions & 4 deletions users_microservice/src/main/resources/templates/home/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,8 @@
<a class="navbar-brand fw-bold" href="registration.html">Alcohol Agent</a>
<div class="collapse navbar-collapse justify-content-end">
<ul class="navbar-nav">
<li class="nav-item"><a class="nav-link" href="registration.html">Register</a></li>
<li class="nav-item"><a class="nav-link active" href="login.html">Login</a></li>
<li class="nav-item"><a class="nav-link" href="#">About</a></li>
<li class="nav-item"><a class="nav-link" href="/sign-up">Register</a></li>
<li class="nav-item"><a class="nav-link active" href="/login">Login</a></li>
</ul>
</div>
</div>
Expand Down Expand Up @@ -149,7 +148,7 @@ <h2 class="mb-4 text-center">Login Form</h2>
</div>
<button type="submit" class="btn btn-primary-custom w-100">Login</button>
<div class="text-center mt-3">
<a href="#" class="text-decoration-none">Forgot Password?</a>
<a href="/forgot-password" class="text-decoration-none">Forgot Password?</a>
</div>
</form>
</div>
Expand Down
5 changes: 2 additions & 3 deletions users_microservice/src/main/resources/templates/home/registration.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@
<a class="navbar-brand fw-bold" href="registration.html">Alcohol Agent</a>
<div class="collapse navbar-collapse justify-content-end">
<ul class="navbar-nav">
<li class="nav-item"><a class="nav-link active" href="registration.html">Register</a></li>
<li class="nav-item"><a class="nav-link" href="login.html">Login</a></li>
<li class="nav-item"><a class="nav-link" href="#">About</a></li>
<li class="nav-item"><a class="nav-link active" href="/sign-up">Register</a></li>
<li class="nav-item"><a class="nav-link" href="/login">Login</a></li>
</ul>
</div>
</div>
Expand Down
14 changes: 1 addition & 13 deletions users_microservice/src/main/resources/templates/home/reset.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,19 +110,7 @@
</head>
<body>

<!-- Navbar -->
<nav class="navbar navbar-expand-lg fixed-top">
<div class="container">
<a class="navbar-brand fw-bold" href="registration.html">Alcohol Agent</a>
<div class="collapse navbar-collapse justify-content-end">
<ul class="navbar-nav">
<li class="nav-item"><a class="nav-link" href="registration.html">Register</a></li>
<li class="nav-item"><a class="nav-link" href="login.html">Login</a></li>
<li class="nav-item"><a class="nav-link active" href="reset-password.html">Reset Password</a></li>
</ul>
</div>
</div>
</nav>


<!-- Hero -->
<section class="hero">
Expand Down
Loading