Skip to content

Commit

Permalink
Merge pull request #98 from gcivil-nyu-org/search-frontend
Browse files Browse the repository at this point in the history 
Modify redirect
  • Loading branch information
@weineng-hsu
weineng-hsu committed Mar 29, 2022
2 parents 7e75b67 + 3f730ed commit 525444e
Show file tree
Hide file tree
Showing 13 changed files with 440 additions and 147 deletions.
2 changes: 1 addition & 1 deletion nyu_marketplace/settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@
LOGIN_REDIRECT_URL = "/posts"
LOGOUT_REDIRECT_URL = "/accounts/login"
SIGNUP_REDIRECT_URL = "/posts"
ACCOUNT_EMAIL_CONFIRMATION_ANONYMOUS_REDIRECT_URL = "/profile"
ACCOUNT_AUTHENTICATION_METHOD = "email"
ACCOUNT_EMAIL_REQUIRED = True
ACCOUNT_EMAIL_VERIFICATION = True
Expand All @@ -198,7 +199,6 @@
ACCOUNT_ADAPTER = "nyu_marketplace.adapters.RestrictEmailAdapter"
SOCIALACCOUNT_ADAPTER = "nyu_marketplace.adapters.CustomSocialAccountAdapter"


EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
EMAIL_HOST = "smtp.gmail.com"
EMAIL_HOST_USER = "nyumarketplace@gmail.com"
Expand Down
Binary file added posts/static/posts/NYU-Marketplace-Logo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
274 changes: 153 additions & 121 deletions posts/templates/posts/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,156 +2,188 @@
<!DOCTYPE html>

<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<title></title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Poppins&display=swap" rel="stylesheet">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.1/font/bootstrap-icons.css">
</head>
<body>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
<link rel="stylesheet" type="text/css" href="{% static 'posts/main.css' %}">
<link rel="stylesheet" type='text/css' href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.14/semantic.min.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.js"></script>

<!-- Navbar -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<title></title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Poppins&display=swap" rel="stylesheet">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.1/font/bootstrap-icons.css">
</head>
<body>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"
integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p"
crossorigin="anonymous"></script>
<link rel="stylesheet" type="text/css" href="{% static 'posts/main.css' %}">
<link rel="stylesheet" type='text/css'
href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.14/semantic.min.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.js"></script>

<!-- Navbar -->
<nav class="navbar navbar-expand-lg">
<!-- Container wrapper -->
<div class="container-fluid">
<!-- Toggle button -->
<button
<!-- Container wrapper -->
<div class="container-fluid">
<!-- Toggle button -->
<button
class="navbar-toggler"
type="button"
data-mdb-toggle="collapse"
data-mdb-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent"
aria-expanded="false"
aria-label="Toggle navigation"
>
<i class="fas fa-bars"></i>
</button>

<!-- Collapsible wrapper -->
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<!-- Navbar brand -->
<a class="navbar-brand mt-2 mt-lg-0" href="{% url 'home' %}">

<img src= "https://smartdesignworldwide.com/wp-content/uploads/2018/05/nyu-logo.jpg" width = 100 loading = "lazy"/>
>
<i class="fas fa-bars"></i>
</button>

<!-- Collapsible wrapper -->
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<!-- Navbar brand -->
<a class="navbar-brand mt-2 mt-lg-0" href="{% url 'home' %}">

<img src="https://smartdesignworldwide.com/wp-content/uploads/2018/05/nyu-logo.jpg" width=100 loading="lazy"/>
</a>
<!-- Left links -->
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="{% url 'home' %}">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'profile' %}">Profile</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'post-create' %}">My Posts</a>
</li>
<li style="margin-left: 300px;">

<form class="navbar-form" role="search" method="get" onsubmit="return validateSearch()"
action="{% url 'search' %}">
<div class="form-group row">
<div class="col">
<input type="text" id="searchInput" name="q" class="form-control"
placeholder="Search Marketplace" style="width: 300px">
</div>
<div class="col">
<button type="submit" class="btn btn-secondary" style="color: #000000; background-color: #ffffff"><i
class="bi bi-search"></i></button>
</div>

</div>
</form>
</li>
</ul>
<!-- Left links -->
</div>
<!-- Collapsible wrapper -->

<!-- Right elements -->
<div class="d-flex align-items-center">

