Merge pull request #5 from Savage-Aim/discord

- Added Discord URL to site
- Added Sentry to frontend
- Added new traffic lights colour scheme

backend/api/serializers/settings.py

@@ -20,6 +20,7 @@
     'green',
     'purple',
     'red',
+    'traffic',
     'trans',
 }
 

backend/backend/settings_live.py

@@ -137,11 +137,7 @@
 sentry_sdk.init(
     dsn=environ['SENTRY_DSN'],
     integrations=[DjangoIntegration()],
-
-    # Set traces_sample_rate to 1.0 to capture 100%
-    # of transactions for performance monitoring.
-    # We recommend adjusting this value in production.
-    traces_sample_rate=1.0,
+    traces_sample_rate=0,
 
     # If you wish to associate users to errors (assuming you are using
     # django.contrib.auth) you may enable sending PII data.

frontend/.env

@@ -1 +1 @@
-VUE_APP_VERSION="0.2.0"
+VUE_APP_VERSION="0.2.1"

frontend/package.json

@@ -9,6 +9,8 @@
   },
   "dependencies": {
     "@creativebulma/bulma-badge": "^1.0.1",
+    "@sentry/tracing": "^6.17.3",
+    "@sentry/vue": "^6.17.3",
     "@xivapi/js": "^0.3.3",
     "bulma": "^0.9.3",
     "dayjs": "^1.10.7",

frontend/src/assets/gear_gradients/_index.scss

@@ -3,4 +3,5 @@
 @import './green.scss';
 @import './purple.scss';
 @import './red.scss';
+@import './traffic.scss';
 @import './trans.scss';

frontend/src/assets/gear_gradients/beta.scss

@@ -13,7 +13,7 @@ table.gear-table.is-beta {
   }
   .is-il-minus-20 {
     background-color: $is-il-minus-20;
-    color: #fff;
+    color: rgba(#000, 0.7);
   }
   .is-il-minus-15 {
     background-color: $is-il-minus-15;

frontend/src/assets/gear_gradients/traffic.scss

@@ -0,0 +1,38 @@
+$is-il-minus-25: #7c0000;
+$is-il-minus-20: #7c0000;
+$is-il-minus-15: #E69F00;
+$is-il-minus-10: #7c0000;
+$is-il-minus-5: #7c0000;
+$is-il-minus-0: #7c0000;
+$is-il-bis: #163832;
+
+table.gear-table.is-traffic {
+  .is-il-minus-25 {
+    background-color: $is-il-minus-25;
+    color: #fff;
+  }
+  .is-il-minus-20 {
+    background-color: $is-il-minus-20;
+    color: #fff;
+  }
+  .is-il-minus-15 {
+    background-color: $is-il-minus-15;
+    color: rgba(#000, 0.7);
+  }
+  .is-il-minus-10 {
+    background-color: $is-il-minus-10;
+    color: #fff;
+  }
+  .is-il-minus-5 {
+    background-color: $is-il-minus-5;
+    color: #fff;
+  }
+  .is-il-minus-0 {
+    background-color: $is-il-minus-0;
+    color: #fff;
+  }
+  .is-il-bis {
+    background-color: $is-il-bis;
+    color: #fff;
+  }
+}

frontend/src/components/bis_list_form.vue

@@ -33,14 +33,15 @@
 
           <div class="field is-horizontal">
             <div class="field-label is-normal">
-              <label class="label">URL</label>
+              <label class="label">Extra URL</label>
             </div>
             <div class="field-body">
               <div class="field">
                 <div class="control">
-                  <input class="input" :class="{'is-danger': errors.external_link !== undefined}" v-model="bisList.external_link" />
+                  <input class="input" :class="{'is-danger': errors.external_link !== undefined}" v-model="bisList.external_link" placeholder="i.e. Etro, Ariyala, etc" />
                 </div>
                 <p v-if="errors.external_link !== undefined" class="help is-danger">{{ errors.external_link[0] }}</p>
+                <p class="help is-info" v-else>This is just a link to any page you deem would be handy to have attached to the list!</p>
               </div>
             </div>
           </div>

frontend/src/components/footer.vue

@@ -2,7 +2,8 @@
   <footer id="footer" class="content has-text-centered">
     <a href="https://wiki.savageaim.com" target="_blank" data-microtip-position="top" role="tooltip" aria-label="Wiki"><span class="icon is-large"><i class="material-icons">menu_book</i></span></a>
     <a href="#changelog" data-microtip-position="top" role="tooltip" aria-label="Changelog" @click="showChangelog"><span class="icon is-large"><i class="material-icons">update</i></span></a>
-    <a href="https://github.com/Savage-Aim/app" target="_blank" data-microtip-position="top" role="tooltip" aria-label="Github Repo" @click="showChangelog"><span class="icon is-large"><i class="material-icons">code</i></span></a>
+    <a href="https://github.com/Savage-Aim/app" target="_blank" data-microtip-position="top" role="tooltip" aria-label="Github Repo"><span class="icon is-large"><i class="material-icons">code</i></span></a>
+    <a href="https://discord.gg/k8szJ5qAKw" target="_blank" data-microtip-position="top" role="tooltip" aria-label="Savage Aim Discord"><span class="icon"><span class="icon is-large"><i class="material-icons">question_answer</i></span></span></a>
     <p>Savage Aim v{{ $store.state.version }}, by Erika Yukiko (Lich)</p>
     <p>FINAL FANTASY XIV ©2010 - {{ currentYear }} SQUARE ENIX CO., LTD. All Rights Reserved.</p>
     <p>FINAL FANTASY is a registered trademark of Square Enix Holdings Co., Ltd. All material used under license.</p>

frontend/src/components/modals/changelog.vue

@@ -12,6 +12,18 @@
     </div>
     <div class="card-content content">
       <h2 class="has-text-primary subtitle">{{ version }}</h2>
+      <div class="divider"><i class="material-icons icon">expand_more</i> A Message <i class="material-icons icon">expand_more</i></div>
+      <p>I had a little look at some DB metrics last night and I see a lot more people than I would have expected, since I've been slowly rolling the site out to friends' statics and such..</p>
+      <p>Needless to say, I'm sorta overwhelmed with the use (in a good way, don't worry!)</p>
+      <p>But, to those of you who have stumbled across my little website, I had no way of getting feedback from you so far...</p>
+      <p>So there's a Discord server available now! It's smol and not very good but I figured it was important to get one out at least, and we can grow from there!</p>
+      <p>Thank you to everyone who's been using the site so far, I will try my best to keep it going towards something ideal o7</p>
+      <p class="has-text-centered">
+        <a href="https://discord.gg/k8szJ5qAKw" class="button is-blurple icon-text" target="_blank">
+          <span class="icon"><img src="/discord.svg" alt="Discord Logo" /></span>
+          <span>Savage Aim Discord</span>
+        </a>
+      </p>
       <div class="divider"><i class="material-icons icon">expand_more</i> Major Changes <i class="material-icons icon">expand_more</i></div>
       <p>Notifications System has been added!</p>
       <p>
@@ -27,11 +39,9 @@
       <p>Currently the Notification system is polled every 30 seconds for updates, but I intend to make this truly live in the near future with instant updates when necessary!</p>
 
       <div class="divider"><i class="material-icons icon">expand_more</i> Minor Changes <i class="material-icons icon">expand_more</i></div>
-      <p>Added Trans Pride colour scheme.</p>
-      <p>Fixed issues causing too much side padding on some pages, especially on mobile views.</p>
-      <p>Fixed breadcrumbs for Edit and New BIS pages linking to the wrong URL.</p>
-      <p>Removed mentions of "Raid Lead", only using "Team Lead" to avoid any confusion.</p>
-      <p>Add Badges to Character cards on the Loot Tracker pages to indicate how much Loot they have already received in this Tier.</p>
+      <p>Added Traffic Lights style colour scheme.</p>
+      <p>Added more visibility into client side errors.</p>
+      <p>Minor help text additions.</p>
     </div>
   </div>
 </template>