Commit graph

25741 commits

Author SHA1 Message Date
Sabe Jones
a08005e5da Revert "Revert "chore(lint): disable breaking rules""
This reverts commit a6e32d0822.
2021-08-27 18:55:21 -05:00
Sabe Jones
f13e982553 Revert "Revert "chore(lint): run fix""
This reverts commit 5179440f77.
2021-08-27 18:54:55 -05:00
Sabe Jones
5b346690a9 fix(storybook): temporarily disable story 2021-08-26 23:05:48 -05:00
Sabe Jones
e6da2752a7 fix(storybook): temporarily disable story 2021-08-26 23:05:13 -05:00
Sabe Jones
0f668ec96f Merge branch 'release' into develop 2021-08-26 22:52:34 -05:00
Sabe Jones
e5a19d7fb4 Revert "chore(package): update client lock"
This reverts commit 562db48e02.
2021-08-26 22:50:54 -05:00
Sabe Jones
5179440f77 Revert "chore(lint): run fix"
This reverts commit 15fdf2d75a.
2021-08-26 22:50:46 -05:00
Sabe Jones
a6e32d0822 Revert "chore(lint): disable breaking rules"
This reverts commit 7207ca8cc4.
2021-08-26 22:50:37 -05:00
Sabe Jones
7207ca8cc4 chore(lint): disable breaking rules 2021-08-26 21:23:59 -05:00
Sabe Jones
15fdf2d75a chore(lint): run fix 2021-08-26 21:19:18 -05:00
Sabe Jones
562db48e02 chore(package): update client lock 2021-08-26 21:05:10 -05:00
Sabe Jones
638e29c6cd chore(packages): update lock 2021-08-26 20:39:41 -05:00
negue
53424d548a
Rework Notifications: separate and bundle to an amount of 4 (#13300)
* WIP notifications only show 2 at once

* separate and bundle notifications to pairs

* notification fadein/-out/move animations - remove notifications on an interval instead of calculated timeouts

* easier way to import all sprite css files

* add stories + fix sizes / paddings + click to hide + animation fixes

* keep notification at the top but always under the toolbars

* change animations to ease-in 0.25s + add prop to change the delay between deletion and add

* fix adding logic in a rare case of added notifications when only one item is currently visible + add debug mode

* disable lint for notification console

* add more notification example trigger buttons

* potential fix of animation / queue

* increase amount of notifications to 4

* fix sanity

* fix test:unit call again

* new notification styles - fix animations

* keep error notifications visible until manually removed + refactor adding/removal logic

* fix margins

* prevent multiple filling + different delay on filling

* stop and restart removal timer on new notifications

* reduce line-height / apply different margin for icons

* move sprites.scss out and use it in app.vue as well

* update sprites back to 31
2021-08-26 19:56:41 -05:00
Sabe Jones
07ecbd4444 4.203.1 2021-08-26 19:54:42 -05:00
Sabe Jones
4f0f058b2d Merge branch 'develop' into release 2021-08-26 19:54:37 -05:00
Sabe Jones
7f0bdd6a9c fix(shops): merge issue with mounted() function 2021-08-26 19:54:13 -05:00
Zach Bauer
1a484b56ac
Fix shop item popover staying open after click (#12921)
* don't refocus shopItem popover on click

* fix webpack compile error

* manually disable and enable popover

* clean up old changes
2021-08-26 19:47:27 -05:00
Alan Cruz
876a7b766c
if selectedpage === 'invites' check if there is any pending invitation, if not, set selectedPage to 'members' (#13315) 2021-08-26 19:36:18 -05:00
negue
30c202dbbe
Quest Sidebar: Boss Pending Health inside the normal Bar (#13317) 2021-08-26 19:22:56 -05:00
Lu
572e709d63
Settings: Add missing margin to settings checkboxes - Fixes #12794 (#13319)
* Add missing margin to settings checkboxes

* Fix checkboxes in notifications
2021-08-26 18:42:51 -05:00
Sabe Jones
b4dc3796a1 fix(achievement): Bunny not Rabbit 2021-08-26 18:34:17 -05:00
dependabot[bot]
cae36ea554
build(deps): bump vue-cli-plugin-storybook in /website/client (#13346)
Bumps [vue-cli-plugin-storybook](https://github.com/storybookjs/vue-cli-plugin-storybook) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/storybookjs/vue-cli-plugin-storybook/releases)
- [Changelog](https://github.com/storybookjs/vue-cli-plugin-storybook/blob/master/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/vue-cli-plugin-storybook/compare/v2.0.0...v2.1.0)

---
updated-dependencies:
- dependency-name: vue-cli-plugin-storybook
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 18:33:23 -05:00
Faris P
f9a0939796
Class icon misalignment fixed. fixes #13316 (#13330)
* change position of class icon on profile modal

Changed the bottom position of class icon on profile modal

* Convert `badgeSize` to pixel

Converted the badgeSize prop to pixel value by adding `+ 'px'`.
2021-08-26 18:33:05 -05:00
dependabot[bot]
62602a997c
build(deps): bump vue and vue-template-compiler in /website/client (#13336)
Bumps [vue](https://github.com/vuejs/vue) and [vue-template-compiler](https://github.com/vuejs/vue). These dependencies needed to be updated together.

Updates `vue` from 2.6.12 to 2.6.14
- [Release notes](https://github.com/vuejs/vue/releases)
- [Commits](https://github.com/vuejs/vue/compare/v2.6.12...v2.6.14)

Updates `vue-template-compiler` from 2.6.12 to 2.6.14
- [Release notes](https://github.com/vuejs/vue/releases)
- [Commits](https://github.com/vuejs/vue/compare/v2.6.12...v2.6.14)

---
updated-dependencies:
- dependency-name: vue
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: vue-template-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 18:18:21 -05:00
Nat Welch
7870ffece8
fix(cors): Allow all origins to support 3rd party tools (#13383) 2021-08-26 18:12:11 -05:00
KoRnoliX
9a2df5c1e5
Fix habits' dropdown list overlap (#13385)
Fix habits' tags dropdown list to properly close after expanding
difficulties dropdown list so they don't overlap
2021-08-26 18:09:23 -05:00
KoRnoliX
76fccd80ac
Fix transform atidote unpin after using rebirthing fixes #13306 (#13400)
* Fix habits' dropdown list overlap

Fix habits' tags dropdown list to properly close after expanding
difficulties dropdown list so they don't overlap

* Fix transform antidote unpin after rebirth

Fix transformation buff antidote to properly unpin from Rewards section
after using Orb of Rebirth

* Revert "Fix habits' dropdown list overlap"

This reverts commit 6a72e27b89dfaa337169ea0137ec1e7b0ca11c02.

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2021-08-26 18:05:59 -05:00
dependabot[bot]
b3adc88138
build(deps): bump intro.js from 3.4.0 to 4.1.0 in /website/client (#13356)
Bumps [intro.js](https://github.com/usablica/intro.js) from 3.4.0 to 4.1.0.
- [Release notes](https://github.com/usablica/intro.js/releases)
- [Commits](https://github.com/usablica/intro.js/compare/v3.4.0...v4.1.0)

---
updated-dependencies:
- dependency-name: intro.js
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 17:52:24 -05:00
dependabot[bot]
1435b7a012
build(deps-dev): bump sinon-chai from 3.6.0 to 3.7.0 (#13310)
Bumps [sinon-chai](https://github.com/domenic/sinon-chai) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/domenic/sinon-chai/releases)
- [Changelog](https://github.com/domenic/sinon-chai/blob/master/CHANGELOG.md)
- [Commits](https://github.com/domenic/sinon-chai/compare/3.6.0...3.7.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 17:17:53 -05:00
dependabot[bot]
c7f58ddf9a
build(deps): bump ws from 6.2.1 to 6.2.2 in /website/client (#13314)
Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/commits)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 17:08:41 -05:00
dependabot[bot]
6344a90f41
build(deps): bump @babel/preset-env from 7.14.4 to 7.15.0 (#13434)
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.14.4 to 7.15.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.15.0/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 17:08:16 -05:00
dependabot[bot]
b240490142
build(deps-dev): bump @babel/plugin-proposal-optional-chaining (#13341)
Bumps [@babel/plugin-proposal-optional-chaining](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-optional-chaining) from 7.14.2 to 7.14.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.14.5/packages/babel-plugin-proposal-optional-chaining)

---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-optional-chaining"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:35:26 -05:00
dependabot[bot]
96af878c3b
build(deps): bump postcss from 7.0.23 to 7.0.36 in /website/client (#13342)
Bumps [postcss](https://github.com/postcss/postcss) from 7.0.23 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/7.0.23...7.0.36)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:35:06 -05:00
dependabot[bot]
4d9c366a7e
build(deps-dev): bump run-rs from 0.7.4 to 0.7.5 (#13351)
Bumps [run-rs](https://github.com/vkarpov15/run-rs) from 0.7.4 to 0.7.5.
- [Release notes](https://github.com/vkarpov15/run-rs/releases)
- [Changelog](https://github.com/vkarpov15/run-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vkarpov15/run-rs/compare/0.7.4...0.7.5)

---
updated-dependencies:
- dependency-name: run-rs
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:34:22 -05:00
dependabot[bot]
4862264172
build(deps): bump nconf from 0.11.2 to 0.11.3 (#13362)
Bumps [nconf](https://github.com/flatiron/nconf) from 0.11.2 to 0.11.3.
- [Release notes](https://github.com/flatiron/nconf/releases)
- [Changelog](https://github.com/indexzero/nconf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flatiron/nconf/compare/v0.11.2...v0.11.3)

---
updated-dependencies:
- dependency-name: nconf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:34:07 -05:00
dependabot[bot]
ecc00889da
build(deps): bump nconf from 0.11.2 to 0.11.3 in /website/client (#13365)
Bumps [nconf](https://github.com/flatiron/nconf) from 0.11.2 to 0.11.3.
- [Release notes](https://github.com/flatiron/nconf/releases)
- [Changelog](https://github.com/indexzero/nconf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flatiron/nconf/compare/v0.11.2...v0.11.3)

---
updated-dependencies:
- dependency-name: nconf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:33:54 -05:00
Jon Wolverton
f86bb98ccd
Collection quest ignoring items (#13401)
* update tests to check for issue #12664

* rewrite processCollectionQuest to allocate quest items proportionally

Removes need to check for excess items, fixing issue #12664

* move test for this bug to the correct context section & remove redundant test

* refactor processCollectionQuest more

* tweak confusing comments
2021-08-26 16:33:29 -05:00
dependabot[bot]
234252d7d1
build(deps): bump hellojs from 1.19.3 to 1.19.4 in /website/client (#13366)
Bumps [hellojs](https://github.com/MrSwitch/hello.js) from 1.19.3 to 1.19.4.
- [Release notes](https://github.com/MrSwitch/hello.js/releases)
- [Changelog](https://github.com/MrSwitch/hello.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MrSwitch/hello.js/compare/v1.19.3...v1.19.4)

---
updated-dependencies:
- dependency-name: hellojs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:30:52 -05:00
dependabot[bot]
ccd37a5b88
build(deps): bump vue-router from 3.5.1 to 3.5.2 in /website/client (#13368)
Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/vuejs/vue-router/releases)
- [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-router/compare/v3.5.1...v3.5.2)

---
updated-dependencies:
- dependency-name: vue-router
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:23:01 -05:00
dependabot[bot]
001c771dc1
build(deps): bump @babel/register from 7.13.16 to 7.15.3 (#13448)
Bumps [@babel/register](https://github.com/babel/babel/tree/HEAD/packages/babel-register) from 7.13.16 to 7.15.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.15.3/packages/babel-register)

---
updated-dependencies:
- dependency-name: "@babel/register"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:22:31 -05:00
KoRnoliX
b3cfcab5fb
Fix negative quest scroll number on bundle purchase (#13415) 2021-08-26 16:22:00 -05:00
dependabot[bot]
28e133858a
build(deps): bump jwks-rsa from 2.0.3 to 2.0.4 (#13398)
Bumps [jwks-rsa](https://github.com/auth0/node-jwks-rsa) from 2.0.3 to 2.0.4.
- [Release notes](https://github.com/auth0/node-jwks-rsa/releases)
- [Changelog](https://github.com/auth0/node-jwks-rsa/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/node-jwks-rsa/compare/v2.0.3...2.0.4)

---
updated-dependencies:
- dependency-name: jwks-rsa
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:16:26 -05:00
dependabot[bot]
435b41604e
build(deps): bump regenerator-runtime from 0.13.7 to 0.13.9 (#13410)
Bumps [regenerator-runtime](https://github.com/facebook/regenerator) from 0.13.7 to 0.13.9.
- [Release notes](https://github.com/facebook/regenerator/releases)
- [Commits](https://github.com/facebook/regenerator/compare/regenerator-runtime@0.13.7...regenerator-runtime@0.13.9)

---
updated-dependencies:
- dependency-name: regenerator-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:15:33 -05:00
dependabot[bot]
8540c7ab85
build(deps): bump rate-limiter-flexible from 2.2.2 to 2.2.4 (#13411)
Bumps [rate-limiter-flexible](https://github.com/animir/node-rate-limiter-flexible) from 2.2.2 to 2.2.4.
- [Release notes](https://github.com/animir/node-rate-limiter-flexible/releases)
- [Commits](https://github.com/animir/node-rate-limiter-flexible/commits)

---
updated-dependencies:
- dependency-name: rate-limiter-flexible
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:15:18 -05:00
dependabot[bot]
f289fe5ce5
build(deps): bump mongoose from 5.13.5 to 5.13.7 (#13452)
Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.13.5 to 5.13.7.
- [Release notes](https://github.com/Automattic/mongoose/releases)
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md)
- [Commits](https://github.com/Automattic/mongoose/compare/5.13.5...5.13.7)

---
updated-dependencies:
- dependency-name: mongoose
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 15:55:28 -05:00
dependabot[bot]
a322555a36
build(deps): bump amplitude-js from 8.4.0 to 8.5.0 in /website/client (#13453)
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript) from 8.4.0 to 8.5.0.
- [Release notes](https://github.com/amplitude/amplitude-javascript/releases)
- [Changelog](https://github.com/amplitude/Amplitude-JavaScript/blob/main/CHANGELOG.md)
- [Commits](https://github.com/amplitude/amplitude-javascript/compare/v8.4.0...v8.5.0)

---
updated-dependencies:
- dependency-name: amplitude-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 15:55:15 -05:00
dependabot[bot]
13e7d45549
build(deps): bump @storybook/addon-knobs in /website/client (#13456)
Bumps [@storybook/addon-knobs](https://github.com/storybookjs/addon-knobs) from 6.2.9 to 6.3.0.
- [Release notes](https://github.com/storybookjs/addon-knobs/releases)
- [Changelog](https://github.com/storybookjs/addon-knobs/blob/v6.3.0/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/addon-knobs/commits/v6.3.0)

---
updated-dependencies:
- dependency-name: "@storybook/addon-knobs"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 15:54:52 -05:00
dependabot[bot]
2398714fc2
build(deps): bump stripe from 8.168.0 to 8.170.0 (#13459)
Bumps [stripe](https://github.com/stripe/stripe-node) from 8.168.0 to 8.170.0.
- [Release notes](https://github.com/stripe/stripe-node/releases)
- [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-node/compare/v8.168.0...v8.170.0)

---
updated-dependencies:
- dependency-name: stripe
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 15:54:42 -05:00
dependabot[bot]
f9deea3b8d
build(deps): bump core-js from 3.16.1 to 3.16.2 in /website/client (#13461)
Bumps [core-js](https://github.com/zloirock/core-js) from 3.16.1 to 3.16.2.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v3.16.1...v3.16.2)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 15:54:18 -05:00
dependabot[bot]
f26cbab27f
build(deps): bump @google-cloud/trace-agent from 5.1.3 to 5.1.5 (#13462)
Bumps [@google-cloud/trace-agent](https://github.com/googleapis/cloud-trace-nodejs) from 5.1.3 to 5.1.5.
- [Release notes](https://github.com/googleapis/cloud-trace-nodejs/releases)
- [Changelog](https://github.com/googleapis/cloud-trace-nodejs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/cloud-trace-nodejs/compare/v5.1.3...v5.1.5)

---
updated-dependencies:
- dependency-name: "@google-cloud/trace-agent"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 15:53:30 -05:00