aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris2016-03-21 21:49:29 +0100
committerJoris2016-03-21 21:49:29 +0100
commitcda08750ac7cdd83e73c1110800bea39928ffed9 (patch)
treec92d1b49d1f6b1e8067b2ae0c27fe073ad32c41b
parent86ffcb49d24d1a42b7fbb69eafa05c932b220efe (diff)
downloadcatchvoid-cda08750ac7cdd83e73c1110800bea39928ffed9.tar.gz
catchvoid-cda08750ac7cdd83e73c1110800bea39928ffed9.tar.bz2
catchvoid-cda08750ac7cdd83e73c1110800bea39928ffed9.zip
Use public directory
-rw-r--r--.gitignore2
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--package.json4
-rw-r--r--public/index.html (renamed from index.html)0
-rw-r--r--public/style.css (renamed from style.css)0
5 files changed, 9 insertions, 3 deletions
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/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/index.html b/public/index.html
index 6155f3c..6155f3c 100644
--- a/index.html
+++ b/public/index.html
diff --git a/style.css b/public/style.css
index 4281b43..4281b43 100644
--- a/style.css
+++ b/public/style.css