mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 14:47:53 +01:00
Pin Habitica Eslint Config (#15057)
* Pin Habitica Eslint Config * fix lint
This commit is contained in:
@@ -3,4 +3,7 @@ module.exports = {
|
|||||||
extends: [
|
extends: [
|
||||||
'habitrpg/lib/node'
|
'habitrpg/lib/node'
|
||||||
],
|
],
|
||||||
|
rules: {
|
||||||
|
'import/no-extraneous-dependencies': 'off',
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
2842
package-lock.json
generated
2842
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -24,9 +24,9 @@
|
|||||||
"csv-stringify": "^5.6.5",
|
"csv-stringify": "^5.6.5",
|
||||||
"cwait": "^1.1.1",
|
"cwait": "^1.1.1",
|
||||||
"domain-middleware": "~0.1.0",
|
"domain-middleware": "~0.1.0",
|
||||||
"eslint": "^6.8.0",
|
"eslint": "6.8.0",
|
||||||
"eslint-config-habitrpg": "^6.2.0",
|
"eslint-config-habitrpg": "6.2.1",
|
||||||
"eslint-plugin-mocha": "^5.0.0",
|
"eslint-plugin-mocha": "5.3.0",
|
||||||
"express": "^4.18.2",
|
"express": "^4.18.2",
|
||||||
"express-basic-auth": "^1.2.1",
|
"express-basic-auth": "^1.2.1",
|
||||||
"express-validator": "^5.2.0",
|
"express-validator": "^5.2.0",
|
||||||
|
|||||||
@@ -9,4 +9,7 @@ module.exports = {
|
|||||||
sinon: true,
|
sinon: true,
|
||||||
sandbox: true
|
sandbox: true
|
||||||
},
|
},
|
||||||
|
rules: {
|
||||||
|
'import/no-extraneous-dependencies': 'off',
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ module.exports = {
|
|||||||
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
|
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
|
||||||
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
|
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
|
||||||
// TODO find a way to let eslint understand webpack aliases
|
// TODO find a way to let eslint understand webpack aliases
|
||||||
|
'import/no-extraneous-dependencies': 'off',
|
||||||
'import/no-unresolved': 'off',
|
'import/no-unresolved': 'off',
|
||||||
'import/extensions': 'off',
|
'import/extensions': 'off',
|
||||||
'vue/no-v-html': 'off',
|
'vue/no-v-html': 'off',
|
||||||
|
|||||||
3138
website/client/package-lock.json
generated
3138
website/client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -26,10 +26,10 @@
|
|||||||
"chai": "^4.3.7",
|
"chai": "^4.3.7",
|
||||||
"core-js": "^3.33.1",
|
"core-js": "^3.33.1",
|
||||||
"dompurify": "^3.0.3",
|
"dompurify": "^3.0.3",
|
||||||
"eslint": "^6.8.0",
|
"eslint": "6.8.0",
|
||||||
"eslint-config-habitrpg": "^6.2.0",
|
"eslint-config-habitrpg": "6.2.1",
|
||||||
"eslint-plugin-mocha": "^5.3.0",
|
"eslint-plugin-mocha": "5.3.0",
|
||||||
"eslint-plugin-vue": "^7.20.0",
|
"eslint-plugin-vue": "7.20.0",
|
||||||
"habitica-markdown": "^3.0.0",
|
"habitica-markdown": "^3.0.0",
|
||||||
"hellojs": "^1.20.0",
|
"hellojs": "^1.20.0",
|
||||||
"inspectpack": "^4.7.1",
|
"inspectpack": "^4.7.1",
|
||||||
|
|||||||
@@ -190,7 +190,6 @@ import {
|
|||||||
const bugReportModal = () => import(/* webpackChunkName: "bug-report-modal" */'@/components/bugReportModal');
|
const bugReportModal = () => import(/* webpackChunkName: "bug-report-modal" */'@/components/bugReportModal');
|
||||||
const bugReportSuccessModal = () => import(/* webpackChunkName: "bug-report-success-modal" */'@/components/bugReportSuccessModal');
|
const bugReportSuccessModal = () => import(/* webpackChunkName: "bug-report-success-modal" */'@/components/bugReportSuccessModal');
|
||||||
|
|
||||||
|
|
||||||
const COMMUNITY_MANAGER_EMAIL = process.env.EMAILS_COMMUNITY_MANAGER_EMAIL; // eslint-disable-line
|
const COMMUNITY_MANAGER_EMAIL = process.env.EMAILS_COMMUNITY_MANAGER_EMAIL; // eslint-disable-line
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|||||||
@@ -73,11 +73,11 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import Avatar from '../avatar';
|
|
||||||
import { mapState } from '@/libs/store';
|
|
||||||
import percent from '@/../../common/script/libs/percent';
|
import percent from '@/../../common/script/libs/percent';
|
||||||
import { MAX_HEALTH as maxHealth } from '@/../../common/script/constants';
|
import { MAX_HEALTH as maxHealth } from '@/../../common/script/constants';
|
||||||
import revive from '@/../../common/script/ops/revive';
|
import revive from '@/../../common/script/ops/revive';
|
||||||
|
import { mapState } from '@/libs/store';
|
||||||
|
import Avatar from '../avatar';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
|
|||||||
@@ -96,8 +96,8 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { mapState } from '@/libs/store';
|
|
||||||
import achievements from '@/../../common/script/content/achievements';
|
import achievements from '@/../../common/script/content/achievements';
|
||||||
|
import { mapState } from '@/libs/store';
|
||||||
import svgClose from '@/assets/svg/close.svg';
|
import svgClose from '@/assets/svg/close.svg';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|||||||
@@ -124,9 +124,9 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import content from '@/../../common/script/content/index';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import Avatar from '../avatar';
|
import Avatar from '../avatar';
|
||||||
import content from '@/../../common/script/content/index';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
|
|||||||
@@ -97,10 +97,10 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import Avatar from '../avatar';
|
|
||||||
import { mapState } from '@/libs/store';
|
|
||||||
import percent from '@/../../common/script/libs/percent';
|
import percent from '@/../../common/script/libs/percent';
|
||||||
import { MAX_HEALTH as maxHealth } from '@/../../common/script/constants';
|
import { MAX_HEALTH as maxHealth } from '@/../../common/script/constants';
|
||||||
|
import Avatar from '../avatar';
|
||||||
|
import { mapState } from '@/libs/store';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
|
|||||||
@@ -54,9 +54,9 @@
|
|||||||
<script>
|
<script>
|
||||||
import * as quests from '@/../../common/script/content/quests';
|
import * as quests from '@/../../common/script/content/quests';
|
||||||
|
|
||||||
import { mapState } from '@/libs/store';
|
|
||||||
import percent from '@/../../common/script/libs/percent';
|
import percent from '@/../../common/script/libs/percent';
|
||||||
import { MAX_HEALTH as maxHealth } from '@/../../common/script/constants';
|
import { MAX_HEALTH as maxHealth } from '@/../../common/script/constants';
|
||||||
|
import { mapState } from '@/libs/store';
|
||||||
import QuestRewards from '../shops/quests/questRewards';
|
import QuestRewards from '../shops/quests/questRewards';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|||||||
@@ -90,9 +90,9 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import * as quests from '@/../../common/script/content/quests';
|
import * as quests from '@/../../common/script/content/quests';
|
||||||
import { mapState } from '@/libs/store';
|
|
||||||
import percent from '@/../../common/script/libs/percent';
|
import percent from '@/../../common/script/libs/percent';
|
||||||
import { MAX_HEALTH as maxHealth } from '@/../../common/script/constants';
|
import { MAX_HEALTH as maxHealth } from '@/../../common/script/constants';
|
||||||
|
import { mapState } from '@/libs/store';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data () {
|
data () {
|
||||||
|
|||||||
@@ -95,7 +95,6 @@ function _getGearSetDescription (key) {
|
|||||||
return (wantSetName) ? `${setType}: ${setName}` : setType;
|
return (wantSetName) ? `${setType}: ${setName}` : setType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -148,8 +148,8 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import saveHero from '../mixins/saveHero';
|
|
||||||
import { getPlanContext } from '@/../../common/script/cron';
|
import { getPlanContext } from '@/../../common/script/cron';
|
||||||
|
import saveHero from '../mixins/saveHero';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
mixins: [saveHero],
|
mixins: [saveHero],
|
||||||
|
|||||||
@@ -225,8 +225,8 @@
|
|||||||
import hello from 'hellojs';
|
import hello from 'hellojs';
|
||||||
import debounce from 'lodash/debounce';
|
import debounce from 'lodash/debounce';
|
||||||
import isEmail from 'validator/lib/isEmail';
|
import isEmail from 'validator/lib/isEmail';
|
||||||
import { setUpAxios, buildAppleAuthUrl } from '@/libs/auth';
|
|
||||||
import { MINIMUM_PASSWORD_LENGTH } from '@/../../common/script/constants';
|
import { MINIMUM_PASSWORD_LENGTH } from '@/../../common/script/constants';
|
||||||
|
import { setUpAxios, buildAppleAuthUrl } from '@/libs/auth';
|
||||||
import googleIcon from '@/assets/svg/google.svg';
|
import googleIcon from '@/assets/svg/google.svg';
|
||||||
import appleIcon from '@/assets/svg/apple_black.svg';
|
import appleIcon from '@/assets/svg/apple_black.svg';
|
||||||
|
|
||||||
|
|||||||
@@ -615,9 +615,9 @@ import hello from 'hellojs';
|
|||||||
import debounce from 'lodash/debounce';
|
import debounce from 'lodash/debounce';
|
||||||
import isEmail from 'validator/lib/isEmail';
|
import isEmail from 'validator/lib/isEmail';
|
||||||
import DOMPurify from 'dompurify';
|
import DOMPurify from 'dompurify';
|
||||||
|
import { MINIMUM_PASSWORD_LENGTH } from '@/../../common/script/constants';
|
||||||
import { buildAppleAuthUrl } from '../../libs/auth';
|
import { buildAppleAuthUrl } from '../../libs/auth';
|
||||||
|
|
||||||
import { MINIMUM_PASSWORD_LENGTH } from '@/../../common/script/constants';
|
|
||||||
import exclamation from '@/assets/svg/exclamation.svg';
|
import exclamation from '@/assets/svg/exclamation.svg';
|
||||||
import gryphon from '@/assets/svg/gryphon.svg';
|
import gryphon from '@/assets/svg/gryphon.svg';
|
||||||
import habiticaIcon from '@/assets/svg/habitica-logo.svg';
|
import habiticaIcon from '@/assets/svg/habitica-logo.svg';
|
||||||
|
|||||||
@@ -78,13 +78,13 @@
|
|||||||
<script>
|
<script>
|
||||||
import groupBy from 'lodash/groupBy';
|
import groupBy from 'lodash/groupBy';
|
||||||
import appearance from '@/../../common/script/content/appearance';
|
import appearance from '@/../../common/script/content/appearance';
|
||||||
|
import appearanceSets from '@/../../common/script/content/appearance/sets';
|
||||||
import { subPageMixin } from '../../mixins/subPage';
|
import { subPageMixin } from '../../mixins/subPage';
|
||||||
import { userStateMixin } from '../../mixins/userState';
|
import { userStateMixin } from '../../mixins/userState';
|
||||||
import { avatarEditorUtilies } from '../../mixins/avatarEditUtilities';
|
import { avatarEditorUtilies } from '../../mixins/avatarEditUtilities';
|
||||||
import subMenu from './sub-menu';
|
import subMenu from './sub-menu';
|
||||||
import customizeOptions from './customize-options';
|
import customizeOptions from './customize-options';
|
||||||
import gem from '@/assets/svg/gem.svg';
|
import gem from '@/assets/svg/gem.svg';
|
||||||
import appearanceSets from '@/../../common/script/content/appearance/sets';
|
|
||||||
|
|
||||||
const hairColorBySet = groupBy(appearance.hair.color, 'set.key');
|
const hairColorBySet = groupBy(appearance.hair.color, 'set.key');
|
||||||
const freeHairColorKeys = hairColorBySet[undefined].map(s => s.key);
|
const freeHairColorKeys = hairColorBySet[undefined].map(s => s.key);
|
||||||
|
|||||||
@@ -33,10 +33,10 @@
|
|||||||
<script>
|
<script>
|
||||||
import groupBy from 'lodash/groupBy';
|
import groupBy from 'lodash/groupBy';
|
||||||
import appearance from '@/../../common/script/content/appearance';
|
import appearance from '@/../../common/script/content/appearance';
|
||||||
|
import appearanceSets from '@/../../common/script/content/appearance/sets';
|
||||||
import { subPageMixin } from '../../mixins/subPage';
|
import { subPageMixin } from '../../mixins/subPage';
|
||||||
import { userStateMixin } from '../../mixins/userState';
|
import { userStateMixin } from '../../mixins/userState';
|
||||||
import { avatarEditorUtilies } from '../../mixins/avatarEditUtilities';
|
import { avatarEditorUtilies } from '../../mixins/avatarEditUtilities';
|
||||||
import appearanceSets from '@/../../common/script/content/appearance/sets';
|
|
||||||
import subMenu from './sub-menu';
|
import subMenu from './sub-menu';
|
||||||
import customizeOptions from './customize-options';
|
import customizeOptions from './customize-options';
|
||||||
import gem from '@/assets/svg/gem.svg';
|
import gem from '@/assets/svg/gem.svg';
|
||||||
|
|||||||
@@ -372,6 +372,7 @@ import cloneDeep from 'lodash/cloneDeep';
|
|||||||
import omit from 'lodash/omit';
|
import omit from 'lodash/omit';
|
||||||
import { v4 as uuid } from 'uuid';
|
import { v4 as uuid } from 'uuid';
|
||||||
|
|
||||||
|
import taskDefaults from '@/../../common/script/libs/taskDefaults';
|
||||||
import { userStateMixin } from '../../mixins/userState';
|
import { userStateMixin } from '../../mixins/userState';
|
||||||
import externalLinks from '../../mixins/externalLinks';
|
import externalLinks from '../../mixins/externalLinks';
|
||||||
import memberSearchDropdown from '@/components/members/memberSearchDropdown';
|
import memberSearchDropdown from '@/components/members/memberSearchDropdown';
|
||||||
@@ -387,7 +388,6 @@ import reportChallengeModal from './reportChallengeModal';
|
|||||||
import sidebarSection from '../sidebarSection';
|
import sidebarSection from '../sidebarSection';
|
||||||
import userLink from '../userLink';
|
import userLink from '../userLink';
|
||||||
import groupLink from '../groupLink';
|
import groupLink from '../groupLink';
|
||||||
import taskDefaults from '@/../../common/script/libs/taskDefaults';
|
|
||||||
|
|
||||||
import gemIcon from '@/assets/svg/gem.svg';
|
import gemIcon from '@/assets/svg/gem.svg';
|
||||||
import memberIcon from '@/assets/svg/member-icon.svg';
|
import memberIcon from '@/assets/svg/member-icon.svg';
|
||||||
|
|||||||
@@ -276,11 +276,10 @@
|
|||||||
import clone from 'lodash/clone';
|
import clone from 'lodash/clone';
|
||||||
import throttle from 'lodash/throttle';
|
import throttle from 'lodash/throttle';
|
||||||
|
|
||||||
import markdownDirective from '@/directives/markdown';
|
|
||||||
import { userStateMixin } from '../../mixins/userState';
|
|
||||||
|
|
||||||
import { TAVERN_ID, MIN_SHORTNAME_SIZE_FOR_CHALLENGES, MAX_SUMMARY_SIZE_FOR_CHALLENGES } from '@/../../common/script/constants';
|
import { TAVERN_ID, MIN_SHORTNAME_SIZE_FOR_CHALLENGES, MAX_SUMMARY_SIZE_FOR_CHALLENGES } from '@/../../common/script/constants';
|
||||||
import CategoryOptions from '@/../../common/script/content/categoryOptions';
|
import CategoryOptions from '@/../../common/script/content/categoryOptions';
|
||||||
|
import markdownDirective from '@/directives/markdown';
|
||||||
|
import { userStateMixin } from '../../mixins/userState';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
directives: {
|
directives: {
|
||||||
|
|||||||
@@ -87,9 +87,9 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import throttle from 'lodash/throttle';
|
import throttle from 'lodash/throttle';
|
||||||
|
import CategoryOptions from '@/../../common/script/content/categoryOptions';
|
||||||
import FilterSidebar from '@/components/ui/filterSidebar';
|
import FilterSidebar from '@/components/ui/filterSidebar';
|
||||||
import FilterGroup from '@/components/ui/filterGroup';
|
import FilterGroup from '@/components/ui/filterGroup';
|
||||||
import CategoryOptions from '@/../../common/script/content/categoryOptions';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: { FilterGroup, FilterSidebar },
|
components: { FilterGroup, FilterSidebar },
|
||||||
|
|||||||
@@ -201,6 +201,7 @@ import moment from 'moment';
|
|||||||
import cloneDeep from 'lodash/cloneDeep';
|
import cloneDeep from 'lodash/cloneDeep';
|
||||||
import escapeRegExp from 'lodash/escapeRegExp';
|
import escapeRegExp from 'lodash/escapeRegExp';
|
||||||
|
|
||||||
|
import { CHAT_FLAG_LIMIT_FOR_HIDING, CHAT_FLAG_FROM_SHADOW_MUTE } from '@/../../common/script/constants';
|
||||||
import renderWithMentions from '@/libs/renderWithMentions';
|
import renderWithMentions from '@/libs/renderWithMentions';
|
||||||
import { userStateMixin } from '../../mixins/userState';
|
import { userStateMixin } from '../../mixins/userState';
|
||||||
import userLink from '../userLink';
|
import userLink from '../userLink';
|
||||||
@@ -210,7 +211,6 @@ import copyIcon from '@/assets/svg/copy.svg';
|
|||||||
import likeIcon from '@/assets/svg/like.svg';
|
import likeIcon from '@/assets/svg/like.svg';
|
||||||
import likedIcon from '@/assets/svg/liked.svg';
|
import likedIcon from '@/assets/svg/liked.svg';
|
||||||
import reportIcon from '@/assets/svg/report.svg';
|
import reportIcon from '@/assets/svg/report.svg';
|
||||||
import { CHAT_FLAG_LIMIT_FOR_HIDING, CHAT_FLAG_FROM_SHADOW_MUTE } from '@/../../common/script/constants';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: { userLink },
|
components: { userLink },
|
||||||
|
|||||||
@@ -44,13 +44,12 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import taskDefaults from '@/../../common/script/libs/taskDefaults';
|
||||||
import { mapActions } from '@/libs/store';
|
import { mapActions } from '@/libs/store';
|
||||||
import markdownDirective from '@/directives/markdown';
|
import markdownDirective from '@/directives/markdown';
|
||||||
import notificationsMixin from '@/mixins/notifications';
|
import notificationsMixin from '@/mixins/notifications';
|
||||||
import Task from '@/components/tasks/task';
|
import Task from '@/components/tasks/task';
|
||||||
|
|
||||||
import taskDefaults from '@/../../common/script/libs/taskDefaults';
|
|
||||||
|
|
||||||
const baseUrl = 'https://habitica.com';
|
const baseUrl = 'https://habitica.com';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|||||||
@@ -1159,10 +1159,12 @@
|
|||||||
<script>
|
<script>
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import map from 'lodash/map';
|
import map from 'lodash/map';
|
||||||
|
import shops from '@/../../common/script/libs/shops';
|
||||||
|
import isPinned from '@/../../common/script/libs/isPinned';
|
||||||
|
import content from '@/../../common/script/content/index';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import avatar from './avatar';
|
import avatar from './avatar';
|
||||||
import usernameForm from './settings/usernameForm';
|
import usernameForm from './settings/usernameForm';
|
||||||
import shops from '@/../../common/script/libs/shops';
|
|
||||||
import guide from '@/mixins/guide';
|
import guide from '@/mixins/guide';
|
||||||
import notifications from '@/mixins/notifications';
|
import notifications from '@/mixins/notifications';
|
||||||
import PinBadge from '@/components/ui/pinBadge';
|
import PinBadge from '@/components/ui/pinBadge';
|
||||||
@@ -1185,11 +1187,8 @@ import gold from '@/assets/svg/gold.svg';
|
|||||||
import arrowRight from '@/assets/svg/arrow_right.svg';
|
import arrowRight from '@/assets/svg/arrow_right.svg';
|
||||||
import arrowLeft from '@/assets/svg/arrow_left.svg';
|
import arrowLeft from '@/assets/svg/arrow_left.svg';
|
||||||
import svgClose from '@/assets/svg/close.svg';
|
import svgClose from '@/assets/svg/close.svg';
|
||||||
import isPinned from '@/../../common/script/libs/isPinned';
|
|
||||||
import { avatarEditorUtilies } from '../mixins/avatarEditUtilities';
|
import { avatarEditorUtilies } from '../mixins/avatarEditUtilities';
|
||||||
|
|
||||||
import content from '@/../../common/script/content/index';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
avatar,
|
avatar,
|
||||||
|
|||||||
@@ -87,6 +87,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import debounce from 'lodash/debounce';
|
import debounce from 'lodash/debounce';
|
||||||
|
|
||||||
|
import { MAX_MESSAGE_LENGTH } from '@/../../common/script/constants';
|
||||||
import externalLinks from '../../mixins/externalLinks';
|
import externalLinks from '../../mixins/externalLinks';
|
||||||
|
|
||||||
import autocomplete from '../chat/autoComplete';
|
import autocomplete from '../chat/autoComplete';
|
||||||
@@ -94,7 +95,6 @@ import communityGuidelines from './communityGuidelines';
|
|||||||
import chatMessage from '../chat/chatMessages';
|
import chatMessage from '../chat/chatMessages';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import markdownDirective from '@/directives/markdown';
|
import markdownDirective from '@/directives/markdown';
|
||||||
import { MAX_MESSAGE_LENGTH } from '@/../../common/script/constants';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
directives: {
|
directives: {
|
||||||
|
|||||||
@@ -372,14 +372,14 @@ label.custom-control-label(v-once) {{ $t('allowGuildInvitationsFromNonMembers')
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import { MAX_SUMMARY_SIZE_FOR_GUILDS } from '@/../../common/script/constants';
|
||||||
|
import CategoryOptions from '@/../../common/script/content/categoryOptions';
|
||||||
import toggleSwitch from '@/components/ui/toggleSwitch';
|
import toggleSwitch from '@/components/ui/toggleSwitch';
|
||||||
import markdownDirective from '@/directives/markdown';
|
import markdownDirective from '@/directives/markdown';
|
||||||
import gemIcon from '@/assets/svg/gem.svg';
|
import gemIcon from '@/assets/svg/gem.svg';
|
||||||
import informationIcon from '@/assets/svg/information.svg';
|
import informationIcon from '@/assets/svg/information.svg';
|
||||||
|
|
||||||
import { MAX_SUMMARY_SIZE_FOR_GUILDS } from '@/../../common/script/constants';
|
|
||||||
import { userStateMixin } from '../../mixins/userState';
|
import { userStateMixin } from '../../mixins/userState';
|
||||||
import CategoryOptions from '@/../../common/script/content/categoryOptions';
|
|
||||||
|
|
||||||
// @TODO: Not sure the best way to pass party creating status
|
// @TODO: Not sure the best way to pass party creating status
|
||||||
// Since we need the modal in the header, passing props doesn't work
|
// Since we need the modal in the header, passing props doesn't work
|
||||||
|
|||||||
@@ -84,9 +84,9 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import throttle from 'lodash/throttle';
|
import throttle from 'lodash/throttle';
|
||||||
|
import CategoryOptions from '@/../../common/script/content/categoryOptions';
|
||||||
import FilterSidebar from '@/components/ui/filterSidebar';
|
import FilterSidebar from '@/components/ui/filterSidebar';
|
||||||
import FilterGroup from '@/components/ui/filterGroup';
|
import FilterGroup from '@/components/ui/filterGroup';
|
||||||
import CategoryOptions from '@/../../common/script/content/categoryOptions';
|
|
||||||
|
|
||||||
// TODO use checkbox-component to add/remove entries to *Filters, but without the v-model binding
|
// TODO use checkbox-component to add/remove entries to *Filters, but without the v-model binding
|
||||||
|
|
||||||
|
|||||||
@@ -213,6 +213,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
|
import { MAX_SUMMARY_SIZE_FOR_GUILDS } from '@/../../common/script/constants';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import categoryTags from '../categories/categoryTags';
|
import categoryTags from '../categories/categoryTags';
|
||||||
import groupUtilities from '@/mixins/groupsUtilities';
|
import groupUtilities from '@/mixins/groupsUtilities';
|
||||||
@@ -221,7 +222,6 @@ import gemIcon from '@/assets/svg/gem.svg';
|
|||||||
import goldGuildBadgeIcon from '@/assets/svg/gold-guild-badge-large.svg';
|
import goldGuildBadgeIcon from '@/assets/svg/gold-guild-badge-large.svg';
|
||||||
import silverGuildBadgeIcon from '@/assets/svg/silver-guild-badge-large.svg';
|
import silverGuildBadgeIcon from '@/assets/svg/silver-guild-badge-large.svg';
|
||||||
import bronzeGuildBadgeIcon from '@/assets/svg/bronze-guild-badge-large.svg';
|
import bronzeGuildBadgeIcon from '@/assets/svg/bronze-guild-badge-large.svg';
|
||||||
import { MAX_SUMMARY_SIZE_FOR_GUILDS } from '@/../../common/script/constants';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
directives: {
|
directives: {
|
||||||
|
|||||||
@@ -303,11 +303,10 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import orderBy from 'lodash/orderBy';
|
import orderBy from 'lodash/orderBy';
|
||||||
|
import * as quests from '@/../../common/script/content/quests';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import * as Analytics from '@/libs/analytics';
|
import * as Analytics from '@/libs/analytics';
|
||||||
|
|
||||||
import * as quests from '@/../../common/script/content/quests';
|
|
||||||
|
|
||||||
import navigationBack from '@/assets/svg/navigation_back.svg';
|
import navigationBack from '@/assets/svg/navigation_back.svg';
|
||||||
import questDialogContent from '../shops/quests/questDialogContent';
|
import questDialogContent from '../shops/quests/questDialogContent';
|
||||||
import closeIcon from '../shared/closeIcon';
|
import closeIcon from '../shared/closeIcon';
|
||||||
|
|||||||
@@ -638,10 +638,10 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { mapState } from '@/libs/store';
|
|
||||||
|
|
||||||
import * as quests from '@/../../common/script/content/quests';
|
import * as quests from '@/../../common/script/content/quests';
|
||||||
import percent from '@/../../common/script/libs/percent';
|
import percent from '@/../../common/script/libs/percent';
|
||||||
|
import { mapState } from '@/libs/store';
|
||||||
import sidebarSection from '../sidebarSection';
|
import sidebarSection from '../sidebarSection';
|
||||||
|
|
||||||
import questIcon from '@/assets/svg/quest.svg';
|
import questIcon from '@/assets/svg/quest.svg';
|
||||||
|
|||||||
@@ -746,10 +746,11 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import find from 'lodash/find';
|
import find from 'lodash/find';
|
||||||
|
import { TAVERN_ID } from '@/../../common/script/constants';
|
||||||
|
import * as quests from '@/../../common/script/content/quests';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import { goToModForm } from '@/libs/modform';
|
import { goToModForm } from '@/libs/modform';
|
||||||
|
|
||||||
import { TAVERN_ID } from '@/../../common/script/constants';
|
|
||||||
import worldBossInfoModal from '../world-boss/worldBossInfoModal';
|
import worldBossInfoModal from '../world-boss/worldBossInfoModal';
|
||||||
import worldBossRageModal from '../world-boss/worldBossRageModal';
|
import worldBossRageModal from '../world-boss/worldBossRageModal';
|
||||||
import sidebarSection from '../sidebarSection';
|
import sidebarSection from '../sidebarSection';
|
||||||
@@ -775,7 +776,6 @@ import tierMod from '@/assets/svg/tier-mod.svg';
|
|||||||
import tierNPC from '@/assets/svg/tier-npc.svg';
|
import tierNPC from '@/assets/svg/tier-npc.svg';
|
||||||
import tierStaff from '@/assets/svg/tier-staff.svg';
|
import tierStaff from '@/assets/svg/tier-staff.svg';
|
||||||
|
|
||||||
import * as quests from '@/../../common/script/content/quests';
|
|
||||||
import staffList from '../../libs/staffList';
|
import staffList from '../../libs/staffList';
|
||||||
import reportBug from '@/mixins/reportBug.js';
|
import reportBug from '@/mixins/reportBug.js';
|
||||||
|
|
||||||
|
|||||||
@@ -319,12 +319,12 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import each from 'lodash/each';
|
import each from 'lodash/each';
|
||||||
import markdownDirective from '@/directives/markdown';
|
|
||||||
import styleHelper from '@/mixins/styleHelper';
|
|
||||||
import * as quests from '@/../../common/script/content/quests';
|
import * as quests from '@/../../common/script/content/quests';
|
||||||
import { mountInfo, petInfo } from '@/../../common/script/content/stable';
|
import { mountInfo, petInfo } from '@/../../common/script/content/stable';
|
||||||
import content from '@/../../common/script/content';
|
import content from '@/../../common/script/content';
|
||||||
import gear from '@/../../common/script/content/gear';
|
import gear from '@/../../common/script/content/gear';
|
||||||
|
import styleHelper from '@/mixins/styleHelper';
|
||||||
|
import markdownDirective from '@/directives/markdown';
|
||||||
import notifications from '@/mixins/notifications';
|
import notifications from '@/mixins/notifications';
|
||||||
import userLink from '../userLink';
|
import userLink from '../userLink';
|
||||||
import PurchaseHistoryTable from '../ui/purchaseHistoryTable.vue';
|
import PurchaseHistoryTable from '../ui/purchaseHistoryTable.vue';
|
||||||
|
|||||||
@@ -39,9 +39,9 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import * as quests from '@/../../common/script/content/quests';
|
||||||
import BaseNotification from './base';
|
import BaseNotification from './base';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import * as quests from '@/../../common/script/content/quests';
|
|
||||||
import questInfo from '@/components/shops/quests/questInfo';
|
import questInfo from '@/components/shops/quests/questInfo';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|||||||
@@ -112,9 +112,9 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { mapState, mapActions } from '@/libs/store';
|
|
||||||
import * as quests from '@/../../common/script/content/quests';
|
import * as quests from '@/../../common/script/content/quests';
|
||||||
import { hasCompletedOnboarding } from '@/../../common/script/libs/onboarding';
|
import { hasCompletedOnboarding } from '@/../../common/script/libs/onboarding';
|
||||||
|
import { mapState, mapActions } from '@/libs/store';
|
||||||
import notificationsIcon from '@/assets/svg/notifications.svg';
|
import notificationsIcon from '@/assets/svg/notifications.svg';
|
||||||
import MenuDropdown from '../ui/customMenuDropdown';
|
import MenuDropdown from '../ui/customMenuDropdown';
|
||||||
import MessageCount from './messageCount.functional.vue';
|
import MessageCount from './messageCount.functional.vue';
|
||||||
|
|||||||
@@ -297,6 +297,7 @@ import map from 'lodash/map';
|
|||||||
import throttle from 'lodash/throttle';
|
import throttle from 'lodash/throttle';
|
||||||
import _sortBy from 'lodash/sortBy';
|
import _sortBy from 'lodash/sortBy';
|
||||||
import _reverse from 'lodash/reverse';
|
import _reverse from 'lodash/reverse';
|
||||||
|
import i18n from '@/../../common/script/i18n';
|
||||||
import { CONSTANTS, setLocalSetting, getLocalSetting } from '@/libs/userlocalManager';
|
import { CONSTANTS, setLocalSetting, getLocalSetting } from '@/libs/userlocalManager';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
|
|
||||||
@@ -306,8 +307,6 @@ import ItemRows from '@/components/ui/itemRows';
|
|||||||
import EquipmentAttributesPopover from '@/components/inventory/equipment/attributesPopover';
|
import EquipmentAttributesPopover from '@/components/inventory/equipment/attributesPopover';
|
||||||
import Drawer from '@/components/ui/drawer';
|
import Drawer from '@/components/ui/drawer';
|
||||||
|
|
||||||
import i18n from '@/../../common/script/i18n';
|
|
||||||
|
|
||||||
import EquipGearModal from './equipGearModal';
|
import EquipGearModal from './equipGearModal';
|
||||||
|
|
||||||
import FilterGroup from '@/components/ui/filterGroup';
|
import FilterGroup from '@/components/ui/filterGroup';
|
||||||
|
|||||||
@@ -80,8 +80,8 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import markdownDirective from '@/directives/markdown';
|
|
||||||
import { mountInfo } from '@/../../common/script/content/stable';
|
import { mountInfo } from '@/../../common/script/content/stable';
|
||||||
|
import markdownDirective from '@/directives/markdown';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
directives: {
|
directives: {
|
||||||
|
|||||||
@@ -184,16 +184,15 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import { toNextLevel } from '@/../../common/script/statHelpers';
|
||||||
|
import statsComputed from '@/../../common/script/libs/statsComputed';
|
||||||
|
import percent from '@/../../common/script/libs/percent';
|
||||||
import Avatar from './avatar';
|
import Avatar from './avatar';
|
||||||
import ClassBadge from './members/classBadge';
|
import ClassBadge from './members/classBadge';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import StatsBar from './ui/statsbar';
|
import StatsBar from './ui/statsbar';
|
||||||
import userLink from './userLink';
|
import userLink from './userLink';
|
||||||
|
|
||||||
import { toNextLevel } from '@/../../common/script/statHelpers';
|
|
||||||
import statsComputed from '@/../../common/script/libs/statsComputed';
|
|
||||||
import percent from '@/../../common/script/libs/percent';
|
|
||||||
|
|
||||||
import buffIcon from '@/assets/svg/buff.svg';
|
import buffIcon from '@/assets/svg/buff.svg';
|
||||||
import healthIcon from '@/assets/svg/health.svg';
|
import healthIcon from '@/assets/svg/health.svg';
|
||||||
import experienceIcon from '@/assets/svg/experience.svg';
|
import experienceIcon from '@/assets/svg/experience.svg';
|
||||||
|
|||||||
@@ -226,16 +226,15 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import { toNextLevel } from '@/../../common/script/statHelpers';
|
||||||
|
import statsComputed from '@/../../common/script/libs/statsComputed';
|
||||||
|
import percent from '@/../../common/script/libs/percent';
|
||||||
import Avatar from './avatar';
|
import Avatar from './avatar';
|
||||||
import ClassBadge from './members/classBadge';
|
import ClassBadge from './members/classBadge';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import StatsBar from './ui/statsbar';
|
import StatsBar from './ui/statsbar';
|
||||||
import userLink from './userLink';
|
import userLink from './userLink';
|
||||||
|
|
||||||
import { toNextLevel } from '@/../../common/script/statHelpers';
|
|
||||||
import statsComputed from '@/../../common/script/libs/statsComputed';
|
|
||||||
import percent from '@/../../common/script/libs/percent';
|
|
||||||
|
|
||||||
import buffIcon from '@/assets/svg/buff.svg';
|
import buffIcon from '@/assets/svg/buff.svg';
|
||||||
import healthIcon from '@/assets/svg/health.svg';
|
import healthIcon from '@/assets/svg/health.svg';
|
||||||
import experienceIcon from '@/assets/svg/experience.svg';
|
import experienceIcon from '@/assets/svg/experience.svg';
|
||||||
|
|||||||
@@ -729,9 +729,8 @@
|
|||||||
<script>
|
<script>
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
|
||||||
import { mapState } from '@/libs/store';
|
|
||||||
|
|
||||||
import Content from '@/../../common/script/content';
|
import Content from '@/../../common/script/content';
|
||||||
|
import { mapState } from '@/libs/store';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data () {
|
data () {
|
||||||
|
|||||||
@@ -359,7 +359,6 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
@import '~@/assets/scss/colors.scss';
|
@import '~@/assets/scss/colors.scss';
|
||||||
@import '~@/assets/scss/mixins.scss';
|
@import '~@/assets/scss/mixins.scss';
|
||||||
@@ -788,16 +787,15 @@
|
|||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
// to check if user owns JG or not
|
// to check if user owns JG or not
|
||||||
|
import content from '@/../../common/script/content/index';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
|
|
||||||
// Purchase functionality
|
// Purchase functionality
|
||||||
import buy from '@/mixins/buy';
|
import buy from '@/mixins/buy';
|
||||||
import notifications from '@/mixins/notifications';
|
import notifications from '@/mixins/notifications';
|
||||||
import payments from '@/mixins/payments';
|
import payments from '@/mixins/payments';
|
||||||
import content from '@/../../common/script/content/index';
|
|
||||||
import amazonButton from '@/components/payments/buttons/amazon';
|
import amazonButton from '@/components/payments/buttons/amazon';
|
||||||
|
|
||||||
// import images
|
// import images
|
||||||
|
|||||||
@@ -11,9 +11,9 @@
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-for="(post, index) in posts"
|
v-for="(post, index) in posts"
|
||||||
|
id="bailey"
|
||||||
:key="post._id"
|
:key="post._id"
|
||||||
class="static-view bailey"
|
class="static-view bailey"
|
||||||
id="bailey"
|
|
||||||
:class="{'bailey-last': index == (posts.length - 1)}"
|
:class="{'bailey-last': index == (posts.length - 1)}"
|
||||||
>
|
>
|
||||||
<small
|
<small
|
||||||
|
|||||||
@@ -109,8 +109,8 @@ import Vue from 'vue';
|
|||||||
import { toNextLevel } from '@/../../common/script/statHelpers';
|
import { toNextLevel } from '@/../../common/script/statHelpers';
|
||||||
import { shouldDo } from '@/../../common/script/cron';
|
import { shouldDo } from '@/../../common/script/cron';
|
||||||
import { onOnboardingComplete } from '@/../../common/script/libs/onboarding';
|
import { onOnboardingComplete } from '@/../../common/script/libs/onboarding';
|
||||||
import { mapState } from '@/libs/store';
|
|
||||||
import { MAX_LEVEL_HARD_CAP } from '@/../../common/script/constants';
|
import { MAX_LEVEL_HARD_CAP } from '@/../../common/script/constants';
|
||||||
|
import { mapState } from '@/libs/store';
|
||||||
import notifications from '@/mixins/notifications';
|
import notifications from '@/mixins/notifications';
|
||||||
import guide from '@/mixins/guide';
|
import guide from '@/mixins/guide';
|
||||||
import { CONSTANTS, setLocalSetting } from '@/libs/userlocalManager';
|
import { CONSTANTS, setLocalSetting } from '@/libs/userlocalManager';
|
||||||
|
|||||||
@@ -168,12 +168,12 @@ input[type="radio"] {
|
|||||||
import toArray from 'lodash/toArray';
|
import toArray from 'lodash/toArray';
|
||||||
import omitBy from 'lodash/omitBy';
|
import omitBy from 'lodash/omitBy';
|
||||||
import orderBy from 'lodash/orderBy';
|
import orderBy from 'lodash/orderBy';
|
||||||
import { mapState } from '@/libs/store';
|
|
||||||
import planGemLimits from '@/../../common/script/libs/planGemLimits';
|
import planGemLimits from '@/../../common/script/libs/planGemLimits';
|
||||||
|
import { MAX_GIFT_MESSAGE_LENGTH } from '@/../../common/script/constants';
|
||||||
|
import { mapState } from '@/libs/store';
|
||||||
import paymentsMixin from '@/mixins/payments';
|
import paymentsMixin from '@/mixins/payments';
|
||||||
import notificationsMixin from '@/mixins/notifications';
|
import notificationsMixin from '@/mixins/notifications';
|
||||||
import paymentsButtons from '@/components/payments/buttons/list';
|
import paymentsButtons from '@/components/payments/buttons/list';
|
||||||
import { MAX_GIFT_MESSAGE_LENGTH } from '@/../../common/script/constants';
|
|
||||||
|
|
||||||
// @TODO: EMAILS.TECH_ASSISTANCE_EMAIL, load from config
|
// @TODO: EMAILS.TECH_ASSISTANCE_EMAIL, load from config
|
||||||
const TECH_ASSISTANCE_EMAIL = 'admin@habitica.com';
|
const TECH_ASSISTANCE_EMAIL = 'admin@habitica.com';
|
||||||
|
|||||||
@@ -415,13 +415,13 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
// icons
|
// icons
|
||||||
|
import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks';
|
||||||
import checkIcon from '@/assets/svg/check.svg';
|
import checkIcon from '@/assets/svg/check.svg';
|
||||||
import gemIcon from '@/assets/svg/gem.svg';
|
import gemIcon from '@/assets/svg/gem.svg';
|
||||||
import closeIcon from '@/assets/svg/close.svg';
|
import closeIcon from '@/assets/svg/close.svg';
|
||||||
|
|
||||||
// components
|
// components
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks';
|
|
||||||
import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
|
import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
|
||||||
import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
|
import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
|
||||||
|
|
||||||
|
|||||||
@@ -619,10 +619,11 @@
|
|||||||
<script>
|
<script>
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import { mapState } from '@/libs/store';
|
|
||||||
|
|
||||||
import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks';
|
import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks';
|
||||||
import planGemLimits from '@/../../common/script/libs/planGemLimits';
|
import planGemLimits from '@/../../common/script/libs/planGemLimits';
|
||||||
|
import { getPlanContext } from '@/../../common/script/cron';
|
||||||
|
import { mapState } from '@/libs/store';
|
||||||
|
|
||||||
import paymentsMixin from '../../mixins/payments';
|
import paymentsMixin from '../../mixins/payments';
|
||||||
import notificationsMixin from '../../mixins/notifications';
|
import notificationsMixin from '../../mixins/notifications';
|
||||||
|
|
||||||
@@ -643,7 +644,6 @@ import logo from '@/assets/svg/habitica-logo-purple.svg';
|
|||||||
import paypalLogo from '@/assets/svg/paypal-logo.svg';
|
import paypalLogo from '@/assets/svg/paypal-logo.svg';
|
||||||
import subscriberGems from '@/assets/svg/subscriber-gems.svg';
|
import subscriberGems from '@/assets/svg/subscriber-gems.svg';
|
||||||
import subscriberHourglasses from '@/assets/svg/subscriber-hourglasses.svg';
|
import subscriberHourglasses from '@/assets/svg/subscriber-hourglasses.svg';
|
||||||
import { getPlanContext } from '@/../../common/script/cron';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
|
|||||||
@@ -133,9 +133,9 @@
|
|||||||
import filter from 'lodash/filter';
|
import filter from 'lodash/filter';
|
||||||
import sortBy from 'lodash/sortBy';
|
import sortBy from 'lodash/sortBy';
|
||||||
|
|
||||||
|
import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks';
|
||||||
import paymentsButtons from '@/components/payments/buttons/list';
|
import paymentsButtons from '@/components/payments/buttons/list';
|
||||||
import paymentsMixin from '../../mixins/payments';
|
import paymentsMixin from '../../mixins/payments';
|
||||||
import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
|
|||||||
@@ -17,7 +17,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '~@/assets/scss/colors.scss';
|
@import '~@/assets/scss/colors.scss';
|
||||||
@import '~@/assets/scss/mixins.scss';
|
@import '~@/assets/scss/mixins.scss';
|
||||||
|
|||||||
@@ -551,7 +551,6 @@
|
|||||||
// padding-top: 0.15rem;
|
// padding-top: 0.15rem;
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
.gems-left {
|
.gems-left {
|
||||||
height: 32px;
|
height: 32px;
|
||||||
background-color: $green-100;
|
background-color: $green-100;
|
||||||
@@ -600,8 +599,10 @@ import size from 'lodash/size';
|
|||||||
import reduce from 'lodash/reduce';
|
import reduce from 'lodash/reduce';
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
|
|
||||||
import spellsMixin from '@/mixins/spells';
|
|
||||||
import planGemLimits from '@/../../common/script/libs/planGemLimits';
|
import planGemLimits from '@/../../common/script/libs/planGemLimits';
|
||||||
|
import { drops as dropEggs } from '@/../../common/script/content/eggs';
|
||||||
|
import { drops as dropPotions } from '@/../../common/script/content/hatching-potions';
|
||||||
|
import spellsMixin from '@/mixins/spells';
|
||||||
import numberInvalid from '@/mixins/numberInvalid';
|
import numberInvalid from '@/mixins/numberInvalid';
|
||||||
|
|
||||||
import svgClose from '@/assets/svg/close.svg';
|
import svgClose from '@/assets/svg/close.svg';
|
||||||
@@ -628,9 +629,6 @@ import EquipmentAttributesGrid from '../inventory/equipment/attributesGrid.vue';
|
|||||||
import Item from '@/components/inventory/item';
|
import Item from '@/components/inventory/item';
|
||||||
import Avatar from '@/components/avatar';
|
import Avatar from '@/components/avatar';
|
||||||
|
|
||||||
import { drops as dropEggs } from '@/../../common/script/content/eggs';
|
|
||||||
import { drops as dropPotions } from '@/../../common/script/content/hatching-potions';
|
|
||||||
|
|
||||||
const dropEggKeys = keys(dropEggs);
|
const dropEggKeys = keys(dropEggs);
|
||||||
|
|
||||||
const amountOfDropEggs = size(dropEggs);
|
const amountOfDropEggs = size(dropEggs);
|
||||||
|
|||||||
@@ -33,11 +33,11 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import planGemLimits from '@/../../common/script/libs/planGemLimits';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import CountBadge from '@/components/ui/countBadge';
|
import CountBadge from '@/components/ui/countBadge';
|
||||||
|
|
||||||
import PinBadge from '@/components/ui/pinBadge';
|
import PinBadge from '@/components/ui/pinBadge';
|
||||||
import planGemLimits from '@/../../common/script/libs/planGemLimits';
|
|
||||||
import pinUtils from '../../../mixins/pinUtils';
|
import pinUtils from '../../../mixins/pinUtils';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|||||||
@@ -22,9 +22,9 @@
|
|||||||
import _filter from 'lodash/filter';
|
import _filter from 'lodash/filter';
|
||||||
import _sortBy from 'lodash/sortBy';
|
import _sortBy from 'lodash/sortBy';
|
||||||
import _map from 'lodash/map';
|
import _map from 'lodash/map';
|
||||||
|
import planGemLimits from '@/../../common/script/libs/planGemLimits';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import pinUtils from '@/mixins/pinUtils';
|
import pinUtils from '@/mixins/pinUtils';
|
||||||
import planGemLimits from '@/../../common/script/libs/planGemLimits';
|
|
||||||
|
|
||||||
import ShopItem from '../shopItem';
|
import ShopItem from '../shopItem';
|
||||||
import CategoryItem from './categoryItem';
|
import CategoryItem from './categoryItem';
|
||||||
|
|||||||
@@ -74,6 +74,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import _filter from 'lodash/filter';
|
import _filter from 'lodash/filter';
|
||||||
import _orderBy from 'lodash/orderBy';
|
import _orderBy from 'lodash/orderBy';
|
||||||
|
import shops from '@/../../common/script/libs/shops';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import LayoutSection from '@/components/ui/layoutSection';
|
import LayoutSection from '@/components/ui/layoutSection';
|
||||||
import FilterDropdown from '@/components/ui/filterDropdown';
|
import FilterDropdown from '@/components/ui/filterDropdown';
|
||||||
@@ -81,8 +82,6 @@ import ItemRows from '@/components/ui/itemRows';
|
|||||||
import PinBadge from '@/components/ui/pinBadge';
|
import PinBadge from '@/components/ui/pinBadge';
|
||||||
import ShopItem from '../shopItem';
|
import ShopItem from '../shopItem';
|
||||||
|
|
||||||
import shops from '@/../../common/script/libs/shops';
|
|
||||||
|
|
||||||
import svgWarrior from '@/assets/svg/warrior.svg';
|
import svgWarrior from '@/assets/svg/warrior.svg';
|
||||||
import svgWizard from '@/assets/svg/wizard.svg';
|
import svgWizard from '@/assets/svg/wizard.svg';
|
||||||
import svgRogue from '@/assets/svg/rogue.svg';
|
import svgRogue from '@/assets/svg/rogue.svg';
|
||||||
|
|||||||
@@ -150,6 +150,8 @@ import find from 'lodash/find';
|
|||||||
import _filter from 'lodash/filter';
|
import _filter from 'lodash/filter';
|
||||||
import _map from 'lodash/map';
|
import _map from 'lodash/map';
|
||||||
import _throttle from 'lodash/throttle';
|
import _throttle from 'lodash/throttle';
|
||||||
|
import getItemInfo from '@/../../common/script/libs/getItemInfo';
|
||||||
|
import shops from '@/../../common/script/libs/shops';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
|
|
||||||
import KeysToKennel from './keysToKennel';
|
import KeysToKennel from './keysToKennel';
|
||||||
@@ -165,8 +167,6 @@ import FilterDropdown from '@/components/ui/filterDropdown';
|
|||||||
import MarketFilter from './filter';
|
import MarketFilter from './filter';
|
||||||
|
|
||||||
import SellModal from './sellModal.vue';
|
import SellModal from './sellModal.vue';
|
||||||
import getItemInfo from '@/../../common/script/libs/getItemInfo';
|
|
||||||
import shops from '@/../../common/script/libs/shops';
|
|
||||||
|
|
||||||
import notifications from '@/mixins/notifications';
|
import notifications from '@/mixins/notifications';
|
||||||
import buyMixin from '@/mixins/buy';
|
import buyMixin from '@/mixins/buy';
|
||||||
|
|||||||
@@ -59,11 +59,10 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import { beastCount, mountMasterProgress } from '@/../../common/script/count';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import ShopItem from '../shopItem';
|
import ShopItem from '../shopItem';
|
||||||
|
|
||||||
import { beastCount, mountMasterProgress } from '@/../../common/script/count';
|
|
||||||
|
|
||||||
import notifications from '@/mixins/notifications';
|
import notifications from '@/mixins/notifications';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|||||||
@@ -405,6 +405,8 @@ import _groupBy from 'lodash/groupBy';
|
|||||||
import _map from 'lodash/map';
|
import _map from 'lodash/map';
|
||||||
import _each from 'lodash/each';
|
import _each from 'lodash/each';
|
||||||
import * as stopword from 'stopword/dist/stopword.esm.mjs';
|
import * as stopword from 'stopword/dist/stopword.esm.mjs';
|
||||||
|
import shops from '@/../../common/script/libs/shops';
|
||||||
|
import isPinned from '@/../../common/script/libs/isPinned';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
|
|
||||||
import ShopItem from '../shopItem';
|
import ShopItem from '../shopItem';
|
||||||
@@ -420,9 +422,6 @@ import BuyModal from './buyQuestModal.vue';
|
|||||||
import PinBadge from '@/components/ui/pinBadge';
|
import PinBadge from '@/components/ui/pinBadge';
|
||||||
import QuestInfo from './questInfo.vue';
|
import QuestInfo from './questInfo.vue';
|
||||||
|
|
||||||
import shops from '@/../../common/script/libs/shops';
|
|
||||||
|
|
||||||
import isPinned from '@/../../common/script/libs/isPinned';
|
|
||||||
import FilterSidebar from '@/components/ui/filterSidebar';
|
import FilterSidebar from '@/components/ui/filterSidebar';
|
||||||
import FilterGroup from '@/components/ui/filterGroup';
|
import FilterGroup from '@/components/ui/filterGroup';
|
||||||
import SelectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
|
import SelectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
|
||||||
|
|||||||
@@ -347,6 +347,10 @@ import _throttle from 'lodash/throttle';
|
|||||||
import _groupBy from 'lodash/groupBy';
|
import _groupBy from 'lodash/groupBy';
|
||||||
import _reverse from 'lodash/reverse';
|
import _reverse from 'lodash/reverse';
|
||||||
import _find from 'lodash/find';
|
import _find from 'lodash/find';
|
||||||
|
import isPinned from '@/../../common/script/libs/isPinned';
|
||||||
|
import getOfficialPinnedItems from '@/../../common/script/libs/getOfficialPinnedItems';
|
||||||
|
import i18n from '@/../../common/script/i18n';
|
||||||
|
import shops from '@/../../common/script/libs/shops';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
|
|
||||||
import Checkbox from '@/components/ui/checkbox';
|
import Checkbox from '@/components/ui/checkbox';
|
||||||
@@ -362,12 +366,6 @@ import svgWizard from '@/assets/svg/wizard.svg';
|
|||||||
import svgRogue from '@/assets/svg/rogue.svg';
|
import svgRogue from '@/assets/svg/rogue.svg';
|
||||||
import svgHealer from '@/assets/svg/healer.svg';
|
import svgHealer from '@/assets/svg/healer.svg';
|
||||||
|
|
||||||
import isPinned from '@/../../common/script/libs/isPinned';
|
|
||||||
import getOfficialPinnedItems from '@/../../common/script/libs/getOfficialPinnedItems';
|
|
||||||
|
|
||||||
import i18n from '@/../../common/script/i18n';
|
|
||||||
|
|
||||||
import shops from '@/../../common/script/libs/shops';
|
|
||||||
import SelectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
|
import SelectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
|
||||||
import FilterSidebar from '@/components/ui/filterSidebar';
|
import FilterSidebar from '@/components/ui/filterSidebar';
|
||||||
import FilterGroup from '@/components/ui/filterGroup';
|
import FilterGroup from '@/components/ui/filterGroup';
|
||||||
|
|||||||
@@ -274,6 +274,8 @@ import _throttle from 'lodash/throttle';
|
|||||||
import _groupBy from 'lodash/groupBy';
|
import _groupBy from 'lodash/groupBy';
|
||||||
import _map from 'lodash/map';
|
import _map from 'lodash/map';
|
||||||
import _find from 'lodash/find';
|
import _find from 'lodash/find';
|
||||||
|
import isPinned from '@/../../common/script/libs/isPinned';
|
||||||
|
import shops from '@/../../common/script/libs/shops';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
|
|
||||||
import ShopItem from '../shopItem';
|
import ShopItem from '../shopItem';
|
||||||
@@ -287,9 +289,6 @@ import BuyQuestModal from '../quests/buyQuestModal.vue';
|
|||||||
|
|
||||||
import svgHourglass from '@/assets/svg/hourglass.svg';
|
import svgHourglass from '@/assets/svg/hourglass.svg';
|
||||||
|
|
||||||
import isPinned from '@/../../common/script/libs/isPinned';
|
|
||||||
import shops from '@/../../common/script/libs/shops';
|
|
||||||
|
|
||||||
import pinUtils from '@/mixins/pinUtils';
|
import pinUtils from '@/mixins/pinUtils';
|
||||||
import FilterSidebar from '@/components/ui/filterSidebar';
|
import FilterSidebar from '@/components/ui/filterSidebar';
|
||||||
import FilterGroup from '@/components/ui/filterGroup';
|
import FilterGroup from '@/components/ui/filterGroup';
|
||||||
|
|||||||
@@ -781,6 +781,7 @@
|
|||||||
import hello from 'hellojs';
|
import hello from 'hellojs';
|
||||||
import debounce from 'lodash/debounce';
|
import debounce from 'lodash/debounce';
|
||||||
import isEmail from 'validator/lib/isEmail';
|
import isEmail from 'validator/lib/isEmail';
|
||||||
|
import { MINIMUM_PASSWORD_LENGTH } from '@/../../common/script/constants';
|
||||||
import { buildAppleAuthUrl } from '../../libs/auth';
|
import { buildAppleAuthUrl } from '../../libs/auth';
|
||||||
import googlePlay from '@/assets/images/home/google-play-badge.svg';
|
import googlePlay from '@/assets/images/home/google-play-badge.svg';
|
||||||
import iosAppStore from '@/assets/images/home/ios-app-store.svg';
|
import iosAppStore from '@/assets/images/home/ios-app-store.svg';
|
||||||
@@ -800,7 +801,6 @@ import kickstarter from '@/assets/images/home/kickstarter.svg';
|
|||||||
import lifehacker from '@/assets/images/home/lifehacker.svg';
|
import lifehacker from '@/assets/images/home/lifehacker.svg';
|
||||||
import makeuseof from '@/assets/images/home/make-use-of.svg';
|
import makeuseof from '@/assets/images/home/make-use-of.svg';
|
||||||
import thenewyorktimes from '@/assets/images/home/the-new-york-times.svg';
|
import thenewyorktimes from '@/assets/images/home/the-new-york-times.svg';
|
||||||
import { MINIMUM_PASSWORD_LENGTH } from '@/../../common/script/constants';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data () {
|
data () {
|
||||||
|
|||||||
@@ -1035,7 +1035,6 @@ import calendarIcon from '@/assets/svg/calendar.svg';
|
|||||||
import gripIcon from '@/assets/svg/grip.svg';
|
import gripIcon from '@/assets/svg/grip.svg';
|
||||||
import InformationIcon from '@/components/ui/informationIcon.vue';
|
import InformationIcon from '@/components/ui/informationIcon.vue';
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
InformationIcon,
|
InformationIcon,
|
||||||
|
|||||||
@@ -387,6 +387,7 @@ import Vue from 'vue';
|
|||||||
import throttle from 'lodash/throttle';
|
import throttle from 'lodash/throttle';
|
||||||
import cloneDeep from 'lodash/cloneDeep';
|
import cloneDeep from 'lodash/cloneDeep';
|
||||||
import draggable from 'vuedraggable';
|
import draggable from 'vuedraggable';
|
||||||
|
import taskDefaults from '@/../../common/script/libs/taskDefaults';
|
||||||
import TaskColumn from './column';
|
import TaskColumn from './column';
|
||||||
import TaskModal from './taskModal';
|
import TaskModal from './taskModal';
|
||||||
import TaskSummary from './taskSummary';
|
import TaskSummary from './taskSummary';
|
||||||
@@ -403,7 +404,6 @@ import rewardIcon from '@/assets/svg/reward.svg';
|
|||||||
import dragIcon from '@/assets/svg/drag_indicator.svg';
|
import dragIcon from '@/assets/svg/drag_indicator.svg';
|
||||||
|
|
||||||
import { mapState, mapActions } from '@/libs/store';
|
import { mapState, mapActions } from '@/libs/store';
|
||||||
import taskDefaults from '@/../../common/script/libs/taskDefaults';
|
|
||||||
import brokenTaskModal from './brokenTaskModal';
|
import brokenTaskModal from './brokenTaskModal';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|||||||
@@ -87,9 +87,8 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
import styleHelper from '@/mixins/styleHelper';
|
|
||||||
|
|
||||||
import achievementsLib from '@/../../common/script/libs/achievements';
|
import achievementsLib from '@/../../common/script/libs/achievements';
|
||||||
|
import styleHelper from '@/mixins/styleHelper';
|
||||||
|
|
||||||
import tier1 from '@/assets/svg/tier-1.svg';
|
import tier1 from '@/assets/svg/tier-1.svg';
|
||||||
import tier2 from '@/assets/svg/tier-2.svg';
|
import tier2 from '@/assets/svg/tier-2.svg';
|
||||||
|
|||||||
@@ -980,13 +980,13 @@ import moment from 'moment';
|
|||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import each from 'lodash/each';
|
import each from 'lodash/each';
|
||||||
import cloneDeep from 'lodash/cloneDeep';
|
import cloneDeep from 'lodash/cloneDeep';
|
||||||
|
import achievementsLib from '@/../../common/script/libs/achievements';
|
||||||
|
import Content from '@/../../common/script/content';
|
||||||
import toggleSwitch from '../ui/toggleSwitch';
|
import toggleSwitch from '../ui/toggleSwitch';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
|
|
||||||
import MemberDetails from '../memberDetails';
|
import MemberDetails from '../memberDetails';
|
||||||
import markdown from '@/directives/markdown';
|
import markdown from '@/directives/markdown';
|
||||||
import achievementsLib from '@/../../common/script/libs/achievements';
|
|
||||||
import Content from '@/../../common/script/content';
|
|
||||||
import profileStats from './profileStats';
|
import profileStats from './profileStats';
|
||||||
|
|
||||||
import message from '@/assets/svg/message.svg';
|
import message from '@/assets/svg/message.svg';
|
||||||
|
|||||||
@@ -96,5 +96,4 @@ export default {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -321,15 +321,15 @@
|
|||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import size from 'lodash/size';
|
import size from 'lodash/size';
|
||||||
import keys from 'lodash/keys';
|
import keys from 'lodash/keys';
|
||||||
import toggleSwitch from '@/components/ui/toggleSwitch';
|
|
||||||
import attributesGrid from '@/components/inventory/equipment/attributesGrid';
|
|
||||||
|
|
||||||
import { mapState } from '@/libs/store';
|
|
||||||
import Content from '@/../../common/script/content';
|
import Content from '@/../../common/script/content';
|
||||||
import { beastMasterProgress, mountMasterProgress } from '@/../../common/script/count';
|
import { beastMasterProgress, mountMasterProgress } from '@/../../common/script/count';
|
||||||
import autoAllocate from '@/../../common/script/fns/autoAllocate';
|
import autoAllocate from '@/../../common/script/fns/autoAllocate';
|
||||||
import allocateBulk from '@/../../common/script/ops/stats/allocateBulk';
|
import allocateBulk from '@/../../common/script/ops/stats/allocateBulk';
|
||||||
import statsComputed from '@/../../common/script/libs/statsComputed';
|
import statsComputed from '@/../../common/script/libs/statsComputed';
|
||||||
|
import { mapState } from '@/libs/store';
|
||||||
|
import attributesGrid from '@/components/inventory/equipment/attributesGrid';
|
||||||
|
import toggleSwitch from '@/components/ui/toggleSwitch';
|
||||||
|
|
||||||
const DROP_ANIMALS = keys(Content.pets);
|
const DROP_ANIMALS = keys(Content.pets);
|
||||||
const TOTAL_NUMBER_OF_DROP_ANIMALS = DROP_ANIMALS.length;
|
const TOTAL_NUMBER_OF_DROP_ANIMALS = DROP_ANIMALS.length;
|
||||||
|
|||||||
@@ -442,13 +442,13 @@
|
|||||||
<script>
|
<script>
|
||||||
import size from 'lodash/size';
|
import size from 'lodash/size';
|
||||||
import keys from 'lodash/keys';
|
import keys from 'lodash/keys';
|
||||||
import { mapState } from '@/libs/store';
|
|
||||||
import Content from '@/../../common/script/content';
|
import Content from '@/../../common/script/content';
|
||||||
import { beastMasterProgress, mountMasterProgress } from '@/../../common/script/count';
|
import { beastMasterProgress, mountMasterProgress } from '@/../../common/script/count';
|
||||||
import statsComputed from '@/../../common/script/libs/statsComputed';
|
import statsComputed from '@/../../common/script/libs/statsComputed';
|
||||||
import autoAllocate from '@/../../common/script/fns/autoAllocate';
|
import autoAllocate from '@/../../common/script/fns/autoAllocate';
|
||||||
import changeClass from '@/../../common/script/ops/changeClass';
|
import changeClass from '@/../../common/script/ops/changeClass';
|
||||||
import allocate from '@/../../common/script/ops/stats/allocate';
|
import allocate from '@/../../common/script/ops/stats/allocate';
|
||||||
|
import { mapState } from '@/libs/store';
|
||||||
|
|
||||||
const DROP_ANIMALS = keys(Content.pets);
|
const DROP_ANIMALS = keys(Content.pets);
|
||||||
const TOTAL_NUMBER_OF_DROP_ANIMALS = DROP_ANIMALS.length;
|
const TOTAL_NUMBER_OF_DROP_ANIMALS = DROP_ANIMALS.length;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import notifications from '@/mixins/notifications';
|
|
||||||
import isPinned from '@/../../common/script/libs/isPinned';
|
import isPinned from '@/../../common/script/libs/isPinned';
|
||||||
|
import notifications from '@/mixins/notifications';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
mixins: [notifications],
|
mixins: [notifications],
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
|
|
||||||
import notifications from './notifications';
|
|
||||||
import scoreTask from '@/../../common/script/ops/scoreTask';
|
import scoreTask from '@/../../common/script/ops/scoreTask';
|
||||||
|
import notifications from './notifications';
|
||||||
import { mapState } from '@/libs/store';
|
import { mapState } from '@/libs/store';
|
||||||
import * as Analytics from '@/libs/analytics';
|
import * as Analytics from '@/libs/analytics';
|
||||||
import { CONSTANTS, getLocalSetting, setLocalSetting } from '@/libs/userlocalManager';
|
import { CONSTANTS, getLocalSetting, setLocalSetting } from '@/libs/userlocalManager';
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.healer {
|
.healer {
|
||||||
color: $healer-color;
|
color: $healer-color;
|
||||||
}
|
}
|
||||||
@@ -82,7 +81,6 @@ export default {
|
|||||||
color: $maroon-50;
|
color: $maroon-50;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.label {
|
.label {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
line-height: 1.71;
|
line-height: 1.71;
|
||||||
|
|||||||
@@ -53,7 +53,6 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
||||||
<h2 v-once>
|
<h2 v-once>
|
||||||
{{ $t('character') }}
|
{{ $t('character') }}
|
||||||
</h2>
|
</h2>
|
||||||
|
|||||||
@@ -47,7 +47,6 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<gem-price
|
<gem-price
|
||||||
gem-price="3"
|
gem-price="3"
|
||||||
icon-size="24"
|
icon-size="24"
|
||||||
@@ -117,7 +116,6 @@ input {
|
|||||||
margin-top: 1.5rem;
|
margin-top: 1.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.label {
|
.label {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
line-height: 1.71;
|
line-height: 1.71;
|
||||||
@@ -155,6 +153,7 @@ input {
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
import changeClass from '@/../../common/script/ops/changeClass';
|
||||||
import { mapGetters, mapState } from '@/libs/store';
|
import { mapGetters, mapState } from '@/libs/store';
|
||||||
|
|
||||||
import SaveCancelButtons from '../components/saveCancelButtons.vue';
|
import SaveCancelButtons from '../components/saveCancelButtons.vue';
|
||||||
@@ -163,7 +162,6 @@ import { GenericUserPreferencesMixin } from '../components/genericUserPreference
|
|||||||
import YourBalance from '@/pages/settings/components/yourBalance.vue';
|
import YourBalance from '@/pages/settings/components/yourBalance.vue';
|
||||||
import GemPrice from '@/components/shops/gemPrice.vue';
|
import GemPrice from '@/components/shops/gemPrice.vue';
|
||||||
import checkIcon from '@/assets/svg/check.svg';
|
import checkIcon from '@/assets/svg/check.svg';
|
||||||
import changeClass from '@/../../common/script/ops/changeClass';
|
|
||||||
import ClassIconLabel from '@/pages/settings/components/classIconLabel.vue';
|
import ClassIconLabel from '@/pages/settings/components/classIconLabel.vue';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|||||||
@@ -114,7 +114,6 @@ import SaveCancelButtons from '../components/saveCancelButtons.vue';
|
|||||||
import CurrentPasswordInput from '../components/currentPasswordInput.vue';
|
import CurrentPasswordInput from '../components/currentPasswordInput.vue';
|
||||||
import { PasswordInputChecksMixin } from '@/mixins/passwordInputChecks';
|
import { PasswordInputChecksMixin } from '@/mixins/passwordInputChecks';
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: { CurrentPasswordInput, SaveCancelButtons },
|
components: { CurrentPasswordInput, SaveCancelButtons },
|
||||||
mixins: [InlineSettingMixin, PasswordInputChecksMixin],
|
mixins: [InlineSettingMixin, PasswordInputChecksMixin],
|
||||||
|
|||||||
@@ -46,7 +46,6 @@ import { InlineSettingMixin } from '../components/inlineSettingMixin';
|
|||||||
import ToggleSwitch from '@/components/ui/toggleSwitch.vue';
|
import ToggleSwitch from '@/components/ui/toggleSwitch.vue';
|
||||||
import { GenericUserPreferencesMixin } from '../components/genericUserPreferencesMixin';
|
import { GenericUserPreferencesMixin } from '../components/genericUserPreferencesMixin';
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: { ToggleSwitch },
|
components: { ToggleSwitch },
|
||||||
mixins: [InlineSettingMixin, GenericUserPreferencesMixin],
|
mixins: [InlineSettingMixin, GenericUserPreferencesMixin],
|
||||||
|
|||||||
@@ -106,7 +106,6 @@ import SaveCancelButtons from '../components/saveCancelButtons.vue';
|
|||||||
import CurrentPasswordInput from '../components/currentPasswordInput.vue';
|
import CurrentPasswordInput from '../components/currentPasswordInput.vue';
|
||||||
import { PasswordInputChecksMixin } from '@/mixins/passwordInputChecks';
|
import { PasswordInputChecksMixin } from '@/mixins/passwordInputChecks';
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: { CurrentPasswordInput, SaveCancelButtons },
|
components: { CurrentPasswordInput, SaveCancelButtons },
|
||||||
mixins: [InlineSettingMixin, PasswordInputChecksMixin],
|
mixins: [InlineSettingMixin, PasswordInputChecksMixin],
|
||||||
|
|||||||
@@ -35,7 +35,6 @@
|
|||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<li v-once>
|
<li v-once>
|
||||||
{{ $t('sleepBullet1') }}
|
{{ $t('sleepBullet1') }}
|
||||||
@@ -74,7 +73,6 @@ import { mapState } from '@/libs/store';
|
|||||||
import { InlineSettingMixin } from '../components/inlineSettingMixin';
|
import { InlineSettingMixin } from '../components/inlineSettingMixin';
|
||||||
import SaveCancelButtons from '../components/saveCancelButtons.vue';
|
import SaveCancelButtons from '../components/saveCancelButtons.vue';
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: { SaveCancelButtons },
|
components: { SaveCancelButtons },
|
||||||
mixins: [InlineSettingMixin],
|
mixins: [InlineSettingMixin],
|
||||||
|
|||||||
@@ -86,7 +86,6 @@
|
|||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
|
|
||||||
|
|
||||||
td {
|
td {
|
||||||
border: 0 !important;
|
border: 0 !important;
|
||||||
padding-bottom: 0 !important;
|
padding-bottom: 0 !important;
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ const QuestsPage = () => import(/* webpackChunkName: "shops-quest" */'@/componen
|
|||||||
const SeasonalPage = () => import(/* webpackChunkName: "shops-seasonal" */'@/components/shops/seasonal/index');
|
const SeasonalPage = () => import(/* webpackChunkName: "shops-seasonal" */'@/components/shops/seasonal/index');
|
||||||
const TimeTravelersPage = () => import(/* webpackChunkName: "shops-timetravelers" */'@/components/shops/timeTravelers/index');
|
const TimeTravelersPage = () => import(/* webpackChunkName: "shops-timetravelers" */'@/components/shops/timeTravelers/index');
|
||||||
|
|
||||||
|
|
||||||
Vue.use(VueRouter);
|
Vue.use(VueRouter);
|
||||||
|
|
||||||
const router = new VueRouter({
|
const router = new VueRouter({
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ const PrivacyPage = () => import(/* webpackChunkName: "static" */'@/components/s
|
|||||||
const ChatSunsetFaq = () => import(/* webpackChunkName: "static" */'@/components/static/chatSunsetFaq');
|
const ChatSunsetFaq = () => import(/* webpackChunkName: "static" */'@/components/static/chatSunsetFaq');
|
||||||
const TermsPage = () => import(/* webpackChunkName: "static" */'@/components/static/terms');
|
const TermsPage = () => import(/* webpackChunkName: "static" */'@/components/static/terms');
|
||||||
|
|
||||||
|
|
||||||
export const STATIC_ROUTES = {
|
export const STATIC_ROUTES = {
|
||||||
path: '/static',
|
path: '/static',
|
||||||
component: StaticWrapper,
|
component: StaticWrapper,
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import setProps from 'lodash/set';
|
import setProps from 'lodash/set';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { loadAsyncResource } from '@/libs/asyncResource';
|
|
||||||
|
|
||||||
import { togglePinnedItem as togglePinnedItemOp } from '@/../../common/script/ops/pinnedGearUtils';
|
import { togglePinnedItem as togglePinnedItemOp } from '@/../../common/script/ops/pinnedGearUtils';
|
||||||
import changeClassOp from '@/../../common/script/ops/changeClass';
|
import changeClassOp from '@/../../common/script/ops/changeClass';
|
||||||
import disableClassesOp from '@/../../common/script/ops/disableClasses';
|
import disableClassesOp from '@/../../common/script/ops/disableClasses';
|
||||||
import openMysteryItemOp from '@/../../common/script/ops/openMysteryItem';
|
import openMysteryItemOp from '@/../../common/script/ops/openMysteryItem';
|
||||||
|
import { loadAsyncResource } from '@/libs/asyncResource';
|
||||||
import { unEquipByType } from '../../../../common/script/ops/unequip';
|
import { unEquipByType } from '../../../../common/script/ops/unequip';
|
||||||
import markPMSRead from '../../../../common/script/ops/markPMSRead';
|
import markPMSRead from '../../../../common/script/ops/markPMSRead';
|
||||||
import updateStats from '../../../../common/script/fns/updateStats';
|
import updateStats from '../../../../common/script/fns/updateStats';
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import Store from '@/libs/store';
|
|
||||||
import deepFreeze from '@/libs/deepFreeze';
|
|
||||||
import content from '@/../../common/script/content/index';
|
import content from '@/../../common/script/content/index';
|
||||||
import * as commonConstants from '@/../../common/script/constants';
|
import * as commonConstants from '@/../../common/script/constants';
|
||||||
import { DAY_MAPPING } from '@/../../common/script/cron';
|
import { DAY_MAPPING } from '@/../../common/script/cron';
|
||||||
|
import deepFreeze from '@/libs/deepFreeze';
|
||||||
|
import Store from '@/libs/store';
|
||||||
import { asyncResourceFactory } from '@/libs/asyncResource';
|
import { asyncResourceFactory } from '@/libs/asyncResource';
|
||||||
import { setUpAxios } from '@/libs/auth';
|
import { setUpAxios } from '@/libs/auth';
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { shallowMount, createLocalVue } from '@vue/test-utils';
|
import { shallowMount, createLocalVue } from '@vue/test-utils';
|
||||||
|
import { toNextLevel } from '@/../../common/script/statHelpers';
|
||||||
import NotificationsComponent from '@/components/notifications.vue';
|
import NotificationsComponent from '@/components/notifications.vue';
|
||||||
import Store from '@/libs/store';
|
import Store from '@/libs/store';
|
||||||
import { hasClass } from '@/store/getters/members';
|
import { hasClass } from '@/store/getters/members';
|
||||||
import { toNextLevel } from '@/../../common/script/statHelpers';
|
|
||||||
|
|
||||||
const localVue = createLocalVue();
|
const localVue = createLocalVue();
|
||||||
localVue.use(Store);
|
localVue.use(Store);
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
import { sleep } from '@/../../../test/helpers/sleep';
|
||||||
import { asyncResourceFactory, loadAsyncResource } from '@/libs/asyncResource';
|
import { asyncResourceFactory, loadAsyncResource } from '@/libs/asyncResource';
|
||||||
import generateStore from '@/store';
|
import generateStore from '@/store';
|
||||||
import { sleep } from '@/../../../test/helpers/sleep';
|
|
||||||
|
|
||||||
describe('async resource', () => {
|
describe('async resource', () => {
|
||||||
it('asyncResourceFactory', () => {
|
it('asyncResourceFactory', () => {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
import i18n from '@/libs/i18n';
|
|
||||||
import commoni18n from '@/../../common/script/i18n';
|
import commoni18n from '@/../../common/script/i18n';
|
||||||
|
import i18n from '@/libs/i18n';
|
||||||
|
|
||||||
describe('i18n plugin', () => {
|
describe('i18n plugin', () => {
|
||||||
before(() => {
|
before(() => {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { createLocalVue } from '@vue/test-utils';
|
import { createLocalVue } from '@vue/test-utils';
|
||||||
import groupsUtilities from '@/mixins/groupsUtilities';
|
|
||||||
import { TAVERN_ID } from '@/../../common/script/constants';
|
import { TAVERN_ID } from '@/../../common/script/constants';
|
||||||
|
import groupsUtilities from '@/mixins/groupsUtilities';
|
||||||
import generateStore from '@/store';
|
import generateStore from '@/store';
|
||||||
import Store from '@/libs/store';
|
import Store from '@/libs/store';
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import generateStore from '@/store';
|
|
||||||
|
|
||||||
import content from '@/../../common/script/content';
|
import content from '@/../../common/script/content';
|
||||||
import getItemInfo from '@/../../common/script/libs/getItemInfo';
|
import getItemInfo from '@/../../common/script/libs/getItemInfo';
|
||||||
|
|
||||||
import getOfficialPinnedItems from '@/../../common/script/libs/getOfficialPinnedItems';
|
import getOfficialPinnedItems from '@/../../common/script/libs/getOfficialPinnedItems';
|
||||||
|
import generateStore from '@/store';
|
||||||
|
|
||||||
describe('shops actions', () => {
|
describe('shops actions', () => {
|
||||||
let store;
|
let store;
|
||||||
|
|||||||
@@ -37,5 +37,5 @@ if (CORES !== 0 && cluster.isMaster && (IS_DEV || IS_PROD)) {
|
|||||||
logger.info(`[${new Date()}] [master:${process.pid}] worker:${worker.process.pid} disconnect! new worker:${w.process.pid} fork`);
|
logger.info(`[${new Date()}] [master:${process.pid}] worker:${worker.process.pid} disconnect! new worker:${w.process.pid} fork`);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
module.exports = require('./server.js');
|
module.exports = require('./server');
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user