Merge pull request #9 from nyaomaru/deno-study-7

stydy: add test, change source directory, and refactor
nyaomaru · Aug 10, 2024 · 21dcd67 · 21dcd67
2 parents dc79f1f + 5715577
commit 21dcd67
Show file tree

Hide file tree

Showing 44 changed files with 346 additions and 231 deletions.
diff --git a/README.md b/README.md
@@ -11,3 +11,11 @@ deno task start
 ```
 
 Then you can access to http://localhost:8000/
+
+## 🧪 Test
+
+If you try the deno test, you could run below command.
+
+```sh
+deno test --allow-read --allow-env --allow-net
+```
diff --git a/components/Button.tsx b/components/Button.tsx
diff --git a/components/Link.tsx b/components/Link.tsx
diff --git a/deno.json b/deno.json
@@ -4,7 +4,7 @@
     "check": "deno fmt --check && deno lint && deno check **/*.ts && deno check **/*.tsx",
     "cli": "echo \"import '\\$fresh/src/dev/cli.ts'\" | deno run --unstable -A -",
     "manifest": "deno task cli manifest $(pwd)",
-    "start": "deno run -A --watch=static/,routes/ dev.ts",
+    "start": "deno run -A --watch=src/static/,src/routes/ src/dev.ts",
     "build": "deno run -A dev.ts build",
     "preview": "deno run -A main.ts",
     "update": "deno run -A -r https://fresh.deno.dev/update ."

diff --git a/dev.ts b/dev.ts
diff --git a/routes/_app.tsx b/routes/_app.tsx
diff --git a/routes/about.tsx b/routes/about.tsx
diff --git a/routes/countdown.tsx b/routes/countdown.tsx
diff --git a/routes/greet/[name].tsx b/routes/greet/[name].tsx
diff --git a/routes/search.tsx b/routes/search.tsx
diff --git a/routes/subscribe.tsx b/routes/subscribe.tsx
diff --git a/src/components/Button.tsx b/src/components/Button.tsx
@@ -0,0 +1,22 @@
+import { JSX } from "preact";
+import { IS_BROWSER } from "$fresh/runtime.ts";
+
+type ButtonProps = {
+  color?: "primary" | "secondary";
+} & JSX.HTMLAttributes<HTMLButtonElement>;
+
+export function Button(
+  { color = "primary", ...props }: ButtonProps,
+) {
+  return (
+    <button
+      {...props}
+      disabled={!IS_BROWSER || props.disabled}
+      class={`px-2 py-1 border-2 rounded ${
+        color === "primary"
+          ? "bg-black text-white hover:text-black"
+          : "bg-white border-gray-500"
+      } hover:bg-gray-200 transition-colors`}
+    />
+  );
+}
diff --git a/components/Card.tsx → src/components/Card.tsx b/components/Card.tsx → src/components/Card.tsx
diff --git a/src/components/Link.tsx b/src/components/Link.tsx
@@ -0,0 +1,20 @@
+type LinkProps = {
+  text: string;
+  href: string;
+  color?: "primary" | "secondary";
+};
+
+export function Link({ color = "primary", ...props }: LinkProps) {
+  return (
+    <a class="mx-2" href={props.href}>
+      <span
+        class={`align-middle select-none font-sans font-bold text-center uppercase transition-all disabled:opacity-50 disabled:shadow-none disabled:pointer-events-none text-xs py-3 px-6 rounded-lg ${
+          color === "primary" ? "bg-gray-900 text-white" : "bg-white text-black"
+        } shadow-md shadow-gray-900/10 hover:shadow-lg hover:shadow-gray-900/20 focus:opacity-[0.85] focus:shadow-none active:opacity-[0.85] active:shadow-none`}
+        type="button"
+      >
+        {props.text}
+      </span>
+    </a>
+  );
+}
diff --git a/src/dev.ts b/src/dev.ts
@@ -0,0 +1,8 @@
+#!/usr/bin/env -S deno run -A --watch=static/,routes/
+
+import dev from "$fresh/dev.ts";
+import config from "./fresh.config.ts";
+
+import "$std/dotenv/load.ts";
+
+await dev(import.meta.url, "./main.ts", config);
diff --git a/fresh.config.ts → src/fresh.config.ts b/fresh.config.ts → src/fresh.config.ts
diff --git a/fresh.gen.ts → src/fresh.gen.ts b/fresh.gen.ts → src/fresh.gen.ts
diff --git a/islands/Chart.tsx → src/islands/Chart.tsx b/islands/Chart.tsx → src/islands/Chart.tsx
diff --git a/islands/Countdown.tsx → src/islands/Countdown.tsx b/islands/Countdown.tsx → src/islands/Countdown.tsx
diff --git a/islands/Counter.tsx → src/islands/Counter.tsx b/islands/Counter.tsx → src/islands/Counter.tsx
diff --git a/islands/NextContentButton.tsx → src/islands/NextContentButton.tsx b/islands/NextContentButton.tsx → src/islands/NextContentButton.tsx
diff --git a/main.ts → src/main.ts b/main.ts → src/main.ts
diff --git a/routes/_404.tsx → src/routes/_404.tsx b/routes/_404.tsx → src/routes/_404.tsx
diff --git a/routes/_500.tsx → src/routes/_500.tsx b/routes/_500.tsx → src/routes/_500.tsx
diff --git a/src/routes/_app.tsx b/src/routes/_app.tsx
@@ -0,0 +1,37 @@
+import { type PageProps } from "$fresh/server.ts";
+export default function App({ Component }: PageProps) {
+  return (
+    <html>
+      <head>
+        <meta charset="utf-8" />
+        <meta name="author" content="nyaomaru" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <meta
+          name="description"
+          content="This fresh sample brought to you by nyaomaru"
+        />
+        <meta name="og:title" content="nyaomaru-deno-sample" />
+        <meta property="og:locale" content="ja_JP" key="ogLocale" />
+        <meta
+          property="og:site_name"
+          content="nyaomaru-deno-sample"
+          key="ogSiteName"
+        />
+        <meta
+          name="og:description"
+          content="This fresh sample brought to you by nyaomaru"
+        />
+        <meta property="og:type" content="website" key="ogType" />
+        <meta
+          name="apple-mobile-web-app-title"
+          content="nyaomaru-deno-sample"
+        />
+        <title>nyaomaru-deno-sample</title>
+        <link rel="stylesheet" href="/styles.css" />
+      </head>
+      <body>
+        <Component />
+      </body>
+    </html>
+  );
+}
diff --git a/routes/_layout.tsx → src/routes/_layout.tsx b/routes/_layout.tsx → src/routes/_layout.tsx
diff --git a/routes/_middleware.ts → src/routes/_middleware.ts b/routes/_middleware.ts → src/routes/_middleware.ts