diff --git a/src/app/screenshots/screenshots.js b/src/app/screenshots/screenshots.js index e27d7ea..ccfdc86 100644 --- a/src/app/screenshots/screenshots.js +++ b/src/app/screenshots/screenshots.js @@ -53,39 +53,39 @@ async function captureScreenshot(options) { return result; } -function captureScheduleScreenshot(startTime) { - let hash = `/schedules/${startTime}`; +function captureScheduleScreenshot(now) { + let hash = `/schedules/${now}`; return captureScreenshot({ hash }); } -function captureGearScreenshot(startTime, endTime) { - let hash = `/splatNetGear/${startTime}/${endTime}`; +function captureGearScreenshot(now) { + let hash = `/splatNetGear/${now}`; return captureScreenshot({ hash, viewport: { height: 700 } }); } -function captureSalmonRunScreenshot(startTime) { - let hash = `/salmonRun/${startTime}`; +function captureSalmonRunScreenshot(now) { + let hash = `/salmonRun/${now}`; return captureScreenshot({ hash }); } -function captureSalmonRunGearScreenshot(startTime) { - let hash = `/salmonRunGear/${startTime}`; +function captureSalmonRunGearScreenshot(now) { + let hash = `/salmonRunGear/${now}`; return captureScreenshot({ hash }); } -function captureNewWeaponScreenshot(releaseTime) { - let hash = `/newWeapon/${releaseTime}`; +function captureNewWeaponScreenshot(now) { + let hash = `/newWeapon/${now}`; return captureScreenshot({ hash }); } -function captureSplatfestScreenshot(region, startTime, regions) { +function captureSplatfestScreenshot(region, now, regions) { regions = regions.join(','); - let hash = `/splatfest/${region}/${startTime}?regions=${regions}`; + let hash = `/splatfest/${region}/${now}?regions=${regions}`; return captureScreenshot({ hash }); } diff --git a/src/app/twitter/tweets/GearTweet.js b/src/app/twitter/tweets/GearTweet.js index 893b139..10bfee2 100644 --- a/src/app/twitter/tweets/GearTweet.js +++ b/src/app/twitter/tweets/GearTweet.js @@ -27,9 +27,8 @@ class GearTweet extends TwitterPostBase { } getImage(data) { - let startTime = getTopOfCurrentHour(); - let endTime = this.getDataTime(); - return captureGearScreenshot(startTime, endTime); + let now = getTopOfCurrentHour(); + return captureGearScreenshot(now); } getText(data) { diff --git a/src/web/components/Main.vue b/src/web/components/Main.vue index 12f120f..3d1bcc3 100644 --- a/src/web/components/Main.vue +++ b/src/web/components/Main.vue @@ -36,7 +36,7 @@ -
+
{{ $t('splatnet_gear.button') }} @@ -58,73 +58,73 @@
-
+
- +
- +
- +
- +
- +
-
+
- +
-
+
- +
-
+
-
+
+ />
-
+
-
+
+ />
@@ -143,7 +143,7 @@ Calendar FeedsTwitter - @@ -179,62 +165,60 @@ diff --git a/src/web/components/Screenshots.vue b/src/web/components/Screenshots.vue index 08c11a0..f0b7e85 100644 --- a/src/web/components/Screenshots.vue +++ b/src/web/components/Screenshots.vue @@ -3,3 +3,24 @@
+ + diff --git a/src/web/components/screenshots/ScreenshotHelper.vue b/src/web/components/screenshots/ScreenshotHelper.vue index 659e781..5e96da3 100644 --- a/src/web/components/screenshots/ScreenshotHelper.vue +++ b/src/web/components/screenshots/ScreenshotHelper.vue @@ -12,7 +12,7 @@
- + SplatNet Gear @@ -48,7 +48,7 @@ + :to="`/splatfest/${splatfest.region}/${splatfest.time}`"> {{ splatfest.region }} @@ -59,72 +59,40 @@ diff --git a/src/web/components/screenshots/Wrapper.vue b/src/web/components/screenshots/Wrapper.vue index dcf4ca4..dc69eb8 100644 --- a/src/web/components/screenshots/Wrapper.vue +++ b/src/web/components/screenshots/Wrapper.vue @@ -30,15 +30,15 @@
- + - - + + - - + +
{{ time | dateTime('en', 'UTC', 'MMMM D, YYYY HH:mm z') }}{{ now | dateTime('en', 'UTC', 'MMMM D, YYYY HH:mm z') }}
{{ time | dateTime('en-us', 'America/Los_Angeles') }}{{ time | dateTime('en-gb', 'Europe/London') }}{{ now | dateTime('en-us', 'America/Los_Angeles') }}{{ now | dateTime('en-gb', 'Europe/London') }}
{{ time | dateTime('en-us', 'America/New_York') }}{{ time | dateTime('ja-jp', 'Asia/Tokyo') }}{{ now | dateTime('en-us', 'America/New_York') }}{{ now | dateTime('ja-jp', 'Asia/Tokyo') }}
@@ -51,10 +51,11 @@ diff --git a/src/web/components/screenshots/newweapon/NewWeapon.vue b/src/web/components/screenshots/newweapon/NewWeapon.vue index d89f719..8c03151 100644 --- a/src/web/components/screenshots/newweapon/NewWeapon.vue +++ b/src/web/components/screenshots/newweapon/NewWeapon.vue @@ -1,13 +1,13 @@ diff --git a/src/web/components/screenshots/salmonrun/SalmonRun.vue b/src/web/components/screenshots/salmonrun/SalmonRun.vue index f4d2cf3..08c3fe5 100644 --- a/src/web/components/screenshots/salmonrun/SalmonRun.vue +++ b/src/web/components/screenshots/salmonrun/SalmonRun.vue @@ -1,54 +1,18 @@ diff --git a/src/web/components/screenshots/salmonrun/SalmonRunGear.vue b/src/web/components/screenshots/salmonrun/SalmonRunGear.vue index bc80aea..fc70b46 100644 --- a/src/web/components/screenshots/salmonrun/SalmonRunGear.vue +++ b/src/web/components/screenshots/salmonrun/SalmonRunGear.vue @@ -1,33 +1,23 @@ diff --git a/src/web/components/screenshots/schedules/ScheduleBox.vue b/src/web/components/screenshots/schedules/ScheduleBox.vue index 9ae8b0e..1b0dbc0 100644 --- a/src/web/components/screenshots/schedules/ScheduleBox.vue +++ b/src/web/components/screenshots/schedules/ScheduleBox.vue @@ -1,5 +1,5 @@ diff --git a/src/web/components/splatoon/ScheduleBox.vue b/src/web/components/splatoon/ScheduleBox.vue index 43ff131..2a05b9f 100644 --- a/src/web/components/splatoon/ScheduleBox.vue +++ b/src/web/components/splatoon/ScheduleBox.vue @@ -1,25 +1,25 @@ diff --git a/src/web/components/splatoon/ScheduleDialog.vue b/src/web/components/splatoon/ScheduleDialog.vue index 8b2593b..0bb8471 100644 --- a/src/web/components/splatoon/ScheduleDialog.vue +++ b/src/web/components/splatoon/ScheduleDialog.vue @@ -1,11 +1,11 @@ diff --git a/src/web/components/splatoon/SplatfestResultsRow.vue b/src/web/components/splatoon/SplatfestResultsRow.vue index c73461f..57ba8f7 100644 --- a/src/web/components/splatoon/SplatfestResultsRow.vue +++ b/src/web/components/splatoon/SplatfestResultsRow.vue @@ -4,7 +4,7 @@
-
{{ results.rates[type].alpha | wholePercent }}.{{ results.rates[type].alpha | partialPercent }}{{ $t('splatfest.results.%') }}
+
{{ rates.alpha | wholePercent }}.{{ rates.alpha | partialPercent }}{{ $t('splatfest.results.%') }}
@@ -16,7 +16,7 @@
-
{{ results.rates[type].bravo | wholePercent }}.{{ results.rates[type].bravo | partialPercent }}{{ $t('splatfest.results.%') }}
+
{{ rates.bravo | wholePercent }}.{{ rates.bravo | partialPercent }}{{ $t('splatfest.results.%') }}
@@ -24,10 +24,10 @@