Restructure

zzh8829 · Apr 15, 2017 · aebd6ed · aebd6ed
1 parent b651c16
commit aebd6ed
Show file tree

Hide file tree

Showing 50 changed files with 7 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 public/
-hugo/themes/*
-!hugo/themes/cactus-plus-plus
+themes/*
+!themes/cactus-plus-plus
 node_modules/
 .DS_Store
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "cactus-plus"]
-  path = hugo/themes/cactus-plus-plus
+  path = themes/cactus-plus-plus
   url = https://github.com/zzh8829/cactus-plus-plus.git
diff --git a/hugo/archetypes/default.md → archetypes/default.md b/hugo/archetypes/default.md → archetypes/default.md
diff --git a/hugo/config.yaml → config.yaml b/hugo/config.yaml → config.yaml
diff --git a/hugo/content/about.md → content/about.md b/hugo/content/about.md → content/about.md
diff --git a/hugo/content/no-track.md → content/no-track.md b/hugo/content/no-track.md → content/no-track.md
diff --git a/...ic-neural-network-for-mnist-with-keras.md → ...ic-neural-network-for-mnist-with-keras.md b/...ic-neural-network-for-mnist-with-keras.md → ...ic-neural-network-for-mnist-with-keras.md
diff --git a/.../building-a-blog-with-hugo-and-webpack.md → .../building-a-blog-with-hugo-and-webpack.md b/.../building-a-blog-with-hugo-and-webpack.md → .../building-a-blog-with-hugo-and-webpack.md
diff --git a/...etes-cluster-from-scratch-with-kubeadm.md → ...etes-cluster-from-scratch-with-kubeadm.md b/...etes-cluster-from-scratch-with-kubeadm.md → ...etes-cluster-from-scratch-with-kubeadm.md
@@ -182,7 +182,7 @@ This deploy script contains 3 parts: Deployment, Service and Ingress. The deploy
 ```
 kubectl apply -f deploy.yaml
 ```
-Point your domain DNS to the master server and after a while you will be able to see our example working at https://hello.kube.zihao.ca YAY!
+Point your domain DNS to the master server and after a while you will be able to see our example working at https://hello.kube.zihao.me YAY!
 
 ![Hello World](/images/kube-hello.png)
 

diff --git a/hugo/content/post/hello-hugo.md → content/post/hello-hugo.md b/hugo/content/post/hello-hugo.md → content/post/hello-hugo.md
diff --git a/...ent/post/migrating-to-password-manager.md → ...ent/post/migrating-to-password-manager.md b/...ent/post/migrating-to-password-manager.md → ...ent/post/migrating-to-password-manager.md
diff --git a/pages/.gitlab-ci.yml → gitlab-pages/.gitlab-ci.yml b/pages/.gitlab-ci.yml → gitlab-pages/.gitlab-ci.yml
diff --git a/pages/README.md → gitlab-pages/README.md b/pages/README.md → gitlab-pages/README.md
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -4,7 +4,7 @@ import BrowserSync from "browser-sync";
 
 const browserSync = BrowserSync.create();
 const webpackOptions = ["--progress", "--colors", "--display-error-details"]
-const hugoOptions = ["--source", "hugo", "--destination", "../public", "-v"];
+const hugoOptions = ["-v"];
 
 // gulp.task("hugo", (cb) => runHugo(cb, ["--canonifyURLs"]));
 gulp.task("hugo", (cb) => runHugo(cb));
@@ -22,7 +22,7 @@ gulp.task("watch", ["webpack:watch", "hugo:watch"], () => {
     }
   });
   gulp.watch("./app/**/*", ["webpack:watch"]);
