Skip to content
This repository was archived by the owner on May 7, 2021. It is now read-only.

Commit 55a63c1

Browse files
committed
Mv footer from Home.vue to App.vue
1 parent 294c552 commit 55a63c1

File tree

2 files changed

+36
-38
lines changed

2 files changed

+36
-38
lines changed

src/App.vue

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,45 @@
11
<template>
22
<div id="app">
33
<error-page v-if="isError"/>
4+
45
<header>
56
<router-link :to="{ name: 'home' }">
67
<img class="logo" src="@/assets/logo.svg" alt="ProLab">
78
</router-link>
89
<loading-indicator/>
910
</header>
11+
1012
<router-view v-show="!isError"/>
13+
14+
<footer>
15+
<div v-if="loggedIn">
16+
<router-link to="/editprofile">プロフィール編集</router-link>
17+
<router-link :to="{ name: 'editAchievements' }" exact>実績編集</router-link>
18+
<Logout/>
19+
</div>
20+
<div v-else>
21+
<router-link to="/login">ログイン</router-link>
22+
</div>
23+
<small>&copy; Programming Laboratory, 2019</small>
24+
</footer>
1125
</div>
1226
</template>
1327

1428
<script>
1529
import { mapGetters } from 'vuex';
1630
import ErrorPage from './components/ErrorPage.vue';
1731
import LoadingIndicator from './components/LoadingIndicator.vue';
32+
import Logout from '@/components/Logout.vue';
1833
1934
export default {
2035
components: {
2136
ErrorPage,
2237
LoadingIndicator,
38+
Logout,
2339
},
2440
computed: {
2541
...mapGetters('criticalError', ['isError']),
42+
...mapGetters('session', ['loggedIn']),
2643
},
2744
metaInfo: {
2845
title: 'Untitled',
@@ -52,6 +69,25 @@ header img {
5269
padding: 3px;
5370
}
5471
72+
footer div {
73+
text-align: center;
74+
}
75+
76+
footer a {
77+
display: inline-block;
78+
padding: 12px;
79+
border-bottom: 2px #333 solid;
80+
color: black;
81+
margin: 0 4px 24px;
82+
}
83+
84+
footer small {
85+
display: block;
86+
}
87+
88+
small {
89+
text-align: center;
90+
}
5591
5692
@media screen and (max-width: 480px) {
5793
header img {

src/views/Home.vue

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,11 @@
2121
<publicMemberList includeLeftUser/>
2222
</div>
2323
</section>
24-
25-
<footer>
26-
<div v-if="loggedIn">
27-
<router-link to="/editprofile">プロフィール編集</router-link>
28-
<router-link :to="{ name: 'editAchievements' }" exact>実績編集</router-link>
29-
<Logout/>
30-
</div>
31-
<div v-else>
32-
<router-link to="/login">ログイン</router-link>
33-
</div>
34-
<small>&copy; Programming Laboratory, 2019</small>
35-
</footer>
3624
</div>
3725
</template>
3826

3927
<script>
40-
import { mapGetters } from 'vuex';
4128
import AchievementsList from '@/components/AchievementsList.vue';
42-
import Logout from '@/components/Logout.vue';
4329
import publicMemberList from '@/components/PublicMemberList.vue';
4430
4531
export default {
@@ -50,12 +36,8 @@ export default {
5036
},
5137
components: {
5238
AchievementsList,
53-
Logout,
5439
publicMemberList,
5540
},
56-
computed: {
57-
...mapGetters('session', ['loggedIn']),
58-
},
5941
};
6042
</script>
6143

@@ -69,22 +51,6 @@ export default {
6951
}
7052
}
7153
72-
footer div {
73-
text-align: center;
74-
}
75-
76-
footer a {
77-
display: inline-block;
78-
padding: 12px;
79-
border-bottom: 2px #333 solid;
80-
color: black;
81-
margin: 0 4px 24px;
82-
}
83-
84-
footer small {
85-
display: block;
86-
}
87-
8854
.home {
8955
max-width: 1500px;
9056
margin: 40px auto;
@@ -127,10 +93,6 @@ p {
12793
margin-right: 20px;
12894
}
12995
130-
small {
131-
text-align: center;
132-
}
133-
13496
@media screen and (max-width: 480px) {
13597
h2 {
13698
padding-left: 30px;

0 commit comments

Comments
 (0)