From 0260ea3fcdc238e9f9d3ec8e89b7ff70d746f2d7 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Tue, 3 Nov 2015 15:04:31 -0500 Subject: [PATCH] WIP(sharing): Draft functional landing page --- common/locales/en/front.json | 3 +- website/views/social/hatch-pet.jade | 2 +- website/views/social/landing-page.jade | 20 ++++++----- website/views/social/layout.jade | 4 --- website/views/social/level-up.jade | 2 +- website/views/social/raise-pet.jade | 2 +- website/views/social/unlock-quest.jade | 2 +- website/views/social/won-challenge.jade | 2 +- website/views/static/login-modal.jade | 45 +++++++++++++------------ 9 files changed, 42 insertions(+), 40 deletions(-) diff --git a/common/locales/en/front.json b/common/locales/en/front.json index c668d49443..a97ac395e7 100644 --- a/common/locales/en/front.json +++ b/common/locales/en/front.json @@ -183,5 +183,6 @@ "imagine1": "Imagine if improving your life was as fun as playing a game.", "landingCopy1": "Advance in the game by completing your real-life tasks.", "landingCopy2": "Battle monsters with friends to stay accountable to your goals.", - "landingCopy3": "Join over 300,000 people having fun as they improve their lives." + "landingCopy3": "Join over 850,000 people having fun as they improve their lives.", + "alreadyHaveAccount": "I already have an account!" } diff --git a/website/views/social/hatch-pet.jade b/website/views/social/hatch-pet.jade index ccf55b2eb4..211314c0b3 100644 --- a/website/views/social/hatch-pet.jade +++ b/website/views/social/hatch-pet.jade @@ -1,7 +1,7 @@ extends ./layout block extraHead - - var spcialPage = 'hatch-pet' + - var socialPage = 'hatch-pet' - var socialTitle = 'New Pet!' - var socialDescription = 'In Habitica, you earn cute companions as you accomplish real-world tasks. I\'ve worked hard and gotten myself a new pet!' diff --git a/website/views/social/landing-page.jade b/website/views/social/landing-page.jade index 568229ee73..958120769a 100644 --- a/website/views/social/landing-page.jade +++ b/website/views/social/landing-page.jade @@ -1,17 +1,19 @@ .text-center - h1=env.t('imagine1') - ul - li=env.t('landingCopy1') - li=env.t('landingCopy2') - li=env.t('landingCopy3') - .container-fluid + #intro + h1=env.t('imagine1') + ul + li=env.t('landingCopy1') + li=env.t('landingCopy2') + li=env.t('landingCopy3') + .mobile-container .row .col-md-6 img.img-rendering-auto.center-block.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/intro.png') .col-md-6 - p Login form here - button.btn.btn-primary.btn-lg Get Started Now! - a I already have an account! + .row + +registrationForm + .row + a(ng-click='playButtonClick()')=env.t('alreadyHaveAccount') .row .presslogos =env.t('featuredIn') diff --git a/website/views/social/layout.jade b/website/views/social/layout.jade index 3aa12c6aea..165fc0fbee 100644 --- a/website/views/social/layout.jade +++ b/website/views/social/layout.jade @@ -38,10 +38,6 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') body(ng-controller='AuthCtrl') include ../static/login-modal - include ../shared/avatar/index include ../shared/mixins - include ../shared/modals/members .container block content - - include ../shared/footer diff --git a/website/views/social/level-up.jade b/website/views/social/level-up.jade index 6ef1ece693..2bb5aba74d 100644 --- a/website/views/social/level-up.jade +++ b/website/views/social/level-up.jade @@ -1,7 +1,7 @@ extends ./layout block extraHead - - var spcialPage = 'level-up' + - var socialPage = 'level-up' - var socialTitle = 'Level Up!' - var socialDescription = 'In Habitica, your avatar grows in strength as you improve your real-life habits. I\'ve attained a new level with what I\'ve accomplished!' diff --git a/website/views/social/raise-pet.jade b/website/views/social/raise-pet.jade index fa19e2e9a9..6116802cf0 100644 --- a/website/views/social/raise-pet.jade +++ b/website/views/social/raise-pet.jade @@ -1,7 +1,7 @@ extends ./layout block extraHead - - var spcialPage = 'raise-pet' + - var socialPage = 'raise-pet' - var socialTitle = 'Raised a Pet into a Mount!' - var socialDescription = 'In Habitica, collectible pets grow along with you as you advance you real-life goals. My progress has turned a pet into a trusty mount!' diff --git a/website/views/social/unlock-quest.jade b/website/views/social/unlock-quest.jade index d1203d63bc..7067ad023d 100644 --- a/website/views/social/unlock-quest.jade +++ b/website/views/social/unlock-quest.jade @@ -1,7 +1,7 @@ extends ./layout block extraHead - - var spcialPage = 'unlock-quest' + - var socialPage = 'unlock-quest' - var socialTitle = 'Unlocked a Quest!' - var socialDescription = 'In Habitica, you can defeat fearsome monsters and devious villains with real-life productivity. I\'ve earned just such a Quest with my progress!' diff --git a/website/views/social/won-challenge.jade b/website/views/social/won-challenge.jade index 5b475fccc4..617a679b3b 100644 --- a/website/views/social/won-challenge.jade +++ b/website/views/social/won-challenge.jade @@ -1,7 +1,7 @@ extends ./layout block extraHead - - var spcialPage = 'won-challenge' + - var socialPage = 'won-challenge' - var socialTitle = 'Won a Challenge!' - var socialDescription = 'In Habitica, users can challenge one another to accomplish goals in all areas of life. I\'ve won just such a Challenge!' diff --git a/website/views/static/login-modal.jade b/website/views/static/login-modal.jade index b60f1bafe5..b8dbb2bff4 100644 --- a/website/views/static/login-modal.jade +++ b/website/views/static/login-modal.jade @@ -1,3 +1,26 @@ +mixin registrationForm + form#registrationForm(ng-submit='register()', name='registrationForm') + .form-group + input.form-control(type='text', ng-model='registerVals.username', placeholder=env.t('username'), spellcheck='false', required) + .form-group + input.form-control(type='email', ng-model='registerVals.email', placeholder=env.t('email'), required) + .form-group + input.form-control(type='password', ng-model='registerVals.password', placeholder=env.t('password'), required) + .form-group + input.form-control(type='password', ng-model='registerVals.confirmPassword', placeholder=env.t('passConfirm'), required) + .form-group + small + =env.t('accept1Terms') + |  + a(href='/static/terms' target='_blank')=env.t('terms') + |  + =env.t('accept2Terms') + |  + a(href='/static/privacy' target='_blank')=env.t('privacy') + | . + .form-group + input.btn.btn-block.btn-lg.btn-primary(type='submit', ng-disabled='registrationForm.$invalid || registrationInProgress', value=env.t('register')) + script(id='modals/login.html', type='text/ng-template') .modal-header button.close(type='button', ng-click='$close()') × @@ -45,24 +68,4 @@ script(id='modals/login.html', type='text/ng-template') input.btn.btn-default(type='submit', value=env.t('submit')) tab(heading=env.t('register')) - form#registrationForm(ng-submit='register()', name='registrationForm') - .form-group - input.form-control(type='text', ng-model='registerVals.username', placeholder=env.t('username'), spellcheck='false', required) - .form-group - input.form-control(type='email', ng-model='registerVals.email', placeholder=env.t('email'), required) - .form-group - input.form-control(type='password', ng-model='registerVals.password', placeholder=env.t('password'), required) - .form-group - input.form-control(type='password', ng-model='registerVals.confirmPassword', placeholder=env.t('passConfirm'), required) - .form-group - small - =env.t('accept1Terms') - |  - a(href='/static/terms' target='_blank')=env.t('terms') - |  - =env.t('accept2Terms') - |  - a(href='/static/privacy' target='_blank')=env.t('privacy') - | . - .form-group - input.btn.btn-block.btn-lg.btn-primary(type='submit', ng-disabled='registrationForm.$invalid || registrationInProgress', value=env.t('register')) + +registrationForm