Add gallery and VR reef

CMCRobotics · Oct 13, 2024 · 4193598 · 4193598
1 parent 75fab6e
commit 4193598
Show file tree

Hide file tree

Showing 9 changed files with 266 additions and 269 deletions.
diff --git a/public/assets.json b/public/assets.json
diff --git a/public/index.html b/public/index.html
diff --git a/public/presentation.html b/public/presentation.html
@@ -1,35 +1,43 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Sauve le corail</title>
+    <title>Les récifs coraliens</title>
 </head>
 <body>
     <div class="reveal">
         <div class="slides">
-            <section data-markdown data-background-image="presentation/images/background.svg">
-                <textarea data-template>
-                    ## Sauve le corail
-
-                    Let's learn about our oceans!
-                </textarea>
-            </section>
-            <section data-markdown>
-                <textarea data-template>
-                    ## Question 1: Coral Bleaching
+            <section data-background-image="presentation/images/background.svg">
+                <h1 class="r-fit-text">Les récifs coraliens</h1>
+            </section>
+            <section data-markdown="presentation/introduction.md" data-separator="^---$" data-separator-vertical="^--$">
+            </section>
 
-                    What causes coral bleaching?
+            <section>
+                <section>
+                    <h1 class="r-fit-text">Qui es-tu ?</h1>
+                </section>
+                <section data-microsquad data-background-iframe="/tutorial.html" data-background-interactive> 
+                </section>
+            </section>
 
-                    1. Water pollution
-                    2. **Rising water temperatures**
-                    3. Overfishing
-                    4. Loud noises
-                </textarea>
+            <section data-markdown="presentation/constitution.md" data-separator="^---$" data-separator-vertical="^--$" >
+            </section>
+            <section>
+                <section>
+                    <h1 class="r-fit-text">La Galerie</h1>
+                </section>
+                <section data-microsquad data-background-iframe="/gallery.html" data-background-interactive> 
+                </section>
+            </section>
+            <section data-markdown="presentation/threats.md" data-separator="^\n===\n$" data-separator-vertical="^\n---\n$">
+            </section>
+            <section data-markdown="presentation/health.md" data-separator="^\n===\n$" data-separator-vertical="^\n---\n$">
             </section>
             <section>
                 <section>
                     <h1 class="r-fit-text">Le Recif</h1>
                 </section>
-                <section data-microsquad data-background-iframe="/index.html" data-background-interactive> 
+                <section data-microsquad data-background-iframe="/reef.html" data-background-interactive> 
                 </section>
             </section>
         </div>

diff --git a/public/questions/vote-config.yaml b/public/questions/vote-config.yaml
@@ -29,4 +29,4 @@ questions:
     option-2: "Long long long answer that's just very very long just fine fine fine just fine fine fine and then some more"
     option-3: "Long long long answer that's just very very long just fine fine fine just fine fine fine and then some more"
     option-4: "Long long long answer that's just very very long just fine fine fine just fine fine fine and then some more"
-    correct-option: 3
+    correct-option: 2
diff --git a/src/aframe-scene.js b/src/aframe-scene.js
@@ -6,9 +6,10 @@ import './components/bubble';
 // import './components/floating-camera';
 // import './components/custom-controls';
 import './components/gradient';
-// import './components/simple-navmesh';
-// import './components/surface-placer';
 import './components/ocean-shader';
+import 'js-yaml';
+import 'loglevel';
+import 'lit-html';
 
 import 'aframe-orbit-controls';
 import 'aframe-extras';

diff --git a/src/reveal-presentation.js b/src/reveal-presentation.js
@@ -9,20 +9,20 @@ Reveal.initialize({
     progress: false,
     controls: true
   }).then(() => {
-    $(document).ready(
-        function(){
-            $('body').on('submit','form',function() {
-                var sessionCode = $('#session_code')[0].value;
-                $("section[data-microsquad]").each(
-                    function(){
-                        var iframeUrl = new URL( $(this).data("background-iframe") );
-                        iframeUrl.searchParams.set("sc", sessionCode);
-                        $(this).data("background-iframe",iframeUrl.href);
-                        console.log("Now "+$(this).data("background-iframe"));
-                    }
-                );
-                return false;
-            });
-        } 
-    );
+    // $(document).ready(
+    //     function(){
+    //         // $('body').on('submit','form',function() {
+    //         //     var sessionCode = $('#session_code')[0].value;
+    //         //     $("section[data-microsquad]").each(
+    //         //         function(){
+    //         //             var iframeUrl = new URL( $(this).data("background-iframe") );
+    //         //             iframeUrl.searchParams.set("sc", sessionCode);
+    //         //             $(this).data("background-iframe",iframeUrl.href);
+    //         //             console.log("Now "+$(this).data("background-iframe"));
+    //         //         }
+    //         //     );
+    //         //     return false;
+    //         // });
+    //     } 
+    // );
 });