28f2e9c356
* 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
213 lines
11 KiB
Plaintext
213 lines
11 KiB
Plaintext
script(type='text/ng-template', id='partials/options.social.challenges.detail.close.html')
|
||
a.btn.btn-sm.btn-danger(ng-click="delete(closingChal)")=env.t('delete')
|
||
h5= '- ' + env.t('or') + ' -'
|
||
select(ui-select2, ng-required=true, ng-model='closingChal.winner', data-placeholder=env.t('selectWinner'), ng-change='selectWinner(closingChal)', style='display:block')
|
||
option(value='')
|
||
option(ng-repeat='u in closingChal.members', value='{{u._id}}') {{u.profile.name}}
|
||
|
||
.text-right
|
||
small.btn-link(ng-click='cancelClosing(closingChal)')=env.t('cancel')
|
||
|
||
script(type='text/ng-template', id='partials/options.social.challenges.detail.member.html')
|
||
.modal.bs-modal-lg(style='display: block')
|
||
.modal-dialog.modal-lg
|
||
.modal-content
|
||
.modal-header
|
||
button.close(type='button', ng-click='$state.go("^")', aria-hidden='true') ×
|
||
a(ng-click='clickMember(obj._id, true)')
|
||
h3 {{obj.profile.name}}
|
||
.modal-body
|
||
habitrpg-tasks(main=false, modal='true')
|
||
.modal-footer
|
||
.btn-group.pull-left(role="group")
|
||
button.btn.btn-default(ng-click='clickMember(obj._id, true)')
|
||
.glyphicon.glyphicon-user
|
||
button.btn.btn-default(ng-click='sendMessageToChallengeParticipant(obj._id)')
|
||
.glyphicon.glyphicon-envelope
|
||
button.btn.btn-default(ng-click='sendGiftToChallengeParticipant(obj._id)')
|
||
.glyphicon.glyphicon-gift
|
||
a.btn.btn-default(ng-click='$state.go("^")')=env.t('close')
|
||
|
||
script(type='text/ng-template', id='partials/options.social.challenges.detail.html')
|
||
// Edit button
|
||
div(bindonce='challenge', ng-if='challenge.leader._id==user._id || user.contributor.admin')
|
||
div(ng-hide='challenge._locked==false')
|
||
button.btn.btn-sm.btn-default(ng-click='edit(challenge)')=env.t('edit')
|
||
button.btn.btn-sm.btn-success(ng-click='clone(challenge)')=env.t('clone')
|
||
button.btn.btn-sm.btn-warning(ng-click='close(challenge, $event)', tooltip=env.t('deleteOrSelect'))=env.t('endChallenge')
|
||
|
||
form(ng-show='challenge._locked==false')
|
||
.form-group(ng-show='challenge._locked==false')
|
||
button.btn.btn-sm.btn-primary(ng-click='save(challenge)')=env.t('save')
|
||
button.btn.btn-sm.btn-default(ng-click='challenge._locked=true')=env.t('cancel')
|
||
.form-group
|
||
input.form-control(type='text', ng-model='challenge.name')
|
||
.form-group
|
||
input.form-control(type='text', minlength="3", maxlength="16", ng-model='challenge.shortName', placeholder=env.t('challengeTag'), required)
|
||
.form-group
|
||
textarea.form-control(cols='3', placeholder=env.t('challengeDescr'), ng-model='challenge.description')
|
||
hr
|
||
|
||
.well(bindonce='challenge', ng-if='challenge.description')
|
||
markdown(text='challenge.description')
|
||
.modal-body=env.t('challengeDiscription')
|
||
habitrpg-tasks(obj='challenge', main=false)
|
||
|
||
// Member List
|
||
div(bindonce='challenge', ng-if='challenge.members.length > 0')
|
||
a.btn.btn-primary.btn-sm.pull-right(ng-href='/api/v3/challenges/{{challenge._id}}/export/csv')
|
||
=env.t('exportChallengeCSV')
|
||
h3=env.t('hows')
|
||
menu
|
||
button.customize-option(ng-repeat='member in challenge.members track by member._id', ng-click='toggleMember(challenge._id, member._id)') {{member.profile.name}}
|
||
div(ui-view)
|
||
|
||
// Accordion version if we choose that instead
|
||
//- div(ng-if='challenge.members')
|
||
h4=env.t('hows')
|
||
.accordion-group(bindonce='challenge.members', ng-repeat='member in challenge.members')
|
||
.accordion-heading
|
||
a.accordion-toggle(ng-click='toggleMember(challenge._id, member._id)') {{member.profile.name}}
|
||
.accordion-body(ng-class='{collapse: $stateParams.uid != member._id}')
|
||
.accordion-inner(ng-if='$stateParams.uid == member._id')
|
||
div(ui-view)
|
||
|
||
script(type='text/ng-template', id='partials/options.social.challenges.html')
|
||
.options-blurbmenu
|
||
small.muted=env.t('blurbChallenges')
|
||
|
||
.container-fluid
|
||
.row
|
||
.col-md-2
|
||
.well#challenges-filters(ng-hide="cid")
|
||
h3=env.t('filter') + ':'
|
||
h4=env.t('groups')
|
||
ul.list-unstyled
|
||
a.btn.btn-xs.btn-default.pull-left(ng-click='selectAll()')=env.t('all')
|
||
a.btn.btn-xs.btn-default(ng-click='selectNone()')=env.t('none')
|
||
br
|
||
.checkbox(ng-repeat='group in groupsFilter')
|
||
label
|
||
input(type='checkbox', ng-model='search.group[group._id]')
|
||
| {{group.name}}
|
||
h4=env.t('membership')
|
||
.radio
|
||
label
|
||
input(type='radio', name='search-participation-radio', ng-model='search._isMember', ng-value='true', ng-change='filterChallenges')
|
||
=env.t('participating')
|
||
.radio
|
||
label
|
||
input(type='radio', name='search-participation-radio', ng-model='search._isMember', ng-value='false', ng-change='filterChallenges')
|
||
=env.t('notParticipating')
|
||
.radio
|
||
label
|
||
input(type='radio', name='search-participation-radio', ng-model='search._isMember', value='either', ng-change='filterChallenges')
|
||
=env.t('either')
|
||
h4=env.t('challengedOwnedFilterHeader')
|
||
.radio
|
||
label
|
||
input(type='radio', name='search-owner-radio', ng-model='search._isOwner', ng-value='true', ng-change='filterChallenges')
|
||
=env.t('challengedOwnedFilter')
|
||
.radio
|
||
label
|
||
input(type='radio', name='search-owner-radio', ng-model='search._isOwner', ng-value='false', ng-change='filterChallenges')
|
||
=env.t('challengedNotOwnedFilter')
|
||
.radio
|
||
label
|
||
input(type='radio', name='search-owner-radio', ng-model='search._isOwner', value='either', ng-change='filterChallenges', checked='checked')
|
||
=env.t('challengedEitherOwnedFilter')
|
||
.col-md-10
|
||
a.btn.btn-info#back-to-challenges(ng-show="cid",
|
||
ui-sref='options.social.challenges', ui-sref-opts='{reload: true}')
|
||
=env.t('backToChallenges')
|
||
// Creation form
|
||
button.btn.btn-success#create-challenge-btn(ng-click='create()', ng-hide='newChallenge')=env.t('createChallenge')
|
||
.create-challenge-from.well(ng-if='newChallenge')
|
||
form(ng-submit='save(newChallenge)')
|
||
div
|
||
input.btn.btn-success(type='submit', value=env.t('save'),
|
||
ng-disabled='insufficientGemsForTavernChallenge()')
|
||
input.btn.btn-danger(type='button', ng-click='discard()', value=env.t('discard'))
|
||
select(ng-model='newChallenge.group', ng-required='required', name='Group', ng-options='g._id as g.name for g in groups')
|
||
.alert.alert-warning(ng-if='insufficientGemsForTavernChallenge()',
|
||
ng-click='openModal("buyGems",{track:"Gems > Toolbar"})')
|
||
=env.t('challengeNotEnoughGems')
|
||
|
||
.challenge-options(ng-show='newChallenge.group')
|
||
.form-group
|
||
input.form-control(type='text', ng-model='newChallenge.name',
|
||
placeholder=env.t('challengeTitle'), required='required',
|
||
ng-disabled='insufficientGemsForTavernChallenge()')
|
||
|
||
.form-group
|
||
textarea.form-control(cols='3', placeholder=env.t('challengeDescr'), ng-model='newChallenge.description'
|
||
ng-disabled='insufficientGemsForTavernChallenge()')
|
||
|
||
.row
|
||
.form-group.col-md-6.col-sm-12
|
||
input.form-control(type='text',
|
||
ng-model='newChallenge.shortName', placeholder=env.t('challengeTag'), required
|
||
ng-disabled='insufficientGemsForTavernChallenge()')
|
||
|
|
||
a.hint.vertical-20(target='_blank', href='http://habitica.wikia.com/wiki/Tags',
|
||
popover=env.t('challengeTagPop'), popover-trigger='mouseenter', popover-placement='right')
|
||
=env.t('moreInfo')
|
||
|
||
.row
|
||
.form-group.col-md-6.col-sm-12
|
||
.input-group
|
||
span.input-group-addon
|
||
.Pet_Currency_Gem1x
|
||
input.form-control(type='number', placeholder=env.t('prize'),
|
||
ng-disabled='insufficientGemsForTavernChallenge()'
|
||
min="{{newChallenge.group==TAVERN_ID ? 1 : 0}}",
|
||
max="{{maxPrize}}", ng-model='newChallenge.prize')
|
||
a.hint(popover="{{newChallenge.group==TAVERN_ID ? env.t('prizePopTavern') : env.t('prizePop')}}",
|
||
popover-trigger='mouseenter', popover-placement='right')
|
||
=env.t('moreInfo')
|
||
div(ng-show='newChallenge.group==TAVERN_ID')
|
||
!=env.t('publicChallenges')
|
||
|
||
.form-group(ng-if='user.contributor.admin')
|
||
.checkbox
|
||
label
|
||
input(type='checkbox', ng-model='newChallenge.official')
|
||
=env.t('officialChallenge')
|
||
|
||
habitrpg-tasks(main=false, obj='newChallenge')
|
||
|
||
// Challenges list
|
||
.panel-group
|
||
.panel.panel-default(ng-repeat='challenge in challenges | filter:filterChallenges track by challenge._id ')
|
||
.panel-heading
|
||
ul.pull-right.challenge-accordion-header-specs
|
||
li.bg-transparent(ng-if='challenge.official')
|
||
span.label.label-success=env.t('officialChallenge')
|
||
li
|
||
a(ui-sref="options.social.guilds.detail({gid:challenge.group._id})" ng-if="challenge.group.type=='guild'")
|
||
| {{challenge.group.name}}
|
||
a(ui-sref="options.social.party" ng-if="challenge.group.type=='party'")
|
||
| {{challenge.group.name}}
|
||
li(ng-if='challenge.leader.profile.name')
|
||
=env.t('by') + ' '
|
||
a(ng-click='clickMember(challenge.leader._id, true)') {{::challenge.leader.profile.name}}
|
||
li(ng-if='!challenge.leader.profile.name',
|
||
popover=env.t('noChallengeOwnerPopover'),
|
||
popover-trigger='mouseenter')=env.t('noChallengeOwner')
|
||
li=env.t('participants', {membercount: "{{challenge.memberCount}}"})
|
||
li(ng-show='challenge.prize')
|
||
p!=env.t('prizeValue', {gemcount: "{{challenge.prize}}", gemicon: "<span class='inline-block Pet_Currency_Gem1x'></span>"})
|
||
li.bg-transparent
|
||
// leave / join
|
||
a.btn.btn-sm.btn-danger(ng-show='isUserMemberOf(challenge)', ng-click='clickLeave(challenge, $event)')
|
||
span.glyphicon.glyphicon-ban-circle
|
||
=env.t('leave')
|
||
a.btn.btn-sm.btn-success(ng-hide='isUserMemberOf(challenge)', ng-click='join(challenge)')
|
||
span.glyphicon.glyphicon-ok
|
||
=env.t('join')
|
||
a.accordion-toggle(id="{{challenge._id}}" ng-click='toggle(challenge._id)')
|
||
markdown(text='challenge.name')
|
||
.panel-body(ng-class='{collapse: !$stateParams.cid == challenge._id}')
|
||
.accordion-inner(ng-if='$stateParams.cid == challenge._id')
|
||
div(ui-view)
|