krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(build): do not lint when testing on github

Browse Source
This commit is contained in:
Matteo Pagliazzi
2019-10-22 20:38:01 +02:00
parent 3031caffe8
commit 9afcf8d5eb
5 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View File

@@ -22,7 +22,7 @@ jobs:
npm ci npm ci
env: env:
CI: true CI: true
- run: npm run lint - run: npm run lint-no-fix
apidoc: apidoc:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:

1
package.json
View File

@@ -73,6 +73,7 @@
}, },
"scripts": { "scripts": {
"lint": "eslint --ext .js --fix . && cd website/client && npm run lint", "lint": "eslint --ext .js --fix . && cd website/client && npm run lint",
"lint-no-fix": "eslint --ext .js . && cd website/client && npm run lint --no-fix",
"test": "npm run lint && gulp test && gulp apidoc", "test": "npm run lint && gulp test && gulp apidoc",
"test:build": "gulp test:prepare:build", "test:build": "gulp test:prepare:build",
"test:api-v3": "gulp test:api-v3", "test:api-v3": "gulp test:api-v3",

4
website/client/src/components/notifications.vue
View File

@@ -214,12 +214,12 @@ const NOTIFICATIONS = {
}, },
ACHIEVEMENT_MONSTER_MAGUS: { ACHIEVEMENT_MONSTER_MAGUS: {
achievement: true, achievement: true,
label: ($t) => `${$t('achievement')}: ${$t('achievementMonsterMagus')}`, label: $t => `${$t('achievement')}: ${$t('achievementMonsterMagus')}`,
modalId: 'generic-achievement', modalId: 'generic-achievement',
}, },
ACHIEVEMENT_UNDEAD_UNDERTAKER: { ACHIEVEMENT_UNDEAD_UNDERTAKER: {
achievement: true, achievement: true,
label: ($t) => `${$t('achievement')}: ${$t('achievementUndeadUndertaker')}`, label: $t => `${$t('achievement')}: ${$t('achievementUndeadUndertaker')}`,
modalId: 'generic-achievement', modalId: 'generic-achievement',
}, },
}; };

4
website/common/script/content/constants.js
View File

@@ -268,9 +268,9 @@ export const ANIMAL_COLOR_ACHIEVEMENTS = [
color: 'Base', petAchievement: 'backToBasics', petNotificationType: 'ACHIEVEMENT_BACK_TO_BASICS', mountAchievement: 'allYourBase', mountNotificationType: 'ACHIEVEMENT_ALL_YOUR_BASE', color: 'Base', petAchievement: 'backToBasics', petNotificationType: 'ACHIEVEMENT_BACK_TO_BASICS', mountAchievement: 'allYourBase', mountNotificationType: 'ACHIEVEMENT_ALL_YOUR_BASE',
}, },
{ {
color: 'Desert', petAchievement: 'dustDevil', petNotificationType: 'ACHIEVEMENT_DUST_DEVIL', mountAchievement: 'aridAuthority', mountNotificationType: 'ACHIEVEMENT_ARID_AUTHORITY' color: 'Desert', petAchievement: 'dustDevil', petNotificationType: 'ACHIEVEMENT_DUST_DEVIL', mountAchievement: 'aridAuthority', mountNotificationType: 'ACHIEVEMENT_ARID_AUTHORITY',
}, },
{ {
color: 'Zombie', petAchievement: 'monsterMagus', petNotificationType: 'ACHIEVEMENT_MONSTER_MAGUS', mountAchievement: 'undeadUndertaker', mountNotificationType: 'ACHIEVEMENT_UNDEAD_UNDERTAKER' color: 'Zombie', petAchievement: 'monsterMagus', petNotificationType: 'ACHIEVEMENT_MONSTER_MAGUS', mountAchievement: 'undeadUndertaker', mountNotificationType: 'ACHIEVEMENT_UNDEAD_UNDERTAKER',
}, },
]; ];

