From cda08750ac7cdd83e73c1110800bea39928ffed9 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 21 Mar 2016 21:49:29 +0100
Subject: Use public directory
---
.gitignore | 2 +-
.gitlab-ci.yml | 6 ++++++
index.html | 21 ---------------------
package.json | 4 ++--
public/index.html | 21 +++++++++++++++++++++
public/style.css | 9 +++++++++
style.css | 9 ---------
7 files changed, 39 insertions(+), 33 deletions(-)
create mode 100644 .gitlab-ci.yml
delete mode 100644 index.html
create mode 100644 public/index.html
create mode 100644 public/style.css
delete mode 100644 style.css
diff --git a/.gitignore b/.gitignore
index c60650d..f86f321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
elm-stuff
node_modules
-client.js
+public/client.js
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..ba8722f
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,6 @@
+pages:
+ artifacts:
+ paths:
+ - public
+ only:
+ - pages
diff --git a/index.html b/index.html
deleted file mode 100644
index 6155f3c..0000000
--- a/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
- cAtchVoid
-
-
-
-
-
-
-
-
-
-
-
diff --git a/package.json b/package.json
index 00d42c4..571e4af 100644
--- a/package.json
+++ b/package.json
@@ -7,9 +7,9 @@
"start": "npm run watch",
"watch": "npm run launch-server & nodemon --watch src -e elm --exec 'npm run build --silent'",
- "build": "elm make src/Main.elm --output client.js",
+ "build": "elm make src/Main.elm --output public/client.js",
- "launch-server": "npm run kill-server && http-server ./ -p 8080",
+ "launch-server": "npm run kill-server && http-server ./public -p 8080",
"kill-server": "fuser -k 8080/tcp || true"
}
}
diff --git a/public/index.html b/public/index.html
new file mode 100644
index 0000000..6155f3c
--- /dev/null
+++ b/public/index.html
@@ -0,0 +1,21 @@
+
+
+
+
+
+ cAtchVoid
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/style.css b/public/style.css
new file mode 100644
index 0000000..4281b43
--- /dev/null
+++ b/public/style.css
@@ -0,0 +1,9 @@
+body { margin: 0; }
+
+body > div {
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+}
diff --git a/style.css b/style.css
deleted file mode 100644
index 4281b43..0000000
--- a/style.css
+++ /dev/null
@@ -1,9 +0,0 @@
-body { margin: 0; }
-
-body > div {
- position: fixed;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
-}
--
cgit v1.2.3