Skip to content

Module 1 submission #3

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
merged 3 commits into from
Jun 10, 2025
Merged

Module 1 submission #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a7b93d
Module 1 changes.
nadra-m Jun 10, 2025
1807de9
Conflict edits settings.py + urls.py
nadra-m Jun 10, 2025
c078f4b
Merge branch 'main' into new-nadra
nadra-m Jun 10, 2025
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
2 changes: 0 additions & 2 deletions server/djangoproj/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,5 +142,3 @@
os.path.join(BASE_DIR, 'frontend/static'),
os.path.join(BASE_DIR, 'frontend/build'),
os.path.join(BASE_DIR, 'frontend/build/static'),
]

2 changes: 2 additions & 0 deletions server/frontend/static/About.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<link rel="stylesheet" href="/static/style.css">
<link rel="stylesheet" href="/static/bootstrap.min.css">
</head>

<div>
<nav class="navbar navbar-expand-lg navbar-light" style="background-color:darkturquoise; height: 1in;">
<div class="container-fluid">
Expand All @@ -29,6 +30,7 @@ <h2 style="padding-right: 5%;">Dealerships</h2>

<div class="card" style="width: 80%;margin: auto; margin-top:5%;">
<div class="banner" name="about-header">
<!-- HEADER -->
<!-- Insert header information here -->
<h1>About Us</h1>
Welcome to Best Cars dealership, home to the best cars in North America. We deal in sale of domestic and imported cars at reasonable prices.
Expand Down
121 changes: 79 additions & 42 deletions server/frontend/static/Contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,79 @@
<html>
<head>
<!-- Link the style sheet here -->
<link rel="stylesheet" href="/static/style.css">
<link rel="stylesheet" href="/static/bootstrap.min.css">
</head>
<div>
<nav class="navbar navbar-expand-lg navbar-light" style="background-color:darkturquoise; height: 1in;">
<div class="container-fluid">
<h2 style="padding-right: 5%;">Dealerships</h2>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarText">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" style="font-size: larger;" aria-current="page" href="/">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" style="font-size: larger;" href="/about">About Us</a>
</li>
<li class="nav-item">
<a class="nav-link active" style="font-size: larger;" href="/contact">Contact Us</a>
</li>
</ul>
</div>
</div>
</nav>

<div class="card" style="width: 80%;margin: auto; margin-top:5%;">
<div class="banner" name="about-header">
<!-- Insert header information here -->
<h1>Contact us</h1>
These our information
</div>
</div>
</div>
</div>

</div>

</html>
<html>
<head>
<link rel="stylesheet" href="/static/style.css">
<link rel="stylesheet" href="/static/bootstrap.min.css">
</head>
</html>

<div>
<nav class="navbar navbar-expand-lg navbar-light" style="background-color:#5A827E; height: 1in;">
<div class="container-fluid">
<h2 style="padding-right: 5%;">Dealerships</h2>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarText">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" style="font-size: larger;" aria-current="page" href="/">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" style="font-size: larger;" href="/about">About Us</a>
</li>
<li class="nav-item">
<a class="nav-link active" style="font-size: larger;" href="/contact">Contact Us</a>
</li>
</ul>
</div>
</div>
</nav>

<body style="background-color: #b7caae; font-family: 'Roboto', sans-serif; width: 100vw; min-height: 100vh; margin: 0">
<div style="bottom: 25px;">
<h1 style="text-align: center; font-size: 45px; color:#182422">
Contact [CAR DEALERSHIP] today!
</h1>
</div>
</body>
<html>
<head>
<!-- Link the style sheet here -->
<link rel="stylesheet" href="/static/style.css">
<link rel="stylesheet" href="/static/bootstrap.min.css">
</head>
<div>
<nav class="navbar navbar-expand-lg navbar-light" style="background-color:darkturquoise; height: 1in;">
<div class="container-fluid">
<h2 style="padding-right: 5%;">Dealerships</h2>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarText">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" style="font-size: larger;" aria-current="page" href="/">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" style="font-size: larger;" href="/about">About Us</a>
</li>
<li class="nav-item">
<a class="nav-link active" style="font-size: larger;" href="/contact">Contact Us</a>
</li>
</ul>
</div>
</div>
</nav>

<div class="card" style="width: 80%;margin: auto; margin-top:5%;">
<div class="banner" name="about-header">
<!-- Insert header information here -->
<h1>Contact us</h1>
These our information
</div>
</div>
</div>
</div>

</div>

</html>
8 changes: 8 additions & 0 deletions server/frontend/static/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
body {
background-color: #B9D4AA;
font-family: 'Roboto', sans-serif;
width: 100vw;
min-height: 100vh;
margin: 0;
}

img{
width: 60%;
align-self: center;
Expand Down