Skip to content
This repository has been archived by the owner on Dec 2, 2022. It is now read-only.

Feature/fix misc #580

Merged
merged 5 commits into from Aug 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion ui/components/organisms/Navigation.vue
@@ -1,17 +1,18 @@
<template>
<v-app-bar app dense color="primary">
<navigation-link to="/">
<!-- TODO: v-imgにする, max-heightプロパティが使いたい -->
<img class="logo" src="~assets/img/ictsc-logo-white.svg" alt="ICTSC" />
</navigation-link>

<navigation-link to="/guide">
ガイド
</navigation-link>

<!-- TODO: 未実装なため隠す
<navigation-link to="/teams">
チーム
</navigation-link>
-->

<v-spacer />

Expand Down
7 changes: 7 additions & 0 deletions ui/pages/guide.vue
Expand Up @@ -4,18 +4,25 @@
<v-flex>
<v-layout column align-center>
<page-title title="ガイド" />
<markdown :content="guidePage" />
</v-layout>
</v-flex>
</v-layout>
</v-container>
</template>
<script>
import { mapGetters } from 'vuex'
import Markdown from '~/components/atoms/Markdown'
import PageTitle from '~/components/atoms/PageTitle'

export default {
name: 'Guide',
components: {
Markdown,
PageTitle
},
computed: {
...mapGetters('contestInfo', ['guidePage'])
}
}
</script>
9 changes: 6 additions & 3 deletions ui/pages/login.vue
Expand Up @@ -51,8 +51,10 @@ export default {
password: '',
passwordVisible: false,
loading: false,
nameRules: [v => !!v || 'チーム名を入力してください'],
passwordRules: [v => !!v || 'パスワードを入力してください']

// 鬱陶しいのでメッセージは出さない
nameRules: [v => !!v || ''],
passwordRules: [v => !!v || '']
}
},
methods: {
Expand All @@ -62,7 +64,8 @@ export default {

if (await this.login({ name: this.name, password: this.password })) {
this.notifySuccess({ message: 'ログインしました' })
this.$router.push('/')
// locationを直接使うことで強制リロード
window.location = '/'
} else {
this.notifyWarning({
message: 'チーム名かパスワードが正しくありません'
Expand Down
17 changes: 17 additions & 0 deletions ui/pages/summary.vue
@@ -0,0 +1,17 @@
<template>
<v-container>
<v-layout column align-center>
<page-title title="状況" />
</v-layout>
</v-container>
</template>
<script>
import PageTitle from '~/components/atoms/PageTitle'

export default {
name: 'Summary',
components: {
PageTitle
}
}
</script>