Clarify teams for events that have similar teams

slmnio · Feb 23, 2022 · 25a7e68 · 25a7e68
1 parent 194710d
commit 25a7e68
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/website/src/utils/content-utils.js b/website/src/utils/content-utils.js
@@ -167,3 +167,14 @@ export function money(num) {
 export function getAuctionMax() {
     return 8;
 }
+
+export function clarifyTeam(team) {
+    console.log({
+        team,
+        event: team.event
+    });
+    if (team.event && team.event.clarify_teams && team.event.short) {
+        return `${team.name} (${team.event.short})`;
+    }
+    return team.name;
+}
diff --git a/website/src/views/Player.vue b/website/src/views/Player.vue
@@ -44,6 +44,7 @@ export default {
         player () {
             return ReactiveRoot(this.id, {
                 member_of: ReactiveArray("member_of", {
+                    event: ReactiveThing("event"),
                     theme: ReactiveThing("theme"),
                     accolades: ReactiveArray("accolades", {
                         event: ReactiveThing("event", {
@@ -52,9 +53,11 @@ export default {
                     })
                 }),
                 owned_teams: ReactiveArray("owned_teams", {
+                    event: ReactiveThing("event"),
                     theme: ReactiveThing("theme")
                 }),
                 captain_of: ReactiveArray("captain_of", {
+                    event: ReactiveThing("event"),
                     theme: ReactiveThing("theme")
                 }),
                 event_staff: ReactiveArray("event_staff", {
@@ -64,6 +67,7 @@ export default {
                     theme: ReactiveThing("theme")
                 }),
                 team_staff: ReactiveArray("team_staff", {
+                    event: ReactiveThing("event"),
                     theme: ReactiveThing("theme")
                 }),
                 accolades: ReactiveArray("accolades", {
@@ -72,6 +76,7 @@ export default {
                     })
                 }),
                 brands_designed: ReactiveArray("brands_designed", {
+                    event: ReactiveThing("event"),
                     theme: ReactiveThing("theme")
                 }),
                 socials: ReactiveArray("socials"),

diff --git a/website/src/views/sub-views/PlayerMain.vue b/website/src/views/sub-views/PlayerMain.vue
@@ -7,23 +7,23 @@
             </ContentRow>
             <ContentRow title="Owner of" v-if="ownedTeams">
                 <ContentThing :thing="team" type="team" :theme="team.theme" v-for="team in ownedTeams"
-                              v-bind:key="team.id" :show-logo="true" />
+                              :text="clarifyTeam(team)" v-bind:key="team.id" :show-logo="true" />
             </ContentRow>
             <ContentRow title="Captain of" v-if="captainedTeams">
                 <ContentThing :thing="team" type="team" :theme="team.theme" v-for="team in captainedTeams"
-                              v-bind:key="team.id" :show-logo="true" />
+                              :text="clarifyTeam(team)" v-bind:key="team.id" :show-logo="true" />
             </ContentRow>
             <ContentRow title="Team staff for" v-if="teamStaff">
               <ContentThing :thing="team" type="team" :theme="team.theme" v-for="team in teamStaff"
-                            v-bind:key="team.id" :show-logo="true" />
+                            :text="clarifyTeam(team)" v-bind:key="team.id" :show-logo="true" />
             </ContentRow>
             <ContentRow title="Brand designer for" v-if="brandsDesigned">
               <ContentThing :thing="team" type="team" :theme="team.theme" v-for="team in brandsDesigned"
-                            v-bind:key="team.id" :show-logo="true" :overrideURL="`/team/${team.id}/theme`" />
+                            :text="clarifyTeam(team)" v-bind:key="team.id" :show-logo="true" :overrideURL="`/team/${team.id}/theme`" />
             </ContentRow>
             <ContentRow title="Player for" v-if="teams">
                 <ContentThing :thing="team" type="team" :theme="team.theme" v-for="team in teams"
-                              v-bind:key="team.id" :show-logo="true" />
+                              :text="clarifyTeam(team)" v-bind:key="team.id" :show-logo="true" />
             </ContentRow>
             <ContentRow title="Event staff for" v-if="eventStaff">
                 <ContentThing :thing="event" type="event" :theme="event.theme" v-for="event in eventStaff"
@@ -50,6 +50,7 @@
 import ContentRow from "@/components/website/ContentRow";
 import ContentThing from "@/components/website/ContentThing";
 import { sortTeams, sortEvents } from "@/utils/sorts";
+import { clarifyTeam } from "@/utils/content-utils";
 
 export default {
     props: ["player"],
@@ -135,6 +136,9 @@ export default {
 
             return groups;
         }
+    },
+    methods: {
+        clarifyTeam
     }
 };
 </script>