diff options
author | Dennis Eriksen <dennis.se@gmail.com> | 2013-05-23 03:58:21 +0200 |
---|---|---|
committer | Dennis Eriksen <dennis.se@gmail.com> | 2013-05-23 03:58:21 +0200 |
commit | 66bf1813f037eb92e8bf0e929318aa4276b73fcf (patch) | |
tree | 7b64d7e977ac1f9999047eff5393b795e2b153f2 | |
parent | added use.less to the file that actually uses it (diff) | |
download | Divid-66bf1813f037eb92e8bf0e929318aa4276b73fcf.tar.gz |
made new homescreen on '/'
-rw-r--r-- | controllers/system.js | 2 | ||||
-rw-r--r-- | public/css/shame.less | 41 | ||||
-rw-r--r-- | views/index.ejs | 128 |
3 files changed, 167 insertions, 4 deletions
diff --git a/controllers/system.js b/controllers/system.js index adddcba..4a4c818 100644 --- a/controllers/system.js +++ b/controllers/system.js @@ -32,7 +32,7 @@ Validator.prototype.getErrors = function() { */ exports.index = function(req, res) { - res.render('index', { title: 'DERS' }); + res.render('index', { title: 'DERS', loggedin: false }); }; diff --git a/public/css/shame.less b/public/css/shame.less index 0a4efa1..1f841e5 100644 --- a/public/css/shame.less +++ b/public/css/shame.less @@ -8,6 +8,14 @@ @import "bootstrapless/mixins.less"; /* The rest comes here */ +@blueDark: #0d56a6; +@blueMedium: #4186d3; +@blueLight: #000022; + + + + + body { margin-top: @navbarHeight; background-color:white; @@ -215,6 +223,39 @@ div.lastactivity .activity .details { text-decoration: none; } + +.indexwrapper { + width: 100%; +} + +#index1 { + +} + +#index3 { + background-color: @blueMedium; +} + +#index4 { + background-color: @blueDark; + color: @yellow; +} + +.infobox { + text-align: center; + padding: 46px; + margin-bottom: 20px; +} + +.logo { float: left } + + + + + + + + @media (max-width: 480px) { canvas { display: none; } } diff --git a/views/index.ejs b/views/index.ejs index 9b6035f..906402e 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -2,9 +2,131 @@ </head> <body> - <h1><%= title %></h1> - <p>Velkommen til <%= title %></p> - <p>Her kommer det <em>kanskje</em> mer senere.</p> + + <% include navbar %> + + <div class="indexwrapper" id="index1"> + <div class="container"> + <div class="row-fluid"> + <div class="span5"> + <h1><%= title %></h1> + <p>Velkommen til <%= title %></p> + <p>Her kommer det <em>kanskje</em> mer senere.</p> + <ul class="blue"> + </li><h3><i class="icon-pencil"></i> Registrer deg gratis</h3></li> + </li><h3><i class="icon-play"></i> Opprett prosjekt</h3></li> + </li><h3><i class="icon-user"></i> Inviter deltakere</h3></li> + </li><h3><i class="icon-barcode"></i> Før inn utgiftene</h3></li> + </li><h3><i class="icon-ok"></i> Ta et oppgjør</h3></li> + </ul> + <p>Perfekt for venner, familie og bekjente!</p> + <a href="#register" class="btn btn-large btn-warning">Registrer deg!</a> + </div> + <div class="span7"> + <img src="/img/dashboard.png"> + </div> + </div> + <div class="row-fluid"> + <div class="span4 infobox"> + <img class="infoimg" src="/img/laptop.png"> + <h4>Bruk mobil eller nettleser</h4> + <p>Divid er en webapplikasjon og kan brukes på pc, nettbrett og mobil. Uansett hva du bruker er Divid tilgjengelig.</p> + </div> + <div class="span4 infobox"> + <img class="infoimg" src="/img/addpeople.png"> + <h4>Inviter de du vil</h4> + <p>Inviter deltakere til prosjekt ved å legge til epost-adressen deres eller send dem en link!</p> + </div> + <div class="span4 infobox"> + <img class="infoimg" src="/img/overwatch.png"> + <h4>Få oversikt</h4> + <p>Ikke la delte utgifter gå i glemmeboken. Send påminnelser og få varsel når deltakere betaler.</p> + </div> + </div> + </div> + </div> + + <div class="indexwrapper" id="index2"> + <div class="container"> + <h1>Hva kan Divid brukes til</h1> + <div class="row-fluid"> + <div class="span3 infobox"> + <img src="/img/student.png"> + <h4>Studentkollektiv</h4> + <p>Fellesutgifter, fester, bøter, bursdager, øl, mat, strøm</p> + </div> + <div class="span3 infobox"> + <img src="/img/fest.png"> + <h4>Singelliv</h4> + <p>Ute på farten, stelle i stand aktiviter med andre, sydentur osv</p> + </div> + <div class="span3 infobox"> + <img src="/img/par.png"> + <h4>Parforhold</h4> + <p>I etableringsfasen som ønsker å ha ordnet økonomi fra starten av</p> + </div> + <div class="span3 infobox"> + <img src="/img/omsorg.png"> + <h4>Delt omsorg</h4> + <p>Klær, mat, medisiner og aktiviteter. Hvem betaler hva for barnet?</p> + <!--<p>klær, mat, reiser, aktiviteter, sport, skolebøker, tannlege, medisiner</p>--!> + </div> + </div> + </div> + </div> + + + <div class="indexwrapper" id="index3"> + <div class="container"> + <h1>Hvordan bruke Divid</h1> + + <a href="https://itunes.apple.com/us/genre/ios-finance/id6015?mt=8"><img src="/img/iph.png" onmouseover="this.src='/img/iphoneA.png'" onmouseout="this.src='/img/iph.png'"></a> + <a href="https://play.google.com/store"><img src="/img/android.png" onmouseover="this.src='/img/androidA.png'" onmouseout="this.src='/img/android.png'"></a> + <a href="http://www.windowsphone.com/nb-no/store"><img src="/img/win.png" onmouseover="this.src='/img/winA.png'" onmouseout="this.src='/img/win.png'"></a> + </div> + </div> + + + <div class="indexwrapper" id="index4"> + <div class="container"> + <h1>Registrer deg i dag!</h1> + <p>Du kan enten bruke <a href="/auth/facebook">Facebook</a> eller <a href="/auth/twitter">Twitter</a>, eller registrere deg med epost under!</p> + <div class="control-group"> + <label class="control-label" for="name">Navn</label> + <div class="controls"> + <input type="text" id="reg_name" name="name" required> + </div> + </div> + <div class="control-group"> + <label class="control-label" for="email">E-post</label> + <div class="controls"> + <input type="email" id="reg_email" name="email" required> + </div> + </div> + <div class="control-group"> + <label class="control-label" for="username">Brukernavn</label> + <div class="controls"> + <input type="text" id="reg_username" name="username" required> + </div> + </div> + <div class="control-group"> + <label class="control-label" for="password">Passord</label> + <div class="controls"> + <input type="password" id="reg_password" name="password" required> + </div> + </div> + <div class="control-group"> + <div class="form-actions"><a id="register" class="hidden">a</a> + <input type="submit" class="btn btn-primary" value="Registrer!"> + </div> + </div> + + </div> + </div> + + <% include footer %> +</body> +</html> |