Skip to content
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

Merge #168

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Merge #168

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
2b219e5
Added about and contact page
waraujo-ia Dec 20, 2023
c21cf56
Added login, logout and sigup methods
waraujo-ia Dec 20, 2023
fc0c652
new models
waraujo-ia Dec 21, 2023
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
Binary file added server/db.sqlite3
View file
Open in desktop
Binary file not shown.
32 changes: 32 additions & 0 deletions server/djangoapp/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@
# - Description
# - Any other fields you would like to include in car make model
# - __str__ method to print a car make object
class CarMake(models.Model):
name = models.CharField(null=False, max_length=30, default='Name')
description = models.CharField(null=False, max_length=30, default='Description')

# Create a toString method for object string representation
def __str__(self):
return self.name + " " + self.description


# <HINT> Create a Car Model model `class CarModel(models.Model):`:
Expand All @@ -19,6 +26,31 @@
# - Year (DateField)
# - Any other fields you would like to include in car model
# - __str__ method to print a car make object
class CarModel(models.Model):
SEDAN = 'Sedan'
SUV = 'SUV'
WAGON = 'WAGON'
TYPE_CHOICES = [
(SEDAN, 'Sedan'),
(SUV, 'SUV'),
(WAGON, 'WAGON')
]
dealer_id = models.IntegerField()
name = models.CharField(null=False, max_length=100, default='name')
description = models.CharField(max_length=500)
type = models.CharField(
null=False,
max_length=20,
choices=TYPE_CHOICES,
default=SEDAN
)
year = models.IntegerField()
carMade = models.ManyToManyField(CarMake)

# Create a toString method for object string representation
def __str__(self):
return "Name: " + self.name + "," + \
"Description: " + self.type


# <HINT> Create a plain Python class `CarDealer` to hold dealer data
Expand Down
87 changes: 87 additions & 0 deletions server/djangoapp/templates/djangoapp/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Dealership Review</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
<link href="https://unpkg.com/[email protected]/dist/bootstrap-table.min.css" rel="stylesheet">
<script src="https://unpkg.com/[email protected]/dist/bootstrap-table.min.js"></script>
<script src="https://unpkg.com/[email protected]/dist/extensions/filter-control/bootstrap-table-filter-control.min.js"></script>

</head>

<body>
<!--Add a nav bar here -->
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<a class="navbar-brand" href="#">Navbar</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="/djangoapp">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="/djangoapp/contact">Contact</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/djangoapp/about">About</a>
</li>
</ul>
<ul class="navbar-nav my-2 my-lg-0">
{% if user.is_authenticated %}
<li class="nav-item order-2">
<a class="nav-link" href="/djangoapp/signup">{{user.first_name}}</a>
</li>
<li class="nav-item order-2">
<a class="nav-link" href="{% url 'djangoapp:logout' %}">Logout</a>
</li>
{% else %}
<li class="dropdown order-1">
<button type="button" id="dropdownMenu1" data-toggle="dropdown" class="btn btn-outline-secondary dropdown-toggle">Login <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right mt-1">
<li class="p-3">
<form class="form" role="form" action="{% url 'djangoapp:login' %}" method="post">
{% csrf_token %}
<div class="form-group">
<input id="emailInput" placeholder="Email" class="form-control form-control-sm" type="text" required="" name="username">
</div>
<div class="form-group">
<input id="passwordInput" placeholder="Password" class="form-control form-control-sm" type="password" required="" name="psw">
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary btn-block">Login</button>
</div>
<div class="form-group text-xs-center">
<small><a href="#">Forgot password?</a></small>
</div>
{% if message %}
<div class="alert alert-warning"> <!--Style the message paragraph with .alert and .alert-warning class -->
{{ message }}
</div>
{% endif %}
</form>
</li>
</ul>
</li>
<li class="nav-item order-2">
<a class="nav-link" href="/djangoapp/registration">Sign Up</a>
</li>
{% endif %}
</ul>
</div>
</nav>

<!--Add a dealer table here -->
<h1>
Welcome to Best Cars dealership, home to the best cars in North America. We sell domestic and imported cars at reasonable prices.
</h1>

</body>

</html>
139 changes: 139 additions & 0 deletions server/djangoapp/templates/djangoapp/contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Dealership Review</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
<link href="https://unpkg.com/[email protected]/dist/bootstrap-table.min.css" rel="stylesheet">
<script src="https://unpkg.com/[email protected]/dist/bootstrap-table.min.js"></script>
<script src="https://unpkg.com/[email protected]/dist/extensions/filter-control/bootstrap-table-filter-control.min.js"></script>

</head>

