Skip to content

Commit

Permalink
updatecon
Browse files Browse the repository at this point in the history
  • Loading branch information
InuiluDD committed Jul 6, 2024
2 parents dc25f48 + b4fe68f commit 9501c90
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 102 deletions.
3 changes: 1 addition & 2 deletions about.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ <h1>Giới Thiệu</h1>
<ul>
<li><a href="index.html">Trang Chủ</a></li>
<li><a href="login.html">Đăng Nhập</a></li>
<li><a href="calculator.html">Tính Calories</a></li>
<li><a href="calculator.html">Tính calories</a></li>
<li><a href="about.html">Giới Thiệu</a></li>
<li><a href="signup.html">Đăng ký</a></li>
</ul>
</nav>
</header>
Expand Down
41 changes: 39 additions & 2 deletions calculator.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="vi">

<head>
Expand All @@ -18,7 +17,6 @@ <h1>Tính Calories</h1>
<li><a href="login.html">Đăng Nhập</a></li>
<li><a href="calculator.html">Tính Calories</a></li>
<li><a href="about.html">Giới Thiệu</a></li>
<li><a href="signup.html">Đăng ký</a></li>
</ul>
</nav>
</header>
Expand All @@ -40,4 +38,43 @@ <h2>Nhập số lượng Calories</h2>
</footer>
<script src="script.js"></script>
</body>

</html>
<html lang="vi">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Tính Calories</title>
<link rel="stylesheet" href="styles.css">
</head>

<body>
<header>
<h1>Tính Calories</h1>
<nav>
<ul>
<li><a href="index.html">Trang Chủ</a></li>
<li><a href="login.html">Đăng Nhập</a></li>
<li><a href="calculator.html">Tính Calories</a></li>
<li><a href="about.html">Giới Thiệu</a></li>
<li><a href="signup.html">Đăng ký</a></li>
</ul>
</nav>
</header>
<main>
<h2>Nhập số lượng Calories</h2>
<form id="cal-form">
<label for="calories">Số lượng Calories:</label>
<input type="number" id="calories" name="calories" required>
<button type="submit">Tính</button>
</form>
<p id="result"></p>
</main>
<footer>
<p>&copy; 2024 Vui Là 9</p>
</footer>
<script src="script.js"></script>
</body>

</html>
33 changes: 4 additions & 29 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ol class="carousel-indicators"></ol>
<!DOCTYPE html>
<html lang="vi">

<head>
Expand Down Expand Up @@ -27,6 +27,7 @@
}
.carousel-item img {
width: 100%;
bottom: 0;
}
</style>
</head>
Expand All @@ -40,31 +41,12 @@ <h1>Chào mừng đến với trang web Vui Là 9</h1>
<li><a href="login.html">Đăng Nhập</a></li>
<li><a href="calculator.html">Tính Calories</a></li>
<li><a href="about.html">Giới Thiệu</a></li>
<li><a href="signup.html">Đăng ký</a></li>
</ul>
</nav>
</header>
<main>
<div id="carouselExampleIndicators" class="carousel slide" data-ride="carousel">
<div class="carousel-inner">
<div class="carousel-item active">
<img src="banner_image.png" class="d-block mx-auto" alt="Image 1">
</div>
<div class="carousel-item">
<img src="banner_image.png" class="d-block mx-auto" alt="Image 2">
</div>
<div class="carousel-item">
<img src="banner_image.png" class="d-block mx-auto" alt="Image 3">
</div>
</div>
<a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
<div class="text-center">
<img src="banner_image.png" class="img-fluid" alt="Banner Image">
</div>
</main>
<footer>
Expand All @@ -75,13 +57,6 @@ <h1>Chào mừng đến với trang web Vui Là 9</h1>
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.5.4/dist/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
<script>
$(document).ready(function () {
$('.carousel').carousel({
interval: 2000 // Change the interval value to adjust the speed (in milliseconds)
});
});
</script>
</body>

