Merge remote-tracking branch 'origin/develop' into negue/ui/setting

# Conflicts:
#	website/client/src/components/settings/site.vue

website/common/script/content/constants/events.js

@@ -10,11 +10,22 @@ const gemsPromo = {
 
 export const EVENTS = {
   noEvent: {
-    start: '2023-05-31T23:59-04:00',
-    end: '2023-06-22T08:00-04:00',
+    start: '2023-08-01T23:59-04:00',
+    end: '2023-08-31T08:00-04:00',
     season: 'normal',
     npcImageSuffix: '',
   },
+  summer2023: {
+    start: '2023-06-20T08:00-04:00',
+    end: '2023-07-31T23:59-04:00',
+    npcImageSuffix: '_summer',
+    season: 'summer',
+    gear: true,
+  },
+  bundle202306: {
+    start:'2023-06-13T08:00-04:00',
+    end:'2023-06-30T23:59-04:00',
+  },
   bundle202305: {
     start:'2023-05-23T08:00-04:00',
     end:'2023-05-31T23:59-04:00',

website/common/script/content/constants/seasonalSets.js

@@ -156,6 +156,11 @@ const SEASONAL_SETS = {
     'summer2022WaterspoutWarriorSet',
     'summer2022MantaRayMageSet',
     'summer2022AngelfishHealerSet',
+
+    'summer2023GoldfishWarriorSet',
+    'summer2023CoralMageSet',
+    'summer2023GuppyRogueSet',
+    'summer2023KelpHealerSet',
   ],
   fall: [
     // fall 2014