Skip to content

Commit

Permalink
Styling fix, disable ShipRemoval
Browse files Browse the repository at this point in the history
ShipRemoval is bugged for some reason, I should probably go and rewrite
some of the refresh functionality.
  • Loading branch information
Rukenshia committed Dec 28, 2020
1 parent f8bf200 commit 9106297
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 deletions.
12 changes: 6 additions & 6 deletions backend/functions/refresh/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
//}
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions frontend/src/Progress.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/Whaling.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions frontend/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ 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: {
extend: {},
},
variants: {},
plugins: [],
}
}

0 comments on commit 9106297

Please sign in to comment.