From efa2b345a14a6b34f51671fff715ccf5d6d15559 Mon Sep 17 00:00:00 2001 From: LLLL Colonq Date: Tue, 18 Feb 2025 00:41:11 -0500 Subject: Actually what if we just included it in the API templates like we're supposed to :3 --- Makefile | 47 ++++++++++------------------------------- flake.nix | 17 --------------- templates/api/throwshade.html | 38 +++++++++++++++++++++++++++++++++ templates/throwshade/index.html | 38 --------------------------------- 4 files changed, 49 insertions(+), 91 deletions(-) create mode 100644 templates/api/throwshade.html delete mode 100644 templates/throwshade/index.html diff --git a/Makefile b/Makefile index 9eeb0a8..b630ed3 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,8 @@ TEMPLATES_API=$(shell ls templates/api) TEMPLATES_PUBNIX=$(shell ls templates/pubnix) TEMPLATES_AUTH=$(shell ls templates/auth) TEMPLATES_GREENCIRCLE=$(shell ls templates/greencircle) -TEMPLATES_THROWSHADE=$(shell ls templates/greencircle) -all: api pubnix extension auth greencircle throwshade +all: api pubnix extension auth greencircle dist: mkdir -p dist/api/test @@ -17,16 +16,22 @@ dist: mkdir -p dist/auth/deploy mkdir -p dist/greencircle/test mkdir -p dist/greencircle/deploy - mkdir -p dist/throwshade/test - mkdir -p dist/throwshade/deploy main.js: $(shell find src) purs-nix bundle # api -deploy_api: dist $(addprefix dist/api/deploy/,$(TEMPLATES_API)) dist/api/deploy/assets dist/api/deploy/main.js dist/api/deploy/main.css +deploy_api: dist $(addprefix dist/api/deploy/,$(TEMPLATES_API)) dist/api/deploy/assets dist/api/deploy/main.js dist/api/deploy/main.css dist/api/deploy/newton -api: dist $(addprefix dist/api/test/,$(TEMPLATES_API)) dist/api/test/assets dist/api/test/main.js dist/api/test/main.css +api: dist $(addprefix dist/api/test/,$(TEMPLATES_API)) dist/api/test/assets dist/api/test/main.js dist/api/test/main.css dist/api/test/newton + +dist/api/%/newton: ${NEWTON_PATH} + rm -rf $@ + mkdir -p $@ + cp -r --no-preserve=mode,ownership $$$@" -endef -$(foreach template,$(TEMPLATES_THROWSHADE), $(eval $(GEN_RULE_THROWSHADE))) - # extension extension: dist dist/extension/assets dist/extension/manifest.json dist/extension/background.js dist/extension/main.js dist/extension/main.css dist/extension/config.js diff --git a/flake.nix b/flake.nix index 67550c2..57669da 100644 --- a/flake.nix +++ b/flake.nix @@ -86,22 +86,6 @@ cp -r dist/greencircle/deploy/* $out/ ''; }; - bundleThrowshade = pkgs.stdenv.mkDerivation { - name = "bundt-bundle-throwshade"; - src = ./.; - inherit NEWTON_PATH; - buildInputs = [ - (purescript.command {}) - pkgs.m4 - ]; - buildPhase = " - make deploy_throwshade - "; - installPhase = '' - mkdir -p $out - cp -r dist/throwshade/deploy/* $out/ - ''; - }; in { devShells.x86_64-linux.default = pkgs.mkShell { inherit NEWTON_PATH; @@ -122,7 +106,6 @@ bundleAPI bundleAuth bundleGreencircle - bundleThrowshade ; }; overlay = self: super: { diff --git a/templates/api/throwshade.html b/templates/api/throwshade.html new file mode 100644 index 0000000..2bf006a --- /dev/null +++ b/templates/api/throwshade.html @@ -0,0 +1,38 @@ + + + + + + LLLLColonq ShaderVerse Prime: The NEXTus (shado-realm) + + + + + + + +
+
+
+ +
+
+ + +
+
+ + diff --git a/templates/throwshade/index.html b/templates/throwshade/index.html deleted file mode 100644 index 2bf006a..0000000 --- a/templates/throwshade/index.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - LLLLColonq ShaderVerse Prime: The NEXTus (shado-realm) - - - - - - - -
-
-
- -
-
- - -
-
- - -- cgit v1.2.3