Skip to content
This repository has been archived by the owner on Jul 9, 2024. It is now read-only.

Commit

Permalink
Merge pull request #25 from ynufes-tech/shion1305/reservation-info
Browse files Browse the repository at this point in the history
事前予約情報の反映
  • Loading branch information
Shion1305 authored May 14, 2024
2 parents 1acdd7c + faf3115 commit d5f99ba
Show file tree
Hide file tree
Showing 11 changed files with 344 additions and 19 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
module.exports = {
root: true,
env: {
node: true
node: true,
'vue/setup-compiler-macros': true
},
'extends': [
'plugin:vue/vue3-essential',
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"sass-loader": "^13.0.2",
"tsparticles": "^2.2.4",
"vue": "^3.2.13",
"vue-final-modal": "^3.4.4",
"vue-router": "^4.0.3",
"vue3-particles": "^2.2.4",
"vuex": "^4.0.0"
Expand Down
18 changes: 16 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,28 @@
<!DOCTYPE html>
<html lang="">
<head>
<head prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb# website: http://ogp.me/ns/website#">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<meta property="og:url" content="https://tokiwa22.ynu-fes.yokohama/"/>
<meta property="og:type" content="website"/>
<meta property="og:title" content="【星彩】22常盤祭 - 横浜国立大学大学祭 準備中"/>
<meta property="og:description" content="22常盤祭 横浜国立大学大学祭の公式HPです。公開までしばらくお待ちください。"/>
<meta property="og:site_name" content="【星彩】22常盤祭 - 横浜国立大学大学祭 準備中"/>
<meta content="https://tokiwa22.ynu-fes.yokohama/ogp_image.webp" property="og:image"/>
<meta content="summary" property="twitter:card"/>
<meta content="@ynu_fes" property="twitter:site"/>
<meta content="【星彩】22常盤祭 - 横浜国立大学大学祭 準備中" property="twitter:title"/>
<meta content="https://tokiwa22.ynu-fes.yokohama/ogp_image.webp" property="twitter:image"/>
<meta content="22常盤祭 横浜国立大学大学祭の公式HPです。公開までしばらくお待ちください。" name="description"/>
<meta content="https://tokiwa22.ynu-fes.yokohama/ogp_image.webp" name="thumbnail"/>
<meta content="常盤祭,22常盤祭,大学祭,星彩,横浜国立大学,横国,YNU,文化祭,YNUFES" name="keyword"/>
<title>【星彩】22常盤祭 - 横浜国立大学大学祭 準備中</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Klee+One&family=Petit+Formal+Script&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Klee+One&family=Petit+Formal+Script&display=swap"
rel="stylesheet">
</head>
<body>
<noscript>
Expand Down
Binary file added public/ogp_image.webp
Binary file not shown.
45 changes: 31 additions & 14 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
<script setup>
import CountDown from "@/components/CountDown";
import ReservationModal from "@/components/ReservationModal";
import {ref} from "vue";
const reservation_modal = ref(null)
function openModal() {
reservation_modal.value.showModal = true;
}
</script>


<template>
<div class="container">
<ReservationModal ref="reservation_modal"/>
<div class="countdown-frame">
<div class="theme">
<div class="theme-label">2022横浜国立大学<br>常盤祭 テーマ</div>
Expand All @@ -13,8 +22,10 @@ import CountDown from "@/components/CountDown";
<div class="date">開催期間: 10/28~30</div>
<CountDown/>
<div class="image-button-area">
<img src="@/assets/funding.webp" alt="クラウドファンディングのご案内"/>
<img src="@/assets/pokemon.webp" alt="ポケモン企画の紹介"/>
<img src="@/assets/reservation-1.webp" alt="事前予約制についてのご案内" @click="openModal()" class="reservation-button"/>
<a href="https://www.pokemonunite.jp/ja/news/82/" target="_blank" rel="noopener noreferrer">
<img src="@/assets/pokemon.webp" alt="ポケモン企画の紹介"/>
</a>
</div>
</div>

Expand All @@ -23,7 +34,7 @@ import CountDown from "@/components/CountDown";
</template>

<style lang="scss">
body{
body {
margin: 0;
}
Expand All @@ -35,13 +46,16 @@ body{
color: #FFFFFF;
}
.image-button-area{
.image-button-area {
display: flex;
flex-direction: row;
justify-content: center;
gap: 3vw;
>img{
img {
object-fit: cover;
width: min(40vw, 30vh);
aspect-ratio: 1;
}
}
Expand Down Expand Up @@ -77,18 +91,21 @@ body{
font-size: 2em;
margin-bottom: -1em;
}
.reservation-button{
cursor: pointer;
}
.date{
.date {
font-size: 1.2em;
margin-top: -0.7em;
margin-bottom: 2em;
}
.countdown-label{
.countdown-label {
font-size: 1.5em;
}
.count-down{
.count-down {
font-size: 4em;
}
Expand All @@ -105,25 +122,25 @@ nav a.router-link-exact-active {
color: #42b983;
}
@media screen and (max-width: 520px){
@media screen and (max-width: 520px) {
.theme-label{
.theme-label {
font-size: 3em;
}
.theme-title{
.theme-title {
font-size: 12em;
}
.date{
.date {
font-size: 1em;
}
.countdown-label{
.countdown-label {
font-size: 1.5em;
}
.count-down{
.count-down {
font-size: 10vw;
}
}
Expand Down
Binary file modified src/assets/funding.webp
Binary file not shown.
Binary file added src/assets/logo-seisai-trans08.webp
Binary file not shown.
Binary file added src/assets/reservation-1.webp
Binary file not shown.
185 changes: 185 additions & 0 deletions src/components/ReservationModal.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
<script setup>
import {ref} from "vue";
const showModal = ref(false)
function clickOutside() {
console.log("outside")
}
defineExpose({
showModal
})
</script>

<template>
<vue-final-modal v-model="showModal" @click-outside="clickOutside" class="modal">
<div class="back-button" @click="showModal=false">トップに戻る</div>
<div class="ticket-info-frame" @click="null">
<h1><span>22常盤祭は</span><span><b>事前予約制</b><span>です!!</span></span></h1>
<div class="modal-content">
<p>
22常盤祭では、感染症対策の観点から事前予約制を導入します。チケットの無い方はご入場いただけませんのでご了承下さい。
</p>
<h2><span>事前予約制への</span><span>申し込み方法</span></h2>
<div class="event-application-buttons">
<a href="https://e-ve.event-form.jp/event/39275/TokiwaDay1" target="_blank" rel="noopener noreferrer">
1日目(10/28)分はこちら
</a>
<a href="https://e-ve.event-form.jp/event/39472/TokiwaDay2" target="_blank" rel="noopener noreferrer">
2日目(10/29)分はこちら
</a>
<a href="https://e-ve.event-form.jp/event/39672/TokiwaDay3" target="_blank" rel="noopener noreferrer">
3日目(10/30)分はこちら
</a>
</div>
<h2>定員について</h2>
<ul>
<li>大学側との競技により1日当たり<b>4000人</b>となります。</li>
<li><b>当日枠等は設けておりません</b>。来場をご希望の方は<b>必ず</b>事前予約をお願いいたします。</li>
</ul>
<h2>チケットについて</h2>
<ul>
<li>4歳以上の方のご入場には、一人一枚ずつのチケットが必要です。(3歳までのお子様は保護者の方と一緒にご入場できます。)</li>
<li>22常盤祭の来場チケットは、<b>メール宛にお送りするQRコード</b>です。当日は入場・退場ジに読み取ることで受付を行います。</li>
<li>多くの方にご入場いただくため、各日程一人一枚のお申込みとなります(複数日程の申し込みは可能です。)</li>
<li>お連れ様と一緒にお申込みいただけます(4人まで)</li>
</ul>
<h2>抽選について</h2>
<ul>
<li>抽選結果は、<b>10/22(土)の18:00まで</b>にメールでお知らせします。</li>
<li><b>落選の方は申し訳ありませんがご来場頂けません</b>。企画によって配信の予定もございますのでそちらもご覧ください。</li>
</ul>
</div>
<div class="back-button" @click="showModal=!showModal">トップに戻る</div>
</div>
</vue-final-modal>
</template>
<style scoped lang="scss">
.modal {
overflow: scroll;
overflow-x: hidden;
}
.ticket-info-frame {
margin: 0 auto;
box-sizing: border-box;
width: min(80%, 50rem);
background: white;
color: #2c3e50;
border-radius: 1em;
overflow: hidden;
span {
display: inline-block;
}
h1 {
padding: 1em 0;
margin: 0;
width: 100%;
font-size: 2em;
background: #25254d;
color: white;
b {
color: white;
font-size: 1.5em;
margin: 0 0.1em;
text-decoration: none;
}
}
.modal-content {
margin: 1em;
background-image: url("@/assets/logo-seisai-trans08.webp");
background-size: contain;
background-repeat: no-repeat;
background-position: center;
font-size: 1em;
font-weight: bold;
h2 {
font-weight: bolder;
font-size: 1.8em;
width: fit-content;
margin: 0.5em auto;
}
h2:after {
content: "";
float: left;
background: #b49b29;
width: 100%;
height: 6px;
border-radius: 3px;
}
ul {
text-align: start;
margin: 0 auto;
line-height: 1.5;
li {
margin: 0.5em 0;
}
}
p, ul {
font-size: 1.3em;
}
}
b {
color: red;
text-decoration: underline;
}
.back-button {
border-color: #25254d;
color: #25254d;
font-weight: bold;
}
.event-application-buttons {
display: flex;
flex-direction: column;
margin: auto;
width: fit-content;
gap: 0.5em;
a {
border-radius: 0.8em;
font-size: 1.3em;
color: rgb(44, 44, 44);
width: fit-content;
padding: 0.8em;
&:nth-child(1) {
background: #c5d2ef;
}
&:nth-child(2) {
background: #aff6d6;
}
&:nth-child(3) {
background: #f8c1e1;
}
}
}
}
.back-button {
color: white;
padding: 0.8em 2em;
border-radius: 2em;
border: solid 0.1em white;
width: fit-content;
margin: 1em auto;
font-size: 1.3em;
}
</style>
3 changes: 2 additions & 1 deletion src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ import App from './App.vue'
import router from './router'
import store from './store'
import Particles from 'vue3-particles'
import { vfmPlugin } from 'vue-final-modal'

createApp(App).use(store).use(Particles).use(router).mount('#app')
createApp(App).use(store).use(Particles).use(router).use(vfmPlugin).mount('#app')
Loading

0 comments on commit d5f99ba

Please sign in to comment.