From 45ac071a7f9e20db769ff3cbbbef1b577cf8f206 Mon Sep 17 00:00:00 2001
From: HumanoidSandvichDispenser <humanoidsandvichdispenser@gmail.com>
Date: Tue, 10 Dec 2024 10:24:50 -0800
Subject: [PATCH] Improve readability

---
 availabili.tf/src/assets/main.css             | 28 ++++++++++++-
 .../src/components/EventSchedulerForm.vue     | 38 +++++++++++++++++-
 .../src/components/GithubCommitHistory.vue    |  2 +-
 .../src/components/PlayerTeamCard.vue         |  8 ++--
 .../src/components/SchedulePlayerListItem.vue | 40 +++++++++++++++++--
 availabili.tf/src/composables/team-details.ts |  2 +-
 availabili.tf/src/views/RosterBuilderView.vue |  6 +--
 availabili.tf/src/views/ScheduleView.vue      |  6 +++
 8 files changed, 113 insertions(+), 17 deletions(-)

diff --git a/availabili.tf/src/assets/main.css b/availabili.tf/src/assets/main.css
index df4efc1..24775ab 100644
--- a/availabili.tf/src/assets/main.css
+++ b/availabili.tf/src/assets/main.css
@@ -76,6 +76,17 @@ i.bi.margin {
   margin-right: 0.5em;
 }
 
