Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
fatfingers23 committed Apr 22, 2024
1 parent 942115a commit d200b16
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 17 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use actix_web::{get, web, Error, HttpResponse, Scope};
use log::info;
use serde::{Deserialize, Serialize};
use trackscape_discord_shared::database::clan_mates::{ClanMateModel, ClanMates};
use trackscape_discord_shared::database::clan_mates::ClanMateModel;
use trackscape_discord_shared::database::BotMongoDb;
use web::Data;

Expand Down
2 changes: 1 addition & 1 deletion trackscape-discord-shared/src/database/pb_activities_db.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use bson::serde_helpers::serialize_object_id_as_hex_string;
use bson::DateTime;
use futures::{TryFutureExt, TryStreamExt};
use futures::TryStreamExt;
use mockall::predicate::*;
use mongodb::bson::doc;
use mongodb::options::FindOptions;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import type { Broadcast } from '@/services/TrackscapeApiTypes';
import { type PropType, ref } from 'vue';
import { type PropType } from 'vue';
const props = defineProps({
broadcast: {
Expand Down
2 changes: 1 addition & 1 deletion trackscape-discord-ui/src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ClanRoutes from './clans';

const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL),
scrollBehavior(to, from, savedPosition) {
scrollBehavior() {
// always scroll to top
return { top: 0 };
},
Expand Down
6 changes: 3 additions & 3 deletions trackscape-discord-ui/src/views/clans/clan/ClanView.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script setup lang="ts">
import {useRoute} from "vue-router";
import { useRoute } from 'vue-router';
import PageTitle from "@/components/PageTitle.vue";
import TrackscapeApiClient from "@/services/TrackscapeApiClient";
import {ref} from "vue";
Expand Down Expand Up @@ -56,6 +55,7 @@ const tabMenus = [
active: false,
childrenNames: [
'collection-log',
'personal-best'
]
},
];
Expand Down Expand Up @@ -108,7 +108,7 @@ const tabMenus = [
<router-link v-for="(tabMenu,index) in tabMenus"
:key="index"
:to="{name: tabMenu.routeName, params: {clanId: clanId}}"
:class="['tab', {'tab-active': route.name === tabMenu.routeName} || tabMenu.childrenNames.includes(route.name)]">{{tabMenu.name}}</router-link>
:class="['tab', {'tab-active': route.name === tabMenu.routeName}, {'tab-active': tabMenu.childrenNames.includes(route.name?.toString() ?? '')}]">{{tabMenu.name}}</router-link>
</div>
<router-view v-slot="{ Component}" >
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<script setup lang="ts">
import TrackscapeApiClient from "@/services/TrackscapeApiClient";
import type {ClanDetail, ClanMateCollectionLogTotalsView} from "@/services/TrackscapeApiTypes";
import type {ClanDetail} from "@/services/TrackscapeApiTypes";
import type {PropType} from "vue";
import {useRoute} from "vue-router";
import {ref} from "vue";
import DataTable from "@/components/General/DataTable.vue";
import SkeletonTable from "@/components/General/SkeletonTable.vue";
import PersonalBestActivitySelect from '@/components/clan/PersonalBestActivitySelect.vue';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<script setup lang="ts">
import type { ClanDetail } from '@/services/TrackscapeApiTypes';
import type {PropType} from "vue";
import {useRoute} from "vue-router";
import {ref} from "vue";
import DataTable from "@/components/General/DataTable.vue";
import SkeletonTable from "@/components/General/SkeletonTable.vue";
import { usePbStore } from '@/stores/PbStore';
import ClanMateWithRank from '@/components/clan/ClanMateWithRank.vue';
import { it } from 'vitest';
const store = usePbStore();
Expand All @@ -23,9 +21,6 @@ let clan = ref<ClanDetail>();
if (props.clanDetail) {
clan.value = props.clanDetail;
} else {
const route = useRoute();
const clanId = route.params.clanId as string;
}
const columns = [
Expand Down

0 comments on commit d200b16

Please sign in to comment.