Skip to content

Commit

Permalink
Merge pull request #203 from traPtitech/feat/group_not_implemented
Browse files Browse the repository at this point in the history
班が未実装であることを表示
  • Loading branch information
mehm8128 authored Jul 20, 2024
2 parents de0edaf + 5d00745 commit e0f0d3b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
7 changes: 4 additions & 3 deletions src/components/User/GroupsContainer.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts" setup>
import { UserGroup } from '/@/lib/apis'
import GroupList from '/@/components/Groups/GroupList.vue'
// import GroupList from '/@/components/Groups/GroupList.vue'
interface Props {
groups: UserGroup[]
Expand All @@ -12,8 +12,9 @@ defineProps<Props>()
<template>
<section :class="$style.section">
<h2 :class="$style.title">班</h2>
<group-list v-if="groups.length > 0" :groups="groups" />
<p v-else>現在所属している班はありません</p>
<p>今後実装予定です</p>
<!-- <group-list v-if="groups.length > 0" :groups="groups" />
<p v-else>現在所属している班はありません</p> -->
</section>
</template>

Expand Down
12 changes: 6 additions & 6 deletions src/pages/IndexPage.vue
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<script lang="ts" setup>
import GroupList from '/@/components/Index/GroupList.vue'
// import GroupList from '/@/components/Index/GroupList.vue'
import RecentList from '/@/components/Index/RecentList.vue'
import { useGroupStore } from '/@/store/group'
// import { useGroupStore } from '/@/store/group'
import { useContestStore } from '/@/store/contest'
import { useProjectStore } from '/@/store/project'
import TopSection from '/@/components/Index/TopSection.vue'
import { useResponsiveStore } from '/@/store/responsive'
import { storeToRefs } from 'pinia'
import { computed, onMounted } from 'vue'
const groupStore = useGroupStore()
// const groupStore = useGroupStore()
const contestStore = useContestStore()
const projectStore = useProjectStore()
const responsiveStore = useResponsiveStore()
const groups = await groupStore.fetchGroups()
// const groups = await groupStore.fetchGroups()
const contests = await contestStore.fetchContests()
const projects = await projectStore.fetchProjects()
Expand Down Expand Up @@ -66,9 +66,9 @@ onMounted(() => {
</top-section>
<top-section
title="班一覧"
description="7つの班に分かれてそれぞれの活動を行っています。"
description="7つの班に分かれてそれぞれの活動を行っています。班一覽は今後実装予定です。"
>
<group-list :groups="groups" :class="$style.groupName" />
<!-- <group-list :groups="groups" :class="$style.groupName" /> -->
</top-section>
</div>
</template>
Expand Down

0 comments on commit e0f0d3b

Please sign in to comment.