2013-09-10 22:06:16 +00:00
|
|
|
'use strict';
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Services for each tour step when you unlock features
|
|
|
|
|
*/
|
|
|
|
|
|
2015-01-18 01:43:37 +00:00
|
|
|
angular.module('habitrpg').factory('Guide',
|
2016-11-24 01:34:09 +00:00
|
|
|
['$rootScope', 'User', '$timeout', '$state', 'Analytics', 'Notification', 'Shared', 'Social',
|
|
|
|
|
function($rootScope, User, $timeout, $state, Analytics, Notification, Shared, Social) {
|
2015-02-06 00:57:34 +00:00
|
|
|
|
|
|
|
|
var chapters = {
|
|
|
|
|
intro: [
|
2015-05-25 20:35:43 +00:00
|
|
|
[
|
|
|
|
|
{
|
|
|
|
|
state: 'options.profile.avatar',
|
|
|
|
|
element: '.tab-content.ng-scope',
|
2015-05-29 19:56:01 +00:00
|
|
|
content: window.env.t('tourAvatar'),
|
2015-05-25 20:35:43 +00:00
|
|
|
placement: "top",
|
2015-05-29 19:56:01 +00:00
|
|
|
proceed: window.env.t('tourAvatarProceed'),
|
2015-05-25 20:35:43 +00:00
|
|
|
backdrop: false,
|
2015-08-24 20:02:25 +00:00
|
|
|
orphan: true,
|
|
|
|
|
gold: 4,
|
|
|
|
|
experience: 29
|
2015-05-25 20:35:43 +00:00
|
|
|
},
|
2015-02-06 00:57:34 +00:00
|
|
|
{
|
|
|
|
|
state: 'tasks',
|
|
|
|
|
element: ".task-column.todos",
|
2015-05-25 20:35:43 +00:00
|
|
|
content: window.env.t('tourToDosBrief'),
|
|
|
|
|
placement: "top",
|
2015-08-24 20:02:25 +00:00
|
|
|
proceed: window.env.t('tourOkay'),
|
|
|
|
|
gold: 4,
|
|
|
|
|
experience: 29
|
2015-05-25 20:35:43 +00:00
|
|
|
},
|
2015-02-06 00:57:34 +00:00
|
|
|
{
|
|
|
|
|
state: 'tasks',
|
|
|
|
|
element: ".task-column.dailys",
|
2015-05-25 20:35:43 +00:00
|
|
|
content: window.env.t('tourDailiesBrief'),
|
|
|
|
|
placement: "top",
|
2015-08-24 20:02:25 +00:00
|
|
|
proceed: window.env.t('tourDailiesProceed'),
|
|
|
|
|
gold: 4,
|
|
|
|
|
experience: 29
|
2015-05-25 20:35:43 +00:00
|
|
|
},
|
2015-02-06 00:57:34 +00:00
|
|
|
{
|
|
|
|
|
state: 'tasks',
|
|
|
|
|
element: ".task-column.habits",
|
2015-05-25 20:35:43 +00:00
|
|
|
content: window.env.t('tourHabitsBrief'),
|
2015-08-28 17:58:30 +00:00
|
|
|
placement: "top",
|
2015-08-24 20:02:25 +00:00
|
|
|
proceed: window.env.t('tourHabitsProceed'),
|
|
|
|
|
gold: 4,
|
|
|
|
|
experience: 29
|
2015-05-25 20:35:43 +00:00
|
|
|
},
|
2015-02-06 00:57:34 +00:00
|
|
|
{
|
|
|
|
|
state: 'tasks',
|
2015-08-28 17:58:30 +00:00
|
|
|
element: "h2.task-column_title.reward-title",
|
2016-09-26 22:10:43 +00:00
|
|
|
content: User.user.flags.armoireEnabled ? window.env.t('tourRewardsArmoire') : window.env.t('tourRewardsBrief'),
|
2015-08-28 17:58:30 +00:00
|
|
|
placement: "left",
|
2015-05-29 19:56:01 +00:00
|
|
|
proceed: window.env.t('tourRewardsProceed'),
|
2015-08-24 20:02:25 +00:00
|
|
|
gold: 4,
|
|
|
|
|
experience: 29,
|
2015-05-25 20:35:43 +00:00
|
|
|
final: true
|
2015-02-06 00:57:34 +00:00
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
],
|
|
|
|
|
classes: [
|
|
|
|
|
[
|
|
|
|
|
{
|
|
|
|
|
state: 'options.inventory.equipment',
|
|
|
|
|
element: '.equipment-tab',
|
|
|
|
|
title: window.env.t('classGear'),
|
2016-03-19 03:23:12 +00:00
|
|
|
content: window.env.t('classGearText')
|
2015-02-06 00:57:34 +00:00
|
|
|
}, {
|
|
|
|
|
state: 'options.profile.stats',
|
|
|
|
|
element: ".allocate-stats",
|
|
|
|
|
title: window.env.t('stats'),
|
|
|
|
|
content: window.env.t('classStats')
|
|
|
|
|
}, {
|
|
|
|
|
state: 'options.profile.stats',
|
|
|
|
|
element: ".auto-allocate",
|
|
|
|
|
title: window.env.t('autoAllocate'),
|
|
|
|
|
placement: 'left',
|
|
|
|
|
content: window.env.t('autoAllocateText')
|
|
|
|
|
}, {
|
|
|
|
|
element: ".meter.mana",
|
|
|
|
|
title: window.env.t('spells'),
|
2016-09-29 11:57:44 +00:00
|
|
|
content: window.env.t('spellsText')
|
2015-02-06 00:57:34 +00:00
|
|
|
}, {
|
|
|
|
|
orphan: true,
|
|
|
|
|
title: window.env.t('readMore'),
|
2016-09-29 11:57:44 +00:00
|
|
|
content: window.env.t('moreClass'),
|
2015-02-06 00:57:34 +00:00
|
|
|
final: true
|
|
|
|
|
}
|
|
|
|
|
]
|
2015-03-19 21:03:43 +00:00
|
|
|
],
|
|
|
|
|
stats: [[
|
|
|
|
|
{
|
|
|
|
|
orphan: true,
|
|
|
|
|
content: window.env.t('tourStatsPage'),
|
2015-05-25 20:35:43 +00:00
|
|
|
final: true,
|
2015-05-29 19:56:01 +00:00
|
|
|
proceed: window.env.t('tourOkay'),
|
|
|
|
|
hideNavigation: true
|
2015-03-19 21:03:43 +00:00
|
|
|
}
|
|
|
|
|
]],
|
|
|
|
|
tavern: [[
|
|
|
|
|
{
|
|
|
|
|
orphan: true,
|
|
|
|
|
content: window.env.t('tourTavernPage'),
|
2015-05-25 20:35:43 +00:00
|
|
|
final: true,
|
2015-05-29 19:56:01 +00:00
|
|
|
proceed: window.env.t('tourAwesome'),
|
|
|
|
|
hideNavigation: true
|
2015-03-19 21:03:43 +00:00
|
|
|
}
|
|
|
|
|
]],
|
|
|
|
|
party: [[
|
|
|
|
|
{
|
|
|
|
|
orphan: true,
|
|
|
|
|
content: window.env.t('tourPartyPage'),
|
2015-05-25 20:35:43 +00:00
|
|
|
final: true,
|
2015-05-29 19:56:01 +00:00
|
|
|
proceed: window.env.t('tourSplendid'),
|
|
|
|
|
hideNavigation: true
|
2015-03-19 21:03:43 +00:00
|
|
|
}
|
|
|
|
|
]],
|
|
|
|
|
guilds: [[
|
|
|
|
|
{
|
|
|
|
|
orphan: true,
|
|
|
|
|
content: window.env.t('tourGuildsPage'),
|
2015-05-25 20:35:43 +00:00
|
|
|
final: true,
|
2015-05-29 19:56:01 +00:00
|
|
|
proceed: window.env.t('tourNifty'),
|
|
|
|
|
hideNavigation: true
|
2015-03-19 21:03:43 +00:00
|
|
|
}
|
|
|
|
|
]],
|
|
|
|
|
challenges: [[
|
|
|
|
|
{
|
|
|
|
|
orphan: true,
|
|
|
|
|
content: window.env.t('tourChallengesPage'),
|
2015-05-25 20:35:43 +00:00
|
|
|
final: true,
|
2015-05-29 19:56:01 +00:00
|
|
|
proceed: window.env.t('tourOkay'),
|
|
|
|
|
hideNavigation: true
|
2015-03-19 21:03:43 +00:00
|
|
|
}
|
|
|
|
|
]],
|
|
|
|
|
market: [[
|
|
|
|
|
{
|
|
|
|
|
orphan: true,
|
|
|
|
|
content: window.env.t('tourMarketPage'),
|
2015-05-25 20:35:43 +00:00
|
|
|
final: true,
|
2015-05-29 19:56:01 +00:00
|
|
|
proceed: window.env.t('tourAwesome'),
|
|
|
|
|
hideNavigation: true
|
2015-05-25 20:35:43 +00:00
|
|
|
}
|
|
|
|
|
]],
|
|
|
|
|
hall: [[
|
|
|
|
|
{
|
|
|
|
|
orphan: true,
|
|
|
|
|
content: window.env.t('tourHallPage'),
|
|
|
|
|
final: true,
|
2015-05-29 19:56:01 +00:00
|
|
|
proceed: window.env.t('tourSplendid'),
|
|
|
|
|
hideNavigation: true
|
2015-05-25 20:35:43 +00:00
|
|
|
}
|
|
|
|
|
]],
|
|
|
|
|
pets: [[
|
|
|
|
|
{
|
|
|
|
|
orphan: true,
|
|
|
|
|
content: window.env.t('tourPetsPage'),
|
|
|
|
|
final: true,
|
2015-05-29 19:56:01 +00:00
|
|
|
proceed: window.env.t('tourNifty'),
|
|
|
|
|
hideNavigation: true
|
2015-05-25 20:35:43 +00:00
|
|
|
}
|
|
|
|
|
]],
|
|
|
|
|
mounts: [[
|
|
|
|
|
{
|
|
|
|
|
orphan: true,
|
|
|
|
|
content: window.env.t('tourMountsPage'),
|
|
|
|
|
final: true,
|
2015-05-29 19:56:01 +00:00
|
|
|
proceed: window.env.t('tourOkay'),
|
|
|
|
|
hideNavigation: true
|
2015-05-25 20:35:43 +00:00
|
|
|
}
|
|
|
|
|
]],
|
|
|
|
|
equipment: [[
|
|
|
|
|
{
|
|
|
|
|
orphan: true,
|
|
|
|
|
content: window.env.t('tourEquipmentPage'),
|
|
|
|
|
final: true,
|
2015-05-29 19:56:01 +00:00
|
|
|
proceed: window.env.t('tourAwesome'),
|
|
|
|
|
hideNavigation: true
|
2015-03-19 21:03:43 +00:00
|
|
|
}
|
|
|
|
|
]]
|
2015-02-06 00:57:34 +00:00
|
|
|
}
|
2015-03-19 21:03:43 +00:00
|
|
|
|
2015-02-06 00:57:34 +00:00
|
|
|
_.each(chapters, function(chapter, k){
|
2017-03-01 16:10:48 +00:00
|
|
|
_(chapter).flattenDeep().forEach(function(step, i) {
|
2015-02-05 02:40:06 +00:00
|
|
|
step.content = "<div><div class='" + (env.worldDmg.guide ? "npc_justin_broken" : "npc_justin") + " float-left'></div>" + step.content + "</div>";
|
2015-02-06 00:57:34 +00:00
|
|
|
$(step.element).popover('destroy'); // destroy existing hover popovers so we can add our own
|
2015-02-05 02:40:06 +00:00
|
|
|
step.onShow = function(){
|
2015-07-23 20:07:37 +00:00
|
|
|
Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'tutorial','eventLabel':k+'-web','eventValue':i+1,'complete':false});
|
2015-02-06 00:57:34 +00:00
|
|
|
if (step.state && !$state.is(step.state)) {
|
|
|
|
|
$state.go(step.state);
|
|
|
|
|
return $timeout(function(){});
|
|
|
|
|
}
|
2015-07-23 20:07:37 +00:00
|
|
|
};
|
2015-02-06 00:57:34 +00:00
|
|
|
step.onHide = function(){
|
2016-09-09 01:23:49 +00:00
|
|
|
var ups = {};
|
|
|
|
|
var lastKnownStep = User.user.flags.tour[k];
|
|
|
|
|
|
|
|
|
|
// Return early if user has already completed this tutorial
|
|
|
|
|
if (lastKnownStep === -2) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
2016-11-24 01:34:09 +00:00
|
|
|
|
2016-09-09 01:23:49 +00:00
|
|
|
if (i > lastKnownStep) {
|
|
|
|
|
if (step.gold) ups['stats.gp'] = User.user.stats.gp + step.gold;
|
|
|
|
|
if (step.experience) ups['stats.exp'] = User.user.stats.exp + step.experience;
|
|
|
|
|
ups['flags.tour.'+k] = i;
|
2015-08-24 20:02:25 +00:00
|
|
|
}
|
2016-11-24 01:34:09 +00:00
|
|
|
|
2015-03-19 21:03:43 +00:00
|
|
|
if (step.final) { // -2 indicates complete
|
2016-11-24 01:34:09 +00:00
|
|
|
if (k === 'intro') {
|
|
|
|
|
// Manually show bunny scroll reward
|
|
|
|
|
var rewardData = {
|
|
|
|
|
reward: [Shared.content.quests.dustbunnies],
|
|
|
|
|
rewardKey: ['inventory_quest_scroll_dustbunnies'],
|
|
|
|
|
rewardText: Shared.content.quests.dustbunnies.text(),
|
|
|
|
|
message: window.env.t('checkinEarned'),
|
|
|
|
|
nextRewardAt: 1,
|
|
|
|
|
};
|
|
|
|
|
Notification.showLoginIncentive(User.user, rewardData, Social.loadWidgets);
|
|
|
|
|
}
|
|
|
|
|
//Mark tour complete
|
2015-08-24 20:02:25 +00:00
|
|
|
ups['flags.tour.'+k] = -2;
|
2015-06-22 21:35:17 +00:00
|
|
|
Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'tutorial','eventLabel':k+'-web','eventValue':i+1,'complete':true})
|
2015-02-06 00:57:34 +00:00
|
|
|
}
|
2016-09-09 01:23:49 +00:00
|
|
|
|
2015-08-24 20:02:25 +00:00
|
|
|
User.set(ups);
|
2016-09-09 01:23:49 +00:00
|
|
|
// User.set() doesn't include a check for level changes, so manually check here.
|
|
|
|
|
if (step.experience) {
|
|
|
|
|
User.user.fns.updateStats(User.user.stats);
|
|
|
|
|
}
|
2015-02-06 00:57:34 +00:00
|
|
|
}
|
2017-03-01 16:10:48 +00:00
|
|
|
});
|
2015-07-23 20:07:37 +00:00
|
|
|
});
|
2013-12-16 20:33:05 +00:00
|
|
|
|
2015-02-06 00:57:34 +00:00
|
|
|
var tour = {};
|
|
|
|
|
_.each(chapters, function(v,k){
|
|
|
|
|
tour[k] = new Tour({
|
2015-03-19 20:40:28 +00:00
|
|
|
name: k,
|
2015-02-06 00:57:34 +00:00
|
|
|
backdrop: true,
|
|
|
|
|
template: function(i,step){
|
2015-03-30 22:57:17 +00:00
|
|
|
var showFinish = step.final || k == 'classes';
|
|
|
|
|
var showCounter = k=='intro' && !step.final;
|
|
|
|
|
|
2015-03-24 21:41:33 +00:00
|
|
|
return '<div class="popover" role="tooltip">' +
|
|
|
|
|
'<div class="arrow"></div>' +
|
|
|
|
|
'<h3 class="popover-title"></h3>' +
|
|
|
|
|
'<div class="popover-content"></div>' +
|
2015-03-06 20:59:28 +00:00
|
|
|
'<div class="popover-navigation"> ' +
|
2015-12-26 14:18:58 +00:00
|
|
|
(showCounter ? '<span style="float:right;">'+ (i+1 +' of '+ _.flattenDeep(chapters[k]).length) +'</span>' : '')+ // counter
|
2015-03-24 21:41:33 +00:00
|
|
|
'<div class="btn-group">' +
|
2015-05-29 19:56:01 +00:00
|
|
|
(step.hideNavigation ? '' : '<button class="btn btn-sm btn-default" data-role="prev">« Previous</button>') +
|
2015-05-25 20:35:43 +00:00
|
|
|
(showFinish ? ('<button class="btn btn-sm btn-primary" data-role="end" style="float:none;">' + (step.proceed ? step.proceed : "Finish Tour") + '</button>') :
|
2015-05-29 19:56:01 +00:00
|
|
|
(step.hideNavigation ? '' : ('<button class="btn btn-sm btn-primary" data-role="next">' + (step.proceed ? step.proceed : "Next") + ' »</button>'))) +
|
2015-03-24 21:41:33 +00:00
|
|
|
'<button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button>' +
|
|
|
|
|
'</div>' +
|
2015-03-06 20:59:28 +00:00
|
|
|
'</div>' +
|
|
|
|
|
'</div>';
|
2015-02-06 00:57:34 +00:00
|
|
|
},
|
2015-05-25 20:35:43 +00:00
|
|
|
storage: false
|
2015-02-06 00:57:34 +00:00
|
|
|
});
|
2015-01-18 01:43:37 +00:00
|
|
|
});
|
2013-12-18 00:12:39 +00:00
|
|
|
|
2015-02-06 00:57:34 +00:00
|
|
|
var goto = function(chapter, page, force) {
|
API v3 [WIP] (#6144)
* Fixed more tests
* Added tags into user service
* Added api-v3 auth urls
* v3: fix package.json
* v3: fix package.json
* Fixed auth tests. Updated Authctrl response
* v3: remove newrelic config file in favour of env variables
* v3: upgrade some deps
* switch from Q to Bluebird
* v3 fix tests with deferred
* Removed extra consoles.log. Changed data.data to res.data
* v3 fix tests and use coroutines instead of regenerator
* v3: fix tests
* v3: do not await a non promise
* v3: q -> bluebird
* Changed id param for registration response
* Updated party query and create
* Ensured login callback happens after user sync
* Add challenges to groups. Fixed isMemberOfGuild check
* Updated party and group tests
* Fixed cron test
* return user.id and send analytics event before changing page
* fix trailing spaces
* disable redirects
* Api v3 party tavern fixes (#7191)
* Added check if user is in party before query
* Cached party query. Prevented party request when user is not in party. Updated Party create with no invites
* Update tavern ctrl to use new promise
* v3: misc fixes
* Api v3 task fixes (#7193)
* Update task view to use _id
* Added try catch to user service ops calls
* v3 client: saving after syncing is complete
* Fixed test broken by part sync change (#7195)
* v3: fix todo scoring and try to fix production testing problem
* revert changes to mongoose config
* mongoose: increase keepAlive
* test mongoose fix
* fix: Only apply captureStackTrace if it exists on the error object
* v3: fix reminders with no startDate
* mongoose: use options
* chore(): rename website/src -> website/server and website/public -> website/client (#7199)
* v3 fix GET /groups: return an error only if an invalid type is supplied not when there are 0 results (#7203)
* [API v3] Fix calls to user.ops and deleting tags (#7204)
* v3: fixes calls to user.ops from views and deleting tags
* v3: fix tests that use user._statsComputed
* Api v3 fixes continued (#7205)
* Added timzeone offset back
* Added APIToken back to settings page
* Fixed fetch recent messages for party
* Fixed returning group description
* Fixed check if user is member of challenge
* Fixed party members appearing in header
* Updated get myGroups param to include public groups. Fixed isMemberOf group
* Fixed hourglass purchase
* Fixed challenge addding tasks on first creating
* Updated tests to accomidate new changes
* fix: Correct checklist on client
Closes #7207
* fix: Pin eslint to 2.9
* minor improvements to cron code for clarity; fix inaccurate comments; add TODOs for rest-in-inn actions
* fix: Add missing type param to equip call
closes #7212
* rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges
* allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227
* fix tests for /members/transfer-gems
* fix: Set gems sent notification as translatable string
* chore: Remove unusued variable
* fix: Remove requirement on message paramter in transfer-gems
* add a missing variable declaration
* chore: clarify comments on cron code
* fix: Correct client request from habitrpg -> tavern
* update apidoc URL in package.json
Closes #7222
* Fixed start party by invites
* Updated spell casting to v3
* Fixed adding and removing tags on tasks
* Fixed page reload on settings change
* Fixed battle monsters with friends button
* Loaded completed todos when done is clicked
* chore: Reinstate floating version number for eslint
babel-eslint regression fixed
* Fixed reload tests
* change "an user" to "a user" in comments and text (no code changes) (#7257)
* fix: Alert user that drops were recieved
* remove userServices.js from karma.conf - it's been moved to website/client/js/services
* feat: Create debug update user route
* fix: Correct set cron debug function
* feat: Add make admin button to debug menu
* lint: Add missing semicolons in test
* fix: Temporarilly comment out udpate user debug route
* v3: fix _tmp for crit and streakBonus
* v3: execute all actions when leaving a solo party
* v3 client: fix group not found when leaving party
* v3 migration: fix challenge prize
* v3 cron: only save modified tasks
* v3: add CHALLENGE_TASK_NOT_FOUND to valid broken reasons
* v3: fix tasks chart
* v3 client: fix ability to leave challenge
* v3 client: fix filtering by tag and correctly show tag tooltip
* v3 common: fix tags tests
* v3 client: support unlinking not found challenges tasks
* v3: disable Bluebird warning for missing return, fixes #7269
* feat: Separate out update-user into set-cron and make-admin debug routes
* chore: Disable make admin debug route for v3 prod testing
* v3: misc fixes
* v3: misc fixes
* v3: fix adding multiple tasks
* Fixed join/leave button updates
* Queried only user groups to be available when creating challenges
* Fixed bulk add tasks to challenge
* Synced challenge tasks after leave and join.
* Fixed default selected group
* Fixed challenge member info. Fixed challenge winner selection
* Fixed deleting challenge tasks
* Fixed particiapting filter
* v3 client: fix casting spells
* v3: do not log sensitive data
* v3: always save user when casting spell
* v3: always save user when casting spell
* v3: more fixes for spells
* fix typos and missing information in apidocs - fixes https://github.com/HabitRPG/habitrpg/issues/7277 (#7282)
* v3: add TODO for client side spells
* feat: Add modify inventory debug menu
* Fixed viewing user progress on challenge
* Updated tests
* fix: Fix quest progress button
* fix incorrect Armoire test; remove unneeded param details from apidocs; disambiguate health potion
* v3: fix stealth casting
* v3: fix tasks saving and selection for rebirth reroll and reset (server-only)
* v3: fix auto allocation
* v3 client: misc fixes
* rename buyPotion and buy-potion to buyHealthPotion and buy-health-potion; fix apidoc param error
* Added delete for saved challenge task
* Fixed member modal on front page
* adjust text in apidocs for errors / clarity / consistency / standard terminology (no code changes) (#7298)
* fix bug in Rebirth test, add new tests, adjust apidocs (#7293)
* Updated task model to allow setting streak (#7306)
* fix: Correct missing * in apidoc comments
* Api v3 challenge fixes (#7287)
* Fixed join/leave button updates
* Queried only user groups to be available when creating challenges
* Fixed bulk add tasks to challenge
* Synced challenge tasks after leave and join.
* Fixed default selected group
* Fixed challenge member info. Fixed challenge winner selection
* Fixed deleting challenge tasks
* Fixed particiapting filter
* Fixed viewing user progress on challenge
* Updated tests
* Added delete for saved challenge task
* v3: fix sorting
* [API v3] add CRON_SAFE_MODE (#7286)
* add CRON_SAFE_MODE to example config file, fix some bugs, add an unrelated low-priority TODO
* create CRON_SAFE_MODE to disable parts of cron for use after extended outage - fixes https://github.com/HabitRPG/habitrpg/issues/7161
* fix a bug with CRON_SAFE_MODE, remove duplicated code, remove completed TODO comment
* fix check for CRON_SAFE_MODE
* v3 client: fix typo
* adjust debug menu Modify Inventory: hungrier pets, fewer Special items, "Hide" buttons
* completed To-Dos: return the 30 most recent instead of 30 oldest (#7318)
* v3 migration: fix createdAt date
* adjust locales text, key names, and files for Rebirth, Reset, and Fortify / ReRoll for consistency with existing strings (#7321)
* v3: fix unlinking multiple tasks
* v3 fix releasing pets
* v3: fix authenticating with apiUrl
* v3: fix typo
* v3 fix client tests for unlinking
* v3 client: do not show start quest button when quest is active
* v3 client: fix ability to send cards
* v3 client: fix misc challenge issues
* v3: fix notifications
* v3 client: more user friendly errors
* v3 client: only load completed todos once
* v3 client: fix tests
* v3: move TAVERN_ID to common code
* fix: Provide default type and text for new task creation in score route
* fix: Provide default history [] for habit in score route
* fix: Add _legacyId prop to tasks to support non-uuid identifiers
* chore: Change v3 migration to use _legacyId instead of legacyId
* fix: check for _legacyId in tasks if id does not exist
* refactor: Extract out finding task by id or _legacyId into a function
* Api v3 party quest fixes (#7341)
* Fix display of add challenge message when group challenges are empty
* Fixed forced quest start to update quest without reload
* Fixed needing to reload when accepting party invite
* Fix group leave and join reload
* Fixed leave current party and join another
* Updated party tests
* v3 client: remove console.log statement
* v3: misc fixes
* v3 client: fix predicatbale random
* v3: info about API v3
* v3: update footer with links to developer resources
* v3: support party invitation from email
* v3 client: fix chat flagging
* fix: Correct get tasks route to properly get todos (#7349)
* move locales strings from api-v3.json to other locales files (#7347)
* move locales strings from api-v3.json: authentication strings -> front.json
* move locales strings from api-v3.json: authentication strings -> tasks.json
* move locales strings from api-v3.json: authentication strings -> groups.json
* move locales strings from api-v3.json: authentication strings -> challenge.json
* move locales strings from api-v3.json: authentication strings -> groups.json (again)
* move locales strings from api-v3.json: authentication strings -> quests.json
* move locales strings from api-v3.json: authentication strings -> subscriber.json
* move locales strings from api-v3.json: authentication strings -> spells.json
* move locales strings from api-v3.json: authentication strings -> character.json
* move locales strings from api-v3.json: authentication strings -> groups.json (PMs)
* move locales strings from api-v3.json: authentication strings -> npc.json
* move locales strings from api-v3.json: authentication strings -> pets.json
* move locales strings from api-v3.json: authentication strings -> miscellaneous
* move locales strings from api-v3.json: authentication strings -> contrib.json and settings.json
* move locales strings from api-v3.json: delete unused string (invalidTasksOwner), delete api-v3.json, whitespace cleanup
* v3 client: fix sticky header
* v3: remove unused code
* v3 client: correctly redirect after inviting
* Removed v2 calls from views (#7351)
* v3: fix tests for challenge export
* v3: fallbackto authWithHeaders if wuthWithSession or authWithUrl fails
* Added force cache update when fetching new messages (#7360)
* v3: fetch whole user when booting from group tto avoid issues with pre save hook expecting all data
* v3: misc fixes for payments
* v3: limit fields of challenge tasks that can be updated
* fix(tests): never connect to NODE_DB_URI for tests
* Added new route for setting last cron and updated front end
* v3: fix iap url
* v3: fix build and ios IAP
* Changed route to user set custom day start
* v3: iap accessible under /api/v3, fixes to spells and groups invitations
* v3: correctly use v3 routes in client
* remove XP, GP when unticking a Daily with a completed checklist - fixes https://github.com/HabitRPG/habitrpg/issues/7246
* use natural language for error message about skills on challenge tasks (#7336), fix other gramatical error
* Updated ui when user rejects a guild invite (#7368)
* feat: complete custom day start route
Closes #7363
* fix: Correct spelling of healAll skill
fix: Correct sprite name of healAll skill
* fix: Change all instances of spookDust -> spookySparkles
* add dateCreated to all tasks; add empty challenge object to tasks that don't have one (#7386)
* add plumilla to artists for Tangle Tree in Bailey message
* Fixed quest drop modal (#7377)
* Fixed quest drop modal
* Fixed broken party test
* [API v3] Maintenance Mode (#7367)
* WIP(maintenance): maintenance
* WIP(maintenance): working locale features
* fix(maintenance): don't translate info page target
* WIP(maintenance): start adding info page
* fix(maintenance): linting
* feat: Add container to maintenance info page
* fix(maintenance): add config.json edits
Also DRY variables for main vs info pages
* fix(maintenance): linting
* refactor(maintenance): further slim down variables
* refactor: Remove unnecessary variables
* fix: Correct string interpolation in maintenace view
* feat: Dynamically add time to maintenance pages
* maintenance mode: do not connect to mongodb
* fix(maintenance): clean up timezones etc.
* fix(maintenance): remove unneeded sprite
* Tavern party challenges invites fix (#7394)
* Added challenges and invitations to party
* Loaded tavern challenges
* Updated group and quest services tests
* v3: implement automatic syncing if user is not up to date
* Removed unnecessary fields when updating groups and challenges (#7395)
* v3: do not saved populated user
* v3: correctly return user subset
* Chained party promises together (#7396)
* v3: $w -> splitWhitespace
* use bluebird
* use babel polyfill
* migration: fix items
* update links for v3
* Updated shortname validation to support multiple browsers
* Docs changes (#7401)
* chore: Clarify transfer-gems documentation
* chore: Clarify api status route documentation
* chore: Mark webhooks as BETA
* Added tags update route. Added sort to user service (#7381)
* Added tags update route. Added sort to user service
* Change update tasks route to reorder tasks
* Fixed linting issue
* Changed params for reorder tags route
* Fixed not found tag and added test
* Added password confirmation when deleteing account (#7402)
* fix production logging
* feat(commit): push
* empty commit
* feat(maintenance): post-downtime news & awards (#7406)
* fix exporting avatar
* second attempt at fixing exporting avatar
* fix production logging
* s3: convert moment to date instance
* fix avatar sharing and caching (30 minutes)
* fix: Correct missing parameter
Closes #7433
* fix: Validate challenge shortname on server
* adjust text strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631 and also Short Name -> Tag Name
2016-05-23 11:58:31 +00:00
|
|
|
if (chapter == 'intro' && User.user.flags.welcomed != true) User.set({'flags.welcomed': true});
|
2015-08-28 20:12:45 +00:00
|
|
|
if (page === -1) page = 0;
|
2015-02-06 00:57:34 +00:00
|
|
|
var curr = User.user.flags.tour[chapter];
|
2015-03-19 21:03:43 +00:00
|
|
|
if (page != curr+1 && !force) return;
|
2015-03-06 20:27:51 +00:00
|
|
|
var chap = tour[chapter], opts = chap._options;
|
|
|
|
|
opts.steps = [];
|
|
|
|
|
_.times(page, function(p){
|
|
|
|
|
opts.steps = opts.steps.concat(chapters[chapter][p]);
|
|
|
|
|
})
|
2016-11-24 01:34:09 +00:00
|
|
|
|
2015-03-06 20:27:51 +00:00
|
|
|
var end = opts.steps.length;
|
|
|
|
|
opts.steps = opts.steps.concat(chapters[chapter][page]);
|
|
|
|
|
chap._removeState('end');
|
2016-11-24 01:34:09 +00:00
|
|
|
|
2015-03-06 20:27:51 +00:00
|
|
|
if (chap._inited) {
|
|
|
|
|
chap.goTo(end);
|
|
|
|
|
} else {
|
|
|
|
|
chap.setCurrentStep(end);
|
2016-09-09 01:23:49 +00:00
|
|
|
if (page > 0) {
|
|
|
|
|
chap.init();
|
|
|
|
|
chap.goTo(page);
|
|
|
|
|
} else {
|
|
|
|
|
chap.start();
|
|
|
|
|
}
|
2015-03-06 20:27:51 +00:00
|
|
|
}
|
2015-02-06 00:57:34 +00:00
|
|
|
}
|
2015-01-18 01:43:37 +00:00
|
|
|
|
2015-02-06 00:57:34 +00:00
|
|
|
//Init and show the welcome tour (only after user is pulled from server & wrapped).
|
API v3 [WIP] (#6144)
* Fixed more tests
* Added tags into user service
* Added api-v3 auth urls
* v3: fix package.json
* v3: fix package.json
* Fixed auth tests. Updated Authctrl response
* v3: remove newrelic config file in favour of env variables
* v3: upgrade some deps
* switch from Q to Bluebird
* v3 fix tests with deferred
* Removed extra consoles.log. Changed data.data to res.data
* v3 fix tests and use coroutines instead of regenerator
* v3: fix tests
* v3: do not await a non promise
* v3: q -> bluebird
* Changed id param for registration response
* Updated party query and create
* Ensured login callback happens after user sync
* Add challenges to groups. Fixed isMemberOfGuild check
* Updated party and group tests
* Fixed cron test
* return user.id and send analytics event before changing page
* fix trailing spaces
* disable redirects
* Api v3 party tavern fixes (#7191)
* Added check if user is in party before query
* Cached party query. Prevented party request when user is not in party. Updated Party create with no invites
* Update tavern ctrl to use new promise
* v3: misc fixes
* Api v3 task fixes (#7193)
* Update task view to use _id
* Added try catch to user service ops calls
* v3 client: saving after syncing is complete
* Fixed test broken by part sync change (#7195)
* v3: fix todo scoring and try to fix production testing problem
* revert changes to mongoose config
* mongoose: increase keepAlive
* test mongoose fix
* fix: Only apply captureStackTrace if it exists on the error object
* v3: fix reminders with no startDate
* mongoose: use options
* chore(): rename website/src -> website/server and website/public -> website/client (#7199)
* v3 fix GET /groups: return an error only if an invalid type is supplied not when there are 0 results (#7203)
* [API v3] Fix calls to user.ops and deleting tags (#7204)
* v3: fixes calls to user.ops from views and deleting tags
* v3: fix tests that use user._statsComputed
* Api v3 fixes continued (#7205)
* Added timzeone offset back
* Added APIToken back to settings page
* Fixed fetch recent messages for party
* Fixed returning group description
* Fixed check if user is member of challenge
* Fixed party members appearing in header
* Updated get myGroups param to include public groups. Fixed isMemberOf group
* Fixed hourglass purchase
* Fixed challenge addding tasks on first creating
* Updated tests to accomidate new changes
* fix: Correct checklist on client
Closes #7207
* fix: Pin eslint to 2.9
* minor improvements to cron code for clarity; fix inaccurate comments; add TODOs for rest-in-inn actions
* fix: Add missing type param to equip call
closes #7212
* rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges
* allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227
* fix tests for /members/transfer-gems
* fix: Set gems sent notification as translatable string
* chore: Remove unusued variable
* fix: Remove requirement on message paramter in transfer-gems
* add a missing variable declaration
* chore: clarify comments on cron code
* fix: Correct client request from habitrpg -> tavern
* update apidoc URL in package.json
Closes #7222
* Fixed start party by invites
* Updated spell casting to v3
* Fixed adding and removing tags on tasks
* Fixed page reload on settings change
* Fixed battle monsters with friends button
* Loaded completed todos when done is clicked
* chore: Reinstate floating version number for eslint
babel-eslint regression fixed
* Fixed reload tests
* change "an user" to "a user" in comments and text (no code changes) (#7257)
* fix: Alert user that drops were recieved
* remove userServices.js from karma.conf - it's been moved to website/client/js/services
* feat: Create debug update user route
* fix: Correct set cron debug function
* feat: Add make admin button to debug menu
* lint: Add missing semicolons in test
* fix: Temporarilly comment out udpate user debug route
* v3: fix _tmp for crit and streakBonus
* v3: execute all actions when leaving a solo party
* v3 client: fix group not found when leaving party
* v3 migration: fix challenge prize
* v3 cron: only save modified tasks
* v3: add CHALLENGE_TASK_NOT_FOUND to valid broken reasons
* v3: fix tasks chart
* v3 client: fix ability to leave challenge
* v3 client: fix filtering by tag and correctly show tag tooltip
* v3 common: fix tags tests
* v3 client: support unlinking not found challenges tasks
* v3: disable Bluebird warning for missing return, fixes #7269
* feat: Separate out update-user into set-cron and make-admin debug routes
* chore: Disable make admin debug route for v3 prod testing
* v3: misc fixes
* v3: misc fixes
* v3: fix adding multiple tasks
* Fixed join/leave button updates
* Queried only user groups to be available when creating challenges
* Fixed bulk add tasks to challenge
* Synced challenge tasks after leave and join.
* Fixed default selected group
* Fixed challenge member info. Fixed challenge winner selection
* Fixed deleting challenge tasks
* Fixed particiapting filter
* v3 client: fix casting spells
* v3: do not log sensitive data
* v3: always save user when casting spell
* v3: always save user when casting spell
* v3: more fixes for spells
* fix typos and missing information in apidocs - fixes https://github.com/HabitRPG/habitrpg/issues/7277 (#7282)
* v3: add TODO for client side spells
* feat: Add modify inventory debug menu
* Fixed viewing user progress on challenge
* Updated tests
* fix: Fix quest progress button
* fix incorrect Armoire test; remove unneeded param details from apidocs; disambiguate health potion
* v3: fix stealth casting
* v3: fix tasks saving and selection for rebirth reroll and reset (server-only)
* v3: fix auto allocation
* v3 client: misc fixes
* rename buyPotion and buy-potion to buyHealthPotion and buy-health-potion; fix apidoc param error
* Added delete for saved challenge task
* Fixed member modal on front page
* adjust text in apidocs for errors / clarity / consistency / standard terminology (no code changes) (#7298)
* fix bug in Rebirth test, add new tests, adjust apidocs (#7293)
* Updated task model to allow setting streak (#7306)
* fix: Correct missing * in apidoc comments
* Api v3 challenge fixes (#7287)
* Fixed join/leave button updates
* Queried only user groups to be available when creating challenges
* Fixed bulk add tasks to challenge
* Synced challenge tasks after leave and join.
* Fixed default selected group
* Fixed challenge member info. Fixed challenge winner selection
* Fixed deleting challenge tasks
* Fixed particiapting filter
* Fixed viewing user progress on challenge
* Updated tests
* Added delete for saved challenge task
* v3: fix sorting
* [API v3] add CRON_SAFE_MODE (#7286)
* add CRON_SAFE_MODE to example config file, fix some bugs, add an unrelated low-priority TODO
* create CRON_SAFE_MODE to disable parts of cron for use after extended outage - fixes https://github.com/HabitRPG/habitrpg/issues/7161
* fix a bug with CRON_SAFE_MODE, remove duplicated code, remove completed TODO comment
* fix check for CRON_SAFE_MODE
* v3 client: fix typo
* adjust debug menu Modify Inventory: hungrier pets, fewer Special items, "Hide" buttons
* completed To-Dos: return the 30 most recent instead of 30 oldest (#7318)
* v3 migration: fix createdAt date
* adjust locales text, key names, and files for Rebirth, Reset, and Fortify / ReRoll for consistency with existing strings (#7321)
* v3: fix unlinking multiple tasks
* v3 fix releasing pets
* v3: fix authenticating with apiUrl
* v3: fix typo
* v3 fix client tests for unlinking
* v3 client: do not show start quest button when quest is active
* v3 client: fix ability to send cards
* v3 client: fix misc challenge issues
* v3: fix notifications
* v3 client: more user friendly errors
* v3 client: only load completed todos once
* v3 client: fix tests
* v3: move TAVERN_ID to common code
* fix: Provide default type and text for new task creation in score route
* fix: Provide default history [] for habit in score route
* fix: Add _legacyId prop to tasks to support non-uuid identifiers
* chore: Change v3 migration to use _legacyId instead of legacyId
* fix: check for _legacyId in tasks if id does not exist
* refactor: Extract out finding task by id or _legacyId into a function
* Api v3 party quest fixes (#7341)
* Fix display of add challenge message when group challenges are empty
* Fixed forced quest start to update quest without reload
* Fixed needing to reload when accepting party invite
* Fix group leave and join reload
* Fixed leave current party and join another
* Updated party tests
* v3 client: remove console.log statement
* v3: misc fixes
* v3 client: fix predicatbale random
* v3: info about API v3
* v3: update footer with links to developer resources
* v3: support party invitation from email
* v3 client: fix chat flagging
* fix: Correct get tasks route to properly get todos (#7349)
* move locales strings from api-v3.json to other locales files (#7347)
* move locales strings from api-v3.json: authentication strings -> front.json
* move locales strings from api-v3.json: authentication strings -> tasks.json
* move locales strings from api-v3.json: authentication strings -> groups.json
* move locales strings from api-v3.json: authentication strings -> challenge.json
* move locales strings from api-v3.json: authentication strings -> groups.json (again)
* move locales strings from api-v3.json: authentication strings -> quests.json
* move locales strings from api-v3.json: authentication strings -> subscriber.json
* move locales strings from api-v3.json: authentication strings -> spells.json
* move locales strings from api-v3.json: authentication strings -> character.json
* move locales strings from api-v3.json: authentication strings -> groups.json (PMs)
* move locales strings from api-v3.json: authentication strings -> npc.json
* move locales strings from api-v3.json: authentication strings -> pets.json
* move locales strings from api-v3.json: authentication strings -> miscellaneous
* move locales strings from api-v3.json: authentication strings -> contrib.json and settings.json
* move locales strings from api-v3.json: delete unused string (invalidTasksOwner), delete api-v3.json, whitespace cleanup
* v3 client: fix sticky header
* v3: remove unused code
* v3 client: correctly redirect after inviting
* Removed v2 calls from views (#7351)
* v3: fix tests for challenge export
* v3: fallbackto authWithHeaders if wuthWithSession or authWithUrl fails
* Added force cache update when fetching new messages (#7360)
* v3: fetch whole user when booting from group tto avoid issues with pre save hook expecting all data
* v3: misc fixes for payments
* v3: limit fields of challenge tasks that can be updated
* fix(tests): never connect to NODE_DB_URI for tests
* Added new route for setting last cron and updated front end
* v3: fix iap url
* v3: fix build and ios IAP
* Changed route to user set custom day start
* v3: iap accessible under /api/v3, fixes to spells and groups invitations
* v3: correctly use v3 routes in client
* remove XP, GP when unticking a Daily with a completed checklist - fixes https://github.com/HabitRPG/habitrpg/issues/7246
* use natural language for error message about skills on challenge tasks (#7336), fix other gramatical error
* Updated ui when user rejects a guild invite (#7368)
* feat: complete custom day start route
Closes #7363
* fix: Correct spelling of healAll skill
fix: Correct sprite name of healAll skill
* fix: Change all instances of spookDust -> spookySparkles
* add dateCreated to all tasks; add empty challenge object to tasks that don't have one (#7386)
* add plumilla to artists for Tangle Tree in Bailey message
* Fixed quest drop modal (#7377)
* Fixed quest drop modal
* Fixed broken party test
* [API v3] Maintenance Mode (#7367)
* WIP(maintenance): maintenance
* WIP(maintenance): working locale features
* fix(maintenance): don't translate info page target
* WIP(maintenance): start adding info page
* fix(maintenance): linting
* feat: Add container to maintenance info page
* fix(maintenance): add config.json edits
Also DRY variables for main vs info pages
* fix(maintenance): linting
* refactor(maintenance): further slim down variables
* refactor: Remove unnecessary variables
* fix: Correct string interpolation in maintenace view
* feat: Dynamically add time to maintenance pages
* maintenance mode: do not connect to mongodb
* fix(maintenance): clean up timezones etc.
* fix(maintenance): remove unneeded sprite
* Tavern party challenges invites fix (#7394)
* Added challenges and invitations to party
* Loaded tavern challenges
* Updated group and quest services tests
* v3: implement automatic syncing if user is not up to date
* Removed unnecessary fields when updating groups and challenges (#7395)
* v3: do not saved populated user
* v3: correctly return user subset
* Chained party promises together (#7396)
* v3: $w -> splitWhitespace
* use bluebird
* use babel polyfill
* migration: fix items
* update links for v3
* Updated shortname validation to support multiple browsers
* Docs changes (#7401)
* chore: Clarify transfer-gems documentation
* chore: Clarify api status route documentation
* chore: Mark webhooks as BETA
* Added tags update route. Added sort to user service (#7381)
* Added tags update route. Added sort to user service
* Change update tasks route to reorder tasks
* Fixed linting issue
* Changed params for reorder tags route
* Fixed not found tag and added test
* Added password confirmation when deleteing account (#7402)
* fix production logging
* feat(commit): push
* empty commit
* feat(maintenance): post-downtime news & awards (#7406)
* fix exporting avatar
* second attempt at fixing exporting avatar
* fix production logging
* s3: convert moment to date instance
* fix avatar sharing and caching (30 minutes)
* fix: Correct missing parameter
Closes #7433
* fix: Validate challenge shortname on server
* adjust text strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631 and also Short Name -> Tag Name
2016-05-23 11:58:31 +00:00
|
|
|
var watcher = $rootScope.$watch('User.user._wrapped', function(wrapped){
|
|
|
|
|
if (!wrapped) return; // only run after user has been wrapped
|
2015-02-06 00:57:34 +00:00
|
|
|
watcher(); // deregister watcher
|
2015-03-06 18:11:41 +00:00
|
|
|
if (window.env.IS_MOBILE) return; // Don't show tour immediately on mobile devices
|
2015-05-25 20:35:43 +00:00
|
|
|
if (User.user.flags.welcomed == false) {
|
|
|
|
|
$rootScope.openModal('welcome', {size: 'lg', backdrop: 'static', keyboard: false});
|
|
|
|
|
}
|
2015-01-18 01:43:37 +00:00
|
|
|
|
2015-02-06 00:57:34 +00:00
|
|
|
var alreadyShown = function(before, after) { return !(!before && after === true) };
|
|
|
|
|
//$rootScope.$watch('user.flags.dropsEnabled', _.flow(alreadyShown, function(already) { //FIXME requires lodash@~3.2.0
|
2015-03-06 20:27:51 +00:00
|
|
|
$rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams){
|
2015-03-19 21:03:43 +00:00
|
|
|
switch (toState.name) {
|
2015-05-25 20:35:43 +00:00
|
|
|
// case 'options.profile.avatar': return goto('intro', 5);
|
|
|
|
|
case 'options.profile.stats': return goto('stats', 0);
|
|
|
|
|
case 'options.social.tavern': return goto('tavern', 0);
|
|
|
|
|
case 'options.social.party': return goto('party', 0);
|
|
|
|
|
case 'options.social.guilds.public': return goto('guilds', 0);
|
|
|
|
|
case 'options.social.challenges': return goto('challenges', 0);
|
|
|
|
|
case 'options.social.hall.heroes': return goto('hall', 0);
|
|
|
|
|
case 'options.inventory.drops': return goto('market', 0);
|
|
|
|
|
case 'options.inventory.pets': return goto('pets', 0);
|
|
|
|
|
case 'options.inventory.mounts': return goto('mounts', 0);
|
|
|
|
|
case 'options.inventory.equipment': return goto('equipment', 0);
|
2015-03-19 21:03:43 +00:00
|
|
|
}
|
2015-05-25 20:35:43 +00:00
|
|
|
});
|
2015-02-06 00:57:34 +00:00
|
|
|
});
|
2013-09-17 18:44:02 +00:00
|
|
|
|
2015-03-24 21:41:02 +00:00
|
|
|
var Guide = {
|
2015-02-06 00:57:34 +00:00
|
|
|
goto: goto
|
2015-01-18 01:43:37 +00:00
|
|
|
};
|
2015-03-24 21:41:02 +00:00
|
|
|
$rootScope.Guide = Guide;
|
|
|
|
|
return Guide;
|
2015-02-06 00:57:34 +00:00
|
|
|
|
2015-01-18 01:43:37 +00:00
|
|
|
}]);
|