Merge branch 'negue/refactor/routes' into negue/ui/setting

# Conflicts:
#	config.json.example
#	website/client/src/router/index.js
#	website/client/src/router/static-routes.js
#	website/client/src/router/user-routes.js
#	website/common/locales/en/settings.json

website/common/script/content/gear/sets/mystery.js

@@ -129,6 +129,7 @@ const eyewear = {
   '202204B': { mystery: '202204' },
   202208: { },
   202303: { },
+  202308: { },
   301404: { },
   301405: { },
   301703: { },
@@ -208,6 +209,7 @@ const head = {
   202301: { },
   202303: { },
   202304: { },
+  202308: { },
   301404: { },
   301405: { },
   301703: { },

website/common/script/content/gear/sets/special/index.js

@@ -27,6 +27,7 @@ const armor = {
   1: contributorGear.armorSpecial1,
   2: backerGear.armorSpecial2,
   takeThis: takeThisGear.armorSpecialTakeThis,
+  heroicTunic: contributorGear.armorSpecialHeroicTunic,
   finnedOceanicArmor: {
     text: t('armorSpecialFinnedOceanicArmorText'),
     notes: t('armorSpecialFinnedOceanicArmorNotes', { str: 15 }),
@@ -868,6 +869,7 @@ const back = {
   wondercon_red: wonderconGear.backSpecialWonderconRed, // eslint-disable-line camelcase
   wondercon_black: wonderconGear.backSpecialWonderconBlack, // eslint-disable-line camelcase
   takeThis: takeThisGear.backSpecialTakeThis,
+  heroicAureole: contributorGear.backSpecialHeroicAureole,
   snowdriftVeil: {
     text: t('backSpecialSnowdriftVeilText'),
     notes: t('backSpecialSnowdriftVeilNotes'),
@@ -2055,6 +2057,7 @@ Object.keys(gearEvents).forEach(event => {
 });
 
 const headAccessory = {
+  heroicCirclet: contributorGear.headAccessorySpecialHeroicCirclet,
   springRogue: {
     specialClass: 'rogue',
     set: 'stealthyKittySet',

website/common/script/content/gear/sets/special/special-contributor.js

@@ -66,10 +66,46 @@ const weaponSpecialCritical = {
   },
 };
 
+const armorSpecialHeroicTunic = {
+  text: t('armorSpecialHeroicTunicText'),
+  notes: t('armorSpecialHeroicTunicNotes', { attrs: 7 }),
+  con: 7,
+  str: 7,
+  per: 7,
+  int: 7,
+  value: 175,
+  canOwn: ownsItem('armor_special_heroicTunic'),
+};
+
+const backSpecialHeroicAureole = {
+  text: t('backSpecialHeroicAureoleText'),
+  notes: t('backSpecialHeroicAureoleNotes', { attrs: 7 }),
+  con: 7,
+  str: 7,
+  per: 7,
+  int: 7,
+  value: 175,
+  canOwn: ownsItem('armor_special_heroicAureole'),
+};
+
+const headAccessorySpecialHeroicCirclet = {
+  text: t('headAccessorySpecialHeroicCircletText'),
+  notes: t('headAccessorySpecialHeroicCircletNotes', { attrs: 7 }),
+  con: 7,
+  str: 7,
+  per: 7,
+  int: 7,
+  value: 175,
+  canOwn: ownsItem('headAccessory_special_heroicCirclet'),
+};
+
 export {
   armorSpecial1,
   headSpecial1,
   shieldSpecial1,
   weaponSpecial1,
   weaponSpecialCritical,
+  armorSpecialHeroicTunic,
+  backSpecialHeroicAureole,
+  headAccessorySpecialHeroicCirclet,
 };

website/common/script/content/stable.js

@@ -92,6 +92,7 @@ const canFindSpecial = {
     'Lion-Veteran': false,
     'Bear-Veteran': false,
     'Fox-Veteran': false,
+    'Dragon-Veteran': false,
 
     // Thanksgiving pet ladder
     'Turkey-Base': false,
@@ -181,6 +182,7 @@ const specialPets = {
   'Gryphon-Gryphatrice': 'gryphatrice',
   'Gryphatrice-Jubilant': 'jubilantGryphatrice',
   'JackOLantern-RoyalPurple': 'royalPurpleJackolantern',
+  'Dragon-Veteran': 'veteranDragon',
 };
 
 const specialMounts = {

website/common/script/libs/achievements.js

@@ -182,7 +182,6 @@ function _getBasicAchievements (user, language) {
 
   _addSimple(result, user, { path: 'partyUp', language });
   _addSimple(result, user, { path: 'partyOn', language });
-  _addSimple(result, user, { path: 'joinedGuild', language });
   _addSimple(result, user, { path: 'royallyLoyal', language });
   _addSimple(result, user, { path: 'joinedChallenge', language });
   _addSimple(result, user, { path: 'invitedFriend', language });
@@ -353,6 +352,10 @@ function _getSpecialAchievements (user, language) {
     _addSimple(result, user, { path: 'groupsBeta2022', language });
   }
 
+  if (user.achievements.joinedGuild) {
+    _addSimple(result, user, { path: 'joinedGuild', language });
+  }
+
   return result;
 }