50
website/common/script/libs/achievements.js
View File

@@ -177,35 +177,35 @@ function _addUltimateGear (result, user, data) {
function _getBasicAchievements (user, language) { function _getBasicAchievements (user, language) {
const result = {}; const result = {};
_addPlural(result, user, {path: 'streak', language}); _addPlural(result, user, { path: 'streak', language });
_addPlural(result, user, {path: 'perfect', language}); _addPlural(result, user, { path: 'perfect', language });
_addSimple(result, user, {path: 'partyUp', language}); _addSimple(result, user, { path: 'partyUp', language });
_addSimple(result, user, {path: 'partyOn', language}); _addSimple(result, user, { path: 'partyOn', language });
_addSimple(result, user, {path: 'joinedGuild', language}); _addSimple(result, user, { path: 'joinedGuild', language });
_addSimple(result, user, {path: 'royallyLoyal', language}); _addSimple(result, user, { path: 'royallyLoyal', language });
_addSimple(result, user, {path: 'joinedChallenge', language}); _addSimple(result, user, { path: 'joinedChallenge', language });
_addSimple(result, user, {path: 'invitedFriend', language}); _addSimple(result, user, { path: 'invitedFriend', language });
_addSimple(result, user, {path: 'lostMasterclasser', language}); _addSimple(result, user, { path: 'lostMasterclasser', language });
_addSimple(result, user, {path: 'mindOverMatter', language}); _addSimple(result, user, { path: 'mindOverMatter', language });
_addSimple(result, user, {path: 'justAddWater', language}); _addSimple(result, user, { path: 'justAddWater', language });
_addSimple(result, user, {path: 'backToBasics', language}); _addSimple(result, user, { path: 'backToBasics', language });
_addSimple(result, user, {path: 'allYourBase', language}); _addSimple(result, user, { path: 'allYourBase', language });
_addSimple(result, user, {path: 'dustDevil', language}); _addSimple(result, user, { path: 'dustDevil', language });
_addSimple(result, user, {path: 'aridAuthority', language}); _addSimple(result, user, { path: 'aridAuthority', language });
_addSimple(result, user, {path: 'monsterMagus', language}); _addSimple(result, user, { path: 'monsterMagus', language });
_addSimple(result, user, {path: 'undeadUndertaker', language}); _addSimple(result, user, { path: 'undeadUndertaker', language });
_addSimpleWithMasterCount(result, user, {path: 'beastMaster', language}); _addSimpleWithMasterCount(result, user, { path: 'beastMaster', language });
_addSimpleWithMasterCount(result, user, {path: 'mountMaster', language}); _addSimpleWithMasterCount(result, user, { path: 'mountMaster', language });
_addSimpleWithMasterCount(result, user, {path: 'triadBingo', language}); _addSimpleWithMasterCount(result, user, { path: 'triadBingo', language });
_addUltimateGear(result, user, {path: 'healer', language}); _addUltimateGear(result, user, { path: 'healer', language });
_addUltimateGear(result, user, {path: 'rogue', language}); _addUltimateGear(result, user, { path: 'rogue', language });
_addUltimateGear(result, user, {path: 'warrior', language}); _addUltimateGear(result, user, { path: 'warrior', language });
_addUltimateGear(result, user, {path: 'mage', altPath: 'wizard', language}); _addUltimateGear(result, user, { path: 'mage', altPath: 'wizard', language });
let cardAchievements = ['greeting', 'thankyou', 'birthday', 'congrats', 'getwell', 'goodluck']; const cardAchievements = ['greeting', 'thankyou', 'birthday', 'congrats', 'getwell', 'goodluck'];
cardAchievements.forEach(path => { cardAchievements.forEach(path => {
_addSimpleWithCount(result, user, { path, key: `${path}Cards`, language }); _addSimpleWithCount(result, user, { path, key: `${path}Cards`, language });
}); });