From d37450622ce3c90754adc63203826b7ffdd5a65a Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Fri, 30 Oct 2015 18:41:46 -0500 Subject: [PATCH 1/2] Create a social layout --- website/views/social/hatch-pet.jade | 24 +++++-------- website/views/social/landing-page.jade | 2 +- website/views/social/layout.jade | 47 +++++++++++++++++++++++++ website/views/social/level-up.jade | 34 +++++------------- website/views/social/raise-pet.jade | 24 +++++-------- website/views/social/unlock-quest.jade | 24 +++++-------- website/views/social/won-challenge.jade | 24 +++++-------- 7 files changed, 92 insertions(+), 87 deletions(-) create mode 100644 website/views/social/layout.jade diff --git a/website/views/social/hatch-pet.jade b/website/views/social/hatch-pet.jade index ac534ba4ef..ccf55b2eb4 100644 --- a/website/views/social/hatch-pet.jade +++ b/website/views/social/hatch-pet.jade @@ -1,15 +1,9 @@ -doctype html -html - head - meta(name='twitter:card' content='summary') - meta(name='twitter:site' content='@habitica') - meta(name='twitter:title' content='New Pet!') - meta(name='twitter:description' content='In Habitica, you earn cute companions as you accomplish real-world tasks. I\'ve worked hard and gotten myself a new pet!') - meta(name='twitter:image' content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo.png') - meta(property='og:url', content='https://habitica.com/social/hatch-pet') - meta(property='og:type', content='website') - meta(property='og:title', content='Level Up!') - meta(property='og:description', content='In Habitica, you earn cute companions as you accomplish real-world tasks. I\'ve worked hard and gotten myself a new pet!') - meta(property='og:site_name', content='Habitica') - meta(property='og:image', content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo_300x300.png') - meta(property='fb:app_id', content='128307497299777') +extends ./layout + +block extraHead + - var spcialPage = '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!' + +block content + include ./landing-page diff --git a/website/views/social/landing-page.jade b/website/views/social/landing-page.jade index e0aba35633..568229ee73 100644 --- a/website/views/social/landing-page.jade +++ b/website/views/social/landing-page.jade @@ -1,4 +1,4 @@ -body(ng-controller='AuthCtrl').text-center +.text-center h1=env.t('imagine1') ul li=env.t('landingCopy1') diff --git a/website/views/social/layout.jade b/website/views/social/layout.jade new file mode 100644 index 0000000000..3aa12c6aea --- /dev/null +++ b/website/views/social/layout.jade @@ -0,0 +1,47 @@ +include ../shared/mixins.jade + +//-Trick needed to pass 'env' to ./layout +block vars +doctype html +html(ng-app='habitrpg', ng-controller='RootCtrl') + head + block extraHead + title Habitica | Your Life the Role Playing Game + meta(charset='utf-8') + meta(name='viewport', content='width=device-width, maximum-scale=1') + meta(property='og:title', content=socialTitle) + meta(property='og:type', content='website') + meta(property='og:site_name', content='Habitica') + meta(property='og:image', content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo_300x300.png') + meta(property='og:url', content='https://habitica.com/social/#{socialPage}') + meta(property='og:description', content=socialDescription) + meta(property='fb:app_id', content='128307497299777') + meta(name='twitter:title' content=socialTitle) + meta(name='twitter:card' content='summary') + meta(name='twitter:site' content='@habitica') + meta(name='twitter:image' content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo.png') + meta(name='twitter:description' content=socialDescription) + meta(name='apple-itunes-app' content='app-id=994882113') + link(rel='canonical', href='', type='text/html') + link(rel='shortcut icon', href='/favicon.ico') + + link(href='//fonts.googleapis.com/css?family=Lato:400,700', rel='stylesheet', type='text/css') + link(rel='stylesheet', type='text/css', href='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/css/bootstrap.min.css') + + script(type='text/javascript'). + window.env = !{JSON.stringify(env._.pick(env, env.clientVars))}; + != env.getManifestFiles("tmp_static_front") + + script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js') + script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.1/ui-bootstrap.min.js') + script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.1/ui-bootstrap-tpls.min.js') + + 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 a4f4b2047c..6ef1ece693 100644 --- a/website/views/social/level-up.jade +++ b/website/views/social/level-up.jade @@ -1,27 +1,9 @@ -doctype html -html(ng-app='habitrpg') - head - meta(charset='utf-8') - link(href='//fonts.googleapis.com/css?family=Lato:400,700', rel='stylesheet', type='text/css') - title Habitica | Your Life the Role Playing Game - script(type='text/javascript'). - window.env = !{JSON.stringify(env._.pick(env, env.clientVars))}; - != env.getManifestFiles("tmp_static_front") - meta(name='twitter:card' content='summary') - meta(name='twitter:site' content='@habitica') - meta(name='twitter:title' content='Level Up!') - meta(name='twitter:description' content='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!') - meta(name='twitter:image' content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo.png') - meta(property='og:url', content='https://habitica.com/social/level-up') - meta(property='og:type', content='website') - meta(property='og:title', content='Level Up!') - meta(property='og:description', content='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!') - meta(property='og:site_name', content='Habitica') - meta(property='og:image', content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo_300x300.png') - meta(property='fb:app_id', content='128307497299777') - script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js') - script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.1/ui-bootstrap.min.js') - script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.1/ui-bootstrap-tpls.min.js') - link(rel='stylesheet', type='text/css', href='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/css/bootstrap.min.css') +extends ./layout -include ./landing-page +block extraHead + - var spcialPage = '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!' + +block content + include ./landing-page diff --git a/website/views/social/raise-pet.jade b/website/views/social/raise-pet.jade index 1d3f39ac51..fa19e2e9a9 100644 --- a/website/views/social/raise-pet.jade +++ b/website/views/social/raise-pet.jade @@ -1,15 +1,9 @@ -doctype html -html - head - meta(name='twitter:card' content='summary') - meta(name='twitter:site' content='@habitica') - meta(name='twitter:title' content='Raised a Pet into a Mount!') - meta(name='twitter:description' content='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!') - meta(name='twitter:image' content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo.png') - meta(property='og:url', content='https://habitica.com/social/raise-pet') - meta(property='og:type', content='website') - meta(property='og:title', content='Level Up!') - meta(property='og:description', content='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!') - meta(property='og:site_name', content='Habitica') - meta(property='og:image', content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo_300x300.png') - meta(property='fb:app_id', content='128307497299777') +extends ./layout + +block extraHead + - var spcialPage = '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!' + +block content + include ./landing-page diff --git a/website/views/social/unlock-quest.jade b/website/views/social/unlock-quest.jade index f3442fa3e6..d1203d63bc 100644 --- a/website/views/social/unlock-quest.jade +++ b/website/views/social/unlock-quest.jade @@ -1,15 +1,9 @@ -doctype html -html - head - meta(name='twitter:card' content='summary') - meta(name='twitter:site' content='@habitica') - meta(name='twitter:title' content='Unlocked a Quest!') - meta(name='twitter:description' content='In Habitica, you can defeat fearsome monsters and devious villains with real-life productivity. I\'ve earned just such a Quest with my progress!') - meta(name='twitter:image' content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo.png') - meta(property='og:url', content='https://habitica.com/social/level-up') - meta(property='og:type', content='website') - meta(property='og:title', content='Unlocked a Quest!') - meta(property='og:description', content='In Habitica, you can defeat fearsome monsters and devious villains with real-life productivity. I\'ve earned just such a Quest with my progress!') - meta(property='og:site_name', content='Habitica') - meta(property='og:image', content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo_300x300.png') - meta(property='fb:app_id', content='128307497299777') +extends ./layout + +block extraHead + - var spcialPage = '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!' + +block content + include ./landing-page diff --git a/website/views/social/won-challenge.jade b/website/views/social/won-challenge.jade index 08ac66b089..5b475fccc4 100644 --- a/website/views/social/won-challenge.jade +++ b/website/views/social/won-challenge.jade @@ -1,15 +1,9 @@ -doctype html -html - head - meta(name='twitter:card' content='summary') - meta(name='twitter:site' content='@habitica') - meta(name='twitter:title' content='Won a Challenge!') - meta(name='twitter:description' content='In Habitica, users can challenge one another to accomplish goals in all areas of life. I\'ve won just such a Challenge!') - meta(name='twitter:image' content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo.png') - meta(property='og:url', content='https://habitica.com/social/level-up') - meta(property='og:type', content='website') - meta(property='og:title', content='Won a Challenge!') - meta(property='og:description', content='In Habitica, users can challenge one another to accomplish goals in all areas of life. I\'ve won just such a Challenge!') - meta(property='og:site_name', content='Habitica') - meta(property='og:image', content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo_300x300.png') - meta(property='fb:app_id', content='128307497299777') +extends ./layout + +block extraHead + - var spcialPage = '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!' + +block content + include ./landing-page From 391e09dd33ca4451a056168bee0b696549ec1da4 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Fri, 30 Oct 2015 22:28:11 -0500 Subject: [PATCH 2/2] Fix auto-redirect --- common/script/public/userServices.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/script/public/userServices.js b/common/script/public/userServices.js index b26a4c531d..67d705e8b7 100644 --- a/common/script/public/userServices.js +++ b/common/script/public/userServices.js @@ -251,7 +251,8 @@ angular.module('habitrpg') $window.location.href='/'; }); } else { - if ($window.location.pathname.indexOf('/static') !== 0){ + var isStaticOrSocial = $window.location.pathname.match(/^\/(static|social)/); + if (!isStaticOrSocial){ localStorage.clear(); $window.location.href = '/logout'; }