Skip to content
Merged

Fix #11

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: CI
on:
pull_request:
branches: [main]

jobs:
ci:
name: CI
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: nixbuild/nix-quick-install-action@v34
- uses: nix-community/cache-nix-action@v7
with:
primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix', '**/flake.lock') }}
restore-prefixes-first-match: nix-${{ runner.os }}-
gc-max-store-size-linux: 1G
purge: true
purge-prefixes: nix-${{ runner.os }}-
purge-created: 0
purge-last-accessed: P1DT12H
purge-primary-key: never
- name: Install dependencies
run: nix develop -c bun install

- name: Lint code
run: nix develop -c bun run lint

- name: Format code
run: nix develop -c bun run format

- name: Build project
run: nix develop -c bun run build
7 changes: 5 additions & 2 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@unocss/astro": "66.6.7",
"astro": "^6.1.3",
"astro-llms-generate": "1.3.3",
"hono": "4.12.10",
"hono": "catalog:",
"prettier-plugin-vue": "1.1.6",
"sharp": "0.34.5",
"unocss": "66.6.7",
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/CalendarListSkeleton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const props = defineProps<{

// 0から7までの配列
const skeletonItems = Array.from({ length: 8 }, (_, i) => i);
const exitStates = ref<boolean[]>(new Array(8).fill(false));
const exitStates = ref<boolean[]>(Array.from({ length: 8 }, () => false));
const isFullyExited = ref(false);

watch(
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import Sidebar from "./sidebar.astro";
import Sidebar from "./Sidebar.astro";
import favicon from "../../public/favicon.svg";
import { Image } from "astro:assets";
---
Expand Down
8 changes: 4 additions & 4 deletions client/src/layouts/Layout.astro
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
import Footer from "@/components/footer.astro";
import Head from "@/components/head.astro";
import Header from "@/components/header.astro";
import Breadcrumb from "@/components/breadcrumb.astro";
import Footer from "@/components/Footer.astro";
import Head from "@/components/Head.astro";
import Header from "@/components/Header.astro";
import Breadcrumb from "@/components/Breadcrumb.astro";

import "@/styles/global.css";

Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/access.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: 稽古場所
description: 大阪公立大学合氣道部の活動場所について
---

import Frame from "../components/frame.astro";
import Frame from "../components/Frame.astro";
import { Image } from "astro:assets";
import multi_use_room from "../assets/CCCB5965-798F-4403-A4D9-60C3B3EA05A9.png";

Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/contact.astro
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
import ContactForm from "@/components/contactForm.vue";
import ContactForm from "@/components/ContactForm.vue";
import Layout from "@/layouts/Layout.astro";
---

Expand Down
40 changes: 3 additions & 37 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 27 additions & 22 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = {
nixpkgs,
flake-utils,
...
}:
flake-utils.lib.eachDefaultSystem (
system: let
pkgs = import nixpkgs {inherit system;};
in {
devShell = pkgs.mkShell {
buildInputs = with pkgs; [
bun
nodejs-slim_24
];
shellWrapper = pkgs.writeShellScript "dev-shell" ''
exec ${pkgs.zsh}/bin/zsh \"$@\"
'';
};
}
);
}
outputs = {nixpkgs, ...}: let
systems = ["x86_64-linux" "aarch64-darwin"];
forAllSystems = nixpkgs.lib.genAttrs systems;

deps = pkgs:
with pkgs; [
nodejs-slim_24
];

devDeps = pkgs:
with pkgs; [
bun
];
in {
devShells = forAllSystems (system: let
pkgs = import nixpkgs {inherit system;};
in {
default = pkgs.mkShell {
buildInputs = (deps pkgs) ++ (devDeps pkgs);

shellHook = ''
export NODE_ENV=development
'';
};
});
};
}
15 changes: 10 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
{
"name": "page",
"workspaces": [
"client",
"worker"
],
"workspaces": {
"packages": [
"client",
"worker"
],
"catalog": {
"hono": "4.12.10"
}
},
"scripts": {
"build": "bunx turbo build",
"dev": "bunx turbo dev",
"preview": "bunx turbo preview",
"format": "bunx turbo format",
"lint": "bunx turbo lint",
"outdated": "bunx turbo outdated",
"cf-typegen":"wrangler types ./client/worker-configuration.d.ts"
"cf-typegen": "wrangler types ./client/worker-configuration.d.ts"
},
"devDependencies": {
"oxfmt": "latest",
Expand Down
2 changes: 1 addition & 1 deletion worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@hono/valibot-validator": "0.6.1",
"hono": "4.12.10",
"hono": "catalog:",
"mimetext": "3.0.28",
"ts-ics": "2.4.3",
"valibot": "1.3.1"
Expand Down