From 896773f9ef6d07c7f3a5e4c426916dbd156b6207 Mon Sep 17 00:00:00 2001 From: Christopher Giroir Date: Sat, 20 Feb 2016 11:56:39 -0800 Subject: [PATCH] Adding android app banners Fixes #6692 --- bower.json | 3 ++- website/public/manifest.json | 11 +++++++++++ website/views/social/layout.jade | 13 +++++++++++++ website/views/static/front.jade | 13 +++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 9219a95a94..df653f24c6 100644 --- a/bower.json +++ b/bower.json @@ -41,7 +41,8 @@ "ngInfiniteScroll": "1.0.0", "pnotify": "1.3.1", "sticky": "*", - "swagger-ui": "wordnik/swagger-ui#v2.0.24" + "swagger-ui": "wordnik/swagger-ui#v2.0.24", + "smart-app-banner": "*" }, "devDependencies": { "angular-mocks": "1.3.9" diff --git a/website/public/manifest.json b/website/public/manifest.json index accb695df3..2994dbe92b 100644 --- a/website/public/manifest.json +++ b/website/public/manifest.json @@ -32,6 +32,8 @@ "bower_components/jquery-ui/ui/minified/jquery.ui.mouse.min.js", "bower_components/jquery-ui/ui/minified/jquery.ui.sortable.min.js", + "bower_components/smart-app-banner/smart-app-banner.js", + "common/dist/scripts/habitrpg-shared.js", "js/env.js", @@ -98,6 +100,7 @@ "css": [ "bower_components/bootstrap/dist/css/bootstrap.css", "bower_components/css-social-buttons/css/zocial.css", + "bower_components/smart-app-banner/smart-app-banner.css", "app.css", "bower_components/pnotify/jquery.pnotify.default.css", "bower_components/pnotify/jquery.pnotify.default.icons.css", @@ -119,6 +122,9 @@ "bower_components/hello/dist/hello.all.min.js", "bower_components/angular-loading-bar/build/loading-bar.js", + + "bower_components/smart-app-banner/smart-app-banner.js", + "js/env.js", "js/static.js", "js/services/analyticsServices.js", @@ -134,6 +140,7 @@ "bower_components/bootstrap/dist/css/bootstrap.css", "bower_components/css-social-buttons/css/zocial.css", "bower_components/jquery-colorbox/example1/colorbox.css", + "bower_components/smart-app-banner/smart-app-banner.css", "app.css", "common/dist/sprites/habitrpg-shared.css", "static.css" @@ -149,6 +156,9 @@ "bower_components/hello/dist/hello.all.min.js", "bower_components/angular-loading-bar/build/loading-bar.js", + + "bower_components/smart-app-banner/smart-app-banner.js", + "js/env.js", "js/static.js", "js/services/analyticsServices.js", @@ -162,6 +172,7 @@ ], "css": [ "bower_components/css-social-buttons/css/zocial.css", + "bower_components/smart-app-banner/smart-app-banner.css", "front/staticstyle.css", "common/dist/sprites/habitrpg-shared.css", "app.css" diff --git a/website/views/social/layout.jade b/website/views/social/layout.jade index 7789a6150b..5cdd7abb79 100644 --- a/website/views/social/layout.jade +++ b/website/views/social/layout.jade @@ -22,6 +22,9 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') 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') + meta(name='google-play-app' content='app-id=com.habitrpg.android.habitica') + link(rel='apple-touch-icon' href='/apple-touch-icon-precomposed.png') + link(rel='android-touch-icon' href='/apple-touch-icon-precomposed.png') link(rel='canonical', href='', type='text/html') link(rel='shortcut icon', href='/favicon.ico') link(rel='mask-icon', href='/favicon.ico') @@ -42,3 +45,13 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') include ../shared/mixins .container block content + script(type='text/javascript'). + new SmartBanner({ + title: 'Habitica: Gamify Your Tasks', + author: 'HabitRPG, Inc.', + button: 'VIEW', + store: { + ios: 'On the App Store', + android: 'In Google Play' + }//, force: 'ios' // Uncomment for platform emulation + }); diff --git a/website/views/static/front.jade b/website/views/static/front.jade index c1a2a5683e..057cf50e5d 100644 --- a/website/views/static/front.jade +++ b/website/views/static/front.jade @@ -22,6 +22,9 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') meta(name='twitter:description' content='Habitica is a free habit-building and productivity app that treats your real life like a game! Motivate yourself with in-game rewards and social encouragement.') meta(name='twitter:image' content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo.png') meta(name='apple-itunes-app' content='app-id=994882113') + meta(name='google-play-app' content='app-id=com.habitrpg.android.habitica') + link(rel='apple-touch-icon' href='/apple-touch-icon-precomposed.png') + link(rel='android-touch-icon' href='/apple-touch-icon-precomposed.png') link(rel='canonical', href='', type='text/html') link(rel='shortcut icon', sizes="32x32", href='/favicon.ico') link(rel='shortcut icon', sizes="192x192", href='/favicon_192x192.png') @@ -637,6 +640,16 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') $('[data-toggle="popover"]').popover() }) // Hack fix for carousel (http://stackoverflow.com/a/22182184/362790) + script(type='text/javascript'). + new SmartBanner({ + title: 'Habitica: Gamify Your Tasks', + author: 'HabitRPG, Inc.', + button: 'VIEW', + store: { + ios: 'On the App Store', + android: 'In Google Play' + }//, force: 'ios' // Uncomment for platform emulation + }); script. angular.module('ui.bootstrap.carousel', ['ui.bootstrap.transition']) .controller('CarouselController', ['$scope', '$timeout', '$transition', '$q', function ($scope, $timeout, $transition, $q) {