Skip to content

Commit

Permalink
Merge branch 'production'
Browse files Browse the repository at this point in the history
  • Loading branch information
dada878 committed Jan 13, 2025
2 parents 6518271 + 9a4967c commit 316712d
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 42 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
jobs:
deploy:
runs-on: ubuntu-latest
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
steps:
- run: echo ::set-env name=GHA_OWNER::$(echo $GITHUB_REPOSITORY | awk -F / '{print $1}')
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion app/(website)/(home)/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function Page() {
backgroundImage: `url(${heroImage.src})`,
backgroundSize: "cover",
}}
className="relative -mb-[50%] aspect-[2/3] w-full bg-top bg-no-repeat"
className="-mb-[50%] aspect-[2/3] w-full bg-top bg-no-repeat"
>
<div className="absolute left-0 right-0 top-1/2 px-10 md:left-10 md:right-auto md:w-2/3"></div>
</div>
Expand Down
7 changes: 3 additions & 4 deletions app/(website)/(pages)/tickets/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,6 @@ export default function Page() {
不論是探討技術或輕鬆的分享,任何與資訊科技、電腦技術相關的講題,我們都非常歡迎。
</p>
<p>SITCON 2025 預計徵求三種形式的稿件:</p>
<li>
海報展:海報展希望以靜態海報呈現您個人或團隊的專案或研究成果,作品只要以資訊相關領域為主,不限語言都歡迎投稿。我們期望透過此方式讓更多學生能有展現自我的機會,同時為會眾帶來不同形式的學習與交流。海報展也能讓您有和與會者直接針對您的作品互動的機會,如果希望作品能得到更多回饋,歡迎投稿海報展!
</li>
<p>歡迎於 2024/01/20 前用以下形式的投搞(已截止)</p>
<li>
一般議程:SITCON 2025 邀請您將您的精彩經歷以 Presentation 與 Espresso
兩種形式呈現。Presentation 想邀請您用 40
Expand All @@ -179,6 +175,9 @@ export default function Page() {
開放式議程:如果您想呈現的主題更加獨特、創新,想跳脫講者對聽眾單向陳述式的演講,那開放式議程會是你的最好選擇!想帶一個實作的工作坊、和其他與會者一同討論特定議題、邀請社群的夥伴彼此分享經驗,或想以任何形式增加議程多元與互動性的稿件,都歡迎來挑戰開放式議程。今年開放式議程也提供
40 或 90 分鐘兩種時長,提供您更彈性的呈現方式。
</li>
<li>
海報展:海報展希望以靜態海報呈現您個人或團隊的專案或研究成果,作品只要以資訊相關領域為主,不限語言都歡迎投稿。我們期望透過此方式讓更多學生能有展現自我的機會,同時為會眾帶來不同形式的學習與交流。海報展也能讓您有和與會者直接針對您的作品互動的機會,如果希望作品能得到更多回饋,歡迎投稿海報展!
</li>
<LinkButton
text="了解更多"
className="leading-normal"
Expand Down
37 changes: 0 additions & 37 deletions app/cfp/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,44 +1,7 @@
import type { Metadata } from "next";
import Navbar from "./_components/navbar";
import Footer from "./_components/footer";
import { NavbarProvider } from "./_components/navbar-context";

export async function generateMetadata(): Promise<Metadata> {
const image = "https://sitcon.org/2025/og.jpg";
const title = "SITCON 2025";
const description =
"學生計算機年會(Students’ Information Technology Conference)自 2012 年發起,以學生為本、由學生自發舉辦,長期投身學生資訊教育與推廣開源精神,鼓勵學生們成為實踐者,貢獻程式碼、打造並部署服務、透過實際行動推動專案,最後將這些結晶分享出去,讓更多人能關注你認為重要的議題,打造更緊密的社群。";
const metadata: Metadata = {
title,
authors: [{ name: "SITCON" }],
keywords: "SITCON, SITCON 2025",
description,
metadataBase: new URL("https://sitcon.org/2025/"),
openGraph: {
type: "website",
locale: "zh_TW",
url: "https://sitcon.org/2025/cfp/",
title,
description,
siteName: "SITCON",
images: [
{
url: image,
},
],
},
twitter: {
creator: "@sitcontw",
site: "@sitcontw",
card: "summary_large_image",
images: image,
title,
description,
},
};
return metadata;
}

export default function RootLayout({
children,
}: Readonly<{
Expand Down
38 changes: 38 additions & 0 deletions app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,47 @@ import { GoogleTagManager } from "@next/third-parties/google";

import { config } from "@fortawesome/fontawesome-svg-core";
import "@fortawesome/fontawesome-svg-core/styles.css";
import { Metadata } from "next";
config.autoAddCss = false;

const inter = Inter({ subsets: ["latin"] });

export async function generateMetadata(): Promise<Metadata> {
const image = "https://sitcon.org/2025/og.jpg";
const title = "SITCON 2025";
const description =
"學生計算機年會(Students’ Information Technology Conference)自 2012 年發起,以學生為本、由學生自發舉辦,長期投身學生資訊教育與推廣開源精神,鼓勵學生們成為實踐者,貢獻程式碼、打造並部署服務、透過實際行動推動專案,最後將這些結晶分享出去,讓更多人能關注你認為重要的議題,打造更緊密的社群。";
const metadata: Metadata = {
title,
authors: [{ name: "SITCON" }],
keywords: "SITCON, SITCON 2025",
description,
metadataBase: new URL("https://sitcon.org/2025/"),
openGraph: {
type: "website",
locale: "zh_TW",
url: "https://sitcon.org/2025/cfp/",
title,
description,
siteName: "SITCON",
images: [
{
url: image,
},
],
},
twitter: {
creator: "@sitcontw",
site: "@sitcontw",
card: "summary_large_image",
images: image,
title,
description,
},
};
return metadata;
}

export default function Layout({ children }: { children: ReactNode }) {
const jsonLd = {
"@context": "https://schema.org",
Expand Down

0 comments on commit 316712d

Please sign in to comment.