Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/views/Events.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<v-tab style="background-color: #64b5f6; color: black;">
開催予定
</v-tab>
<v-tab style="background-color: #9e9e9e; color: black;">
<!-- <v-tab style="background-color: #9e9e9e; color: black;">
終了
</v-tab>
</v-tab> -->
</v-tabs>
<v-tabs-items v-model="tab"> <!--なんかtabがいる-->
<v-tab-item eager>
Expand All @@ -34,12 +34,12 @@
:key="event.id"
:event="event" />
</v-tab-item>
<v-tab-item eager>
<!-- <v-tab-item eager>
<event-item
v-for="event in pastEvents"
:key="event.id"
:event="event" />
</v-tab-item>
</v-tab-item> -->
</v-tabs-items>
</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions src/views/User.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
最終更新日時:{{ getStringFromDate(user.updatedTime.toDate()) }}
</div>

<div v-if="userEvents" class="events-list">
<!-- <div v-if="userEvents" class="events-list">
<user-event-item
v-for="event in userEvents"
:key="event.id"
Expand All @@ -26,23 +26,23 @@
v-for="talk in userTalks"
:key="talk.id"
:talkId="talk.id" />
</div>
</div> -->
</div>
</div>
</template>

<script>
import firebase from 'firebase'
import { db } from '@/firebase/firestore.js'
import UserEventItem from '@/components/UserEventItem.vue'
import TalkItem from '@/components/TalkItem.vue'
// import UserEventItem from '@/components/UserEventItem.vue'
// import TalkItem from '@/components/TalkItem.vue'
import EditUserForm from '@/components/EditUserForm';

export default {
name: 'User',
components: {
UserEventItem,
TalkItem,
// UserEventItem,
// TalkItem,
EditUserForm
},
data() {
Expand Down