-  gulp.watch("./hugo/**/*", ["hugo:watch"]);
+  gulp.watch("./**/*", ["hugo:watch"]);
 });
 
 function runHugo(cb, options) {

diff --git a/hugo/static/images/kube-hello.png b/hugo/static/images/kube-hello.png
diff --git a/hugo/i18n/en.yaml → i18n/en.yaml b/hugo/i18n/en.yaml → i18n/en.yaml
diff --git a/hugo/i18n/zh.yaml → i18n/zh.yaml b/hugo/i18n/zh.yaml → i18n/zh.yaml
diff --git a/hugo/layouts/404.html → layouts/404.html b/hugo/layouts/404.html → layouts/404.html
diff --git a/hugo/layouts/_default/list.html → layouts/_default/list.html b/hugo/layouts/_default/list.html → layouts/_default/list.html
diff --git a/hugo/layouts/_default/rss.xml → layouts/_default/rss.xml b/hugo/layouts/_default/rss.xml → layouts/_default/rss.xml
diff --git a/hugo/layouts/index.html → layouts/index.html b/hugo/layouts/index.html → layouts/index.html
diff --git a/hugo/layouts/partials/footer.html → layouts/partials/footer.html b/hugo/layouts/partials/footer.html → layouts/partials/footer.html
diff --git a/hugo/layouts/partials/head.html → layouts/partials/head.html b/hugo/layouts/partials/head.html → layouts/partials/head.html
diff --git a/hugo/layouts/partials/js.html → layouts/partials/js.html b/hugo/layouts/partials/js.html → layouts/partials/js.html
diff --git a/hugo/layouts/partials/nav.html → layouts/partials/nav.html b/hugo/layouts/partials/nav.html → layouts/partials/nav.html
diff --git a/hugo/layouts/partials/post-list.html → layouts/partials/post-list.html b/hugo/layouts/partials/post-list.html → layouts/partials/post-list.html
diff --git a/hugo/layouts/partials/profile.html → layouts/partials/profile.html b/hugo/layouts/partials/profile.html → layouts/partials/profile.html
diff --git a/hugo/layouts/sitemap.xml → layouts/sitemap.xml b/hugo/layouts/sitemap.xml → layouts/sitemap.xml
diff --git a/release b/release
@@ -3,7 +3,7 @@ set -e
 TMP=$(mktemp -d)
 git clone [email protected]:zzh8829/zihao-pages.git $TMP
 rm -rf $TMP/*
-cp -r pages/. $TMP/
+cp -r gitlab-pages/. $TMP/
 mv public $TMP/
 cd $TMP
 git add .

diff --git a/hugo/static/browserconfig.xml → static/browserconfig.xml b/hugo/static/browserconfig.xml → static/browserconfig.xml
diff --git a/hugo/static/crossdomain.xml → static/crossdomain.xml b/hugo/static/crossdomain.xml → static/crossdomain.xml
diff --git a/hugo/static/css/common.css → static/css/common.css b/hugo/static/css/common.css → static/css/common.css
diff --git a/hugo/static/css/home.css → static/css/home.css b/hugo/static/css/home.css → static/css/home.css
diff --git a/hugo/static/favicon.ico → static/favicon.ico b/hugo/static/favicon.ico → static/favicon.ico
diff --git a/hugo/static/humans.txt → static/humans.txt b/hugo/static/humans.txt → static/humans.txt
diff --git a/hugo/static/images/apple-touch-icon.png → static/images/apple-touch-icon.png b/hugo/static/images/apple-touch-icon.png → static/images/apple-touch-icon.png
diff --git a/hugo/static/images/favicon.ico → static/images/favicon.ico b/hugo/static/images/favicon.ico → static/images/favicon.ico
diff --git a/hugo/static/images/favicon.png → static/images/favicon.png b/hugo/static/images/favicon.png → static/images/favicon.png
diff --git a/hugo/static/images/kube-dash.png → static/images/kube-dash.png b/hugo/static/images/kube-dash.png → static/images/kube-dash.png
diff --git a/static/images/kube-hello.png b/static/images/kube-hello.png
diff --git a/hugo/static/images/mnist-kaggle.png → static/images/mnist-kaggle.png b/hugo/static/images/mnist-kaggle.png → static/images/mnist-kaggle.png
diff --git a/hugo/static/images/mnist-output_3_0.png → static/images/mnist-output_3_0.png b/hugo/static/images/mnist-output_3_0.png → static/images/mnist-output_3_0.png
diff --git a/hugo/static/images/mnist-output_9_0.png → static/images/mnist-output_9_0.png b/hugo/static/images/mnist-output_9_0.png → static/images/mnist-output_9_0.png
diff --git a/hugo/static/images/password-import.png → static/images/password-import.png b/hugo/static/images/password-import.png → static/images/password-import.png
diff --git a/hugo/static/images/password-text.png → static/images/password-text.png b/hugo/static/images/password-text.png → static/images/password-text.png
diff --git a/hugo/static/images/password-weak.png → static/images/password-weak.png b/hugo/static/images/password-weak.png → static/images/password-weak.png
diff --git a/hugo/static/keybase.txt → static/keybase.txt b/hugo/static/keybase.txt → static/keybase.txt
diff --git a/hugo/static/resume.pdf → static/resume.pdf b/hugo/static/resume.pdf → static/resume.pdf
diff --git a/hugo/static/robots.txt → static/robots.txt b/hugo/static/robots.txt → static/robots.txt
diff --git a/hugo/themes/cactus-plus-plus → themes/cactus-plus-plus b/hugo/themes/cactus-plus-plus → themes/cactus-plus-plus