commit 259fbbcdd112232278e349c9ab358c94bf7e3d30
parent b5b73a258d5e2b21a6984e7e49412339e0dade14
Author: Ryan Jeffrey <ryan@ryanmj.xyz>
Date: Mon, 24 Jan 2022 00:10:56 -0800
site-bkgs git module, site-bkgs changes to server and make
Diffstat:
5 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "external/site-bkgs"]
+ path = external/site-bkgs
+ url = git@ryanmj.xyz:/var/www/git/site-bkgs.git
diff --git a/Makefile b/Makefile
@@ -7,6 +7,12 @@ all: publish
publish:
@echo "Publishing normal configuration"
tsc
+ cd external/site-bkgs && $(MAKE)
run: publish
@exec node bin/server.js
+
+clean:
+ @echo "Cleaning up main site"
+ rm -rf bin/
+ cd external/site-bkgs && $(MAKE) clean
diff --git a/external/site-bkgs b/external/site-bkgs
@@ -0,0 +1 @@
+Subproject commit 7a2131357ad41b5f0ec951517f57b0ede3f3b99a
diff --git a/server.ts b/server.ts
@@ -137,6 +137,7 @@ app.set('view engine', 'handlebars');
app.set('views', "./views");
app.use(express.static(path.join(process.cwd(), 'public')));
+app.use(express.static(path.join(process.cwd(), 'external')));
app.use(express.json());
// TODO maybe a system that exports org to handlebars.
diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars
@@ -15,7 +15,7 @@
</head>
<body>
<div id="preamble" class="status">
- <script defer src="scripts/site-bkgs/main.js"></script>
+ <script type="module" defer src="/site-bkgs/bin/archs.js"></script>
<div id="task-meta" class="topl">
<h4 style="margin-left:1em; margin-top:0.5em;">Links</h4>
<hr>
