sandvich
/
availabili.tf
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: sandvich:242562d66284a9634625275b52285448588d8758
Branches Tags
sandvich:master
..
compare: sandvich:3c83eca3802b3f53accb7b74a273d31b33df56c1
Branches Tags
sandvich:master

No commits in common. "242562d66284a9634625275b52285448588d8758" and "3c83eca3802b3f53accb7b74a273d31b33df56c1" have entirely different histories.
242562d662 ... 3c83eca380

17 changed files with 40 additions and 415 deletions
Show Stats Expand all files Collapse all files

0
availabili.tf/src/assets/loader.css
View File

6
availabili.tf/src/assets/main.css
View File

@ -19,6 +19,12 @@ a.button {
padding: unset; padding: unset;
} }
@media (hover: hover) {
a:hover {
background-color: var(--accent-transparent);
}
}
button { button {
display: flex; display: flex;
align-items: center; align-items: center;

1
availabili.tf/src/client/index.ts
View File

@ -34,7 +34,6 @@ export type { TeamInviteSchemaList } from './models/TeamInviteSchemaList';
export type { TeamLogsTfIntegrationSchema } from './models/TeamLogsTfIntegrationSchema'; export type { TeamLogsTfIntegrationSchema } from './models/TeamLogsTfIntegrationSchema';
export { TeamRole } from './models/TeamRole'; export { TeamRole } from './models/TeamRole';
export type { TeamSchema } from './models/TeamSchema'; export type { TeamSchema } from './models/TeamSchema';
export type { TeamWithRoleSchema } from './models/TeamWithRoleSchema';
export type { UpdateEventJson } from './models/UpdateEventJson'; export type { UpdateEventJson } from './models/UpdateEventJson';
export type { ValidationError } from './models/ValidationError'; export type { ValidationError } from './models/ValidationError';
export type { ValidationErrorElement } from './models/ValidationErrorElement'; export type { ValidationErrorElement } from './models/ValidationErrorElement';

15
availabili.tf/src/client/models/TeamWithRoleSchema.ts
View File

@ -1,15 +0,0 @@
/* generated using openapi-typescript-codegen -- do not edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */
export type TeamWithRoleSchema = {
createdAt: string;
id: number;
isTeamLeader: boolean;
minuteOffset: number;
playerCount: number;
role: string;
teamName: string;
tzTimezone: string;
};

4
availabili.tf/src/client/models/ViewTeamsResponse.ts
View File

@ -2,8 +2,8 @@
/* istanbul ignore file */ /* istanbul ignore file */
/* tslint:disable */ /* tslint:disable */
/* eslint-disable */ /* eslint-disable */
import type { TeamWithRoleSchema } from './TeamWithRoleSchema'; import type { TeamSchema } from './TeamSchema';
export type ViewTeamsResponse = { export type ViewTeamsResponse = {
teams: Array<TeamWithRoleSchema>; teams: Array<TeamSchema>;
}; };

11
availabili.tf/src/commit.ts
View File

@ -1,11 +0,0 @@
export default interface Commit {
verified: boolean;
html_url: string;
sha: string;
commit: {
author: {
name: string;
};
message: string;
};
};

40
availabili.tf/src/components/GithubCommitHistory.vue
View File

@ -1,40 +0,0 @@
<script setup lang="ts">
import { useCommitsStore } from "@/stores/commits";
import { onMounted, ref } from "vue";
import GithubCommitHistoryItem from "./GithubCommitHistoryItem.vue";
const commitsStore = useCommitsStore();
onMounted(() => {
commitsStore.fetchCommits();
});
</script>
<template>
<div class="commit-history">
<div class="header">
<h2>Commit History</h2>
<a
class="icon"
href="https://github.com/HumanoidSandvichDispenser/availabili.tf/commits"
>
<button class="icon">
<i class="bi bi-view-list"></i>
</button>
</a>
</div>
<div>
<GithubCommitHistoryItem
v-for="commit in commitsStore.commits.slice(0, 5)"
:commit="commit"
/>
</div>
</div>
</template>
<style scoped>
.header {
display: flex;
justify-content: space-between;
}
</style>

57
availabili.tf/src/components/GithubCommitHistoryItem.vue
View File

@ -1,57 +0,0 @@
<script setup lang="ts">
import type Commit from "@/commit";
import { computed } from "vue";
const props = defineProps<{
commit: Commit;
}>();
const summary = computed(() => {
return props.commit.commit.message.split("\n\n")[0];
});
const description = computed(() => {
return props.commit.commit.message.split("\n\n")[1];
});
</script>
<template>
<div class="commit-history-item">
<div class="header">
<span class="circle"></span>
<a :href="commit.html_url">
<h3>
{{ summary }}
</h3>
</a>
</div>
<div class="description" v-if="description">
{{ description }}
</div>
</div>
</template>
<style scoped>
.header {
display: flex;
align-items: center;
}
.header a {
color: var(--text);
}
.circle {
width: 10px;
height: 10px;
border-radius: 50%;
background-color: var(--green);
margin-right: 1em;
}
.description {
padding: 0.5rem 2rem;
color: var(--subtext-0);
}
</style>

57
availabili.tf/src/components/MatchCard.vue
View File

@ -1,57 +0,0 @@
<script setup lang="ts">
</script>
<template>
<div class="match-card">
<div class="match-scores">
<div class="team-and-score">
<span class="team-name">
NVBLU
</span>
<span class="score">
3
</span>
</div>
<span class="score">-</span>
<div class="team-and-score">
<span class="score">
2
</span>
<span class="team-name">
RED
</span>
</div>
</div>
</div>
</template>
<style scoped>
.match-card {
display: flex;
justify-content: space-between;
padding: 1rem;
border: 1px solid var(--text);
border-radius: 8px;
}
.match-scores {
display: flex;
justify-content: space-evenly;
width: 100%;
font-weight: 700;
}
.match-scores span {
font-weight: 700;
}
.team-and-score {
display: flex;
gap: 1rem;
align-items: center;
}
.match-scores .score {
font-size: 1.5rem;
}
</style>

78
availabili.tf/src/components/TeamsListSidebar.vue
View File

@ -11,54 +11,27 @@ onMounted(() => {
</script> </script>
<template> <template>
<aside>
<div> <div>
<div class="teams-header"> <div class="teams-header">
<h2> <h3>Your Teams</h3>
<i class="bi bi-people-fill margin"></i> <RouterLink to="/team/register">
Your Teams
</h2>
<div class="button-group">
<button class="small">
<i class="bi bi-person-plus-fill margin" />
Join a team
</button>
<RouterLink class="button" to="/team/register">
<button class="small accent"> <button class="small accent">
<i class="bi bi-plus-circle-fill margin"></i> <i class="bi bi-plus-circle-fill margin"></i>
New New
</button> </button>
</RouterLink> </RouterLink>
</div> </div>
</div>
<div <div
v-if="teams.teamsWithRole" v-if="teams.teams"
v-for="(team, _, i) in teams.teamsWithRole" v-for="team in teams.teams"
> >
<div class="team-item">
<div class="major-info">
<RouterLink :to="'/team/id/' + team.id"> <RouterLink :to="'/team/id/' + team.id">
{{ team.teamName }} {{ team.teamName }}
</RouterLink> </RouterLink>
<span class="tag" v-if="team.isTeamLeader">Team Leader</span>
<span class="tag">{{ teams.roleNames[team.role] }}</span>
</div>
<div class="member-info">
<div class="subtext">
{{ team.playerCount }} member(s)
</div>
<RouterLink
class="button"
:to="{ 'name': 'schedule', 'query': { 'teamId': team.id } }"
>
<button class="icon" v-tooltip="'View schedule'">
<i class="bi bi-calendar-fill"></i>
</button>
</RouterLink>
</div>
</div>
<hr v-if="i < Object.keys(teams.teams).length - 1" />
</div> </div>
</div> </div>
</aside>
</template> </template>
<style scoped> <style scoped>
@ -75,43 +48,4 @@ aside {
.teams-header h3 { .teams-header h3 {
font-weight: 600; font-weight: 600;
} }
.button-group {
display: flex;
gap: 0.5rem;
}
.team-item {
display: flex;
align-items: center;
justify-content: space-between;
margin: 1rem 0;
}
.team-item a {
color: var(--text);
font-size: 1rem;
font-weight: 600;
}
.tag {
font-size: 9pt;
padding: 0.25rem 0.5rem;
border-radius: 4px;
background-color: var(--crust);
}
.team-item .major-info, .team-item .member-info {
display: flex;
align-items: center;
gap: 0.5rem;
}
.member-info button.icon {
color: var(--overlay-0);
}
.member-info button.icon:hover {
color: var(--text);
}
</style> </style>

1
availabili.tf/src/main.ts
View File

@ -6,6 +6,7 @@ import { createPinia } from "pinia";
import VueSelect from "vue-select"; import VueSelect from "vue-select";
import { TooltipDirective } from "vue3-tooltip"; import { TooltipDirective } from "vue3-tooltip";
import "vue3-tooltip/tooltip.css"; import "vue3-tooltip/tooltip.css";
import "vue-virtual-scroller/dist/vue-virtual-scroller.css";
import App from "./App.vue"; import App from "./App.vue";
import router from "./router"; import router from "./router";

30
availabili.tf/src/stores/commits.ts
View File

@ -1,30 +0,0 @@
import type Commit from "@/commit";
import { defineStore } from "pinia";
import { ref } from "vue";
export const useCommitsStore = defineStore("commits", () => {
const commits = ref<Commit[]>([]);
const commitsMap = ref<{ [id: string]: Commit }>({ });
function fetchCommits() {
const user = "HumanoidSandvichDispenser";
const repo = "availabili.tf";
if (commits.value.length == 0) {
fetch(`https://api.github.com/repos/${user}/${repo}/commits`)
.then((response) => response.json())
.then((response: Commit[]) => {
commits.value = response;
response.forEach((commit) => {
commitsMap.value[commit.sha] = commit;
});
});
}
}
return {
commits,
commitsMap,
fetchCommits,
};
});

15
availabili.tf/src/stores/teams.ts
View File

@ -2,7 +2,7 @@ import { defineStore } from "pinia";
import { reactive, type Reactive } from "vue"; import { reactive, type Reactive } from "vue";
import { useClientStore } from "./client"; import { useClientStore } from "./client";
import { useAuthStore } from "./auth"; import { useAuthStore } from "./auth";
import { type TeamSchema, type RoleSchema, type ViewTeamMembersResponse, type CreateTeamJson, type TeamWithRoleSchema } from "@/client"; import { type TeamSchema, type RoleSchema, type ViewTeamMembersResponse, type CreateTeamJson } from "@/client";
export type TeamMap = { [id: number]: TeamSchema }; export type TeamMap = { [id: number]: TeamSchema };
@ -11,14 +11,8 @@ export const useTeamsStore = defineStore("teams", () => {
const clientStore = useClientStore(); const clientStore = useClientStore();
const client = clientStore.client; const client = clientStore.client;
const teams = reactive<{ [id: number]: TeamSchema }>({}); const teams: Reactive<{ [id: number]: TeamSchema }> = reactive({});
const teamsWithRole = reactive<{ [id: number]: TeamWithRoleSchema }>({}); const teamMembers: Reactive<{ [id: number]: ViewTeamMembersResponse[] }> = reactive({});
const teamMembers = reactive<{ [id: number]: ViewTeamMembersResponse[] }>({});
const roleNames: { [key: string]: string } = {
"Player": "Player",
"CoachMentor": "Coach/Mentor",
};
async function fetchTeams() { async function fetchTeams() {
const response = await clientStore.call( const response = await clientStore.call(
@ -27,7 +21,6 @@ export const useTeamsStore = defineStore("teams", () => {
); );
response.teams.forEach((team) => { response.teams.forEach((team) => {
teams[team.id] = team; teams[team.id] = team;
teamsWithRole[team.id] = team;
}); });
return response; return response;
} }
@ -77,8 +70,6 @@ export const useTeamsStore = defineStore("teams", () => {
return { return {
teams, teams,
teamsWithRole,
roleNames,
teamMembers, teamMembers,
fetchTeams, fetchTeams,
fetchTeam, fetchTeam,

33
availabili.tf/src/views/HomeView.vue
View File

@ -1,38 +1,13 @@
<script setup lang="ts"> <script setup lang="ts">
import GithubCommitHistory from "@/components/GithubCommitHistory.vue";
import TeamsListSidebar from "../components/TeamsListSidebar.vue"; import TeamsListSidebar from "../components/TeamsListSidebar.vue";
</script> </script>
<template> <template>
<main>
<div class="home-view-container">
<div class="left">
<TeamsListSidebar /> <TeamsListSidebar />
</div> <main>
<div class="right"> <h2>JustGetAHouse</h2>
<GithubCommitHistory /> <div>
</div> test
</div> </div>
</main> </main>
</template> </template>
<style scoped>
.home-view-container {
display: flex;
gap: 2rem;
}
.left {
flex: 2;
}
.right {
flex: 1;
}
@media (max-width: 1024px) {
.home-view-container {
flex-direction: column;
}
}
</style>

10
availabili.tf/src/views/TeamDetailsView.vue
View File

@ -8,7 +8,6 @@ import MembersList from "@/components/MembersList.vue";
import moment from "moment"; import moment from "moment";
import EventList from "@/components/EventList.vue"; import EventList from "@/components/EventList.vue";
import { useTeamsEventsStore } from "@/stores/teams/events"; import { useTeamsEventsStore } from "@/stores/teams/events";
import MatchCard from "@/components/MatchCard.vue";
const route = useRoute(); const route = useRoute();
const teamsStore = useTeamsStore(); const teamsStore = useTeamsStore();
@ -82,8 +81,7 @@ onMounted(() => {
</button> </button>
</RouterLink> </RouterLink>
</h2> </h2>
<em class="subtext" v-if="false">No recent matches.</em> <em class="subtext">No recent matches.</em>
<MatchCard v-else />
</div> </div>
</div> </div>
</template> </template>
@ -137,10 +135,4 @@ onMounted(() => {
.icons button:hover { .icons button:hover {
color: var(--text); color: var(--text);
} }
@media (max-width: 1024px) {
.content-container {
flex-direction: column;
}
}
</style> </style>

65
backend-flask/models/event.py
View File

@ -38,49 +38,12 @@ class Event(app_db.BaseModel):
UniqueConstraint("team_id", "name", "start_time"), UniqueConstraint("team_id", "name", "start_time"),
) )
def get_maximum_matching(self):
players_teams_roles = app_db.db.session.query(
PlayerTeamRole
).join(
PlayerTeam
).join(
PlayerEvent,
PlayerTeam.player_id == PlayerEvent.player_id
).where(
PlayerTeam.team_id == self.team_id
).where(
PlayerTeam.player_id == PlayerEvent.player_id
).where(
PlayerEvent.event_id == self.id
).all()
role_map = {}
for roles in players_teams_roles:
if roles.player_team_id not in role_map:
role_map[roles.player_team_id] = []
role_map[roles.player_team_id].append(roles.role)
import sys
print(role_map, file=sys.stderr)
required_roles = [
PlayerTeamRole.Role.PocketScout,
PlayerTeamRole.Role.FlankScout,
PlayerTeamRole.Role.PocketSoldier,
PlayerTeamRole.Role.Roamer,
PlayerTeamRole.Role.Demoman,
PlayerTeamRole.Role.Medic,
]
graph = BipartiteGraph(role_map, required_roles)
return graph.hopcroft_karp()
def get_discord_content(self): def get_discord_content(self):
start_timestamp = int(self.start_time.timestamp()) start_timestamp = int(self.start_time.timestamp())
players = list(self.players) players = list(self.players)
# players with a role should be sorted first # players with a role should be sorted first
players.sort(key=lambda p: p.role is not None, reverse=True) players.sort(key=lambda p: p.role is not None, reverse=True)
players_info = [] players_info = []
matchings = self.get_maximum_matching()
ringers_needed = 6 - matchings
for player in players: for player in players:
player_info = "- " player_info = "- "
@ -97,10 +60,6 @@ class Event(app_db.BaseModel):
players_info.append(player_info) players_info.append(player_info)
ringers_needed_msg = ""
if ringers_needed > 0:
ringers_needed_msg = f" **({ringers_needed} ringer(s) needed)**"
return "\n".join([ return "\n".join([
f"# {self.name}", f"# {self.name}",
"", "",
@ -108,7 +67,6 @@ class Event(app_db.BaseModel):
"", "",
f"<t:{start_timestamp}:f>", f"<t:{start_timestamp}:f>",
"\n".join(players_info), "\n".join(players_info),
f"Max bipartite matching size: {matchings}" + ringers_needed_msg,
"", "",
"[Confirm attendance here]" + "[Confirm attendance here]" +
f"(https://availabili.tf/team/id/{self.team.id}/events/{self.id})", f"(https://availabili.tf/team/id/{self.team.id}/events/{self.id})",
@ -172,20 +130,17 @@ class EventSchema(spec.BaseModel):
created_at=model.created_at, created_at=model.created_at,
) )
#class EventPlayersSchema(spec.BaseModel): class EventPlayersSchema(spec.BaseModel):
# players: list["PlayerEventRolesSchema"] players: list["PlayerEventRolesSchema"]
#
# @classmethod @classmethod
# def from_model(cls, model: Event) -> "EventPlayersSchema": def from_model(cls, model: Event) -> "EventPlayersSchema":
# return cls( return cls(
# players=[PlayerEventRolesSchema.from_model(player) for player in model.players], players=[PlayerEventRolesSchema.from_model(player) for player in model.players],
# roles=[RoleSchema.from_model(player.role.role) for player in model.players if player.role], roles=[RoleSchema.from_model(player.role.role) for player in model.players if player.role],
# ) )
from models.team import Team from models.team import Team
from models.player_event import PlayerEvent, PlayerEventRolesSchema from models.player_event import PlayerEvent
from models.team_integration import TeamDiscordIntegration from models.team_integration import TeamDiscordIntegration
from models.player_team import PlayerTeam
from models.player_team_role import PlayerTeamRole
from utils.bipartite_graph import BipartiteGraph

18
backend-flask/models/team.py
View File

@ -102,24 +102,6 @@ class TeamSchema(spec.BaseModel):
created_at=team.created_at, created_at=team.created_at,
) )
class TeamWithRoleSchema(TeamSchema):
role: str
is_team_leader: bool
player_count: int
@classmethod
def from_player_team(cls, player_team: "PlayerTeam"):
return cls(
id=player_team.team.id,
team_name=player_team.team.team_name,
tz_timezone=player_team.team.tz_timezone,
minute_offset=player_team.team.minute_offset,
created_at=player_team.team.created_at,
role=player_team.team_role.name,
is_team_leader=player_team.is_team_leader,
player_count=len(player_team.team.players),
)
from models.player_team import PlayerTeam from models.player_team import PlayerTeam
from models.team_invite import TeamInvite from models.team_invite import TeamInvite
from models.team_integration import ( from models.team_integration import (