mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-13 04:37:36 +01:00
Redesign: Sabe fixes 08/31 (#9011)
* fix(modules): datepicker dist * fix(strings): Tumblr typo * fix(default-tasks): remove "ADD Notes" * fix(homepage): working header
This commit is contained in:
Sabe Jones
GitHub
17367
npm-shrinkwrap.json
generated
17367
npm-shrinkwrap.json
generated
File diff suppressed because it is too large
Load Diff
15
package.json
15
package.json
@@ -30,8 +30,8 @@
|
||||
"bcrypt": "^1.0.2",
|
||||
"bluebird": "^3.3.5",
|
||||
"body-parser": "^1.15.0",
|
||||
"bootstrap": "^4.0.0-alpha.6",
|
||||
"bootstrap-vue": "^0.18.0",
|
||||
"bootstrap": "4.0.0-alpha.6",
|
||||
"bootstrap-vue": "^1.0.0-beta.6",
|
||||
"bower": "~1.3.12",
|
||||
"browserify": "~12.0.1",
|
||||
"compression": "^1.6.1",
|
||||
@@ -60,7 +60,7 @@
|
||||
"grunt-contrib-stylus": "~0.20.0",
|
||||
"grunt-contrib-uglify": "~0.6.0",
|
||||
"grunt-contrib-watch": "~0.6.1",
|
||||
"grunt-hashres": "habitrpg/grunt-hashres#v0.4.2",
|
||||
"grunt-hashres": "git://github.com/habitrpg/grunt-hashres#dc85db6d3002e29e1b7c5ee186b80d708d2f0e0b",
|
||||
"gulp": "^3.9.0",
|
||||
"gulp-babel": "^6.1.2",
|
||||
"gulp-grunt": "^0.5.2",
|
||||
@@ -76,12 +76,13 @@
|
||||
"in-app-purchase": "^1.1.6",
|
||||
"intro.js": "^2.6.0",
|
||||
"jade": "~1.11.0",
|
||||
"jquery": ">=3.0.0",
|
||||
"js2xmlparser": "~1.0.0",
|
||||
"lodash": "^4.17.4",
|
||||
"merge-stream": "^1.0.0",
|
||||
"method-override": "^2.3.5",
|
||||
"moment": "^2.13.0",
|
||||
"moment-recur": "habitrpg/moment-recur#v1.0.6",
|
||||
"moment-recur": "git://github.com/habitrpg/moment-recur#f147ef27bbc26ca67638385f3db4a44084c76626",
|
||||
"mongoose": "~4.8.6",
|
||||
"mongoose-id-autoinc": "~2013.7.14-4",
|
||||
"morgan": "^1.7.0",
|
||||
@@ -98,11 +99,12 @@
|
||||
"passport-google-oauth20": "1.0.0",
|
||||
"paypal-ipn": "3.0.0",
|
||||
"paypal-rest-sdk": "^1.2.1",
|
||||
"popper.js": "^1.11.0",
|
||||
"postcss-easy-import": "^2.0.0",
|
||||
"pretty-data": "^0.40.0",
|
||||
"ps-tree": "^1.0.0",
|
||||
"pug": "^2.0.0-beta.12",
|
||||
"push-notify": "habitrpg/push-notify#v1.2.0",
|
||||
"push-notify": "git://github.com/habitrpg/push-notify#6bc2b5fdb1bdc9649b9ec1964d79ca50187fc8a9",
|
||||
"pusher": "^1.3.0",
|
||||
"request": "~2.74.0",
|
||||
"rimraf": "^2.4.3",
|
||||
@@ -129,7 +131,7 @@
|
||||
"vue-router": "^2.0.0-rc.5",
|
||||
"vue-style-loader": "^3.0.0",
|
||||
"vue-template-compiler": "^2.1.10",
|
||||
"vuejs-datepicker": "habitrpg/vuejs-datepicker#v0.9.12",
|
||||
"vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker#45e607a7bccf4e3e089761b3b7b33e3f2c5dc21f",
|
||||
"webpack": "^2.2.1",
|
||||
"webpack-merge": "^4.0.0",
|
||||
"winston": "^2.1.0",
|
||||
@@ -178,7 +180,6 @@
|
||||
"chromedriver": "^2.27.2",
|
||||
"connect-history-api-fallback": "^1.1.0",
|
||||
"coveralls": "^2.11.2",
|
||||
"cross-env": "^4.0.0",
|
||||
"cross-spawn": "^5.0.1",
|
||||
"csv": "~0.3.6",
|
||||
"deep-diff": "~0.1.4",
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
li
|
||||
a(href='https://habitica.wordpress.com/', target='_blank') {{ $t('companyBlog') }}
|
||||
li
|
||||
a(href='http://blog.habitrpg.com/', target='_blank') {{ $t('Tumblr') }}
|
||||
a(href='http://blog.habitrpg.com/', target='_blank') {{ $t('tumblr') }}
|
||||
li
|
||||
a(href='/static/faq') {{ $t('FAQ') }}
|
||||
li
|
||||
|
||||
@@ -742,12 +742,12 @@ let tasksByCategory = {
|
||||
{
|
||||
type: 'daily',
|
||||
text: 'Most important task >> Worked on today’s most important task',
|
||||
notes: '(ADD) Notes: Tap to specify your most important task',
|
||||
notes: 'Tap to specify your most important task',
|
||||
},
|
||||
{
|
||||
type: 'todo',
|
||||
text: 'Work project >> Complete work project',
|
||||
notes: '(ADD) Notes: Tap to specify the name of your current project + set a due date!',
|
||||
notes: 'Tap to specify the name of your current project + set a due date!',
|
||||
},
|
||||
],
|
||||
exercise: [
|
||||
@@ -760,12 +760,12 @@ let tasksByCategory = {
|
||||
{
|
||||
type: 'daily',
|
||||
text: 'Stretching >> Daily workout routine',
|
||||
notes: '(ADD) Notes: Tap to choose your schedule and specify exercises!',
|
||||
notes: 'Tap to choose your schedule and specify exercises!',
|
||||
},
|
||||
{
|
||||
type: 'todo',
|
||||
text: 'Set up workout schedule',
|
||||
notes: '(ADD) Notes: Tap to add a checklist!',
|
||||
notes: 'Tap to add a checklist!',
|
||||
},
|
||||
],
|
||||
health_wellness: [ // eslint-disable-line
|
||||
@@ -778,12 +778,12 @@ let tasksByCategory = {
|
||||
{
|
||||
type: 'daily',
|
||||
text: 'Floss',
|
||||
notes: '(ADD) Notes: Tap to make any changes!',
|
||||
notes: 'Tap to make any changes!',
|
||||
},
|
||||
{
|
||||
type: 'todo',
|
||||
text: 'Schedule check-up >> Brainstorm a healthy change',
|
||||
notes: '(ADD) Notes: Tap to add checklists!',
|
||||
notes: 'Tap to add checklists!',
|
||||
},
|
||||
],
|
||||
school: [
|
||||
@@ -796,12 +796,12 @@ let tasksByCategory = {
|
||||
{
|
||||
type: 'daily',
|
||||
text: 'Finish homework',
|
||||
notes: '(ADD) Notes: Tap to choose your homework schedule!',
|
||||
notes: 'Tap to choose your homework schedule!',
|
||||
},
|
||||
{
|
||||
type: 'todo',
|
||||
text: 'Finish assignment for class',
|
||||
notes: '(ADD) [Notes: Tap to name the assignment and choose a due date!]',
|
||||
notes: 'Tap to name the assignment and choose a due date!]',
|
||||
},
|
||||
],
|
||||
self_care: [ // eslint-disable-line
|
||||
@@ -814,12 +814,12 @@ let tasksByCategory = {
|
||||
{
|
||||
type: 'daily',
|
||||
text: '5 minutes of quiet breathing',
|
||||
notes: '(ADD) Notes: Tap to choose your schedule!',
|
||||
notes: 'Tap to choose your schedule!',
|
||||
},
|
||||
{
|
||||
type: 'todo',
|
||||
text: 'Engage in a fun activity',
|
||||
notes: '(ADD) Notes: Tap to specify what you plan to do!',
|
||||
notes: 'Tap to specify what you plan to do!',
|
||||
},
|
||||
],
|
||||
chores: [
|
||||
@@ -832,12 +832,12 @@ let tasksByCategory = {
|
||||
{
|
||||
type: 'daily',
|
||||
text: 'Wash dishes',
|
||||
notes: '(ADD) Notes: Tap to choose your schedule!',
|
||||
notes: 'Tap to choose your schedule!',
|
||||
},
|
||||
{
|
||||
type: 'todo',
|
||||
text: 'Organize closet >> Organize clutter',
|
||||
notes: '(ADD) Notes: Tap to specify the cluttered area!',
|
||||
notes: 'Tap to specify the cluttered area!',
|
||||
},
|
||||
],
|
||||
creativity: [
|
||||
@@ -850,12 +850,12 @@ let tasksByCategory = {
|
||||
{
|
||||
type: 'daily',
|
||||
text: 'Work on creative project',
|
||||
notes: '(ADD) Notes: Tap to specify the name of your current project + set the schedule!',
|
||||
notes: 'Tap to specify the name of your current project + set the schedule!',
|
||||
},
|
||||
{
|
||||
type: 'todo',
|
||||
text: 'Finish creative project',
|
||||
notes: '(ADD) Notes: Tap to specify the name of your project',
|
||||
notes: 'Tap to specify the name of your project',
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
@@ -4,27 +4,7 @@
|
||||
br
|
||||
a(href='http://www.enable-javascript.com/', target='_blank') {{ $t('jsDisabledLink') }}
|
||||
|
||||
nav.navbar.navbar-toggleable-md.navbar-light.bg-faded
|
||||
button.navbar-toggler.navbar-toggler-right(type='button', data-toggle='collapse', data-target='#navbarNav', aria-controls='navbarNav', aria-expanded='false', aria-label='Toggle navigation')
|
||||
span.navbar-toggler-icon
|
||||
router-link.nav-link(to="/home")
|
||||
.logo.svg-icon(v-html="icons.logo")
|
||||
#navbarNav.collapse.navbar-collapse
|
||||
ul.navbar-nav.float-right
|
||||
li.nav-item
|
||||
router-link.nav-link(to="/static/features") How it Works
|
||||
li.nav-item
|
||||
router-link.nav-link(to="/static/plans") Group Plans
|
||||
li.nav-item
|
||||
a.nav-link(href="https://habitica.wordpress.com/") Blog
|
||||
li.nav-item
|
||||
a.nav-link(href="http://blog.habitrpg.com/") Tumblr
|
||||
li.nav-item
|
||||
router-link.nav-link(to="/static/press-kit") Press Kit
|
||||
li.nav-item
|
||||
router-link.nav-link(to="/static/contact") Contact
|
||||
li.nav-item
|
||||
button#play-btn(class="btn btn-primary btn-lg gamifybutton") Enter Habitica
|
||||
static-header
|
||||
|
||||
#intro.container-fluid
|
||||
.row
|
||||
@@ -530,11 +510,12 @@
|
||||
a(href='https://slack.com/')
|
||||
img.img-rendering-auto.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/landing_slack_hash_wordmark_logo.png', alt="$t(altAttrSlack)")
|
||||
|
||||
.row.footer-content
|
||||
// @TODO: Add footer include ../shared/footer
|
||||
app-footer
|
||||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@import '~client/assets/scss/static.scss';
|
||||
|
||||
.logo {
|
||||
width: 128px;
|
||||
height: 28px;
|
||||
@@ -619,24 +600,26 @@
|
||||
</style>
|
||||
|
||||
<script>
|
||||
import logo from 'assets/svg/logo.svg';
|
||||
import AppFooter from 'client/components/appFooter';
|
||||
import StaticHeader from './header.vue';
|
||||
|
||||
export default {
|
||||
data () {
|
||||
return {
|
||||
icons: Object.freeze({
|
||||
logo,
|
||||
}),
|
||||
userCount: 1000000,
|
||||
};
|
||||
},
|
||||
mounted () {
|
||||
// Analytics.track({"hitType":"pageview","eventCategory":"page","eventAction":"landing page","page":"/home"});
|
||||
},
|
||||
methods: {
|
||||
playButtonClick () {
|
||||
this.$router.push('/register');
|
||||
export default {
|
||||
components: {
|
||||
AppFooter,
|
||||
StaticHeader,
|
||||
},
|
||||
},
|
||||
};
|
||||
data () {
|
||||
return {
|
||||
userCount: 1000000,
|
||||
};
|
||||
},
|
||||
mounted () {
|
||||
// Analytics.track({"hitType":"pageview","eventCategory":"page","eventAction":"landing page","page":"/home"});
|
||||
},
|
||||
methods: {
|
||||
playButtonClick () {
|
||||
this.$router.push('/register');
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user