Merge branch 'server' into 'main' (7ac58396) · Commits · Beaumont Mogridge / ProjectClient_Y1S1_TramshedTech_15.git · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

ProjectClient_Y1S1_TramshedTech_15.git
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7ac58396

Commit 7ac58396 authored 3 years ago by Robert Metcalf

Downloads
- Plain Diff

Merge branch 'server' into 'main'

Add Flask server, templates and initial database support

See merge request !4

parents 74c3fee6 9331c35c

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 3 additions, 0 deletions

.gitignore
database.py 100 additions, 0 deletions

database.py
import_database.py 14 additions, 0 deletions

import_database.py
main.py 13 additions, 0 deletions

main.py
static/Tramshed_Logo.jpg 0 additions, 0 deletions

static/Tramshed_Logo.jpg
static/style.css 6 additions, 12 deletions

static/style.css
templates/home.html 18 additions, 0 deletions

templates/home.html
templates/main.html 7 additions, 5 deletions

templates/main.html

with 161 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment