1
0
Fork 0

Merge branch 'Kyfront' into 'master'

Kyfront

See merge request LETU/LETU!1
This commit is contained in:
Ethanell 2020-10-12 21:11:02 +02:00
commit 326db06121
8 changed files with 798 additions and 634 deletions

View file

@ -1,10 +1,26 @@
{
"database": {
"development": {
"username": "root",
"password": null,
"database": "database_test",
"host": "127.0.0.1",
"dialect": "postgres",
"operatorsAliases": false
},
"test": {
"username": "letu",
"password": "letu",
"database": "letu",
"host": "postgres",
"dialect": "postgres",
"operatorsAliases": false
},
"production": {
"username": "root",
"password": null,
"database": "database_production",
"host": "127.0.0.1",
"dialect": "postgres",
"operatorsAliases": false
}
}

1250
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,8 +1,50 @@
body {
padding: 50px;
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; }
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
color: white;
background-color: #101010;
margin: 0;
padding: 0; }
a {
color: #00B7FF; }
h2 {
color: #e0e0e0;
margin-top: 0;
text-align: center; }
#signin, #signup, #forgotPsw {
padding: 4vw; }
.signinup {
margin-top: 15vh;
background-color: #2a2a2a;
border-radius: 2vw; }
.signinup img {
width: 20%;
display: block;
margin: auto; }
.signinup form input {
color: #e0e0e0;
margin-bottom: 4vh;
font-size: 25px; }
.signinup form input[type="submit"] {
padding: 1vw;
border-radius: 2vw;
background-color: #0099ff;
color: white;
border: none;
width: 40%;
display: block;
margin: auto;
font-size: 35px;
border: 2px solid #2C3531;
cursor: pointer;
transition-duration: 0.3s; }
.signinup form input[type="submit"]:hover {
color: #0099ff;
background-color: #101010;
border: 2px solid #0099ff; }
i {
color: #00c0ff; }
/*# sourceMappingURL=style.css.map */

View file

@ -5,5 +5,5 @@
"style.sass"
],
"names": [],
"mappings": "AAAA,AAAA,IAAI,CAAC;EACH,OAAO,EAAE,IAAI;EACb,IAAI,EAAE,kDAAkD,GAAG;;AAE7D,AAAA,CAAC,CAAC;EACA,KAAK,EAAE,OAAO,GAAG"
"mappings": "AAQA,AAAA,IAAI,CAAC;EACH,OAAO,EAAE,IAAI;EACb,IAAI,EAAE,kDAAkD;EACxD,KAAK,EAAE,KAAK;EACZ,gBAAgB,EAVV,OAAO;EAWb,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC,GAAG;;AAGf,AAAA,EAAE,CAAC;EACD,KAAK,EAdC,OAAO;EAeb,UAAU,EAAE,CAAC;EACb,UAAU,EAAE,MAAM,GAAG;;AAEvB,AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC;EAC3B,OAAO,EAAE,GAAG,GAAG;;AAEjB,AAAA,SAAS,CAAC;EACR,UAAU,EAAE,IAAI;EAChB,gBAAgB,EAxBV,OAAO;EAyBb,aAAa,EAAE,GAAG,GA2BqB;EA9BzC,AAIE,SAJO,CAIP,GAAG,CAAC;IACF,KAAK,EAAE,GAAG;IACV,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,IAAI,GAAG;EAPnB,AAUI,SAVK,CASP,IAAI,CACF,KAAK,CAAC;IACJ,KAAK,EAhCH,OAAO;IAiCT,aAAa,EAAE,GAAG;IAClB,SAAS,EAAE,IAAI,GAAG;EAbxB,AAcI,SAdK,CASP,IAAI,CAKF,KAAK,CAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,EAAe;IACnB,OAAO,EAAE,GAAG;IACZ,aAAa,EAAE,GAAG;IAClB,gBAAgB,EAzCV,OAAO;IA0Cb,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,GAAG;IACV,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,IAAI;IACf,MAAM,EAAE,iBAAiB;IACzB,MAAM,EAAE,OAAO;IACf,mBAAmB,EAAE,IAAI,GAAG;EA1BlC,AA2BI,SA3BK,CASP,IAAI,CAkBF,KAAK,CAAA,AAAA,IAAC,CAAK,QAAQ,AAAb,CAAc,MAAM,CAAC;IACzB,KAAK,EApDC,OAAO;IAqDb,gBAAgB,EApDd,OAAO;IAqDT,MAAM,EAAE,GAAG,CAAC,KAAK,CAtDX,OAAO,GAsDkB;;AAErC,AAAA,CAAC,CAAC;EACA,KAAK,EA1DG,OAAO,GA0DG"
}

View file

@ -1,6 +1,59 @@
$primary: #00c0ff;
$secondary: #0099ff;
$dark1: #101010;
$dark2: #2a2a2a;
$light: #e0e0e0;
$light2: #C5C6C7;
body
padding: 50px
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif
color: white;
background-color: $dark1;
margin: 0;
padding: 0;
a
color: #00B7FF
h2
color: $light;
margin-top: 0;
text-align: center;
#signin, #signup, #forgotPsw
padding: 4vw;
.signinup
margin-top: 15vh;
background-color: $dark2;
border-radius: 2vw;
img
width: 20%;
display: block;
margin: auto;
form
input
color: $light;
margin-bottom: 4vh;
font-size: 25px;
input[type="submit"]
padding: 1vw;
border-radius: 2vw;
background-color: $secondary;
color: white;
border: none;
width: 40%;
display: block;
margin: auto;
font-size: 35px;
border: 2px solid #2C3531;
cursor: pointer;
transition-duration: 0.3s
input[type="submit"]:hover
color: $secondary;
background-color: $dark1;
border: 2px solid $secondary;
i
color: $primary;

View file

@ -1,5 +1,52 @@
extends layout
block content
h1= title
p Welcome to #{title}
div(class='row main-form')
div(class='col s12 m8 offset-m2 signinup z-depth-5' id="signin")
h2 Welcome back
form
div(class="input-field col s12")
i(class="material-icons prefix") mail
input(type="text" id="mail-input" class="autocomplete")
label(for="mail-input") Email
div(class="input-field col s12")
i(class="material-icons prefix") lock
input(type="password" id="password-input" class="autocomplete")
label(for="password-input") Password
input(type='submit' value='Login')
div(class='col s12 m8 offset-m2 signinup z-depth-5' id="signup")
h2 Welcome
form
div(class="input-field col s6")
i(class="material-icons prefix") portrait
input(type="text" id="firstname-input" class="autocomplete")
label(for="firstname-input") First Name
div(class="input-field col s6")
input(type="text" id="lastname-input" class="autocomplete")
label(for="lastname-input") Last Name
div(class="input-field col s12")
i(class="material-icons prefix") mail
input(type="text" id="mailreg-input" class="autocomplete")
label(for="mailreg-input") Email
div(class="input-field col s12")
i(class="material-icons prefix") lock
input(type="password" id="passwordreg-input" class="autocomplete")
label(for="passwordreg-input") Password
input(type='submit' value='Register')
div(class='col s12 m8 offset-m2 signinup z-depth-5' id="forgotPsw")
h2 Forgot password
form
div(class="input-field col s12")
i(class="material-icons prefix") mail
input(type="text" id="mailforgot-input" class="autocomplete")
label(for="mailforgot-input") Email
input(type='submit' value='Send email')

View file

@ -2,6 +2,9 @@ doctype html
html
head
title= title
link(href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet")
link(rel="stylesheet", href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css")
link(rel="stylesheet", href="/stylesheets/style.css")
body
block content
script(src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js")

3
views/signinup.pug Normal file
View file

@ -0,0 +1,3 @@
extends layout
block content