From ef74b67f90c294610749dfa471272eb0c1b66ca1 Mon Sep 17 00:00:00 2001
From: Mark <mark@betalupi.com>
Date: Fri, 22 Sep 2023 10:08:10 -0700
Subject: [PATCH] Moved server files to /server

---
 README.md                                      |   2 +-
 server/.gitignore                              |   2 ++
 Dockerfile => server/Dockerfile                |   0
 default => server/default                      |   0
 .../docker-compose.yml                         |   2 +-
 {site => server/site}/index.html               |   0
 server/site/package-lock.json                  |  17 +++++++++++++++++
 {site => server/site}/package.json             |   0
 {site => server/site}/resources/Fantasque.ttf  | Bin
 {site => server/site}/resources/banner.svg     |   0
 {site => server/site}/resources/daisy-dark.svg |   0
 .../site}/resources/daisy-icon-dark.svg        |   0
 .../site}/resources/daisy-icon-light.svg       |   0
 .../site}/resources/daisy-light.svg            |   0
 .../site}/resources/readme-banner.png          | Bin
 site/.gitignore                                |   3 ---
 16 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 server/.gitignore
 rename Dockerfile => server/Dockerfile (100%)
 rename default => server/default (100%)
 rename docker-compose.yml => server/docker-compose.yml (87%)
 rename {site => server/site}/index.html (100%)
 create mode 100644 server/site/package-lock.json
 rename {site => server/site}/package.json (100%)
 rename {site => server/site}/resources/Fantasque.ttf (100%)
 rename {site => server/site}/resources/banner.svg (100%)
 rename {site => server/site}/resources/daisy-dark.svg (100%)
 rename {site => server/site}/resources/daisy-icon-dark.svg (100%)
 rename {site => server/site}/resources/daisy-icon-light.svg (100%)
 rename {site => server/site}/resources/daisy-light.svg (100%)
 rename {site => server/site}/resources/readme-banner.png (100%)
 delete mode 100644 site/.gitignore

diff --git a/README.md b/README.md
index 4f0943f..0c7f9c6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![](./site/misc/readme-banner.png)
+![](./server/site/resources/readme-banner.png)
 
 A high-precision scientific calculator with support for units, derivatives, and more.
 
diff --git a/server/.gitignore b/server/.gitignore
new file mode 100644
index 0000000..9f62a81
--- /dev/null
+++ b/server/.gitignore
@@ -0,0 +1,2 @@
+/site/node_modules
+/pkg
\ No newline at end of file
diff --git a/Dockerfile b/server/Dockerfile
similarity index 100%
rename from Dockerfile
rename to server/Dockerfile
diff --git a/default b/server/default
similarity index 100%
rename from default
rename to server/default
diff --git a/docker-compose.yml b/server/docker-compose.yml
similarity index 87%
rename from docker-compose.yml
rename to server/docker-compose.yml
index e52a66d..43ccb04 100644
--- a/docker-compose.yml
+++ b/server/docker-compose.yml
@@ -7,7 +7,7 @@ networks:
 
 services:
   daisy:
-    build: ./.
+    build: ./server
     container_name: daisy
     restart: unless-stopped
 
diff --git a/site/index.html b/server/site/index.html
similarity index 100%
rename from site/index.html
rename to server/site/index.html
diff --git a/server/site/package-lock.json b/server/site/package-lock.json
new file mode 100644
index 0000000..3573a37
--- /dev/null
+++ b/server/site/package-lock.json
@@ -0,0 +1,17 @@
+{
+  "name": "site",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "xterm": "^5.3.0"
+      }
+    },
+    "node_modules/xterm": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/xterm/-/xterm-5.3.0.tgz",
+      "integrity": "sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg=="
+    }
+  }
+}
diff --git a/site/package.json b/server/site/package.json
similarity index 100%
rename from site/package.json
rename to server/site/package.json
diff --git a/site/resources/Fantasque.ttf b/server/site/resources/Fantasque.ttf
similarity index 100%
rename from site/resources/Fantasque.ttf
rename to server/site/resources/Fantasque.ttf
diff --git a/site/resources/banner.svg b/server/site/resources/banner.svg
similarity index 100%
rename from site/resources/banner.svg
rename to server/site/resources/banner.svg
diff --git a/site/resources/daisy-dark.svg b/server/site/resources/daisy-dark.svg
similarity index 100%
rename from site/resources/daisy-dark.svg
rename to server/site/resources/daisy-dark.svg
diff --git a/site/resources/daisy-icon-dark.svg b/server/site/resources/daisy-icon-dark.svg
similarity index 100%
rename from site/resources/daisy-icon-dark.svg
rename to server/site/resources/daisy-icon-dark.svg
diff --git a/site/resources/daisy-icon-light.svg b/server/site/resources/daisy-icon-light.svg
similarity index 100%
rename from site/resources/daisy-icon-light.svg
rename to server/site/resources/daisy-icon-light.svg
diff --git a/site/resources/daisy-light.svg b/server/site/resources/daisy-light.svg
similarity index 100%
rename from site/resources/daisy-light.svg
rename to server/site/resources/daisy-light.svg
diff --git a/site/resources/readme-banner.png b/server/site/resources/readme-banner.png
similarity index 100%
rename from site/resources/readme-banner.png
rename to server/site/resources/readme-banner.png
diff --git a/site/.gitignore b/site/.gitignore
deleted file mode 100644
index 6bd0e57..0000000
--- a/site/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/node_modules
-/package-lock.json
-/pkg
\ No newline at end of file