-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from AveryNewkirk/riley_branch
Resolved merge conflict locally—just minor conflict with template.html. All good to merge.
- Loading branch information
Showing
7 changed files
with
34 additions
and
7 deletions.
There are no files selected for viewing
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<!-- CREATE LISTING PAGE --> | ||
{% extends "template.html" %} | ||
{% start block %} | ||
|
||
{% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
<!-- HOME PAGE --> | ||
{% extends "template.html" %} | ||
{% block content %} | ||
<h1>this is the index page</h1> | ||
|
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,15 +4,36 @@ | |
<meta charset="UTF-8"> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
<title>Document</title> | ||
<!-- FONTS --> | ||
<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=Signika+Negative:wght@400;600;700&family=Young+Serif&display=swap" rel="stylesheet"> | ||
<!-- STYLESHEETS --> | ||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous"> | ||
<link rel="stylesheet" href="css/main.css"> | ||
</head> | ||
<body> | ||
<nav> | ||
<ul> | ||
<li><a href="{{url_for('index')}}">Index</a></li> | ||
<li><a href="{{url_for('profile')}}">Profile</a></li> | ||
</ul> | ||
</nav> | ||
{% block content %} | ||
<header> | ||
<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="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation"> | ||
<span class="navbar-toggler-icon"></span> | ||
</button> | ||
<div class="collapse navbar-collapse" id="navbarNavAltMarkup"> | ||
<div class="navbar-nav"> | ||
<!-- <a class="nav-item nav-link active" href="#">Home <span class="sr-only">(current)</span></a> --> | ||
<a class="nav-item nav-link" href="index.html">Home</a> | ||
<a class="nav-item nav-link" href="marketplace.html">Market</a> | ||
<a class="nav-item nav-link" href="community.html">Community</a> | ||
<a class="nav-item nav-link" href="create_listing.html">Create Listing</a> | ||
<a class="nav-item nav-link" href="contact.html">Contact</a> | ||
<a class="nav-item nav-link" href="settings.html">Settings</a> | ||
<a class="nav-item nav-link" href="login.html">Login</a> | ||
</div> | ||
</div> | ||
</nav> | ||
</header> | ||
{% start block %} | ||
{% endblock %} | ||
|
||
</body> | ||
|