<!-- Icon -->
<a class="text-reset me-3" href="#">
<i class="fas fa-shopping-cart"></i>
</a>

<!-- Notifications -->
<!-- div class="dropdown">
<a
class="text-reset me-3 dropdown-toggle hidden-arrow"
href="#"
id="navbarDropdownMenuLink"
role="button"
data-mdb-toggle="dropdown"
aria-expanded="false"
>
<i class="fas fa-bell"></i>
<span class="badge rounded-pill badge-notification bg-danger">1</span>
</a>
<!-- Left links -->
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="{% url 'home' %}">Home</a>
<ul
class="dropdown-menu dropdown-menu-end"
aria-labelledby="navbarDropdownMenuLink"
>
<li>
<a class="dropdown-item" href="#">Some news</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'profile' %}">Profile</a>
<li>
<a class="dropdown-item" href="#">Another news</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'post-create' %}">My Posts</a>
<li>
<a class="dropdown-item" href="#">Something else here</a>
</li>
</ul>
<!-- Left links -->
</div>
<!-- Collapsible wrapper -->

<!-- Right elements -->
<div class="d-flex align-items-center">

<!-- Icon -->
<a class="text-reset me-3" href="#">
<i class="fas fa-shopping-cart"></i>
</a>

<!-- Notifications -->
<!-- div class="dropdown">
<a
class="text-reset me-3 dropdown-toggle hidden-arrow"
href="#"
id="navbarDropdownMenuLink"
role="button"
data-mdb-toggle="dropdown"
aria-expanded="false"
>
<i class="fas fa-bell"></i>
<span class="badge rounded-pill badge-notification bg-danger">1</span>
</a>
<ul
class="dropdown-menu dropdown-menu-end"
aria-labelledby="navbarDropdownMenuLink"
>
<li>
<a class="dropdown-item" href="#">Some news</a>
</li>
<li>
<a class="dropdown-item" href="#">Another news</a>
</li>
<li>
<a class="dropdown-item" href="#">Something else here</a>
</li>
</ul>
</div-->
<!-- Avatar -->


<div class="dropdown">
<a
</div-->
<!-- Avatar -->
{% if user.is_authenticated %}
<div class="dropdown">
<a
class="dropdown-toggle d-flex align-items-center hidden-arrow"
href="#"
id="navbarDropdownMenuAvatar"
role="button"
data-bs-toggle="dropdown"
aria-expanded="false"
style="text-decoration:none;color:#FFFFFF;"
>
<img
>
<img
src="https://mdbcdn.b-cdn.net/img/new/avatars/2.webp"
class="rounded-circle"
height="25"
alt="Black and White Portrait of a Man"
loading="lazy"
/>
&nbsp User
/>
&nbsp {{ user.username }}

</a>
<ul
</a>
<ul
class="dropdown-menu dropdown-menu-end"
aria-labelledby="navbarDropdownMenuAvatar"
>
<li>
<a class="dropdown-item" href="{% url 'home' %}">My profile</a>
</li>
<li>
<a class="dropdown-item" href="{% url 'home' %}">Settings</a>
</li>
<li>
<a class="dropdown-item" href="{% url 'account_logout' %}">Logout</a>
</li>
</ul>
</div>
>
<li>
<a class="dropdown-item" href="{% url 'profile' %}">My profile</a>
</li>
<li>
<a class="dropdown-item" href="{% url 'home' %}">Settings</a>
</li>
<li>
<a class="dropdown-item" href="{% url 'account_logout' %}">Logout</a>
</li>
</ul>
</div>
{% else %}
<div>
</div>
<!-- Right elements -->
{% endif %}
</div>
<!-- Container wrapper -->
</nav>
<!-- Navbar -->
<script src="" async defer></script>
</body>
<main role="main" class="container">
<div class="row">
<div class="col-md-12">
{% block content %}{% endblock %}
</div>

</div>
</main>

<!-- Right elements -->
</div>
<!-- Container wrapper -->
</nav>
<!-- Navbar -->
<script src="" async defer></script>
</body>
<main role="main" class="container">
<div class="row">
<div class="col-md-12">
{% block content %}{% endblock %}
</div>

</div>
</main>
<script>
function validateSearch() {
var x = document.getElementById("searchInput").value;
if (x == null || x.trim() == "") {
alert("Please input search words");
return false;
}
}
</script>
</html>

0 comments on commit 525444e

Please sign in to comment.