Merge branch 'main' of github.com:Zli-UoA/zoo-backend into story/#21

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
 .direnv/
+.env
 
 .idea/

Makefile

@@ -1,7 +1,19 @@
-.PHONY: migrate generate-entities
+.PHONY: migrate generate-entities db-up db-down db-restart db-reset
 
 migrate:
 	$(MAKE) -C backend migrate
 
 generate-entities:
 	$(MAKE) -C backend generate-entities
+
+db-up:
+	$(MAKE) -C infra db-up
+
+db-down:
+	$(MAKE) -C infra db-down
+
+db-restart:
+	$(MAKE) -C infra db-restart
+
+db-reset:
+	$(MAKE) -C infra db-reset

backend/.gitignore

@@ -1,2 +1 @@
 /target
-.env

backend/db-schema/Makefile

@@ -1,8 +1,8 @@
-include .env
-export $(shell sed 's/=.*//' .env)
+include ../.env
+export $(shell sed 's/=.*//' ../.env)
 
 migrate:
-	set -a && source .env && set +a && \
+	set -a && source ../.env && set +a && \
 	npx prisma migrate dev --skip-generate
 
 generate-entities:

flake.nix

@@ -25,10 +25,21 @@
           name = "rust-env";
           nativeBuildInputs = with pkgs; [
             toolchain
+            gcc
             gnumake
             nodejs_22
+            nodePackages.prisma
+            openssl
+            prisma-engines
           ];
+          shellHook = with pkgs; ''
+            export PRISMA_SCHEMA_ENGINE_BINARY="${prisma-engines}/bin/schema-engine"
+            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"
+          '';
         };
       }
     );
-}
+}

frontend/.gitignore

@@ -22,3 +22,7 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+# graphql-codegen
+
+src/generated

frontend/biome.json

@@ -8,6 +8,7 @@
   },
   "linter": {
     "enabled": true,
+    "ignore": ["src/generated/*"],
     "rules": {
       "recommended": true,
       "correctness": {

frontend/codegen.ts

@@ -0,0 +1,22 @@
+import type { CodegenConfig } from "@graphql-codegen/cli";
+
+const config: CodegenConfig = {
+  schema: "https://zoo-backend.zli.works/",
+  documents: ["src/**/*.tsx"],
+  ignoreNoDocuments: true, // for better experience with the watcher
+  generates: {
+    "./src/generated/": {
+      preset: "client",
+      config: {
+        strictScalars: true,
+        scalars: {},
+        nonOptionalTypename: true,
+      },
+    },
+  },
+  hooks: {
+    afterAllFileWrite: ["biome format --write"],
+  },
+};
+
+export default config;