From a0e5a56bf226f32d5ab7ac1510fe43ca84505bcf Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Sun, 13 Oct 2019 18:04:04 +0200 Subject: [PATCH] finish linting client --- package.json | 2 +- website/client/package-lock.json | 139 ++++++++++++++++++ website/client/package.json | 4 +- .../achievements/achievementFooter.vue | 3 +- .../components/achievements/chooseClass.vue | 7 +- .../src/components/achievements/levelUp.vue | 3 +- .../achievements/login-incentives.vue | 11 +- .../achievements/questInvitation.vue | 2 +- .../src/components/achievements/rebirth.vue | 4 +- .../components/achievements/ultimateGear.vue | 5 +- .../client/src/components/auth/authForm.vue | 8 +- .../components/auth/registerLoginReset.vue | 9 +- .../avatarModal/customize-options.vue | 7 +- .../components/avatarModal/hair-settings.vue | 7 + .../components/avatarModal/skin-settings.vue | 3 + .../components/categories/categoryTags.vue | 1 + .../components/challenges/challengeDetail.vue | 9 +- .../components/challenges/challengeItem.vue | 4 +- .../components/challenges/challengeModal.vue | 4 + .../components/challenges/findChallenges.vue | 7 +- .../components/challenges/myChallenges.vue | 7 +- .../src/components/chat/autoComplete.vue | 7 +- .../client/src/components/chat/chatCard.vue | 8 +- .../src/components/chat/chatMessages.vue | 11 +- .../src/components/group-plans/billing.vue | 5 +- .../src/components/groups/discovery.vue | 8 +- .../client/src/components/groups/group.vue | 23 ++- .../src/components/groups/groupFormModal.vue | 25 ++-- .../src/components/groups/groupPlan.vue | 6 +- .../src/components/groups/inviteModal.vue | 4 +- .../src/components/groups/membersModal.vue | 6 +- .../client/src/components/groups/myGuilds.vue | 9 +- .../groups/participantListModal.vue | 1 + .../src/components/groups/publicGuildItem.vue | 4 +- .../components/groups/questDetailsModal.vue | 6 +- .../components/groups/questSidebarSection.vue | 19 ++- .../src/components/groups/startQuestModal.vue | 5 +- .../client/src/components/groups/tavern.vue | 29 +++- website/client/src/components/hall/heroes.vue | 13 +- .../client/src/components/hall/patrons.vue | 5 +- .../client/src/components/header/index.vue | 2 + website/client/src/components/header/menu.vue | 28 +++- .../src/components/header/messageCount.vue | 9 +- .../notifications/challengeInvitation.vue | 4 +- .../notifications/groupTaskApproval.vue | 2 +- .../header/notifications/guildInvitation.vue | 2 +- .../header/notifications/partyInvitation.vue | 2 +- .../header/notifications/worldBoss.vue | 10 +- .../header/notificationsDropdown.vue | 6 +- .../src/components/header/userDropdown.vue | 5 +- .../components/inventory/equipment/index.vue | 13 +- .../src/components/inventory/items/index.vue | 5 +- .../inventory/stable/hatchingModal.vue | 4 +- .../src/components/inventory/stable/index.vue | 25 ++-- .../src/components/payments/amazonButton.vue | 2 +- .../src/components/payments/buyGemsModal.vue | 26 ++-- .../src/components/payments/sendGemsModal.vue | 3 + .../src/components/payments/successModal.vue | 18 ++- .../client/src/components/settings/api.vue | 5 +- .../src/components/settings/notifications.vue | 5 +- .../src/components/settings/restoreModal.vue | 3 +- .../client/src/components/settings/site.vue | 15 +- .../src/components/settings/subscription.vue | 10 +- .../src/components/settings/usernameForm.vue | 10 +- .../src/components/shared/inventoryDrawer.vue | 4 - .../src/components/shops/_currencyMixin.js | 4 +- .../client/src/components/shops/buyModal.vue | 39 ++--- .../src/components/shops/market/index.vue | 15 +- .../components/shops/quests/buyQuestModal.vue | 7 +- .../src/components/shops/quests/index.vue | 21 ++- .../shops/quests/questDialogDrops.vue | 2 + .../src/components/shops/quests/questInfo.vue | 6 +- .../src/components/shops/seasonal/index.vue | 19 ++- .../components/shops/timeTravelers/index.vue | 25 ++-- .../components/static/communityGuidelines.vue | 13 +- .../client/src/components/static/contact.vue | 2 +- .../src/components/static/groupPlans.vue | 2 - website/client/src/components/static/home.vue | 6 +- .../client/src/components/static/merch.vue | 6 +- .../client/src/components/static/overview.vue | 10 +- .../client/src/components/static/pressKit.vue | 25 +++- .../client/src/components/static/privacy.vue | 2 + .../src/components/static/staticWrapper.vue | 5 +- .../client/src/components/static/terms.vue | 2 + .../src/components/tasks/approvalFooter.vue | 2 +- .../src/components/tasks/approvalModal.vue | 1 + .../src/components/tasks/brokenTaskModal.vue | 6 +- .../client/src/components/tasks/column.vue | 16 +- .../client/src/components/tasks/spells.vue | 3 + .../client/src/components/tasks/tagsPopup.vue | 5 +- website/client/src/components/tasks/task.vue | 38 +++-- .../client/src/components/tasks/taskModal.vue | 23 ++- website/client/src/components/tasks/user.vue | 10 +- .../src/components/ui/drawerHeaderTabs.vue | 1 + .../client/src/components/ui/drawerSlider.vue | 5 +- .../src/components/userMenu/achievements.vue | 14 +- .../client/src/components/userMenu/inbox.vue | 26 ++-- .../src/components/userMenu/profile.vue | 31 ++-- .../src/components/userMenu/profileModal.vue | 2 +- .../src/components/userMenu/profileStats.vue | 20 ++- .../client/src/components/userMenu/stats.vue | 21 ++- .../world-boss/worldBossInfoModal.vue | 1 + website/client/src/libs/i18n.js | 2 +- website/client/vue.config.js | 12 +- website/server/libs/setupNconf.js | 12 +- 105 files changed, 804 insertions(+), 316 deletions(-) diff --git a/package.json b/package.json index a5f4e42ffd..b03174886c 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "npm": "^6" }, "scripts": { - "lint": "eslint --ext .js --fix ./website/server", + "lint": "eslint --ext .js --fix .", "test": "npm run lint && gulp test && gulp apidoc", "test:build": "gulp test:prepare:build", "test:api-v3": "gulp test:api-v3", diff --git a/website/client/package-lock.json b/website/client/package-lock.json index 8c36980e3a..224b05b199 100644 --- a/website/client/package-lock.json +++ b/website/client/package-lock.json @@ -6253,6 +6253,12 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true + }, "inquirer": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", @@ -7868,6 +7874,127 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "nconf": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/nconf/-/nconf-0.10.0.tgz", + "integrity": "sha512-fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q==", + "dev": true, + "requires": { + "async": "^1.4.0", + "ini": "^1.3.0", + "secure-keys": "^1.0.0", + "yargs": "^3.19.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", + "dev": true + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "dev": true, + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" + } + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "dev": true, + "requires": { + "invert-kv": "^1.0.0" + } + }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "dev": true, + "requires": { + "lcid": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "dev": true, + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + } + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "dev": true + }, + "yargs": { + "version": "3.32.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", + "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", + "dev": true, + "requires": { + "camelcase": "^2.0.1", + "cliui": "^3.0.3", + "decamelize": "^1.1.1", + "os-locale": "^1.4.0", + "string-width": "^1.0.1", + "window-size": "^0.1.4", + "y18n": "^3.2.0" + } + } + } + }, "negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", @@ -9857,6 +9984,12 @@ "ajv-keywords": "^3.1.0" } }, + "secure-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/secure-keys/-/secure-keys-1.0.0.tgz", + "integrity": "sha1-8MgtmKOxOah3aogIBQuCRDEIf8o=", + "dev": true + }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -12050,6 +12183,12 @@ "string-width": "^1.0.2 || 2" } }, + "window-size": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", + "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=", + "dev": true + }, "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", diff --git a/website/client/package.json b/website/client/package.json index 24f2353c0c..86e1537f45 100644 --- a/website/client/package.json +++ b/website/client/package.json @@ -6,7 +6,7 @@ "serve": "vue-cli-service serve", "build": "vue-cli-service build", "test:unit": "vue-cli-service test:unit --opts ../../test/mocha.opts", - "lint": "vue-cli-service lint" + "lint": "vue-cli-service lint --quiet" }, "dependencies": { "amplitude-js": "^5.3.1", @@ -42,7 +42,7 @@ "eslint": "^5.16.0", "eslint-plugin-vue": "^5.0.0", "inspectpack": "^4.2.2", - "pug": "^2.0.4", + "nconf": "^0.10.0", "sass": "^1.19.0", "sass-loader": "^8.0.0", "svg-inline-loader": "^0.8.0", diff --git a/website/client/src/components/achievements/achievementFooter.vue b/website/client/src/components/achievements/achievementFooter.vue index 85d8056b06..bf4a3a2580 100644 --- a/website/client/src/components/achievements/achievementFooter.vue +++ b/website/client/src/components/achievements/achievementFooter.vue @@ -29,7 +29,8 @@ > {{ $t('share') }} - + diff --git a/website/client/src/components/achievements/chooseClass.vue b/website/client/src/components/achievements/chooseClass.vue index 6746d9cc86..51edd54f34 100644 --- a/website/client/src/components/achievements/chooseClass.vue +++ b/website/client/src/components/achievements/chooseClass.vue @@ -16,6 +16,7 @@
@@ -36,6 +37,7 @@
-
+
- +
diff --git a/website/client/src/components/achievements/login-incentives.vue b/website/client/src/components/achievements/login-incentives.vue index 55abe71903..89bfa7da60 100644 --- a/website/client/src/components/achievements/login-incentives.vue +++ b/website/client/src/components/achievements/login-incentives.vue @@ -35,12 +35,15 @@ v-if="nextReward.rewardKey.length === 1" :class="nextReward.rewardKey[0]" >
+
+
+
+
-

{{ $t('nextRewardUnlocksIn', {numberOfCheckinsLeft: data.nextRewardAt - user.loginIncentives}) }}

+

+ {{ $t('nextRewardUnlocksIn', { + numberOfCheckinsLeft: data.nextRewardAt - user.loginIncentives}) }} +

diff --git a/website/client/src/components/achievements/questInvitation.vue b/website/client/src/components/achievements/questInvitation.vue index 20185d2a6a..b48f62a071 100644 --- a/website/client/src/components/achievements/questInvitation.vue +++ b/website/client/src/components/achievements/questInvitation.vue @@ -29,7 +29,7 @@

{{ $t('collect') }} + ': ' - {{ quests[user.party.quest.key].collect[k].count }} {{ quests[user.party.quest.key].collect[k].text() }} + {{ quests[user.party.quest.key].collect[k].count }} {{ quests[user.party.quest.key].collect[k].text() }}

diff --git a/website/client/src/components/achievements/rebirth.vue b/website/client/src/components/achievements/rebirth.vue index b68f9be475..174b5cd4c3 100644 --- a/website/client/src/components/achievements/rebirth.vue +++ b/website/client/src/components/achievements/rebirth.vue @@ -10,7 +10,9 @@
- {{ $t('rebirthAchievement', {number: user.achievements.rebirths, level: user.achievements.rebirthLevel}) }} + {{ $t('rebirthAchievement', { + number: user.achievements.rebirths, + level: user.achievements.rebirthLevel}) }}
{{ $t('rebirthAchievement100', {number: user.achievements.rebirths}) }}

@@ -22,7 +24,9 @@ class="svg-icon social-icon" v-html="icons.googleIcon" >
- {{ registering ? $t('signUpWithSocial', {social: 'Google'}) : $t('loginWithSocial', {social: 'Google'}) }} + {{ registering + ? $t('signUpWithSocial', {social: 'Google'}) + : $t('loginWithSocial', {social: 'Google'}) }} diff --git a/website/client/src/components/auth/registerLoginReset.vue b/website/client/src/components/auth/registerLoginReset.vue index 09ae91752b..e76d1a902d 100644 --- a/website/client/src/components/auth/registerLoginReset.vue +++ b/website/client/src/components/auth/registerLoginReset.vue @@ -33,7 +33,9 @@
- {{ registering ? $t('signUpWithSocial', {social: 'Facebook'}) : $t('loginWithSocial', {social: 'Facebook'}) }} + {{ registering + ? $t('signUpWithSocial', {social: 'Facebook'}) + : $t('loginWithSocial', {social: 'Facebook'}) }}
@@ -49,7 +51,9 @@
- {{ registering ? $t('signUpWithSocial', {social: 'Google'}) : $t('loginWithSocial', {social: 'Google'}) }} + {{ registering + ? $t('signUpWithSocial', {social: 'Google'}) + : $t('loginWithSocial', {social: 'Google'}) }}
@@ -72,6 +76,7 @@ >
{{ issue }} diff --git a/website/client/src/components/avatarModal/customize-options.vue b/website/client/src/components/avatarModal/customize-options.vue index 86a6263298..6cb26f574d 100644 --- a/website/client/src/components/avatarModal/customize-options.vue +++ b/website/client/src/components/avatarModal/customize-options.vue @@ -7,7 +7,12 @@ v-for="option in items" :key="option.key" class="outer-option-background" - :class="{locked: option.gemLocked || option.goldLocked, premium: Boolean(option.gem), active: option.active || currentValue === option.key, none: option.none, hide: option.hide }" + :class="{ + locked: option.gemLocked || option.goldLocked, + premium: Boolean(option.gem), + active: option.active || currentValue === option.key, + none: option.none, + hide: option.hide }" @click="option.click(option)" >
diff --git a/website/client/src/components/avatarModal/hair-settings.vue b/website/client/src/components/avatarModal/hair-settings.vue index 9ff721946c..2342aa1afc 100644 --- a/website/client/src/components/avatarModal/hair-settings.vue +++ b/website/client/src/components/avatarModal/hair-settings.vue @@ -17,10 +17,13 @@ :items="freeHairColors" :current-value="user.preferences.hair.color" /> +
+ +
+
+ +
diff --git a/website/client/src/components/avatarModal/skin-settings.vue b/website/client/src/components/avatarModal/skin-settings.vue index be2a1f2386..f946359a2a 100644 --- a/website/client/src/components/avatarModal/skin-settings.vue +++ b/website/client/src/components/avatarModal/skin-settings.vue @@ -13,10 +13,13 @@ :items="freeSkins" :current-value="user.preferences.skin" /> +
+ {{ $t('joined') }} {{ $t(category.name) }} diff --git a/website/client/src/components/challenges/challengeDetail.vue b/website/client/src/components/challenges/challengeDetail.vue index 7a2be62060..4467e1b322 100644 --- a/website/client/src/components/challenges/challengeDetail.vue +++ b/website/client/src/components/challenges/challengeDetail.vue @@ -30,8 +30,10 @@ :group="challenge.group" /> - - + @@ -39,6 +41,7 @@
{{ tag }}
@@ -112,6 +115,7 @@
+ +