Merge branch 'main' into 'WebPages' (ea9adc42) · 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

ea9adc42

Commit ea9adc42 authored 3 years ago by Rhiannon Austin

Downloads
- Plain Diff

Merge branch 'main' into 'WebPages'

# Conflicts:
#   Pipfile
#   Pipfile.lock
#   database.py
#   main.py

parents 391a89a7 d9b76f3e

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.flaskenv 2 additions, 0 deletions

.flaskenv
.gitignore 3 additions, 0 deletions

.gitignore
Pipfile 1 addition, 0 deletions

Pipfile
Pipfile.lock 9 additions, 1 deletion

Pipfile.lock
database.py 1 addition, 1 deletion

database.py
import_database.py 14 additions, 0 deletions

import_database.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 8 additions, 7 deletions

templates/main.html

with 62 additions and 21 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