<body>
<!--Add a nav bar here -->
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<a class="navbar-brand" href="#">Navbar</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="/djangoapp">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="/djangoapp/contact">Contact</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/djangoapp/about">About</a>
</li>
</ul>
<ul class="navbar-nav my-2 my-lg-0">
{% if user.is_authenticated %}
<li class="nav-item order-2">
<a class="nav-link" href="/djangoapp/signup">{{user.first_name}}</a>
</li>
<li class="nav-item order-2">
<a class="nav-link" href="{% url 'djangoapp:logout' %}">Logout</a>
</li>
{% else %}
<li class="dropdown order-1">
<button type="button" id="dropdownMenu1" data-toggle="dropdown" class="btn btn-outline-secondary dropdown-toggle">Login <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right mt-1">
<li class="p-3">
<form class="form" role="form" action="{% url 'djangoapp:login' %}" method="post">
{% csrf_token %}
<div class="form-group">
<input id="emailInput" placeholder="Email" class="form-control form-control-sm" type="text" required="" name="username">
</div>
<div class="form-group">
<input id="passwordInput" placeholder="Password" class="form-control form-control-sm" type="password" required="" name="psw">
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary btn-block">Login</button>
</div>
<div class="form-group text-xs-center">
<small><a href="#">Forgot password?</a></small>
</div>
{% if message %}
<div class="alert alert-warning"> <!--Style the message paragraph with .alert and .alert-warning class -->
{{ message }}
</div>
{% endif %}
</form>
</li>
</ul>
</li>
<li class="nav-item order-2">
<a class="nav-link" href="/djangoapp/registration">Sign Up</a>
</li>
{% endif %}
</ul>
</div>
</nav>

<!--Add a dealer table here -->
<div class="container">
<div class="row">
<div class="col-md-10 offset-md-1">
<div class="card my-5 p-2">

<div class="container contact">
<div class="row">
<div class="col-md-3">
<div class="contact-info">
<img src="https://image.ibb.co/kUASdV/contact-image.png" alt="image"/>
<h2>Contact Us</h2>
<h4>We would love to hear from you !</h4>
</div>
</div>
<div class="col-md-9">
<div class="contact-form">
<div class="form-group">
<label class="control-label col-sm-2" for="fname">First Name:</label>
<div class="col-sm-10">
<input type="text" class="form-control" id="fname" placeholder="Enter First Name" name="fname">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="lname">Last Name:</label>
<div class="col-sm-10">
<input type="text" class="form-control" id="lname" placeholder="Enter Last Name" name="lname">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="email">Email:</label>
<div class="col-sm-10">
<input type="email" class="form-control" id="email" placeholder="Enter email" name="email">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="comment">Comment:</label>
<div class="col-sm-10">
<textarea class="form-control" rows="5" id="comment"></textarea>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-default">Submit</button>
</div>
</div>
</div>
</div>
</div>
</div>

</div>

</div>
</div>
</div>

</body>

</html>
104 changes: 104 additions & 0 deletions server/djangoapp/templates/djangoapp/custom_template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Dealership Review</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
<link href="https://unpkg.com/[email protected]/dist/bootstrap-table.min.css" rel="stylesheet">
<script src="https://unpkg.com/[email protected]/dist/bootstrap-table.min.js"></script>
<script src="https://unpkg.com/[email protected]/dist/extensions/filter-control/bootstrap-table-filter-control.min.js"></script>

</head>

<body>
<!--Add a nav bar here -->
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<a class="navbar-brand" href="#">Navbar</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="/djangoapp">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="/djangoapp/contact">Contact</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/djangoapp/about">About</a>
</li>
</ul>
<ul class="navbar-nav my-2 my-lg-0">
{% if user.is_authenticated %}
<li class="nav-item order-2">
<a class="nav-link" href="/djangoapp/signup">{{user.first_name}}</a>
</li>
<li class="nav-item order-2">
<a class="nav-link" href="{% url 'djangoapp:logout' %}">Logout</a>
</li>
{% else %}
<li class="dropdown order-1">
<button type="button" id="dropdownMenu1" data-toggle="dropdown" class="btn btn-outline-secondary dropdown-toggle">Login <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right mt-1">
<li class="p-3">
<form class="form" role="form" action="{% url 'djangoapp:login' %}" method="post">
{% csrf_token %}
<div class="form-group">
<input id="emailInput" placeholder="Email" class="form-control form-control-sm" type="text" required="" name="username">
</div>
<div class="form-group">
<input id="passwordInput" placeholder="Password" class="form-control form-control-sm" type="password" required="" name="psw">
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary btn-block">Login</button>
</div>
<div class="form-group text-xs-center">
<small><a href="#">Forgot password?</a></small>
</div>
{% if message %}
<div class="alert alert-warning"> <!--Style the message paragraph with .alert and .alert-warning class -->
{{ message }}
</div>
{% endif %}
</form>
</li>
</ul>
</li>
<li class="nav-item order-2">
<a class="nav-link" href="/djangoapp/registration">Sign Up</a>
</li>
{% endif %}
</ul>
</div>
</nav>

<!--Add a dealer table here -->
<div class="row">
<div class="col-sm-6">
<div class="card">
<div class="card-body">
<h5 class="card-title">Special title treatment</h5>
<p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
<a href="#" class="btn btn-primary">Go somewhere</a>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="card">
<div class="card-body">
<h5 class="card-title">Special title treatment</h5>
<p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
<a href="#" class="btn btn-primary">Go somewhere</a>
</div>
</div>
</div>
</div>

</body>

</html>
Loading