Added static/front and meta tags (#9712)

* Added static/front and meta tags

* Moved meta to index
This commit is contained in:
Keith Holliday
2017-12-13 15:11:22 -06:00
committed by GitHub
parent 899452279b
commit 7802e30e80
4 changed files with 54 additions and 43 deletions

90
package-lock.json generated
View File

@@ -32,6 +32,15 @@
"ws": "1.1.5" "ws": "1.1.5"
} }
}, },
"JSONStream": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
"integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
"requires": {
"jsonparse": "1.3.1",
"through": "2.3.8"
}
},
"abbrev": { "abbrev": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -1771,9 +1780,9 @@
"resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz", "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz",
"integrity": "sha1-+GzWzvT1MAyOY+B6TVEvZfv/RTE=", "integrity": "sha1-+GzWzvT1MAyOY+B6TVEvZfv/RTE=",
"requires": { "requires": {
"JSONStream": "1.3.1",
"combine-source-map": "0.7.2", "combine-source-map": "0.7.2",
"defined": "1.0.0", "defined": "1.0.0",
"JSONStream": "1.3.1",
"through2": "2.0.3", "through2": "2.0.3",
"umd": "3.0.1" "umd": "3.0.1"
} }
@@ -1803,6 +1812,7 @@
"resolved": "https://registry.npmjs.org/browserify/-/browserify-12.0.2.tgz", "resolved": "https://registry.npmjs.org/browserify/-/browserify-12.0.2.tgz",
"integrity": "sha1-V/IeXm4wj/WYfE2v1EhAsrmPehk=", "integrity": "sha1-V/IeXm4wj/WYfE2v1EhAsrmPehk=",
"requires": { "requires": {
"JSONStream": "1.3.1",
"assert": "1.3.0", "assert": "1.3.0",
"browser-pack": "6.0.2", "browser-pack": "6.0.2",
"browser-resolve": "1.11.2", "browser-resolve": "1.11.2",
@@ -1824,7 +1834,6 @@
"inherits": "2.0.3", "inherits": "2.0.3",
"insert-module-globals": "7.0.1", "insert-module-globals": "7.0.1",
"isarray": "0.0.1", "isarray": "0.0.1",
"JSONStream": "1.3.1",
"labeled-stream-splicer": "2.0.0", "labeled-stream-splicer": "2.0.0",
"module-deps": "4.1.1", "module-deps": "4.1.1",
"os-browserify": "0.1.2", "os-browserify": "0.1.2",
@@ -6711,13 +6720,6 @@
} }
} }
}, },
"string_decoder": {
"version": "1.0.1",
"bundled": true,
"requires": {
"safe-buffer": "5.0.1"
}
},
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
@@ -6727,6 +6729,13 @@
"strip-ansi": "3.0.1" "strip-ansi": "3.0.1"
} }
}, },
"string_decoder": {
"version": "1.0.1",
"bundled": true,
"requires": {
"safe-buffer": "5.0.1"
}
},
"stringstream": { "stringstream": {
"version": "0.0.5", "version": "0.0.5",
"bundled": true, "bundled": true,
@@ -8899,10 +8908,10 @@
"resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz", "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz",
"integrity": "sha1-wDv04BywhtW15azorQr+eInWOMM=", "integrity": "sha1-wDv04BywhtW15azorQr+eInWOMM=",
"requires": { "requires": {
"JSONStream": "1.3.1",
"combine-source-map": "0.7.2", "combine-source-map": "0.7.2",
"concat-stream": "1.5.2", "concat-stream": "1.5.2",
"is-buffer": "1.1.6", "is-buffer": "1.1.6",
"JSONStream": "1.3.1",
"lexical-scope": "1.2.0", "lexical-scope": "1.2.0",
"process": "0.11.10", "process": "0.11.10",
"through2": "2.0.3", "through2": "2.0.3",
@@ -9738,15 +9747,6 @@
"resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=" "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk="
}, },
"JSONStream": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
"integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
"requires": {
"jsonparse": "1.3.1",
"through": "2.3.8"
}
},
"jsprim": { "jsprim": {
"version": "1.4.1", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -11554,6 +11554,7 @@
"resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz", "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
"integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=", "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
"requires": { "requires": {
"JSONStream": "1.3.1",
"browser-resolve": "1.11.2", "browser-resolve": "1.11.2",
"cached-path-relative": "1.0.1", "cached-path-relative": "1.0.1",
"concat-stream": "1.5.2", "concat-stream": "1.5.2",
@@ -11561,7 +11562,6 @@
"detective": "4.5.0", "detective": "4.5.0",
"duplexer2": "0.1.4", "duplexer2": "0.1.4",
"inherits": "2.0.3", "inherits": "2.0.3",
"JSONStream": "1.3.1",
"parents": "1.0.1", "parents": "1.0.1",
"readable-stream": "2.0.6", "readable-stream": "2.0.6",
"resolve": "1.5.0", "resolve": "1.5.0",
@@ -15439,22 +15439,6 @@
"throttleit": "1.0.0" "throttleit": "1.0.0"
} }
}, },
"require_optional": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
"integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
"requires": {
"resolve-from": "2.0.0",
"semver": "5.4.1"
},
"dependencies": {
"semver": {
"version": "5.4.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
}
}
},
"require-again": { "require-again": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/require-again/-/require-again-2.0.0.tgz", "resolved": "https://registry.npmjs.org/require-again/-/require-again-2.0.0.tgz",
@@ -15494,6 +15478,22 @@
} }
} }
}, },
"require_optional": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
"integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
"requires": {
"resolve-from": "2.0.0",
"semver": "5.4.1"
},
"dependencies": {
"semver": {
"version": "5.4.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
}
}
},
"requires-port": { "requires-port": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -16797,11 +16797,6 @@
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
}, },
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
},
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -16812,6 +16807,11 @@
"strip-ansi": "3.0.1" "strip-ansi": "3.0.1"
} }
}, },
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
},
"stringstream": { "stringstream": {
"version": "0.0.5", "version": "0.0.5",
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -18496,6 +18496,14 @@
"resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz", "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz",
"integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==" "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg=="
}, },
"vuedraggable": {
"version": "2.15.0",
"resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.15.0.tgz",
"integrity": "sha1-NSat7pJL0itHigG3DAo038nLu08=",
"requires": {
"sortablejs": "1.7.0"
}
},
"vuejs-datepicker": { "vuejs-datepicker": {
"version": "git://github.com/habitrpg/vuejs-datepicker.git#825a866b6a9c52dd8c588a3e8b900880875ce914" "version": "git://github.com/habitrpg/vuejs-datepicker.git#825a866b6a9c52dd8c588a3e8b900880875ce914"
}, },

