diff --git a/docker-compose.yml b/docker-compose.yml index dea2bf8..bd21cbc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,9 @@ -version: '3.3' +version: '2.0' services: api: build: ./back + image: reimbursinator_back command: gunicorn --bind 0.0.0.0:444 --keyfile /etc/ssl/private/selfsigned.key --certfile /etc/ssl/private/selfsigned.crt reimbursinator.wsgi:application #volumes: # - ./app/:/usr/src/back/ @@ -12,6 +13,7 @@ services: - SECRET_KEY=please_change web: build: ./front + image: reimbursinator_front image: nginx:1.10.3 ports: - "8443:443" diff --git a/front/static/dashboard.html b/front/static/dashboard.html index e6f0aa2..c25f1dc 100644 --- a/front/static/dashboard.html +++ b/front/static/dashboard.html @@ -1,15 +1,32 @@ - + - - - - + + + + + + Reimbursinator - +

Reimbursinator Report

@@ -31,7 +48,7 @@ diff --git a/front/static/index.html b/front/static/index.html index bdab667..ff26455 100644 --- a/front/static/index.html +++ b/front/static/index.html @@ -2,14 +2,37 @@ - + + - + + Reimbursinator - +

Reimbursinator

@@ -19,7 +42,7 @@ Sign up
  • - Login + Log in
    • diff --git a/front/static/js/logout.js b/front/static/js/logout.js index 181372e..e7a3a21 100644 --- a/front/static/js/logout.js +++ b/front/static/js/logout.js @@ -29,5 +29,6 @@ function postToLogoutEndpoint(event) { xhr.send(); } -const logoutLink = document.querySelector("#logoutLink"); -logoutLink.addEventListener("click", postToLogoutEndpoint); +const logoutLinks = document.querySelectorAll(".log-out-link"); +logoutLinks[0].addEventListener("click", postToLogoutEndpoint); +logoutLinks[1].addEventListener("click", postToLogoutEndpoint); diff --git a/front/static/login.html b/front/static/login.html index b5c18e0..5f44283 100644 --- a/front/static/login.html +++ b/front/static/login.html @@ -3,20 +3,24 @@ + - - - Login + + + Log in - -

    Login Page

    -
    - username:
    - password:
    - -
    -

    - - + +

    +

    Log in

    +
    + username:
    + password:
    + +
    +

    + + diff --git a/front/static/signup.html b/front/static/signup.html index aca7e42..c6a6866 100644 --- a/front/static/signup.html +++ b/front/static/signup.html @@ -3,15 +3,21 @@ + - - + + Sign up - +

    +