+button.checkbox, button.checkbox.icon {
+  outline: 1px solid var(--overlay-0);
+  font-size: 1rem;
+  height: 24px;
+  width: 24px;
+  padding: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 button:hover {
   background-color: var(--surface-0);
 }
@@ -206,7 +217,7 @@ main {
   padding: 2rem;
 }
 
-input {
+input, textarea {
   display: block;
   width: 100%;
   color: var(--text);
@@ -233,6 +244,10 @@ input {
     sans-serif;
 }
 
+textarea {
+  resize: vertical;
+}
+
 .form-group {
   display: flex;
   flex-direction: column;
@@ -312,6 +327,7 @@ hr {
   z-index: 1;
   position: fixed;
   inset: 0;
+  animation: smooth-appear 0.2s ease;
 }
 
 [role="dialog"] {
@@ -321,6 +337,16 @@ hr {
   transform: translateX(-50%) translateY(-50%);
   background-color: var(--base);
   z-index: 10;
+  animation: smooth-appear 0.2s ease;
+}
+
+@keyframes smooth-appear {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
 }
 
 div.banner {
diff --git a/availabili.tf/src/components/EventSchedulerForm.vue b/availabili.tf/src/components/EventSchedulerForm.vue
index 603588a..d978e42 100644
--- a/availabili.tf/src/components/EventSchedulerForm.vue
+++ b/availabili.tf/src/components/EventSchedulerForm.vue
@@ -1,16 +1,40 @@
 <script setup lang="ts">
 import { useEventForm } from "@/composables/event-form";
+import { useTeamDetails } from "@/composables/team-details";
 import { useRosterStore } from "@/stores/roster";
+import { useTeamsStore } from "@/stores/teams";
 import moment from "moment";
+import { computed, onMounted } from "vue";
 import { useRoute, useRouter } from "vue-router";
 
 const route = useRoute();
 const router = useRouter();
 
 const rosterStore = useRosterStore();
+const teamsStore = useTeamsStore();
 
 const { eventId } = useEventForm();
 
+const { team, teamId } = useTeamDetails();
+
+const startTime = computed(() => {
+  if (rosterStore.startTime) {
+    return moment.unix(rosterStore.startTime).format("LL LT z");
+  }
+});
+
+const startTimeTeamTz = computed(() => {
+  if (rosterStore.startTime) {
+    // if team timezone is the same as ours, then do nothing
+    if (team.value?.tzTimezone === moment.tz.guess()) {
+      return undefined;
+    }
+    return moment.unix(rosterStore.startTime)
+      .tz(team.value?.tzTimezone)
+      .format("LL LT z");
+  }
+});
+
 function saveRoster() {
   if (eventId.value) {
     rosterStore.updateRoster(eventId.value);
@@ -26,16 +50,26 @@ function saveRoster() {
       });
   }
 }
+
+onMounted(() => {
+  if (!team.value) {
+    teamsStore.fetchTeam(teamId.value);
+  }
+});
 </script>
 
 <template>
   <div class="event-scheduler-container">
     <h1 class="roster-title">
-      Roster for Snus Brotherhood
+      Roster for {{ team?.teamName }}
     </h1>
     <div v-if="rosterStore.startTime">
       <span class="aside date">
-        {{ moment.unix(rosterStore.startTime).format("LL LT") }}
+        {{ startTime }}
+      </span>
+      <br v-if="startTimeTeamTz">
+      <span class="aside date">
+        {{ startTimeTeamTz }}
       </span>
     </div>
     <div class="form-group margin">
diff --git a/availabili.tf/src/components/GithubCommitHistory.vue b/availabili.tf/src/components/GithubCommitHistory.vue
index 0f2b060..5bbcc9a 100644
--- a/availabili.tf/src/components/GithubCommitHistory.vue
+++ b/availabili.tf/src/components/GithubCommitHistory.vue
@@ -13,7 +13,7 @@ onMounted(() => {
 <template>
   <div class="commit-history">
     <div class="header">
-      <h2>Commit History</h2>
+      <h2>Changelog/Commit History</h2>
       <a
         class="icon"
         href="https://github.com/HumanoidSandvichDispenser/availabili.tf/commits"
diff --git a/availabili.tf/src/components/PlayerTeamCard.vue b/availabili.tf/src/components/PlayerTeamCard.vue
index c7b74ea..3491699 100644
--- a/availabili.tf/src/components/PlayerTeamCard.vue
+++ b/availabili.tf/src/components/PlayerTeamCard.vue
@@ -76,13 +76,15 @@ const isUnavailable = computed(() => {
 });
 
 const nextHour = computed(() => {
-  const now = moment().utc();
+  const now = moment();
   const time = now.clone().tz(props.team.tzTimezone);
 
-  if (time.minute() >= props.team.minuteOffset) {
+  let minute = time.minute();
+  let minuteOffset = props.team.minuteOffset;
+  if (minute >= minuteOffset) {
     time.add(1, "hour");
-    time.minute(props.team.minuteOffset);
   }
+  time.minute(minuteOffset);
 
   const diff = time.utc().diff(now, "minutes", false);
 
diff --git a/availabili.tf/src/components/SchedulePlayerListItem.vue b/availabili.tf/src/components/SchedulePlayerListItem.vue
index 13d7c83..7b08141 100644
--- a/availabili.tf/src/components/SchedulePlayerListItem.vue
+++ b/availabili.tf/src/components/SchedulePlayerListItem.vue
@@ -2,6 +2,7 @@
 import { useScheduleStore } from "../stores/schedule";
 import { computed, type PropType } from "vue";
 import { type AvailabilitySchema } from "@/client";
+import { CheckboxIndicator, CheckboxRoot } from "radix-vue";
 
 const scheduleStore = useScheduleStore();
 
@@ -21,10 +22,21 @@ const availabilityAtHoveredIndex = computed(() => {
   return undefined;
 });
 
-const props = defineProps({
-  player: Object as PropType<AvailabilitySchema>,
+const selectedMember = computed({
+  get: () => scheduleStore.selectedMembers[props.player.steamId] ?? false,
+  set: (value: boolean) => {
+    console.log("set", value);
+    scheduleStore.selectedMembers[props.player.steamId] = value;
+  },
 });
 
+const props = defineProps<{
+  player: AvailabilitySchema;
+}>();
+//const props = defineProps({
+//  player: Object as PropType<AvailabilitySchema>,
+//});
+
 function onMouseOver() {
   if (props.player) {
     scheduleStore.hoveredMember = props.player;
@@ -45,16 +57,25 @@ function onMouseLeave() {
     @mouseover="onMouseOver"
     @mouseleave="onMouseLeave"
   >
-    <input
+    <!--input
       class="player-checkbox"
       type="checkbox"
       v-model="scheduleStore.selectedMembers[player.steamId]"
       :value="player"
       :id="player.steamId"
-    />
+    /-->
     <label
       :for="player.steamId"
     >
+      <!-- checkbox for pinning players -->
+      <CheckboxRoot
+        v-model:checked="selectedMember"
+        class="checkbox icon"
+      >
+        <CheckboxIndicator>
+          <i class="bi bi-pin-fill"></i>
+        </CheckboxIndicator>
+      </CheckboxRoot>
       <span v-if="availabilityAtHoveredIndex ?? 0 > 0">
         <span v-if="availabilityAtHoveredIndex == 1" class="can-be-available">
           {{ player.username }}
@@ -105,4 +126,15 @@ input {
 .player s {
   color: var(--overlay-0);
 }
+
+label {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+button.player-checkbox.icon i.bi {
+  /* dont take up space */
+  position: relative;
+}
 </style>
diff --git a/availabili.tf/src/composables/team-details.ts b/availabili.tf/src/composables/team-details.ts
index edf61bb..d588596 100644
--- a/availabili.tf/src/composables/team-details.ts
+++ b/availabili.tf/src/composables/team-details.ts
@@ -8,7 +8,7 @@ export function useTeamDetails() {
   const teamsStore = useTeamsStore();
   const invitesStore = useInvitesStore();
 
-  const teamId = computed(() => Number(route.params.id));
+  const teamId = computed(() => Number(route.params.id ?? route.params.teamId));
 
   const team = computed(() => {
     return teamsStore.teams[teamId.value];
diff --git a/availabili.tf/src/views/RosterBuilderView.vue b/availabili.tf/src/views/RosterBuilderView.vue
index 921da04..fdc0afb 100644
--- a/availabili.tf/src/views/RosterBuilderView.vue
+++ b/availabili.tf/src/views/RosterBuilderView.vue
@@ -2,7 +2,7 @@
 import PlayerCard from "../components/PlayerCard.vue";
 import { computed, reactive, onMounted, ref } from "vue";
 import { useRosterStore } from "../stores/roster";
-import { useRoute } from "vue-router";
+import { RouterLink, useRoute } from "vue-router";
 import moment from "moment";
 import { useEventsStore } from "@/stores/events";
 import EventSchedulerForm from "@/components/EventSchedulerForm.vue";
@@ -60,10 +60,6 @@ onMounted(async () => {
   </main>
   <main v-else>
     <div class="top">
-      <a>
-        <i class="bi bi-arrow-left" />
-        Back
-      </a>
     </div>
     <div class="columns">
       <div class="form-group margin column">
diff --git a/availabili.tf/src/views/ScheduleView.vue b/availabili.tf/src/views/ScheduleView.vue
index 046f186..0e0e31c 100644
--- a/availabili.tf/src/views/ScheduleView.vue
+++ b/availabili.tf/src/views/ScheduleView.vue
@@ -138,6 +138,12 @@ onMounted(() => {
             </button>
           </template>
         </div>
+        <div class="button-group" v-if="isEditing">
+          <span class="subtext">
+            CTRL + Click to fill entire visible column,
+            Shift + Click to fill entire row
+          </span>
+        </div>
       </div>
     </div>
     <div v-else>