Merge branch 'main' into fix-edit-prof

Author: aster-void

bun.lockb

@@ -10,4 +10,20 @@ export const DAY_TO_JAPANESE_MAP = new Map<Day, string>([
   ["sun", "日"],
 ]);
 
-export const ACTIVE_DAYS = ["mon", "tue", "wed", "thu", "fri", "sat"] as const;
+export const ACTIVE_DAYS = ["mon", "tue", "wed", "thu", "fri"] as const;
+
+export const sortSlots = (
+  slots: {
+    day: "mon" | "tue" | "wed" | "thu" | "fri" | "sat" | "sun" | "other";
+    period: number;
+  }[],
+) => {
+  const order = ["mon", "tue", "wed", "thu", "fri", "sat", "sun", "other"];
+  return slots.sort((a, b) => {
+    const dayComparison = order.indexOf(a.day) - order.indexOf(b.day);
+    if (dayComparison !== 0) {
+      return dayComparison;
+    }
+    return a.period - b.period;
+  });
+};

common/consts.ts

@@ -1,41 +1,54 @@
 {
   description = "CourseMate";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/master";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
+    # prisma v6 is only out on unstable uncomment this on updating prisma to v6. can be removed when 25.05 channel is released
+    # unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+
     flake-utils.url = "github:numtide/flake-utils";
-    prisma-utils.url = "github:VanCoding/nix-prisma-utils";
     fenix = {
       url = "github:nix-community/fenix/monthly";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { nixpkgs, flake-utils, prisma-utils, fenix, ... }:
+  outputs = { nixpkgs, flake-utils, fenix, /* unstable, */ ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
-        pkgs = import nixpkgs { inherit system; };
-        prisma = import ./nix/prisma.nix { inherit prisma-utils pkgs; };
-        rust-pkgs = import ./nix/rust-toolchain.nix { inherit fenix system; };
-      in
-      {
-        devShell = pkgs.mkShell {
-          src = ./.;
-          nativeBuildInputs = with pkgs; [ bashInteractive ];
+        pkgs = nixpkgs.legacyPackages.${system};
+        # unstable-pkgs = unstable.legacyPackages.${system};
+        rust-toolchain = import ./nix/rust-toolchain.nix { inherit fenix system; };
+
+        common = {
           buildInputs = with pkgs; [
             gnumake
             bun
             biome
-            pkg-config
-            openssl
             lefthook
-            pkgs.prisma
             dotenv-cli
-          ] ++ [
-            rust-pkgs
+            prisma
+            prisma-engines
+          ];
+
+          shellHook = with pkgs; ''
+            # requird by prisma
+            export PRISMA_QUERY_ENGINE_BINARY="${prisma-engines}/bin/query-engine";
+            export PRISMA_QUERY_ENGINE_LIBRARY="${prisma-engines}/lib/libquery_engine.node";
+            export PRISMA_INTROSPECTION_ENGINE_BINARY="${prisma-engines}/bin/introspection-engine";
+            export PRISMA_FMT_BINARY="${prisma-engines}/bin/prisma-fmt";
+          '';
+        };
+      in
+      {
+        devShells.default = pkgs.mkShell common;
+        devShells.scraper = pkgs.mkShell {
+          buildInputs = common.buildInputs ++ [
+            pkgs.pkg-config
+            pkgs.openssl
+            rust-toolchain
           ];
-          shellHook = ''
-            export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.stdenv.cc.cc.lib}/lib
-          '' + prisma.shellHook;
+          shellHook = common.shellHook;
         };
       });
 }
+

flake.lock

@@ -73,27 +73,27 @@ export const courses = [
   {
     id: "10001",
     name: "国語八列",
-    teacher: "足助太郎",
+    teacher: "八十島漕郎",
   },
   {
     id: "10002",
     name: "数学八列",
-    teacher: "足助太郎",
+    teacher: "八十島漕郎",
   },
   {
     id: "10003",
     name: "英語八列",
-    teacher: "足助太郎",
+    teacher: "八十島漕郎",
   },
   {
     id: "10004",
     name: "理科八列",
-    teacher: "足助太郎",
+    teacher: "八十島漕郎",
   },
   {
     id: "10005",
     name: "社会八列",
-    teacher: "足助太郎",
+    teacher: "八十島漕郎",
   },
 ];
 

flake.nix

@@ -12,16 +12,16 @@ export default function EditCourses() {
   const error = state.current === "error" ? state.error : null;
 
   return (
-    <div className="mx-auto my-0 flex h-full max-w-[350] flex-col p-5 text-center">
+    <div className="mx-auto my-0 flex h-full max-w-[350] flex-col p-2 text-center">
       <h1 className="mb-2 text-xl">授業編集</h1>
       {loading ? (
         <FullScreenCircularProgress />
       ) : error ? (
         <p>Error: {error.message}</p>
       ) : data ? (
-        <>
+        <div className="flex-1 p-2">
           <EditableCoursesTable userId={data.id} />
-        </>
+        </div>
       ) : (
         <p>データがありません。</p>
       )}

nix/prisma.nix

@@ -8,8 +8,10 @@ export default function EditPageLayout({
 }) {
   return (
     <NavigateByAuthState type="toLoginForUnauthenticated">
-      <Header title="編集/Edit" />
-      <div className="flex h-screen flex-col">{children}</div>
+      <div className="flex h-screen flex-col">
+        <Header title="編集/Edit" />
+        <div className="mt-14 flex-1 sm:mt-16">{children}</div>
+      </div>
     </NavigateByAuthState>
   );
 }