From eda76efd2879805ff91569179ff3604b42b2dfc9 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Tue, 26 Sep 2017 23:29:39 +0000 Subject: [PATCH] fix(hooks): remove default tasks from content instead --- website/common/script/content/index.js | 70 ++------------------------ website/server/models/user/hooks.js | 2 +- 2 files changed, 6 insertions(+), 66 deletions(-) diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js index 63ac4f4bc2..0926685081 100644 --- a/website/common/script/content/index.js +++ b/website/common/script/content/index.js @@ -609,71 +609,11 @@ api.userDefaults = { }; api.userDefaultsMobile = { - habits: [ - { - type: 'habit', - text: t('defaultHabit4Text'), - notes: t('defaultHabit4Notes'), - up: true, - down: false, - attribute: 'per', - }, { - type: 'habit', - text: t('defaultHabit5Text'), - notes: t('defaultHabit5Notes'), - up: false, - down: true, - attribute: 'con', - }, - ], - dailys: [ - { - type: 'daily', - text: t('defaultDaily1Text'), - attribute: 'per', - }, - ], - todos: [ - { - type: 'todo', - text: t('defaultTodo1Text'), - notes: t('defaultTodoNotes'), - completed: false, - attribute: 'int', - }, - { - type: 'todo', - text: t('defaultTodo2Text'), - notes: t('defaultTodo2Notes'), - completed: false, - attribute: 'int', - }, - ], - rewards: [ - { - type: 'reward', - text: t('defaultReward2Text'), - notes: t('defaultReward2Notes'), - value: 20, - }, - ], - tags: [ - { - name: t('defaultTag1'), - }, { - name: t('defaultTag2'), - }, { - name: t('defaultTag3'), - }, { - name: t('defaultTag4'), - }, { - name: t('defaultTag5'), - }, { - name: t('defaultTag6'), - }, { - name: t('defaultTag7'), - }, - ], + habits: [], + dailys: [], + todos: [], + rewards: [], + tags: [], }; api.faq = faq; diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js index a3c464ccf7..fa22e5f998 100644 --- a/website/server/models/user/hooks.js +++ b/website/server/models/user/hooks.js @@ -33,7 +33,7 @@ function findTag (user, tagName) { function _populateDefaultTasks (user, taskTypes) { let defaultsData; if (user.registeredThrough === 'habitica-android' || user.registeredThrough === 'habitica-ios') { - return; + defaultsData = shared.content.userDefaultsMobile; } else { defaultsData = shared.content.userDefaults; }