up

mirovia · Aug 1, 2021 · 98dc4fa · 98dc4fa
1 parent 5c8ccfe
commit 98dc4fa
Show file tree

Hide file tree

Showing 21 changed files with 92 additions and 49 deletions.
diff --git a/docs/404.html b/docs/404.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Gouttelettes</title>
+    <link id="style" rel="stylesheet" type="text/css" href="/index.css"/>
+    <link id="theme" rel="stylesheet" type="text/css"/>
+    <!-- TODO: invert icon by 180 degree, like page header icon-->
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg">
+  </head>
+  <body>
+    <noscript>This page contains webassembly and javascript content, please enable javascript in your browser.</noscript>
+    <script src="/bootstrap.js"></script>
+  </body>
+</html>
diff --git a/docs/bootstrap.js b/docs/bootstrap.js
@@ -483,4 +483,4 @@ eval("// A dependency graph that contains any wasm must all be imported\n// asyn
 
 /***/ })
 
-/******/ });
+/******/ });
diff --git a/docs/000_hello_world.gf → docs/examples/000_hello_world.gf b/docs/000_hello_world.gf → docs/examples/000_hello_world.gf
diff --git a/docs/001_hello_someone.gf → docs/examples/001_hello_someone.gf b/docs/001_hello_someone.gf → docs/examples/001_hello_someone.gf
diff --git a/docs/002_drive_alone.gf → docs/examples/002_drive_alone.gf b/docs/002_drive_alone.gf → docs/examples/002_drive_alone.gf
diff --git a/docs/003_high_up.gf → docs/examples/003_high_up.gf b/docs/003_high_up.gf → docs/examples/003_high_up.gf
diff --git a/docs/flags/flag-france.png b/docs/flags/flag-france.png
diff --git a/docs/flags/flag-united-kingdom.png b/docs/flags/flag-united-kingdom.png
diff --git a/docs/index_dark.css b/docs/index_dark.css
@@ -0,0 +1,8 @@
+* {
+  color: #aaf;
+  background: #0000;
+}
+
+body {
+  background: #111;
+}
diff --git a/docs/index_light.css b/docs/index_light.css
@@ -0,0 +1,8 @@
+* {
+  color: #aaf;
+  background: #0000;
+}
+
+body {
+  background: #eee;
+}
diff --git a/front/examples/000_hello_world.gf.test b/front/examples/000_hello_world.gf.test
diff --git a/front/examples/001_hello_someone.gf.test b/front/examples/001_hello_someone.gf.test
diff --git a/docs/000_hello_world.gf.test → front/examples_test/000_hello_world.test.gf b/docs/000_hello_world.gf.test → front/examples_test/000_hello_world.test.gf
diff --git a/docs/001_hello_someone.gf.test → ...t/examples_test/001_hello_someone.test.gf b/docs/001_hello_someone.gf.test → ...t/examples_test/001_hello_someone.test.gf
diff --git a/front/src/flow/format.rs b/front/src/flow/format.rs
@@ -103,12 +103,12 @@ pub fn format_flow_as_yaml(x: &str) -> String {
 fn test_format_flow() {
     let examples = vec!["000_hello_world", "001_hello_someone"];
     for example in examples {
-        let content = read_to_string(format!("examples/{}.gf", example))
+        let content = read_to_string(format!("static/examples/{}.gf", example))
             .expect("Something went wrong reading the file");
         let content_flat = read_to_string(format!("examples_flat/{}.gf", example))
             .expect("Something went wrong reading the file");
         write(
-            format!("examples/{}.gf.test", example),
+            format!("examples_test/{}.test.gf", example),
             format_flow(&content_flat),
         )
         .unwrap();
@@ -119,7 +119,7 @@ fn test_format_flow() {
 fn test_flatten() {
     let examples = vec!["000_hello_world", "001_hello_someone"];
     for example in examples {
-        let content = read_to_string(format!("examples/{}.gf", example))
+        let content = read_to_string(format!("static/examples/{}.gf", example))
             .expect("Something went wrong reading the file");
         let content_flat = read_to_string(format!("examples_flat/{}.gf", example))
             .expect("Something went wrong reading the file");
@@ -135,7 +135,7 @@ fn test_flatten() {
 fn test_format_flow_as_yaml() {
     let examples = vec!["000_hello_world", "001_hello_someone"];
     for example in examples {
-        let content = read_to_string(format!("examples/{}.gf", example))
+        let content = read_to_string(format!("static/examples/{}.gf", example))
             .expect("Something went wrong reading the file");
         let content_yaml = read_to_string(format!("examples_yaml/{}.yaml", example))
             .expect("Something went wrong reading the file");

diff --git a/front/examples/000_hello_world.gf → front/static/examples/000_hello_world.gf b/front/examples/000_hello_world.gf → front/static/examples/000_hello_world.gf
diff --git a/front/examples/001_hello_someone.gf → front/static/examples/001_hello_someone.gf b/front/examples/001_hello_someone.gf → front/static/examples/001_hello_someone.gf
diff --git a/front/examples/002_drive_alone.gf → front/static/examples/002_drive_alone.gf b/front/examples/002_drive_alone.gf → front/static/examples/002_drive_alone.gf
diff --git a/front/examples/003_high_up.gf → front/static/examples/003_high_up.gf b/front/examples/003_high_up.gf → front/static/examples/003_high_up.gf
diff --git a/front/webpack.config.js b/front/webpack.config.js
@@ -13,7 +13,14 @@ module.exports = {
   },
   mode: "development",
   plugins: [
-    new CopyWebpackPlugin(['index.html', 'favicon.svg', 'examples', 'index.css'])
+    new CopyWebpackPlugin([
+      'index.html',
+      'favicon.svg',
+      'static',
+      'index.css',
+      'index_dark.css',
+      'index_light.css'
+    ])
   ],
   devServer: {
     // reference: https://webpack.js.org/configuration/dev-server/#devserverhttps

diff --git a/mir/src/main.rs b/mir/src/main.rs
@@ -65,7 +65,7 @@ fn release() -> bool {
             == 0
         {
             println!("[ok]    webpack");
-            return copy_release();
+            return delete_release();
         } else {
             println!("[error] webpack");
         }
@@ -74,12 +74,59 @@ fn release() -> bool {
     }
     return false;
 }
+fn delete_release() -> bool {
+    if let Ok(mut child) = Command::new("rm")
+        .arg("-r")
+        .arg("-f")
+        .arg("/Users/loicbourgois/github.com/gouttelettes/gouttelettes/docs")
+        .spawn()
+    {
+        if child
+            .wait()
+            .expect("rm wasn't running")
+            .code()
+            .unwrap()
+            == 0
+        {
+            println!("[ok]    rm");
+            return copy_release();
+        } else {
+            println!("[error] rm");
+        }
+    } else {
+        println!("rm didn't start");
+    }
+    return false;
+}
 fn copy_release() -> bool {
     if let Ok(mut child) = Command::new("cp")
         .arg("-R")
         .arg("/Users/loicbourgois/github.com/gouttelettes/gouttelettes/front/dist")
         .arg("/Users/loicbourgois/github.com/gouttelettes/gouttelettes/docs")
         .spawn()
+    {
+        if child
+            .wait()
+            .expect("cp wasn't running")
+            .code()
+            .unwrap()
+            == 0
+        {
+            println!("[ok]    cp");
+            return copy_404();
+        } else {
+            println!("[error] cp");
+        }
+    } else {
+        println!("cp didn't start");
+    }
+    return false;
+}
+fn copy_404() -> bool {
+    if let Ok(mut child) = Command::new("cp")
+        .arg("/Users/loicbourgois/github.com/gouttelettes/gouttelettes/docs/index.html")
+        .arg("/Users/loicbourgois/github.com/gouttelettes/gouttelettes/docs/404.html")
+        .spawn()
     {
         if child
             .wait()