add some styling

This commit is contained in:
2022-11-12 19:50:10 -05:00
parent 235d36a22a
commit 82d45ea0ce
4 changed files with 49 additions and 54 deletions

5
app.py
View File

@@ -1,4 +1,5 @@
import os
from datetime import datetime
from flask import Flask, render_template, request, redirect, url_for
from flask_sqlalchemy import SQLAlchemy
@@ -45,9 +46,9 @@ class Event(db.Model):
@app.route('/')
def index():
events = Event.query.all()
return render_template('index.html', events=events)
return render_template('index.html', events=events, datetime=datetime)
@app.route('/task/<int:task_id>/')
def task(task_id):
task = Task.query.get_or_404(task_id)
return render_template('task.html', task=task)
return render_template('task.html', task=task, datetime=datetime)

View File

@@ -1,52 +1,41 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<title>{% block title %} {% endblock %} - BellScheduler</title>
<style>
.title {
margin: 5px;
}
.content {
margin: 5px;
width: 100%;
display: flex;
flex-direction: row;
flex-wrap: wrap;
}
.event {
flex: 20%;
padding: 10px;
margin: 5px;
background-color: #f3f3f3;
inline-size: 100%;
}
.title a {
color: #00a36f;
text-decoration: none;
}
nav a {
color: #d64161;
font-size: 3em;
margin-left: 50px;
text-decoration: none;
}
</style>
</head>
<body>
<nav>
<a href="{{ url_for('index') }}">BellScheduler</a>
<a href="#">Tasks</a>
<a href="#">About</a>
<nav class="navbar navbar-expand-md navbar-light bg-light">
<a class="navbar-brand" href="{{ url_for('index') }}">BellScheduler</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="#">Tasks</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">About</a>
</li>
</ul>
</div>
</nav>
<hr>
<div class="content">
<div class="container">
{% block content %} {% endblock %}
</div>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
</body>
</html>

View File

@@ -1,19 +1,18 @@
{% extends 'base.html' %}
{% block content %}
<span class="title"><h1>{% block title %} Events {% endblock %}</h1></span>
<div class="content">
<span><h1>{% block title %} Events {% endblock %}</h1></span>
<div>
{% for event in events %}
<div class="event">
<p><b>Period {{ event.period_num }}</b></p>
<div>
{% set convertedTime = datetime.strptime(event.period.periodTime, "%H:%M:%S") %}
<p><b>Period {{ event.period_num }}</b> <br> Time: {{ convertedTime.strftime("%I:%M %p") }} </p>
<b>
<p class="title">
<a href="/task/{{ event.tasks.id }}">
{{ event.tasks.title }}
</a>
</p>
</b>
<div class="content">
<div>
<p>{{ event.tasks.description }}</p>
</div>
<hr>

View File

@@ -1,16 +1,22 @@
{% extends 'base.html' %}
{% set createdTime = datetime.fromtimestamp(task.created_timestamp) %}
{% block content %}
<span class="title"><h1>{% block title %} {{ task.title }} {% endblock %}</h1></span>
<div class="content">
<div class="task">
<p><b>#{{ task.id }}</b></p>
<span><h1>{% block title %} {{ task.title }} {% endblock %}</h1></span>
<div>
<div>
<b>
<p class="title">{{ task.title }}</p>
<p>{{ task.title }}</p>
</b>
<div class="content">
<div>
<p>{{ task.description }}</p>
</div>
<div>
<p>Created: {{ createdTime }} </p>
</div>
<div>
<p>Due: {{ task.due_timestamp }}</p>
</div>
<hr>
</div>
</div>