Skip to content

Commit 814b9d2

Browse files
NEKOYASANNEKOYASAN
authored
Merge pull request #187 from Nekoya3/feature/fix-footer-link
FooterLink OGPの修正
2 parents 60b4966 + 72e7824 commit 814b9d2

File tree

6 files changed

+162
-35
lines changed

6 files changed

+162
-35
lines changed

‎nuxt.config.js‎

Lines changed: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,63 @@ export default {
1616
meta: [
1717
{ charset: 'utf-8' },
1818
{ name: 'viewport', content: 'width=device-width, initial-scale=1' },
19+
{
20+
hid: 'keyword',
21+
name: 'keyword',
22+
content: 'CodeforJapan, おうちで時間割, デジタル, 学び, 今後の学習'
23+
},
24+
{
25+
hid: 'author',
26+
name: 'author',
27+
content: 'Code for Japan'
28+
},
29+
{
30+
hid: 'og:site_name',
31+
property: 'og:site_name',
32+
content: 'おうちで時間割'
33+
},
34+
{
35+
hid: 'og:url',
36+
property: 'og:url',
37+
content: `https://app.studyathome.jp/`
38+
},
39+
{
40+
hid: 'og:title',
41+
property: 'og:title',
42+
content: 'おうちで時間割'
43+
},
44+
{
45+
hid: 'og:description',
46+
property: 'og:description',
47+
content:
48+
'子どもの学びにデジタルの活用を - 臨時休校期間と今後の学習に向けて 簡単に楽しく学べる環境を今だから、みんなでつくろう。'
49+
},
50+
{
51+
hid: 'apple-mobile-web-app-title',
52+
name: 'apple-mobile-web-app-title',
53+
content: 'おうちで時間割'
54+
},
1955
{
2056
hid: 'description',
2157
name: 'description',
2258
content:
23-
'おうちにいても先生から課題が届きます！時間割に合わせて楽しく学んでコロナ休校を乗り切ろう！'
59+
'子どもの学びにデジタルの活用を - 臨時休校期間と今後の学習に向けて 簡単に楽しく学べる環境を今だから、みんなでつくろう。'
2460
},
25-
{ hid: 'robots', name: 'robots', content: 'noindex' }
26-
],
27-
link: [
28-
{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
29-
{ rel: 'apple-touch-icon', href: '/apple-touch-icon-precomposed.png' },
3061
{ hid: 'og:type', property: 'og:type', content: 'website' },
3162
{
3263
hid: 'og:image',
3364
property: 'og:image',
34-
content: 'https://studyathome.web.app/ogp.png'
65+
content: 'https://app.studyathome.jp/'
3566
},
3667
{
3768
hid: 'twitter:image',
3869
name: 'twitter:image',
39-
content: 'https://studyathome.web.app/ogp.png'
40-
},
41-
{
42-
hid: 'og:title',
43-
property: 'og:title',
44-
content: 'おうちで時間割'
70+
content: 'https://app.studyathome.jp/'
4571
}
72+
],
73+
link: [
74+
{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
75+
{ rel: 'apple-touch-icon', href: '/apple-touch-icon-precomposed.png' }
4676
]
4777
},
4878
/*

‎src/pages/edit/index.vue‎

Lines changed: 78 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,96 @@
1111
@clickEditButton="doEdit"
1212
/>
1313
<ul class="Classes-List">
14-
<li>おうちで時間割について</li>
15-
<li>お問い合わせ</li>
16-
<li>サイトポリシー</li>
14+
<li>
15+
<a
16+
class="white--text"
17+
href="http://www.studyathome.jp/"
18+
target="_blank"
19+
rel="noopener"
20+
>
21+
おうちで時間割について
22+
</a>
23+
</li>
24+
<li>
25+
<a
26+
class="white--text"
27+
href="https://forms.gle/G91PJ7T8ipTtYeGA6"
28+
target="_blank"
29+
rel="noopener"
30+
>
31+
お問い合わせ
32+
</a>
33+
</li>
34+
35+
<li>
36+
<nuxt-link class="white--text" to="policy">
37+
利用規約
38+
</nuxt-link>
39+
</li>
1740
</ul>
1841
</div>
1942
<div v-else-if="today" class="Classes-Outer">
2043
<h1 class="Classes-Title">まだ今日の時間割はありません</h1>
2144
<ul class="Classes-List">
22-
<li>おうちで時間割について</li>
23-
<li>お問い合わせ</li>
24-
<li>サイトポリシー</li>
45+
<li>
46+
<a
47+
class="white--text"
48+
href="http://www.studyathome.jp/"
49+
target="_blank"
50+
rel="noopener"
51+
>
52+
おうちで時間割について
53+
</a>
54+
</li>
55+
<li>
56+
<a
57+
class="white--text"
58+
href="https://forms.gle/G91PJ7T8ipTtYeGA6"
59+
target="_blank"
60+
rel="noopener"
61+
>
62+
お問い合わせ
63+
</a>
64+
</li>
65+
66+
<li>
67+
<nuxt-link class="white--text" to="policy">
68+
利用規約
69+
</nuxt-link>
70+
</li>
2571
</ul>
2672
</div>
2773
<div v-else class="Classes-Outer">
2874
<h1 class="Classes-Title">
2975
まだ{{ dateTitle }}の時間割は<br />ありません
3076
</h1>
3177
<ul class="Classes-List">
32-
<li>おうちで時間割について</li>
33-
<li>お問い合わせ</li>
34-
<li>サイトポリシー</li>
78+
<li>
79+
<a
80+
class="white--text"
81+
href="http://www.studyathome.jp/"
82+
target="_blank"
83+
rel="noopener"
84+
>
85+
おうちで時間割について
86+
</a>
87+
</li>
88+
<li>
89+
<a
90+
class="white--text"
91+
href="https://forms.gle/G91PJ7T8ipTtYeGA6"
92+
target="_blank"
93+
rel="noopener"
94+
>
95+
お問い合わせ
96+
</a>
97+
</li>
98+
99+
<li>
100+
<nuxt-link class="white--text" to="policy">
101+
利用規約
102+
</nuxt-link>
103+
</li>
35104
</ul>
36105
</div>
37106
<simple-bottom-sheet

‎src/pages/index.vue‎

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,34 @@
4747
@click="$router.push('/user/login')"
4848
/>
4949
<v-footer color="#004170" padless>
50-
<v-row justify="center" no-gutters>
51-
<v-col class="white--text text-center footerText" cols="12">
52-
<a class="white--text" href="#"> - おうちで時間割について </a>
53-
</v-col>
54-
<v-col class="white--text text-center footerText" cols="12">
55-
<a class="white--text" href="#"> - お問い合わせ </a>
56-
</v-col>
57-
<v-col class="white--text text-center footerText" cols="12">
50+
<ul class="Index-Footer-List">
51+
<li>
52+
<a
53+
class="white--text"
54+
href="http://www.studyathome.jp/"
55+
target="_blank"
56+
rel="noopener"
57+
>
58+
おうちで時間割について
59+
</a>
60+
</li>
61+
<li>
62+
<a
63+
class="white--text"
64+
href="https://forms.gle/G91PJ7T8ipTtYeGA6"
65+
target="_blank"
66+
rel="noopener"
67+
>
68+
お問い合わせ
69+
</a>
70+
</li>
71+
72+
<li>
5873
<nuxt-link class="white--text" to="policy">
59-
- 利用規約
74+
利用規約
6075
</nuxt-link>
61-
</v-col>
62-
</v-row>
76+
</li>
77+
</ul>
6378
</v-footer>
6479
</div>
6580
</v-flex>
@@ -146,8 +161,21 @@ export default Vue.extend({
146161
font-size: 16px;
147162
font-weight: bold;
148163
}
149-
.footerText {
150-
margin-top: 15px;
164+
.Index-Footer-List {
165+
margin: 15px auto 0 auto;
151166
font-size: 12px;
167+
color: $color-white;
168+
text-align: center;
169+
list-style: none;
170+
padding: 0;
171+
172+
li {
173+
margin-bottom: 12px;
174+
175+
&::before {
176+
content: '-';
177+
padding-right: 8px;
178+
}
179+
}
152180
}
153181
</style>

‎src/static/apple-touch-icon-precomposed.png‎

13.8 KB
Loading

‎src/static/favicon.ico‎

-15.1 KB
Binary file not shown.

‎src/static/ogp.png‎

-20.9 KB
Loading

0 commit comments

Comments
 (0)