diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml new file mode 100644 index 0000000..b98eb5c --- /dev/null +++ b/.github/workflows/deploy.yaml @@ -0,0 +1,33 @@ +name: Deploy +on: + push: + branches: [master] + pull_request: + branches: master + +jobs: + deploy: + name: Deploy + runs-on: ubuntu-latest + + permissions: + id-token: write # Needed for auth with Deno Deploy + contents: read # Needed to clone the repository + + steps: + - name: Clone repository + uses: actions/checkout@v3 + + - name: Install Deno + uses: denoland/setup-deno@v1 + with: + deno-version: v1.x + + - name: Build step + run: "deno task build" # ๐Ÿ“ Update the build command(s) if necessary + + - name: Upload to Deno Deploy + uses: denoland/deployctl@v1 + with: + project: "evilmonkey19-cv" # ๐Ÿ“ Update the deploy project name if necessary + entrypoint: "./main.ts" # ๐Ÿ“ Update the entrypoint if necessary \ No newline at end of file diff --git a/.gitignore b/.gitignore index 00e2e86..02db7e8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ # Fresh build directory _fresh/ +.DS_Store +node_modules/ \ No newline at end of file diff --git a/components/AboutUs.tsx b/components/AboutUs.tsx index ee7868f..88f8363 100644 --- a/components/AboutUs.tsx +++ b/components/AboutUs.tsx @@ -1,17 +1,31 @@ -import { apply } from 'twind'; - -const span = `font-bold`; const AboutUs = () => ( -
-

About Us

-

- We are a theater association based in Stockholm, Sweden. We try to bring the joy of improv and theater to local and international students. - Whether you're a seasoned performer or a complete novice, our improv sessions offer a supportive environment to explore your creativity, sharpen your acting skills, and unleash your imagination. - We take pride in our annual show production, bringing you a unique and interactive theatrical experience. - We make the Swedish spex tradition accessible to international students through performances in English, promoting cultural exchange and creating memorable experiences for all. - Join us at The English Theater Improv Club and discover the magic of improv, the excitement of live performance, and the joy of being part of a vibrant theater community! -

+
+
+
+

About Us

+
+
+ Location marker of where we are. +
+

Hey there! We're the cool cats from the English Theater Improv Club, chilling out

+

Stockholm, Sweden.

+
+
+
+ A happy emoji like us. +
+

Our mission? Simple โ€“ spreading the joy of improv and theater to both local and international students.

+
+
+
+ Sparkles of joy to meet you soon. +
+

We throw an annual show. It's unique, it's interactive, and it's so much fun, your laughter might be mistaken for applause.

