Merge branch 'develop' into julius-dev

pull/1/head
Trivernis 5 years ago
commit 40be59a9b7

@ -43,6 +43,32 @@ button:active
@include gridPosition(2, 3, 1, 2)
background-color: $cPrimaryBackground
#input-login
margin-top: 1em
@include gridPosition(2,3,2,3)
grid-template: 7.5% 7.5% 7.5% 7.5% 72%/ 100%
display: grid
background-color: $cPrimaryBackground
input
margin: 0.25em
.loginButton
margin: 0.25em
#input-register
margin-top: 1em
@include gridPosition(2,3,2,3)
grid-template: 7.5% 7.5% 7.5% 7.5% 7.5% 7.5% 58%/ 100%
display: grid
background-color: $cPrimaryBackground
input
margin: 0.25em
.registerButton
margin: 0.25em
#feedcontainer
@include gridPosition(2, 3, 2, 3)
background-color: $cSecondaryBackground

@ -49,6 +49,12 @@ class HomeRoute extends Route {
this.router.get("/", (req, res) => {
res.render("home");
});
this.router.get("/login", (req, res) => {
res.render("login");
});
this.router.get("/register", (req, res) => {
res.render("register");
});
}
}

@ -0,0 +1,8 @@
html
head
title Greenvironment Network Login
include ../includes/head
body
div#content
include stylebar
include login

@ -0,0 +1,6 @@
div#input-login
input(type=text placeholder='username')
input(type=text placeholder='password')
button.loginButton Login
a(href="/register" )
| You aren´t part of greenvironment yet? - create a new account

@ -0,0 +1,2 @@
div.stylebar
h1 Greenvironment

@ -0,0 +1,8 @@
html
head
title Greenvironment Network Register
include ../includes/head
body
div#content
include stylebar
include register

@ -0,0 +1,8 @@
div#input-register
input(type=text placeholder='username')
input(type=text placeholder='email')
input(type=text placeholder='password')
input(type=text placeholder='repeat password')
button.registerButton Register
a(href="/login" )
| You are already part of greenvironment? - login

@ -0,0 +1,2 @@
div.stylebar
h1 Greenvironment
Loading…
Cancel
Save