View File

@@ -1,6 +1,6 @@
<template lang="pug"> <template lang="pug">
div div
static-header(v-if='showContentWrap', :class='{"home-header": $route.name === "home"}') static-header(v-if='showContentWrap', :class='{"home-header": ["home", "front"].indexOf($route.name) !== -1}')
.static-wrapper .static-wrapper
router-view router-view

View File

@@ -3,7 +3,9 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Habitica</title> <title>Habitica - Gamify Your Life</title>
<meta name="description" content="Habitica is a free habit and productivity app that treats your real life like a game. Habitica can help you achieve your goals to become healthy and happy.">
<meta name="keywords" content="Habits,Goals,Todo,Gamification,Health,Fitness,School,Work">
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed:400,400i,700,700i|Roboto:400,400i,700,700i" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Roboto+Condensed:400,400i,700,700i|Roboto:400,400i,700,700i" rel="stylesheet">
<link rel="shortcut icon" sizes="48x48" href="/static/icons/favicon.ico"> <link rel="shortcut icon" sizes="48x48" href="/static/icons/favicon.ico">
<link rel="shortcut icon" sizes="192x192" href="/static/icons/favicon_192x192.png"> <link rel="shortcut icon" sizes="192x192" href="/static/icons/favicon_192x192.png">

View File

@@ -258,6 +258,7 @@ const router = new VueRouter({
{ name: 'features', path: 'features', component: FeaturesPage, meta: {requiresLogin: false}}, { name: 'features', path: 'features', component: FeaturesPage, meta: {requiresLogin: false}},
{ name: 'groupPlans', path: 'group-plans', component: GroupPlansPage, meta: {requiresLogin: false}}, { name: 'groupPlans', path: 'group-plans', component: GroupPlansPage, meta: {requiresLogin: false}},
{ name: 'home', path: 'home', component: HomePage, meta: {requiresLogin: false} }, { name: 'home', path: 'home', component: HomePage, meta: {requiresLogin: false} },
{ name: 'front', path: 'front', component: HomePage, meta: {requiresLogin: false} },
{ name: 'merch', path: 'merch', component: MerchPage, meta: {requiresLogin: false}}, { name: 'merch', path: 'merch', component: MerchPage, meta: {requiresLogin: false}},
{ name: 'news', path: 'new-stuff', component: NewsPage, meta: {requiresLogin: false}}, { name: 'news', path: 'new-stuff', component: NewsPage, meta: {requiresLogin: false}},
{ name: 'overview', path: 'overview', component: OverviewPage, meta: {requiresLogin: false}}, { name: 'overview', path: 'overview', component: OverviewPage, meta: {requiresLogin: false}},