Skip to content

fix: remove merge conflict markers from login page #7249

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
dhairyagothi merged 1 commit into from
Jun 8, 2026
+11 −76
Merged

fix: remove merge conflict markers from login page #7249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
87 changes: 11 additions & 76 deletions public/Login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,43 +6,28 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Login — 100 Days 100 Web Projects</title>

<<<<<<< HEAD
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css"
crossorigin="anonymous" referrerpolicy="no-referrer" />
=======
<link rel="stylesheet" href="style.css" />
</head>
<body class="login-page">
<div class="ambient ambient-left" aria-hidden="true"></div>
<div class="ambient ambient-right" aria-hidden="true"></div>
<div class="noise-layer" aria-hidden="true"></div>
>>>>>>> 64132d0da97817e204b53a23655e32b83ce48041

<link rel="stylesheet" href="style.css" />
</head>

<<<<<<< HEAD
<body>
<div class="ambient ambient-left" aria-hidden="true"></div>
<div class="ambient ambient-right" aria-hidden="true"></div>
<div class="noise-layer" aria-hidden="true"></div>
=======
<header>
<nav class="navbar" aria-label="Main navigation">
<span class="navbar-brand">100 Days 100 Web Projects</span>
<a href="../index.html" class="nav-home-link">
<i class="fa-solid fa-house" aria-hidden="true"></i>
Home
</a>
</nav>
</header>
>>>>>>> 64132d0da97817e204b53a23655e32b83ce48041

<div class="bg-blur"></div>

<nav class="navbar">
<a href="../index.html" class="button home-btn">Home</a>
<header>
<nav class="navbar" aria-label="Main navigation">
<span class="navbar-brand">100 Days 100 Web Projects</span>
<a href="../index.html" class="nav-home-link">
<i class="fa-solid fa-house" aria-hidden="true"></i>
Home
</a>
</nav>
</header>

<section class="hero-section">
<h1 class="hero-title">100 Days 100 Web Projects</h1>
Expand All @@ -66,31 +51,6 @@ <h2 class="auth-title-1">Login</h2>
text-align: center;
"></div>

<<<<<<< HEAD
<form id="loginForm" class="auth-form">
<div class="form-group">
<i class="fa-solid fa-user"></i>
<input type="text" id="username" placeholder="Username" class="form-input" autocomplete="username"
required />
</div>

<div class="form-group">
<i class="fa-solid fa-lock"></i>
<input type="password" id="password" placeholder="Password" class="form-input"
autocomplete="current-password" required />
<span class="toggle-password" onclick="togglePassword()" title="Show/hide password">👁</span>
</div>

<button type="submit" class="button home-btn" id="loginBtn">
<i class="fa-solid fa-right-to-bracket"></i>
Login
</button>
</form>

<p class="already-signed-up">
<a href="./ForgotPassword.html" id="forgotPasswordLink">Forgot Password?</a>
</p>
=======
<form id="loginForm" class="auth-form">
<div class="form-group">
<i aria-hidden="true" class="fa-solid fa-user"></i>
Expand Down Expand Up @@ -131,7 +91,6 @@ <h2 class="auth-title-1">Login</h2>
<p class="already-signed-up">
<a href="./ForgotPassword.html" id="forgotPasswordLink">Forgot Password?</a>
</p>
>>>>>>> 64132d0da97817e204b53a23655e32b83ce48041

<p class="already-signed-up">
Not signed up? <a href="./SignUp.html">Sign Up</a>
Expand All @@ -154,21 +113,12 @@ <h2 class="auth-title-1">Login</h2>
const toast = document.createElement('div');
toast.className = `toast ${type}`;

<<<<<<< HEAD
const iconMap = {
success: '<i class="fa-solid fa-circle-check"></i>',
error: '<i class="fa-solid fa-circle-exclamation"></i>',
warning: '<i class="fa-solid fa-triangle-exclamation"></i>',
info: '<i class="fa-solid fa-circle-info"></i>'
};
=======
const iconMap = {
success: '<i aria-hidden="true" class="fa-solid fa-circle-check"></i>',
error: '<i aria-hidden="true" class="fa-solid fa-circle-exclamation"></i>',
warning: '<i aria-hidden="true" class="fa-solid fa-triangle-exclamation"></i>',
info: '<i aria-hidden="true" class="fa-solid fa-circle-info"></i>'
};
>>>>>>> 64132d0da97817e204b53a23655e32b83ce48041

toast.innerHTML = `
<div class="toast-icon">${iconMap[type] || iconMap.info}</div>
Expand Down Expand Up @@ -270,28 +220,13 @@ <h2 class="auth-title-1">Login</h2>
// Disable the button to prevent double-submit
document.getElementById("loginBtn").disabled = true;

// Redirect after a short delay so the user sees the success message
// Redirect after a short delay so the user sees the success message
setTimeout(function () {
window.location.href = "../index.html";
}, 1000);
});
</script>
</body>

<<<<<<< HEAD
<script type="module" src="./firebase-auth.js"></script>
</body>
</html>
=======
// Disable the button to prevent double-submit
document.getElementById("loginBtn").disabled = true;

// Redirect after a short delay so the user sees the success message
setTimeout(function () {
window.location.href = "../index.html";
}, 1000);
});
</script>

<script type="module" src="./firebase-auth.js"></script>
</body>
</html>
>>>>>>> 64132d0da97817e204b53a23655e32b83ce48041
Loading