</html>
2 changes: 1 addition & 1 deletion login.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ <h1>Đăng Nhập</h1>
<li><a href="login.html">Đăng Nhập</a></li>
<li><a href="calculator.html">Tính Calories</a></li>
<li><a href="about.html">Giới Thiệu</a></li>
<li><a href="signup.html">Đăng ký</a></li>
</ul>
</nav>
</header>
Expand All @@ -32,6 +31,7 @@ <h2>Đăng Nhập</h2>
<input type="password" id="password" name="password" required>
<button type="submit">Đăng Nhập</button>
</form>
<a href="signup.html"><button>Đăng Ký</button></a>
</div>
</div>
</main>
Expand Down
15 changes: 11 additions & 4 deletions signup.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@ <h1>Đăng Ký</h1>
<ul>
<li><a href="index.html">Trang Chủ</a></li>
<li><a href="login.html">Đăng Nhập</a></li>
<li><a href="calculator.html">Tính Calories</a></li>
<li><a href="calculator.html">Tính calories</a></li>
<li><a href="about.html">Giới Thiệu</a></li>
<li><a href="signup.html">Đăng ký</a></li>
</ul>
</nav>
</header>
<main>
<div class="form-container">
<div class="signup-form">
<h2>Đăng Ký</h2>
<form>
<form id="signup-form">
<label for="new-username">Tên đăng nhập:</label>
<input type="text" id="new-username" name="new-username" required>
<label for="new-password">Mật khẩu:</label>
Expand All @@ -36,8 +35,16 @@ <h2>Đăng Ký</h2>
</div>
</main>
<footer>
<p>&copy; 2024 Vui Là 9</p>
<p>&copy; 2024 Trang web của chúng tôi</p>
</footer>
<script>
document.getElementById('signup-form').addEventListener('submit', function(event) {
event.preventDefault(); // Ngăn chặn hành vi mặc định của form
// Thực hiện các thao tác đăng ký ở đây (ví dụ: gửi dữ liệu đến server)
// Sau khi đăng ký thành công, chuyển hướng đến trang chủ
window.location.href = 'index.html';
});
</script>
</body>

</html>
80 changes: 16 additions & 64 deletions styles.css
Original file line number Diff line number Diff line change
@@ -1,95 +1,47 @@
body {
font-family: Arial, sans-serif;
background-color: #f2f2f2;
margin: 0;
padding: 0;
font-family: 'Arial', sans-serif;
background-color: #f8f9fa;
}

header {
background-color: #4CAF50;
background-color: #007bff;
color: white;
padding: 1px 0;
padding: 20px 0;
}

header h1 {
text-align: center;
margin: 0;
}

header nav ul {
list-style-type: none;
nav ul {
list-style: none;
padding: 0;
text-align: center;
}

header nav ul li {
nav ul li {
display: inline;
margin: 0 10px;
margin: 0 15px;
}

header nav ul li a {
nav ul li a {
color: white;
text-decoration: none;
color: inherit;
}

main {
display: flex;
justify-content: center;
align-items: center;
height: 80vh;
}

.form-container {
display: flex;
justify-content: space-around;
width: 30%;
background-color: white;
padding: 20px;
border-radius: 10px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
}

.login-form {
width: 45%;
}

h2 {
text-align: center;
}

form {
display: flex;
flex-direction: column;
align-items: center;
}

label,
input,
button {
width: 100%;
margin: 10px 0;
}

input,
button {
padding: 10px;
border: 1px solid #ccc;
border-radius: 5px;
}

button {
background-color: #4CAF50;
color: white;
border: none;
cursor: pointer;
}

button:hover {
background-color: #45a049;
}

footer {
background-color: #4CAF50;
background-color: #007bff;
color: white;
text-align: center;
padding: 10px 0;
position: fixed;
width: 100%;
bottom: 0;
width: 100%;
height: 5%;
Expand Down

0 comments on commit 9501c90

Please sign in to comment.