diff --git a/.gitignore b/.gitignore index 00e2e86..d30f427 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ # Fresh build directory _fresh/ + +# Needed because of Tailwind (Fresh 1.6+) +node_modules/ diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 971c0ed..455f9fc 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,6 +1,6 @@ { "recommendations": [ "denoland.vscode-deno", - "sastan.twind-intellisense" + "bradlc.vscode-tailwindcss" ] } diff --git a/README.md b/README.md index d392c8f..23c3c6e 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,17 @@ # devICT: Help -This website aims to make it easy to find and act on different ways to be involved with and contribute to the devICT community. +This website aims to make it easy to find and act on different ways to be +involved with and contribute to the devICT community. ## Built with - [Deno](https://deno.land/manual/getting_started/installation) - A typescript-first node alternative with a much better developer experience. - [Fresh](https://fresh.deno.dev) - - A server-first react framework (well, [preact](https://preactjs.com/) really). - - Has tailwind built in (well, [twind](https://twind.style/) really). + - A server-first react framework (well, [preact](https://preactjs.com/) + really). + - Has tailwind built in (it's really + [available now in version 1.6](https://fresh.deno.dev/docs/examples/migrating-to-tailwind)). - Deployed to [Deno Deploy](https://deno.com/deploy). ## Developing locally @@ -22,5 +25,6 @@ This website aims to make it easy to find and act on different ways to be involv ### Configuration - `GITHUB_TOKEN`, required for making GitHub API calls. - - Generate one from your [GitHub settings](https://github.com/settings/tokens?type=beta). - - Does not need any special permissions, it only accesses public information. \ No newline at end of file + - Generate one from your + [GitHub settings](https://github.com/settings/tokens?type=beta). + - Does not need any special permissions, it only accesses public information. diff --git a/components/RepoList.tsx b/components/RepoList.tsx index 55ac828..c22ad2d 100644 --- a/components/RepoList.tsx +++ b/components/RepoList.tsx @@ -3,7 +3,7 @@ import Card from "../components/Card.tsx"; type RepoListProps = { title: string; list: string[]; - shuffleList: boolean; + shuffleList?: boolean; }; const shuffle = (array: string[]) => { diff --git a/deno.json b/deno.json index 9d0ae55..4c48d45 100644 --- a/deno.json +++ b/deno.json @@ -7,8 +7,18 @@ "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.6.8/", "zod": "https://deno.land/x/zod@v3.22.4/mod.ts", @@ -17,12 +27,15 @@ "preact-render-to-string": "https://esm.sh/*preact-render-to-string@6.2.2", "@preact/signals": "https://esm.sh/*@preact/signals@1.2.2", "@preact/signals-core": "https://esm.sh/*@preact/signals-core@1.5.1", - "@twind/core": "https://esm.sh/@twind/core@1.1.3", - "@twind/preset-tailwind": "https://esm.sh/@twind/preset-tailwind@1.1.4", - "@twind/preset-autoprefix": "https://esm.sh/@twind/preset-autoprefix@1.0.7", "tabler_icons/": "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/", "$std/": "https://deno.land/std@0.193.0/", - "$gfm": "https://deno.land/x/gfm@0.2.3/mod.ts" + "$gfm": "https://deno.land/x/gfm@0.2.3/mod.ts", + "tailwindcss": "npm:tailwindcss@3.4.1", + "tailwindcss/": "npm:/tailwindcss@3.4.1/", + "tailwindcss/plugin": "npm:/tailwindcss@3.4.1/plugin.js" }, - "compilerOptions": { "jsx": "react-jsx", "jsxImportSource": "preact" } -} + "compilerOptions": { + "jsx": "react-jsx", + "jsxImportSource": "preact" + } +} \ No newline at end of file diff --git a/fresh.config.ts b/fresh.config.ts index e00d557..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/twindv1.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/routes/_app.tsx b/routes/_app.tsx index 6cf0c78..a5e9039 100644 --- a/routes/_app.tsx +++ b/routes/_app.tsx @@ -38,6 +38,7 @@ export default function App({ Component, route }: PageProps) { {/* */} +