Merge branch 'main' of git.ingemanngade.net:NikolajDanger/UIS_Prototype
This commit is contained in:
@ -26,6 +26,7 @@ class Group(tuple):
|
||||
self.name = group_data[1]
|
||||
self.leaveable = group_data[2]
|
||||
self.parents_can_post = group_data[3]
|
||||
super().__init__()
|
||||
|
||||
def get_posts(self):
|
||||
cur = conn.cursor()
|
||||
@ -48,6 +49,7 @@ class Message(tuple):
|
||||
self.thread_id = message_data[2]
|
||||
self.author_id = message_data[3]
|
||||
self.created_date = message_data[4]
|
||||
super().__init__()
|
||||
|
||||
class Post(tuple):
|
||||
def __init__(self, post_data):
|
||||
@ -57,6 +59,7 @@ class Post(tuple):
|
||||
self.title = post_data[3]
|
||||
self.content = post_data[4]
|
||||
self.created_date = post_data[5]
|
||||
super().__init__()
|
||||
|
||||
class Thread(tuple):
|
||||
def __init__(self, thread_data):
|
||||
@ -64,6 +67,7 @@ class Thread(tuple):
|
||||
self.title = thread_data[1]
|
||||
self.group_id = thread_data[2]
|
||||
self.creator_id = thread_data[3]
|
||||
super().__init__()
|
||||
|
||||
class User(tuple, UserMixin):
|
||||
def __init__(self, user_data):
|
||||
@ -74,6 +78,7 @@ class User(tuple, UserMixin):
|
||||
self.email = user_data[4]
|
||||
self.address = user_data[5]
|
||||
self.role = user_data[6]
|
||||
super().__init__()
|
||||
|
||||
def get_id(self):
|
||||
return self.user_id
|
||||
|
||||
BIN
aula/static/Aula_logo.png
Normal file
BIN
aula/static/Aula_logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
@ -2,18 +2,39 @@ body {
|
||||
background: #fafafa;
|
||||
color: #333333;
|
||||
margin-top: 5rem;
|
||||
font-family: Lato, sans-serif;
|
||||
}
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
color: #444444;
|
||||
}
|
||||
|
||||
.site-header {
|
||||
margin-bottom: 120px;
|
||||
}
|
||||
|
||||
.navbar {
|
||||
padding-top: 0;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
.navbar-brand {
|
||||
height: 80px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
.bg-steel {
|
||||
background-color: #5f788a;
|
||||
background-color: #18638f;
|
||||
}
|
||||
|
||||
.site-header .navbar-nav .nav-link {
|
||||
color: #cbd5db;
|
||||
width: 100px;
|
||||
height: 100px;
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
text-align: center;
|
||||
padding-top: 35px;
|
||||
}
|
||||
|
||||
.site-header li > .nav-item.nav-link {
|
||||
@ -22,6 +43,7 @@ h1, h2, h3, h4, h5, h6 {
|
||||
|
||||
.site-header .navbar-nav .nav-link:hover {
|
||||
color: #ffffff;
|
||||
background-color: #549ec7;
|
||||
}
|
||||
|
||||
.site-header .navbar-nav .nav-link.active {
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
{% extends "layout.html" %}
|
||||
{% block content %}
|
||||
<h1>{{ current_user.name }}</h1>
|
||||
{% if current_user.is_authenticated %}
|
||||
<h1>Hej, {{ current_user.first_name }} {{ current_user.first_name }}</h1>
|
||||
<hr>
|
||||
<h2>Opslag</h2>
|
||||
{% for post in posts %}
|
||||
<article class="media content-section">
|
||||
<div class="media-body">
|
||||
@ -13,4 +16,6 @@
|
||||
</div>
|
||||
</article>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
{% endif %}
|
||||
{% endblock content %}
|
||||
|
||||
@ -1,6 +1,10 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<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=Lato&display=swap" rel="stylesheet">
|
||||
|
||||
<!-- Required meta tags -->
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
@ -20,32 +24,21 @@
|
||||
<header class="site-header">
|
||||
<nav class="navbar navbar-expand-md navbar-dark bg-steel fixed-top">
|
||||
<div class="container">
|
||||
<a class="navbar-brand mr-4" href="/">UIS Prototype</a>
|
||||
<img src="{{ url_for('static', filename='Aula_logo.png') }}" class="navbar-brand mr-4" href="/"/>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggle" aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse" id="navbarToggle">
|
||||
<div class="navbar-nav mr-auto">
|
||||
<a class="nav-item nav-link" href="{{ url_for('Login.home') }}">Home</a>
|
||||
{% if current_user.is_authenticated %}
|
||||
<li class="dropdown">
|
||||
<a href="#" class="nav-item nav-link dropdown-toggle" data-toggle="dropdown">UIS bank<b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a class="nav-item nav-link" href="{{ url_for('Login.account') }}">Account</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a class="nav-item nav-link" href="https://www.pgadmin.org">site pgAdmin</a></li>
|
||||
<li><a class="nav-item nav-link" href="http://127.0.0.1:58653/browser/ ">pgAdmin4</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
{% else %}
|
||||
{% endif %}
|
||||
<a class="nav-item nav-link" href="{{ url_for('Login.about') }}">About</a>
|
||||
<a class="nav-item nav-link" href="{{ url_for('Login.home') }}">Forside</a>
|
||||
<a class="nav-item nav-link" href="/">Grupper</a>
|
||||
<a class="nav-item nav-link" href="/">Tråde</a>
|
||||
</div>
|
||||
<!-- Navbar Right Side -->
|
||||
<div class="navbar-nav">
|
||||
{% if current_user.is_authenticated %}
|
||||
<a class="nav-item nav-link" href="{{ url_for('Login.account') }}">Account</a>
|
||||
<a class="nav-item nav-link" href="{{ url_for('Login.logout') }}">Logout</a>
|
||||
<a class="nav-item nav-link" href="{{ url_for('Login.account') }}">Bruger</a>
|
||||
<a class="nav-item nav-link" href="{{ url_for('Login.logout') }}">Logud</a>
|
||||
{% else %}
|
||||
<a class="nav-item nav-link" href="{{ url_for('Login.login') }}">Login</a>
|
||||
{% endif %}
|
||||
|
||||
Reference in New Issue
Block a user