t510599/2021
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev2' of https://github.com/sitcon-tw/2021 into dev2

Browse Source
This commit is contained in:
Snowmint 2021-01-19 21:50:31 +08:00
commit 2f8c242d91
6 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -4,7 +4,7 @@
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"build": "vue-cli-service build && mv ./dist/2021/* ./dist && rm -rf 2021", "build": "vue-cli-service build && mv ./dist/2021/* ./dist && rm -rf 2021 && mv ./dist/app.html ./dist/index.html",
"lint": "vue-cli-service lint" "lint": "vue-cli-service lint"
}, },
"dependencies": { "dependencies": {
@ -34,4 +34,4 @@
"vue-cli-plugin-prerender-spa": "~1.1.6", "vue-cli-plugin-prerender-spa": "~1.1.6",
"vue-template-compiler": "^2.6.11" "vue-template-compiler": "^2.6.11"
} }
} }

3
public/index.html
View File

@ -13,10 +13,11 @@
<meta property="og:site_name" content="SITCON 2021 學生計算機年會 | Students' Information Technology Conference" /> <meta property="og:site_name" content="SITCON 2021 學生計算機年會 | Students' Information Technology Conference" />
<link rel="icon" href="<%= BASE_URL %>sitcon-logo.png"> <link rel="icon" href="<%= BASE_URL %>sitcon-logo.png">
<title>SITCON 學生計算機年會 2021</title> <title>SITCON 學生計算機年會 2021</title>
<noscript>{{{ %GA_TEMPLATE% }}}</noscript>
</head> </head>
<body> <body>
<noscript>{{{ %GA_TEMPLATE% }}}</noscript>
<noscript> <noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
Please enable it to continue.</strong> Please enable it to continue.</strong>

4
src/components/CFP/Intro.vue
View File

@ -16,8 +16,8 @@
<!-- src="@/assets/images/cfp/Background.svg" --> <!-- src="@/assets/images/cfp/Background.svg" -->
<!-- first part --> <!-- first part -->
<img src="@/assets/images/cfp/Path 740.svg" class="SITCON-text-path"/> <img src="@/assets/images/cfp/Path 740.svg" class="SITCON-text-path"/>
<svg width="890" height="900" class="first-box"> <svg width="1200" height="1000" class="first-box">
<rect width="1000" height="1000" style="fill:#ffffff;" /> <rect width="1200" height="1000" style="fill:#ffffff;" />
</svg> </svg>
<div class="box-back"> <div class="box-back">
<h1>關於 SITCON</h1> <h1>關於 SITCON</h1>

2
src/components/news/Header.vue
View File

@ -2,7 +2,7 @@
<header> <header>
<div class="top-bar"> <div class="top-bar">
<div class="return-wrapper"> <div class="return-wrapper">
<a class="shape-wrapper diamond" href="/cfp" <a class="shape-wrapper diamond" href="/2021/cfp"
><span class="text-wrapper">返回</span></a ><span class="text-wrapper">返回</span></a
> >
</div> </div>

2
src/router/index.ts
View File

@ -10,7 +10,7 @@ export const routes: RouteConfig[] = [
{ {
path: '/', path: '/',
name: 'Home', name: 'Home',
redirect: '/cfp', component: CFP,
meta: { meta: {
index: 0, index: 0,
label: 'SITCON 2021', label: 'SITCON 2021',

18
template/ga.html
View File

@ -36,21 +36,12 @@
"offers": [ "offers": [
{ {
"@type": "Offer", "@type": "Offer",
"name": "個人贊助票", "name": "個人小額贊助方案",
"url": "https://sitcon.kktix.cc/events/sitcon2020-individual-sponsor", "url": "https://sitcon.kktix.cc/events/sitcon2020-individual-sponsor",
"price": "1000",
"priceCurrency": "TWD",
"availability": "http://schema.org/InStock",
"validFrom": "2019-10-14T00:00+08:00"
},
{
"@type": "Offer",
"name": "個人贊助票（純粹贊助）",
"url": "https://sitcon.kktix.cc/events/sitcon2021-individual-sponsor1",
"price": "500", "price": "500",
"priceCurrency": "TWD", "priceCurrency": "TWD",
"availability": "http://schema.org/InStock", "availability": "http://schema.org/InStock",
"validFrom": "2019-10-14T00:00+08:00" "validFrom": "2020-12-01T00:00+08:00"
} }
], ],
"performer": { "performer": {
@ -64,8 +55,7 @@
"https://twitter.com/sitcontw" "https://twitter.com/sitcontw"
] ]
}, },
"eventStatus": "EventRescheduled", "eventStatus": "EventScheduled"
"previousStartDate": "2021-05-29T08:30+08:00"
} }
</script> </script>
<script> <script>
@ -95,4 +85,4 @@
} }
gtag('js', new Date()); gtag('js', new Date());
gtag('config', 'UA-34467841-1'); gtag('config', 'UA-34467841-1');
</script> </script>