+
+
+
+
); diff --git a/components/Frontpage.tsx b/components/Frontpage.tsx deleted file mode 100644 index 935d94a..0000000 --- a/components/Frontpage.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import IconArrowBigDown from "https://deno.land/x/tabler_icons_tsx@0.0.5/tsx/arrow-big-down.tsx" - -const FrontPage = () => ( -
- Logo ET Theater -
-

We are a theater association based in Stockholm, Sweden. We try to bring the joy of improv and theater to local and international students.

- Join Us -
- -
-); - -export default FrontPage; \ No newline at end of file diff --git a/components/Header.tsx b/components/Header.tsx new file mode 100644 index 0000000..4d42827 --- /dev/null +++ b/components/Header.tsx @@ -0,0 +1,13 @@ +export default function Header() { + return ( +
+ + Logo from ET English Theater + +
+ Events + Productions +
+
+ ); +} \ No newline at end of file diff --git a/components/Landing.tsx b/components/Landing.tsx new file mode 100644 index 0000000..ee7ac1a --- /dev/null +++ b/components/Landing.tsx @@ -0,0 +1,28 @@ +const Landing = () => ( +
+
+
+
+

English Theater Improv Club

+
+

โ€œ

+

We are a theater association based in Stockholm, Sweden. + We try to bring the joy of improv and theater to local and international students.

+
+
+ + +

Hire us

+ + + +

Join us

+ +
+
+
+
+
+); + +export default Landing; \ No newline at end of file diff --git a/deno.json b/deno.json index 2e0d3e0..6eab89a 100644 --- a/deno.json +++ b/deno.json @@ -7,30 +7,20 @@ "preview": "deno run -A main.ts", "update": "deno run -A -r https://fresh.deno.dev/update ." }, - "lint": { - "rules": { - "tags": [ - "fresh", - "recommended" - ] - } - }, - "exclude": [ - "**/_fresh/*" - ], + "lint": { "rules": { "tags": ["fresh", "recommended"] } }, + "exclude": ["**/_fresh/*"], + "nodeModulesDir": true, "imports": { - "$fresh/": "https://deno.land/x/fresh@1.5.2/", - "preact": "https://esm.sh/preact@10.18.1", - "preact/": "https://esm.sh/preact@10.18.1/", + "$fresh/": "https://deno.land/x/fresh@1.6.8/", + "preact": "https://esm.sh/preact@10.19.6", + "preact/": "https://esm.sh/preact@10.19.6/", "preact-render-to-string": "https://esm.sh/*preact-render-to-string@6.2.2", - "@preact/signals": "https://esm.sh/*@preact/signals@1.2.1", - "@preact/signals-core": "https://esm.sh/*@preact/signals-core@1.5.0", - "twind": "https://esm.sh/twind@0.16.19", - "twind/": "https://esm.sh/twind@0.16.19/", + "@preact/signals": "https://esm.sh/*@preact/signals@1.2.2", + "@preact/signals-core": "https://esm.sh/*@preact/signals-core@1.5.1", + "tailwindcss": "npm:tailwindcss@3.4.3", + "tailwindcss/": "npm:/tailwindcss@3.4.3/", + "tailwindcss/plugin": "npm:/tailwindcss@3.4.3/plugin.js", "$std/": "https://deno.land/std@0.193.0/" }, - "compilerOptions": { - "jsx": "react-jsx", - "jsxImportSource": "preact" - } + "compilerOptions": { "jsx": "react-jsx", "jsxImportSource": "preact" } } diff --git a/fresh.config.ts b/fresh.config.ts index 548e16a..f50b17a 100644 --- a/fresh.config.ts +++ b/fresh.config.ts @@ -1,7 +1,6 @@ import { defineConfig } from "$fresh/server.ts"; -import twindPlugin from "$fresh/plugins/twind.ts"; -import twindConfig from "./twind.config.ts"; +import tailwind from "$fresh/plugins/tailwind.ts"; export default defineConfig({ - plugins: [twindPlugin(twindConfig)], + plugins: [tailwind()], }); diff --git a/fresh.gen.ts b/fresh.gen.ts index d8ffd00..acf0161 100644 --- a/fresh.gen.ts +++ b/fresh.gen.ts @@ -2,27 +2,22 @@ // This file SHOULD be checked into source version control. // This file is automatically updated during development when running `dev.ts`. -import * as $0 from "./routes/_404.tsx"; -import * as $1 from "./routes/_app.tsx"; -import * as $2 from "./routes/_layout.tsx"; -import * as $3 from "./routes/api/joke.ts"; -import * as $4 from "./routes/greet/[name].tsx"; -import * as $5 from "./routes/index.tsx"; -import * as $$0 from "./islands/Counter.tsx"; +import * as $_app from "./routes/_app.tsx"; +import * as $_layout from "./routes/_layout.tsx"; +import * as $index from "./routes/index.tsx"; +import * as $Counter from "./islands/Counter.tsx"; +import { type Manifest } from "$fresh/server.ts"; const manifest = { routes: { - "./routes/_404.tsx": $0, - "./routes/_app.tsx": $1, - "./routes/_layout.tsx": $2, - "./routes/api/joke.ts": $3, - "./routes/greet/[name].tsx": $4, - "./routes/index.tsx": $5, + "./routes/_app.tsx": $_app, + "./routes/_layout.tsx": $_layout, + "./routes/index.tsx": $index, }, islands: { - "./islands/Counter.tsx": $$0, + "./islands/Counter.tsx": $Counter, }, baseUrl: import.meta.url, -}; +} satisfies Manifest; export default manifest; diff --git a/routes/_404.tsx b/routes/_404.tsx deleted file mode 100644 index fafde29..0000000 --- a/routes/_404.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import { Head } from "$fresh/runtime.ts"; - -export default function Error404() { - return ( - <> - - 404 - Page not found - -
-
-

404 - Page not found

-

- The page you were looking for doesn't exist. -

