From 9106297f325311fdc3c7176cba65ee0bd3b6336c Mon Sep 17 00:00:00 2001
From: Jan Christophersen <code@chrstphrsn.cc>
Date: Mon, 28 Dec 2020 08:22:58 +0100
Subject: [PATCH] Styling fix, disable ShipRemoval

ShipRemoval is bugged for some reason, I should probably go and rewrite
some of the refresh functionality.
---
 backend/functions/refresh/main.go | 12 ++++++------
 frontend/src/Progress.svelte      | 11 ++++++-----
 frontend/src/Whaling.svelte       |  2 +-
 frontend/tailwind.config.js       |  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/backend/functions/refresh/main.go b/backend/functions/refresh/main.go
index 2c46e0f..56cd436 100644
--- a/backend/functions/refresh/main.go
+++ b/backend/functions/refresh/main.go
@@ -220,13 +220,13 @@ func Handler(ctx context.Context, event awsEvents.SNSEvent) (string, error) {
 
 					if !found {
 						log.Printf("Ship removed from garage ship=%d player=%s", storedShip.ShipID, subscriberData.AccountID)
-						storedShip.Private.InGarage = false
-						sentryShipHub.CaptureMessage("ShipRemoval: no longer in garage")
+						subscriberData.Ships[storedShip.ShipID].Private.InGarage = false
+						//sentryShipHub.CaptureMessage("ShipRemoval: no longer in garage")
 
-						if err := events.Add(events.NewShipRemoval(ev.AccountID, storedShip.ShipID)); err != nil {
-							getHub(sentryShipHub, E{"error": err.Error()}).CaptureMessage("Could not send ShipRemoval event")
-							log.Printf("WARN: could not send event for removed subscriber ship error=%v", err)
-						}
+						//if err := events.Add(events.NewShipRemoval(ev.AccountID, storedShip.ShipID)); err != nil {
+						//getHub(sentryShipHub, E{"error": err.Error()}).CaptureMessage("Could not send ShipRemoval event")
+						//log.Printf("WARN: could not send event for removed subscriber ship error=%v", err)
+						//}
 					}
 				}
 			}
diff --git a/frontend/src/Progress.svelte b/frontend/src/Progress.svelte
index 15973b8..6123f1f 100644
--- a/frontend/src/Progress.svelte
+++ b/frontend/src/Progress.svelte
@@ -259,9 +259,10 @@
       <div class="w-1/3" on:click={() => ($resource = res)}>
         <div
           style="transition: background-color .1s"
-          class:bg-purple-800={res === $resource}
-          class="m-2 shadow-xl rounded rounded-b-none bg-gray-800
-          overflow-hidden hover:bg-purple-900 hover:shadow-md">
+          class:bg-gray-700={res === $resource}
+          class:bg-gray-800={res !== $resource}
+          class="m-2 shadow-xl rounded rounded-b-none 
+          overflow-hidden hover:bg-gray-700 hover:shadow-md">
           <div class="p-4 pb-2 flex">
             <div class="">
               <img
@@ -278,10 +279,10 @@
               {$max[res.Type][withShipsNotInGarage ? 1 : 0]}
             </div>
           </div>
-          <div class="relative h-2 w-full z-0 bg-gray-700">
+          <div class="relative h-2 w-full z-0 bg-gray-600">
             <div
               style="width: {(res.Earned / Math.max(1, $max[res.Type][withShipsNotInGarage ? 1 : 0])) * 100}%"
-              class="absolute bottom-0 h-2 bg-gray-600" />
+              class="absolute bottom-0 h-2 bg-green-900" />
           </div>
         </div>
       </div>
diff --git a/frontend/src/Whaling.svelte b/frontend/src/Whaling.svelte
index 61c36db..75f299e 100644
--- a/frontend/src/Whaling.svelte
+++ b/frontend/src/Whaling.svelte
@@ -98,7 +98,7 @@
   show={showDonateModal}
   on:close={() => (showDonateModal = false)}
   title="Thank you!"
-  message="Thanks for clicking on this button!<br /><br />I am always happy to receive gifts on the EU Server to <strong>Rukenshia</strong>, but also appreciate a simple 'thank you' message - I am a Privateer for WoWS and built this project in my spare time. The infrastructure costs for this are also paid out of my pocket.<br /><br />You can contact me as well by clicking on the 'Contact me' button at the top." />
+  message="I am always happy to receive gifts on the EU Server to <strong>Rukenshia</strong>, but also appreciate a simple 'thank you' message - I am a Privateer(volunteer) for WoWS and built this project in my spare time. The infrastructure costs for this are also paid out of my pocket.<br /><br />You can find my contact information by using the 'Contact me' button." />
 <div class="font-sans w-full h-screen text-white bg-gray-900">
   <div
     class="relative w-full h-48 z-0"
diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
index 8b0f642..3253181 100644
--- a/frontend/tailwind.config.js
+++ b/frontend/tailwind.config.js
@@ -8,7 +8,7 @@ module.exports = {
 		mode: 'all',
 		content: ['./src/*.svelte'],
 		options: {
-			safelist: ['border-yellow-800', 'border-green-900', 'line-through', 'bg-purple-800', 'bg-purple-900'],
+			safelist: ['border-yellow-800', 'border-green-900', 'line-through', 'bg-gray-700', 'bg-gray-800'],
 		}
 	},
 	theme: {
@@ -16,4 +16,4 @@ module.exports = {
 	},
 	variants: {},
 	plugins: [],
-}
\ No newline at end of file
+}