Merge base templates. Add database support. Add blueprint for main.

This commit is contained in:
Patrick Jentsch
2019-07-05 14:47:35 +02:00
parent f6b2dd3282
commit b6a67fcd4d
20 changed files with 414 additions and 73 deletions

View File

@ -16,6 +16,7 @@
</div>
</div>
</div>
<div class="col s12 m6">
<div class="card medium">
<div class="card-content">

View File

@ -14,7 +14,35 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
</head>
<body>
{% include 'header.html.j2' %}
<header>
<div id="nav-notifications-dropdown" class="dropdown-content">
<p>Notifications</p>
</div>
<div id="nav-settings-dropdown" class="dropdown-content">
<p>Settings</p>
</div>
<nav>
<div class="nav-wrapper">
<a href="#!" class="brand-logo">
{% if title %}{{ title }}{% else %}Opaque{% endif %}
</a>
<a href="#" data-target="slide-out" class="sidenav-trigger"><i class="material-icons">menu</i></a>
<ul class="right hide-on-med-and-down">
<li><a id="nav-notifications" class="dropdown-trigger" href="#!" data-target="nav-notifications-dropdown"><i class="material-icons">notifications</i></a></li>
<li><a id="nav-settings" class="dropdown-trigger" href="#!" data-target="nav-settings-dropdown"><i class="material-icons">settings</i></a></li>
</ul>
</div>
</nav>
<ul id="slide-out" class="sidenav sidenav-fixed">
<li><a href="{{ url_for('main.index') }}">Opaque</a></li>
{% if current_user.is_authenticated %}
<li><a href="{{ url_for('auth.logout') }}">Log out</a></li>
{% else %}
<li><a href="{{ url_for('auth.login') }}">Log in</a></li>
{% endif %}
</ul>
</header>
<main class="grey lighten-5">
<div class="container">
@ -25,7 +53,45 @@
</div>
</main>
{% include 'footer.html.j2' %}
<footer class="page-footer">
<div class="container">
<div class="row">
<div class="col s12 l3">
<img src="{{ url_for('static', filename='images/logo_sfb_1288.png') }}" class="responsive-img" style="max-height: 140px;">
</div>
<div class="col s12 l3">
<h5 class="white-text">About</h5>
<ul>
<li><a class="grey-text text-lighten-3" href="#!">Link 1</a></li>
<li><a class="grey-text text-lighten-3" href="#!">Link 2</a></li>
<li><a class="grey-text text-lighten-3" href="#!">Link 3</a></li>
</ul>
</div>
<div class="col s12 l3">
<h5 class="white-text">Connect</h5>
<ul>
<li><a class="grey-text text-lighten-3" href="#!">Link 1</a></li>
<li><a class="grey-text text-lighten-3" href="#!">Link 2</a></li>
<li><a class="grey-text text-lighten-3" href="#!">Link 3</a></li>
</ul>
</div>
<div class="col s12 l3">
<h5 class="white-text">Contact</h5>
<ul>
<li><a class="grey-text text-lighten-3" href="#!">Link 1</a></li>
<li><a class="grey-text text-lighten-3" href="#!">Link 2</a></li>
<li><a class="grey-text text-lighten-3" href="#!">Link 3</a></li>
</ul>
</div>
</div>
</div>
<div class="footer-copyright">
<div class="container">
© 2019 Bielefeld University
<a class="grey-text text-lighten-4 right" href="#!">Impress</a>
</div>
</div>
</footer>
<!--JavaScript at end of body for optimized loading-->
<script type="text/javascript" src="{{ url_for('static', filename='js/materialize.min.js') }}"></script>

View File

@ -1,39 +0,0 @@
<footer class="page-footer">
<div class="container">
<div class="row">
<div class="col s12 l3">
<img src="{{ url_for('static', filename='images/logo_sfb_1288.png') }}" class="responsive-img" style="max-height: 140px;">
</div>
<div class="col s12 l3">
<h5 class="white-text">About</h5>
<ul>
<li><a class="grey-text text-lighten-3" href="#!">Link 1</a></li>
<li><a class="grey-text text-lighten-3" href="#!">Link 2</a></li>
<li><a class="grey-text text-lighten-3" href="#!">Link 3</a></li>
</ul>
</div>
<div class="col s12 l3">
<h5 class="white-text">Connect</h5>
<ul>
<li><a class="grey-text text-lighten-3" href="#!">Link 1</a></li>
<li><a class="grey-text text-lighten-3" href="#!">Link 2</a></li>
<li><a class="grey-text text-lighten-3" href="#!">Link 3</a></li>
</ul>
</div>
<div class="col s12 l3">
<h5 class="white-text">Contact</h5>
<ul>
<li><a class="grey-text text-lighten-3" href="#!">Link 1</a></li>
<li><a class="grey-text text-lighten-3" href="#!">Link 2</a></li>
<li><a class="grey-text text-lighten-3" href="#!">Link 3</a></li>
</ul>
</div>
</div>
</div>
<div class="footer-copyright">
<div class="container">
© 2019 Bielefeld University
<a class="grey-text text-lighten-4 right" href="#!">Impress</a>
</div>
</div>
</footer>

View File

@ -1,25 +0,0 @@
<header>
<div id="nav-notifications-dropdown" class="dropdown-content">
<p>Notifications</p>
</div>
<div id="nav-settings-dropdown" class="dropdown-content">
<p>Settings</p>
</div>
<nav>
<div class="nav-wrapper">
<a href="#!" class="brand-logo">
{% if title %}{{ title }}{% else %}Opaque{% endif %}
</a>
<a href="#" data-target="slide-out" class="sidenav-trigger"><i class="material-icons">menu</i></a>
<ul class="right hide-on-med-and-down">
<li><a id="nav-notifications" class="dropdown-trigger" href="#!" data-target="nav-notifications-dropdown"><i class="material-icons">notifications</i></a></li>
<li><a id="nav-settings" class="dropdown-trigger" href="#!" data-target="nav-settings-dropdown"><i class="material-icons">settings</i></a></li>
</ul>
</div>
</nav>
<ul id="slide-out" class="sidenav sidenav-fixed">
<li><a href="{{ url_for('index') }}">Opaque</a></li>
<li><a href="{{ url_for('auth.login') }}">Login</a></li>
</ul>
</header>

View File

@ -2,6 +2,19 @@
{% block page_content %}
<div class="col s12">
<div class="card">
<div class="card-content">
<span class="card-title">
Hello,
{% if current_user.is_authenticated %}
{{ current_user.username }}
{% else %}
Stranger
{% endif %}!
</span>
</div>
</div>
<h2>Services</h2>
<div class="row">