Merge pull request #46 from Savage-Aim/6.25

6.25
SavageAim · Oct 18, 2022 · a23fdd5 · a23fdd5
2 parents 7fd1aee + bb9b2a1
commit a23fdd5
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 21 deletions.
diff --git a/backend/api/management/commands/seed_data/gear.yml b/backend/api/management/commands/seed_data/gear.yml
@@ -1,3 +1,10 @@
+# 6.25
+- has_accessories: False
+  has_armour: False
+  has_weapon: True
+  item_level: 615
+  name: 'Manderville'
+
 # 6.2
 - has_accessories: True
   has_armour: True

diff --git a/backend/backend/settings_live.py b/backend/backend/settings_live.py
@@ -178,7 +178,7 @@ def sampler(context):
     # If you wish to associate users to errors (assuming you are using
     # django.contrib.auth) you may enable sending PII data.
     send_default_pii=True,
-    release='savageaim@20220823',
+    release='savageaim@20221018',
 )
 
 # Channels

diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -39,7 +39,7 @@ Jinja2==3.1.2
 kombu==5.2.3
 MarkupSafe==2.1.1
 msgpack==1.0.3
-oauthlib==3.1.1
+oauthlib==3.2.1
 packaging==21.3
 prompt-toolkit==3.0.24
 psycopg2-binary==2.9.3

diff --git a/frontend/.env b/frontend/.env
@@ -1 +1 @@
-VUE_APP_VERSION="20220823"
+VUE_APP_VERSION="20221018"
diff --git a/frontend/src/assets/gear_gradients/_index.scss b/frontend/src/assets/gear_gradients/_index.scss
@@ -1,6 +1,7 @@
 @import './ace.scss';
 @import './beta.scss';
 @import './blue.scss';
+@import './fflogs.scss';
 @import './green.scss';
 @import './lesbian.scss';
 @import './nb.scss';

diff --git a/frontend/src/assets/gear_gradients/fflogs.scss b/frontend/src/assets/gear_gradients/fflogs.scss
@@ -0,0 +1,38 @@
+$is-il-minus-25: #666666;
+$is-il-minus-20: #1eff00;
+$is-il-minus-15: #0070ff;
+$is-il-minus-10: #a335ee;
+$is-il-minus-5: #ff8000;
+$is-il-minus-0: #e268a8;
+$is-il-bis: #e5cc80;
+
+table.gear-table.is-fflogs {
+  .is-il-minus-25 {
+    background-color: $is-il-minus-25;
+    color: #fff;
+  }
+  .is-il-minus-20 {
+    background-color: $is-il-minus-20;
+    color: rgba(#000, 0.7);
+  }
+  .is-il-minus-15 {
+    background-color: $is-il-minus-15;
+    color: #fff;
+  }
+  .is-il-minus-10 {
+    background-color: $is-il-minus-10;
+    color: #fff;
+  }
+  .is-il-minus-5 {
+    background-color: $is-il-minus-5;
+    color: rgba(#000, 0.7);
+  }
+  .is-il-minus-0 {
+    background-color: $is-il-minus-0;
+    color: rgba(#000, 0.7);
+  }
+  .is-il-bis {
+    background-color: $is-il-bis;
+    color: rgba(#000, 0.7);
+  }
+}
diff --git a/frontend/src/components/modals/changelog.vue b/frontend/src/components/modals/changelog.vue
@@ -13,25 +13,11 @@
     <div class="card-content content">
       <h2 class="has-text-primary subtitle">{{ version }}</h2>
 
-      <div class="divider"><i class="material-icons icon">expand_more</i> FFXIV Patch 6.2 Content <i class="material-icons icon">expand_more</i></div>
-      <p>A new Tier, Pandæmonium: Abyssos, has been added. Please ensure to update your Team to the new Tier to have BIS Table colours display correctly!</p>
-      <p>
-        All the gear added with Patch 6.2 has been added to the site, please enjoy updating your BIS Lists for the new Tier!
-        <ul>
-          <li>Rinascita Weapon, Armour and Accessories (iL 610)</li>
-          <li>Purgatory Normal Mode Raid Armour and Accessories (iL 610)</li>
-          <li>
-            ????? Trial Weapon (iL 615)<br />
-            <span class="has-text-warning">(correct name used in database so be careful re: spoilers)</span>
-          </li>
-          <li>Lunar Envoy and Augmented Lunar Envoy Tome Weapon, Armour and Accessories (iL 620 / 630)</li>
-          <li>Abyssos Weapon, Armour and Accessories (iL 630 / 635)</li>
-        </ul>
-      </p>
-      <p>The default values for the Item Level filters in BIS pages have been updated to the new range for Abyssos. (610 - 635)</p>
+      <div class="divider"><i class="material-icons icon">expand_more</i> FFXIV Patch 6.25 Content <i class="material-icons icon">expand_more</i></div>
+      <p>Added the Item Level 615 Relic Stage 1 - Manderville Weapons</p>
 
       <div class="divider"><i class="material-icons icon">expand_more</i> Minor Changes <i class="material-icons icon">expand_more</i></div>
-      <p>Fixed issue where Permission tags rendered outside their container on smaller desktop screens.</p>
+      <p>Added an FFLogs style colour scheme.</p>
 
     </div>
   </div>

diff --git a/frontend/src/main.ts b/frontend/src/main.ts
@@ -27,7 +27,7 @@ Sentry.init({
   Vue,
   dsn: 'https://[email protected]/6180221',
   logErrors: true,
-  release: 'savageaim@20220823',
+  release: 'savageaim@20221018',
 })
 
 new Vue({

diff --git a/frontend/src/views/settings.vue b/frontend/src/views/settings.vue
@@ -18,6 +18,7 @@
                   <select v-model="theme" ref="dropdown">
                     <option value="beta">Beta</option>
                     <option value="blue">Blue</option>
+                    <option value="fflogs">FFLogs</option>
                     <option value="green">Green</option>
                     <option value="purple">Purple</option>
                     <option value="red">Red</option>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		VUE_APP_VERSION="20220823"
		VUE_APP_VERSION="20221018"