aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRahiel Kasim <rahielkasim@gmail.com>2016-06-30 16:13:42 +0200
committerRahiel Kasim <rahielkasim@gmail.com>2016-06-30 16:13:42 +0200
commit705698151ca56ccaf65967036e59585407c34c29 (patch)
tree5e745572b141a2e1d8b45f85bc6433abb9b0849a
parent53dac4403e45d7f0b0bec263a58b909d2c1d1ec8 (diff)
move github pages website to this repo
-rw-r--r--.gitignore1
-rw-r--r--main.js2
-rw-r--r--package.json2
-rwxr-xr-xupdate.bash22
4 files changed, 8 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore
index 0fe54ad..7318529 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
node_modules
sunsistemo.js
-sunsistemo.github.io
validation/validation.js
diff --git a/main.js b/main.js
index 2b5be73..0a1b3a0 100644
--- a/main.js
+++ b/main.js
@@ -42,7 +42,7 @@ let menuList = [
{"label": "Angular Momentum", "function": systems.genBodiesRot, "args": [200, "solar", true, false]},
{"label": "Angular with Bounce", "function": systems.genBodiesRot, "args": [200, "balls", true, true, true]},
{"label": "Choreographies", "function": showSubmenu, "args": [choreoSubmenuList]},
- {"label": "About", "function": function () { window.open("sunsistemo.pdf"); }, "args": []}
+ {"label": "About", "function": function () { window.open("report/sunsistemo.pdf"); }, "args": []}
];
gui(menuList);
diff --git a/package.json b/package.json
index b48c6cc..c30411f 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
"url": "https://github.com/sunsistemo/sunsistemo/issues"
},
"devDependencies": {
- "babel-core": "^6.9.1",
+ "babel-core": "^6.10.4",
"babel-loader": "^6.2.4",
"babel-preset-es2015": "^6.9.0",
"webpack": "^1.13.1",
diff --git a/update.bash b/update.bash
index d0f79e9..ef49c94 100755
--- a/update.bash
+++ b/update.bash
@@ -1,21 +1,11 @@
#!/usr/bin/env bash
set -e
-path="sunsistemo.github.io/"
-
-cp index.html "$path"
-cp style.css "$path"
-cp -r textures/ "$path"
-cp validation/index.html "$path"/validation/
-cp report/sunsistemo.pdf "$path"
-./node_modules/.bin/webpack --optimize-minimize --output-path "$path"
-cd "$path"
-# git mv CNAME CNAME-disabled
-# git commit -m "force cloudfare cache refresh"
-# git push
-# sleep 300
-# git mv CNAME-disabled CNAME
+git checkout gh-pages
+git merge master -m "merge master"
+./node_modules/.bin/webpack --optimize-minimize
git add -A
+git add --force sunsistemo.js validation/validation.js
git commit -m "update sunsistemo"
-git push -u origin master
-cd -
+git push -u origin gh-pages
+git checkout master