From 69c1f06514a863d801c82a43e9cbf9df5da4a763 Mon Sep 17 00:00:00 2001 From: kazuki-komori Date: Sun, 6 Sep 2020 18:00:10 +0900 Subject: [PATCH 1/5] update --- nuxt.config.js | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/nuxt.config.js b/nuxt.config.js index e23e068..5e5f197 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -3,7 +3,7 @@ export default { ** Nuxt rendering mode ** See https://nuxtjs.org/api/configuration-mode */ - mode: 'spa', + mode: 'universal', /* ** Nuxt target ** See https://nuxtjs.org/api/configuration-target @@ -15,6 +15,7 @@ export default { */ head: { title: process.env.npm_package_name || '', + titleTemplate: '%s - DTL NAVI', meta: [ { charset: 'utf-8' }, { name: 'viewport', content: 'width=device-width, initial-scale=1' }, @@ -23,14 +24,35 @@ export default { name: 'description', content: process.env.npm_package_description || '', }, - ], - link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }], - script: [ { - src: - 'https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.bundle.js', + hid: 'description', + name: 'description', + content: + '同志社大学のテニスサークルの一覧を掲載しています。活動日程から、ビラのダウンロードまで様々な用途でご利用いただけます。', + }, + { + hid: 'keywords', + name: 'keywords', + content: '同志社 テニスサークル テニス サークル 新歓', + }, + { hid: 'og:site_name', property: 'og:site_name', content: 'DTL NAVI' }, + { hid: 'og:type', property: 'og:type', content: 'website' }, + { hid: 'og:url', property: 'og:url', content: 'https://dtlnavi.com' }, + { hid: 'og:title', property: 'og:title', content: 'DTL NAVI' }, + { + hid: 'og:description', + property: 'og:description', + content: + '同志社大学のテニスサークルの一覧を掲載しています。活動日程から、ビラのダウンロードまで様々な用途でご利用いただけます。', + }, + { + hid: 'og:image', + property: 'og:image', + content: 'https://dtlnavi.com/img/headerImage.png', }, ], + link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }], + script: [], }, /* ** Global CSS From 6594f3979c8ad44bb90ba23e10f438ba300f65d7 Mon Sep 17 00:00:00 2001 From: kazuki-komori Date: Sun, 6 Sep 2020 18:05:13 +0900 Subject: [PATCH 2/5] update --- nuxt.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuxt.config.js b/nuxt.config.js index 5e5f197..8fb0b51 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -3,7 +3,7 @@ export default { ** Nuxt rendering mode ** See https://nuxtjs.org/api/configuration-mode */ - mode: 'universal', + mode: 'spa', /* ** Nuxt target ** See https://nuxtjs.org/api/configuration-target From f12239e1983d771cd1a74928febd92969e25ed62 Mon Sep 17 00:00:00 2001 From: Fukuda-Kota Date: Tue, 8 Sep 2020 13:08:23 +0900 Subject: [PATCH 3/5] modified tablet and mobile view --- components/detail/Events.vue | 11 +++++++++++ components/detail/FacultyPieChart.vue | 2 +- pages/index.vue | 10 +++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/components/detail/Events.vue b/components/detail/Events.vue index 2227483..dbefa41 100644 --- a/components/detail/Events.vue +++ b/components/detail/Events.vue @@ -45,4 +45,15 @@ export default { th { text-align: center; } +@media screen and (max-width:1024px) { + .p-Events { + margin-left: 20px; + } +} +@media screen and (max-width:768px) { + .p-Events { + width: auto; + margin-left: 0; + } +} diff --git a/components/detail/FacultyPieChart.vue b/components/detail/FacultyPieChart.vue index 7f8be05..da6745b 100644 --- a/components/detail/FacultyPieChart.vue +++ b/components/detail/FacultyPieChart.vue @@ -63,7 +63,7 @@ export default { diff --git a/components/home/Thumbnail.vue b/components/home/Thumbnail.vue index c5fcf18..b475c76 100644 --- a/components/home/Thumbnail.vue +++ b/components/home/Thumbnail.vue @@ -84,10 +84,10 @@ export default { return this.options.people === '2' && this.data.basicInfo[0].members <= 80 }, gradeJudgement() { - if (this.options.grade === '' || this.options.grade === 2) { + if (this.options.grade === '') { return true } - return this.options.grade === String(this.data.basicInfo[0].canJoinGrade) + return true }, }, async mounted() { diff --git a/pages/detail/_group/index.vue b/pages/detail/_group/index.vue index a232319..bab132d 100644 --- a/pages/detail/_group/index.vue +++ b/pages/detail/_group/index.vue @@ -67,8 +67,8 @@
お問い合わせいつでも
- @@ -287,7 +287,7 @@ ul { } .p-menu-list_button ul { display: flex; - margin: 1% 0; + margin: 1% 0; } .p-menu-list_button ul li { margin: auto 5% auto 0;