- Go back home -
-
- - ); -} diff --git a/routes/_app.tsx b/routes/_app.tsx index c9d9e93..b20b5d2 100644 --- a/routes/_app.tsx +++ b/routes/_app.tsx @@ -1,11 +1,18 @@ -import { AppProps } from "$fresh/server.ts"; +import { PageProps } from "$fresh/server.ts"; -export default function App({ Component }: AppProps) { +export default function App({ Component }: PageProps) { return ( + + + + + + + The ET Improv Club diff --git a/routes/_layout.tsx b/routes/_layout.tsx index 877b9fa..38221b0 100644 --- a/routes/_layout.tsx +++ b/routes/_layout.tsx @@ -1,16 +1,12 @@ -import { LayoutProps } from "$fresh/server.ts"; -// import Footer from "../components/footer.tsx"; -export default function Layout({ Component, state }: LayoutProps) { +import { PageProps } from "$fresh/server.ts"; +import Header from "../components/Header.tsx"; + +export default function Layout({ Component, state }: PageProps) { return (
-
-
-
- -
-
-
+
+ {/*
*/}
) diff --git a/routes/api/joke.ts b/routes/api/joke.ts deleted file mode 100644 index a3f4243..0000000 --- a/routes/api/joke.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { HandlerContext } from "$fresh/server.ts"; - -// Jokes courtesy of https://punsandoneliners.com/randomness/programmer-jokes/ -const JOKES = [ - "Why do Java developers often wear glasses? They can't C#.", - "A SQL query walks into a bar, goes up to two tables and says โ€œcan I join you?โ€", - "Wasn't hard to crack Forrest Gump's password. 1forrest1.", - "I love pressing the F5 key. It's refreshing.", - "Called IT support and a chap from Australia came to fix my network connection. I asked โ€œDo you come from a LAN down under?โ€", - "There are 10 types of people in the world. Those who understand binary and those who don't.", - "Why are assembly programmers often wet? They work below C level.", - "My favourite computer based band is the Black IPs.", - "What programme do you use to predict the music tastes of former US presidential candidates? An Al Gore Rhythm.", - "An SEO expert walked into a bar, pub, inn, tavern, hostelry, public house.", -]; - -export const handler = (_req: Request, _ctx: HandlerContext): Response => { - const randomIndex = Math.floor(Math.random() * JOKES.length); - const body = JOKES[randomIndex]; - return new Response(body); -}; diff --git a/routes/greet/[name].tsx b/routes/greet/[name].tsx deleted file mode 100644 index 9c06827..0000000 --- a/routes/greet/[name].tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { PageProps } from "$fresh/server.ts"; - -export default function Greet(props: PageProps) { - return
Hello {props.params.name}
; -} diff --git a/routes/index.tsx b/routes/index.tsx index 61f4706..0c0154d 100644 --- a/routes/index.tsx +++ b/routes/index.tsx @@ -1,10 +1,10 @@ -import FrontPage from "../components/Frontpage.tsx"; +import Landing from "../components/Landing.tsx"; import AboutUs from "../components/AboutUs.tsx"; export default function Home() { return ( -
- +
+
); diff --git a/static/background_landing.webp b/static/background_landing.webp new file mode 100644 index 0000000..9f35ef2 Binary files /dev/null and b/static/background_landing.webp differ diff --git a/static/favicon.ico b/static/favicon.ico index f8a60c0..5c4bd84 100644 Binary files a/static/favicon.ico and b/static/favicon.ico differ diff --git a/static/fonts/Montserrat-Black.ttf b/static/fonts/Montserrat-Black.ttf new file mode 100644 index 0000000..7af9fb4 Binary files /dev/null and b/static/fonts/Montserrat-Black.ttf differ diff --git a/static/fonts/Montserrat-BlackItalic.ttf b/static/fonts/Montserrat-BlackItalic.ttf new file mode 100644 index 0000000..c608366 Binary files /dev/null and b/static/fonts/Montserrat-BlackItalic.ttf differ diff --git a/static/fonts/Montserrat-Bold.ttf b/static/fonts/Montserrat-Bold.ttf new file mode 100644 index 0000000..0927b81 Binary files /dev/null and b/static/fonts/Montserrat-Bold.ttf differ diff --git a/static/fonts/Montserrat-BoldItalic.ttf b/static/fonts/Montserrat-BoldItalic.ttf new file mode 100644 index 0000000..02f5784 Binary files /dev/null and b/static/fonts/Montserrat-BoldItalic.ttf differ diff --git a/static/fonts/Montserrat-ExtraBold.ttf b/static/fonts/Montserrat-ExtraBold.ttf new file mode 100644 index 0000000..e33afd4 Binary files /dev/null and b/static/fonts/Montserrat-ExtraBold.ttf differ diff --git a/static/fonts/Montserrat-ExtraBoldItalic.ttf b/static/fonts/Montserrat-ExtraBoldItalic.ttf new file mode 100644 index 0000000..92fc301 Binary files /dev/null and b/static/fonts/Montserrat-ExtraBoldItalic.ttf differ diff --git a/static/fonts/Montserrat-ExtraLight.ttf b/static/fonts/Montserrat-ExtraLight.ttf new file mode 100644 index 0000000..8aa56c1 Binary files /dev/null and b/static/fonts/Montserrat-ExtraLight.ttf differ diff --git a/static/fonts/Montserrat-ExtraLightItalic.ttf b/static/fonts/Montserrat-ExtraLightItalic.ttf new file mode 100644 index 0000000..98c10f1 Binary files /dev/null and b/static/fonts/Montserrat-ExtraLightItalic.ttf differ diff --git a/static/fonts/Montserrat-Italic.ttf b/static/fonts/Montserrat-Italic.ttf new file mode 100644 index 0000000..cff3ceb Binary files /dev/null and b/static/fonts/Montserrat-Italic.ttf differ diff --git a/static/fonts/Montserrat-Light.ttf b/static/fonts/Montserrat-Light.ttf new file mode 100644 index 0000000..fd787a8 Binary files /dev/null and b/static/fonts/Montserrat-Light.ttf differ diff --git a/static/fonts/Montserrat-LightItalic.ttf b/static/fonts/Montserrat-LightItalic.ttf new file mode 100644 index 0000000..6a2c9d4 Binary files /dev/null and b/static/fonts/Montserrat-LightItalic.ttf differ diff --git a/static/fonts/Montserrat-Medium.ttf b/static/fonts/Montserrat-Medium.ttf new file mode 100644 index 0000000..4012225 Binary files /dev/null and b/static/fonts/Montserrat-Medium.ttf differ diff --git a/static/fonts/Montserrat-MediumItalic.ttf b/static/fonts/Montserrat-MediumItalic.ttf new file mode 100644 index 0000000..84b2539 Binary files /dev/null and b/static/fonts/Montserrat-MediumItalic.ttf differ diff --git a/static/fonts/Montserrat-Regular.ttf b/static/fonts/Montserrat-Regular.ttf new file mode 100644 index 0000000..f4a266d Binary files /dev/null and b/static/fonts/Montserrat-Regular.ttf differ diff --git a/static/fonts/Montserrat-SemiBold.ttf b/static/fonts/Montserrat-SemiBold.ttf new file mode 100644 index 0000000..189ce9d Binary files /dev/null and b/static/fonts/Montserrat-SemiBold.ttf differ diff --git a/static/fonts/Montserrat-SemiBoldItalic.ttf b/static/fonts/Montserrat-SemiBoldItalic.ttf new file mode 100644 index 0000000..4c59d86 Binary files /dev/null and b/static/fonts/Montserrat-SemiBoldItalic.ttf differ diff --git a/static/fonts/Montserrat-Thin.ttf b/static/fonts/Montserrat-Thin.ttf new file mode 100644 index 0000000..7d085bb Binary files /dev/null and b/static/fonts/Montserrat-Thin.ttf differ diff --git a/static/fonts/Montserrat-ThinItalic.ttf b/static/fonts/Montserrat-ThinItalic.ttf new file mode 100644 index 0000000..6fbfad1 Binary files /dev/null and b/static/fonts/Montserrat-ThinItalic.ttf differ diff --git a/static/fonts/Rye-Regular.ttf b/static/fonts/Rye-Regular.ttf new file mode 100644 index 0000000..424a49f Binary files /dev/null and b/static/fonts/Rye-Regular.ttf differ diff --git a/static/icons/emoji-happy.svg b/static/icons/emoji-happy.svg new file mode 100644 index 0000000..509cc11 --- /dev/null +++ b/static/icons/emoji-happy.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/location-marker.svg b/static/icons/location-marker.svg new file mode 100644 index 0000000..f7b6e13 --- /dev/null +++ b/static/icons/location-marker.svg @@ -0,0 +1,4 @@ + + + + diff --git a/static/icons/sparkles.svg b/static/icons/sparkles.svg new file mode 100644 index 0000000..b198026 --- /dev/null +++ b/static/icons/sparkles.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/union_green.svg b/static/icons/union_green.svg new file mode 100644 index 0000000..548a87f --- /dev/null +++ b/static/icons/union_green.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/static/icons/union_pink.svg b/static/icons/union_pink.svg new file mode 100644 index 0000000..c1ada91 --- /dev/null +++ b/static/icons/union_pink.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/static/styles.css b/static/styles.css new file mode 100644 index 0000000..bd6213e --- /dev/null +++ b/static/styles.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; \ No newline at end of file diff --git a/tailwind.config.ts b/tailwind.config.ts new file mode 100644 index 0000000..540546f --- /dev/null +++ b/tailwind.config.ts @@ -0,0 +1,13 @@ +import { type Config } from "tailwindcss"; + +export default { + content: [ + "{routes,islands,components}/**/*.{ts,tsx}", + ], + theme: { + fontFamily: { + rye: ['"Rye"'], + sans: ['Montserrat', 'sans-serif'], + }, + } +} satisfies Config; \ No newline at end of file diff --git a/twind.config.ts b/twind.config.ts deleted file mode 100644 index 8298639..0000000 --- a/twind.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Options } from "$fresh/plugins/twind.ts"; - -export default { - darkMode: "class", - mode: "silent", - selfURL: import.meta.url, - theme: { - fontFamily: { - sans: ["Montserrat", "sans-serif"], - } - }, - preflight: { - '@import': `@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@600&display=swap');`, - }, -} as Options;