Changed examples

darksoil-studio · May 16, 2024 · 6ba6235 · 6ba6235
1 parent a80fbfd
commit 6ba6235
Show file tree

Hide file tree

Showing 141 changed files with 13,112 additions and 5,440 deletions.
diff --git a/crates/scaffold_holochain_runtime/templates/holochain-runtime/src-tauri/src/lib.rs.hbs b/crates/scaffold_holochain_runtime/templates/holochain-runtime/src-tauri/src/lib.rs.hbs
@@ -24,8 +24,6 @@ pub fn run() {
             },
         ))
         .setup(|app| {
-            let handle = app.handle().clone();
-
             app.holochain()?
                 .main_window_builder("main", true, None, None)?
                 .build()?;

diff --git a/crates/scaffold_holochain_runtime/templates/holochain-runtime/src-tauri/tauri.conf.json.hbs b/crates/scaffold_holochain_runtime/templates/holochain-runtime/src-tauri/tauri.conf.json.hbs
@@ -13,15 +13,7 @@
     "security": {
       "csp": null
     },
-    "windows": [
-      {
-        "fullscreen": false,
-        "height": 600,
-        "resizable": true,
-        "title": "{{title_case runtime_name}}",
-        "width": 800
-      }
-    ]
+    "windows": []
   },
   "bundle": {
     "active": true,

diff --git a/crates/scaffold_tauri_app/templates/executable-happ/src-tauri/Cargo.toml.hbs b/crates/scaffold_tauri_app/templates/executable-happ/src-tauri/Cargo.toml.hbs
@@ -28,4 +28,4 @@ tauri-plugin-log = "2.0.0-beta"
 url2 = "0.0.6"
 app_dirs2 = "2.5.5"
 tempdir = "0.3.7"
-
+anyhow = "1"
diff --git a/crates/scaffold_tauri_app/templates/executable-happ/src-tauri/src/lib.rs.hbs b/crates/scaffold_tauri_app/templates/executable-happ/src-tauri/src/lib.rs.hbs
@@ -33,34 +33,10 @@ pub fn run() {
         .setup(|app| {
             let handle = app.handle().clone();
             tauri::async_runtime::block_on(async move {
-                let mut admin_ws = handle.holochain()?.admin_websocket().await?;
-
-                let installed_apps = admin_ws
-                    .list_apps(None)
-                    .await
-                    .map_err(|err| tauri_plugin_holochain::Error::ConductorApiError(err))?;
-
-                if installed_apps.len() == 0 {
-                    handle
-                        .holochain()?
-                        .install_app(
-                            String::from(APP_ID),
-                            happ_bundle(),
-                            HashMap::new(),
-                            None,
-                        )
-                        .await
-                        .map(|_| ())
-                } else {
-                    // If the app bundle has changed, updated it              
-                    handle.holochain()?.update_app_if_necessary(
-                        String::from(APP_ID),
-                        happ_bundle()
-                    ).await?;
-                    Ok(())
-                }
+                setup(handle).await
             })?;
 
+            // After set up we can be sure our app is installed and up to date, so we can just open it
             app.holochain()?
                 .main_window_builder("main", false, Some(String::from("{{app_name}}")), None)?
                 .build()?;
@@ -71,6 +47,44 @@ pub fn run() {
         .expect("error while running tauri application");
 }
 
+// Very simple setup for now:
+// - On app start, list installed apps:
+//   - If there are no apps installed, this is the first time the app is opened: install our hApp
+//   - If there **are** apps:
+//     - Check if it's necessary to update the coordinators for our hApp
+//       - And do so if it is
+//
+// You can modify this function to suit your needs if they become more complex
+async fn setup(handle: AppHandle) -> anyhow::Result<()> {
+    let mut admin_ws = handle.holochain()?.admin_websocket().await?;
+
+    let installed_apps = admin_ws
+        .list_apps(None)
+        .await
+        .map_err(|err| tauri_plugin_holochain::Error::ConductorApiError(err))?;
+
+    if installed_apps.len() == 0 {
+        handle
+            .holochain()?
+            .install_app(
+                String::from(APP_ID),
+                happ_bundle()
+                HashMap::new(),
+                None,
+            )
+            .await?;
+
+        Ok(())
+    } else {
+        handle.holochain()?.update_app_if_necessary(
+            String::from(APP_ID),
+            happ_bundle()
+        ).await?;
+
+        Ok(())
+    }
+}
+
 fn internal_ip() -> String {
     if cfg!(mobile) {
         std::option_env!("INTERNAL_IP")

diff --git a/crates/scaffold_tauri_app/templates/executable-happ/src-tauri/tauri.conf.json.hbs b/crates/scaffold_tauri_app/templates/executable-happ/src-tauri/tauri.conf.json.hbs
@@ -12,15 +12,7 @@
     "security": {
       "csp": null
     },
-    "windows": [
-      {
-        "fullscreen": false,
-        "height": 600,
-        "resizable": true,
-        "title": "{{title_case app_name}}",
-        "width": 800
-      }
-    ]
+    "windows": []
   },
   "bundle": {
     "active": true,

diff --git a/examples/tauri-app/.envrc → examples/executable-happ/.envrc b/examples/tauri-app/.envrc → examples/executable-happ/.envrc
diff --git a/examples/tauri-app/.gitignore → examples/executable-happ/.gitignore b/examples/tauri-app/.gitignore → examples/executable-happ/.gitignore
diff --git a/examples/tauri-app/Cargo.lock → examples/executable-happ/Cargo.lock b/examples/tauri-app/Cargo.lock → examples/executable-happ/Cargo.lock
diff --git a/examples/tauri-app/Cargo.toml → examples/executable-happ/Cargo.toml b/examples/tauri-app/Cargo.toml → examples/executable-happ/Cargo.toml
diff --git a/examples/tauri-app/README.md → examples/executable-happ/README.md b/examples/tauri-app/README.md → examples/executable-happ/README.md
diff --git a/...les/tauri-app/dnas/forum/workdir/dna.yaml → ...ecutable-happ/dnas/forum/workdir/dna.yaml b/...les/tauri-app/dnas/forum/workdir/dna.yaml → ...ecutable-happ/dnas/forum/workdir/dna.yaml
diff --git a/.../forum/zomes/coordinator/posts/Cargo.toml → .../forum/zomes/coordinator/posts/Cargo.toml b/.../forum/zomes/coordinator/posts/Cargo.toml → .../forum/zomes/coordinator/posts/Cargo.toml
diff --git a/.../zomes/coordinator/posts/src/all_posts.rs → .../zomes/coordinator/posts/src/all_posts.rs b/.../zomes/coordinator/posts/src/all_posts.rs → .../zomes/coordinator/posts/src/all_posts.rs
diff --git a/...um/zomes/coordinator/posts/src/comment.rs → ...um/zomes/coordinator/posts/src/comment.rs b/...um/zomes/coordinator/posts/src/comment.rs → ...um/zomes/coordinator/posts/src/comment.rs
diff --git a/.../forum/zomes/coordinator/posts/src/lib.rs → .../forum/zomes/coordinator/posts/src/lib.rs b/.../forum/zomes/coordinator/posts/src/lib.rs → .../forum/zomes/coordinator/posts/src/lib.rs
diff --git a/...forum/zomes/coordinator/posts/src/post.rs → ...forum/zomes/coordinator/posts/src/post.rs b/...forum/zomes/coordinator/posts/src/post.rs → ...forum/zomes/coordinator/posts/src/post.rs
diff --git a/...as/forum/zomes/integrity/posts/Cargo.toml → ...as/forum/zomes/integrity/posts/Cargo.toml b/...as/forum/zomes/integrity/posts/Cargo.toml → ...as/forum/zomes/integrity/posts/Cargo.toml
diff --git a/...orum/zomes/integrity/posts/src/comment.rs → ...orum/zomes/integrity/posts/src/comment.rs b/...orum/zomes/integrity/posts/src/comment.rs → ...orum/zomes/integrity/posts/src/comment.rs
diff --git a/...as/forum/zomes/integrity/posts/src/lib.rs → ...as/forum/zomes/integrity/posts/src/lib.rs b/...as/forum/zomes/integrity/posts/src/lib.rs → ...as/forum/zomes/integrity/posts/src/lib.rs
diff --git a/...s/forum/zomes/integrity/posts/src/post.rs → ...s/forum/zomes/integrity/posts/src/post.rs b/...s/forum/zomes/integrity/posts/src/post.rs → ...s/forum/zomes/integrity/posts/src/post.rs
diff --git a/examples/tauri-app/flake.lock → examples/executable-happ/flake.lock b/examples/tauri-app/flake.lock → examples/executable-happ/flake.lock
diff --git a/examples/tauri-app/flake.nix → examples/executable-happ/flake.nix b/examples/tauri-app/flake.nix → examples/executable-happ/flake.nix
diff --git a/...uri-app/forum/.github/workflows/test.yaml → ...le-happ/forum/.github/workflows/test.yaml b/...uri-app/forum/.github/workflows/test.yaml → ...le-happ/forum/.github/workflows/test.yaml
diff --git a/examples/tauri-app/forum/.gitignore → examples/executable-happ/forum/.gitignore b/examples/tauri-app/forum/.gitignore → examples/executable-happ/forum/.gitignore
diff --git a/examples/tauri-app/forum/Cargo.lock → examples/executable-happ/forum/Cargo.lock b/examples/tauri-app/forum/Cargo.lock → examples/executable-happ/forum/Cargo.lock
diff --git a/examples/tauri-app/forum/README.md → examples/executable-happ/forum/README.md b/examples/tauri-app/forum/README.md → examples/executable-happ/forum/README.md
diff --git a/examples/tauri-app/forum/flake.lock → examples/executable-happ/forum/flake.lock b/examples/tauri-app/forum/flake.lock → examples/executable-happ/forum/flake.lock
diff --git a/examples/tauri-app/forum/package.json → examples/executable-happ/forum/package.json b/examples/tauri-app/forum/package.json → examples/executable-happ/forum/package.json
diff --git a/examples/tauri-app/forum/tests/package.json → .../executable-happ/forum/tests/package.json b/examples/tauri-app/forum/tests/package.json → .../executable-happ/forum/tests/package.json
diff --git a/...m/tests/src/forum/posts/all-posts.test.ts → ...m/tests/src/forum/posts/all-posts.test.ts b/...m/tests/src/forum/posts/all-posts.test.ts → ...m/tests/src/forum/posts/all-posts.test.ts
diff --git a/...rum/tests/src/forum/posts/comment.test.ts → ...rum/tests/src/forum/posts/comment.test.ts b/...rum/tests/src/forum/posts/comment.test.ts → ...rum/tests/src/forum/posts/comment.test.ts
diff --git a/...app/forum/tests/src/forum/posts/common.ts → ...app/forum/tests/src/forum/posts/common.ts b/...app/forum/tests/src/forum/posts/common.ts → ...app/forum/tests/src/forum/posts/common.ts
diff --git a/.../forum/tests/src/forum/posts/post.test.ts → .../forum/tests/src/forum/posts/post.test.ts b/.../forum/tests/src/forum/posts/post.test.ts → .../forum/tests/src/forum/posts/post.test.ts
diff --git a/examples/tauri-app/forum/tests/tsconfig.json → ...executable-happ/forum/tests/tsconfig.json b/examples/tauri-app/forum/tests/tsconfig.json → ...executable-happ/forum/tests/tsconfig.json
diff --git a/...es/tauri-app/forum/tests/vitest.config.ts → ...cutable-happ/forum/tests/vitest.config.ts b/...es/tauri-app/forum/tests/vitest.config.ts → ...cutable-happ/forum/tests/vitest.config.ts
diff --git a/examples/tauri-app/index.html → examples/executable-happ/index.html b/examples/tauri-app/index.html → examples/executable-happ/index.html
diff --git a/examples/tauri-app/jsconfig.json → examples/executable-happ/jsconfig.json b/examples/tauri-app/jsconfig.json → examples/executable-happ/jsconfig.json
diff --git a/examples/tauri-app/package.json → examples/executable-happ/package.json b/examples/tauri-app/package.json → examples/executable-happ/package.json
diff --git a/examples/tauri-app/src-tauri/.gitignore → ...ples/executable-happ/src-tauri/.gitignore b/examples/tauri-app/src-tauri/.gitignore → ...ples/executable-happ/src-tauri/.gitignore
diff --git a/examples/tauri-app/src-tauri/Cargo.toml → ...ples/executable-happ/src-tauri/Cargo.toml b/examples/tauri-app/src-tauri/Cargo.toml → ...ples/executable-happ/src-tauri/Cargo.toml
@@ -28,4 +28,4 @@ tauri-plugin-log = "2.0.0-beta"
 url2 = "0.0.6"
 app_dirs2 = "2.5.5"
 tempdir = "0.3.7"
-
+anyhow = "1"
diff --git a/examples/tauri-app/src-tauri/build.rs → examples/executable-happ/src-tauri/build.rs b/examples/tauri-app/src-tauri/build.rs → examples/executable-happ/src-tauri/build.rs
diff --git a/examples/tauri-app/src-tauri/src/lib.rs → ...ples/executable-happ/src-tauri/src/lib.rs b/examples/tauri-app/src-tauri/src/lib.rs → ...ples/executable-happ/src-tauri/src/lib.rs
@@ -5,6 +5,7 @@ use std::collections::HashMap;
 use std::path::PathBuf;
 use tauri_plugin_holochain::{HolochainExt, HolochainPluginConfig};
 use url2::Url2;
+use tauri::AppHandle;
 
 const APP_ID: &'static str = "example";
 
@@ -105,32 +106,7 @@ pub fn run() {
         .setup(|app| {
             let handle = app.handle().clone();
             tauri::async_runtime::block_on(async move {
-                let mut admin_ws = handle.holochain()?.admin_websocket().await?;
-
-                let installed_apps = admin_ws
-                    .list_apps(None)
-                    .await
-                    .map_err(|err| tauri_plugin_holochain::Error::ConductorApiError(err))?;
-
-                if installed_apps.len() == 0 {
-                    handle
-                        .holochain()?
-                        .install_app(
-                            String::from(APP_ID),
-                            example_happ(),
-                            HashMap::new(),
-                            None,
-                        )
-                        .await
-                        .map(|_| ())
-                } else {
-                    handle.holochain()?.update_app_if_necessary(
-                        String::from(APP_ID),
-                        example_happ()
-                    ).await.map(|_| ())?;
-
-                    Ok(())
-                }
+                setup(handle).await
             })?;
 
             app.holochain()?
@@ -142,3 +118,41 @@ pub fn run() {
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }
+
+// Very simple setup for now:
+// - On app start, list installed apps:
+//   - If there are no apps installed, this is the first time the app is opened: install our hApp
+//   - If there **are** apps:
+//     - Check if it's necessary to update the coordinators for our hApp
+//       - And do so if it is
+//
+// You can modify this function to suit your needs if they become more complex
+async fn setup(handle: AppHandle) -> anyhow::Result<()> {
+    let mut admin_ws = handle.holochain()?.admin_websocket().await?;
+
+    let installed_apps = admin_ws
+        .list_apps(None)
+        .await
+        .map_err(|err| tauri_plugin_holochain::Error::ConductorApiError(err))?;
+
+    if installed_apps.len() == 0 {
+        handle
+            .holochain()?
+            .install_app(
+                String::from(APP_ID),
+                example_happ(),
+                HashMap::new(),
+                None,
+            )
+            .await?;
+
+        Ok(())
+    } else {
+        handle.holochain()?.update_app_if_necessary(
+            String::from(APP_ID),
+            example_happ()
+        ).await?;
+
+        Ok(())
+    }
+}
diff --git a/examples/tauri-app/src-tauri/src/main.rs → ...les/executable-happ/src-tauri/src/main.rs b/examples/tauri-app/src-tauri/src/main.rs → ...les/executable-happ/src-tauri/src/main.rs
diff --git a/examples/tauri-app/src-tauri/tauri.conf.json → ...executable-happ/src-tauri/tauri.conf.json b/examples/tauri-app/src-tauri/tauri.conf.json → ...executable-happ/src-tauri/tauri.conf.json
diff --git a/examples/tauri-app/src/App.svelte → examples/executable-happ/src/App.svelte b/examples/tauri-app/src/App.svelte → examples/executable-happ/src/App.svelte
diff --git a/examples/tauri-app/src/lib/Greet.svelte → ...ples/executable-happ/src/lib/Greet.svelte b/examples/tauri-app/src/lib/Greet.svelte → ...ples/executable-happ/src/lib/Greet.svelte
diff --git a/examples/tauri-app/src/main.js → examples/executable-happ/src/main.js b/examples/tauri-app/src/main.js → examples/executable-happ/src/main.js
diff --git a/examples/tauri-app/src/style.css → examples/executable-happ/src/style.css b/examples/tauri-app/src/style.css → examples/executable-happ/src/style.css
diff --git a/examples/tauri-app/src/vite-env.d.ts → examples/executable-happ/src/vite-env.d.ts b/examples/tauri-app/src/vite-env.d.ts → examples/executable-happ/src/vite-env.d.ts
diff --git a/examples/tauri-app/ui/.gitignore → examples/executable-happ/ui/.gitignore b/examples/tauri-app/ui/.gitignore → examples/executable-happ/ui/.gitignore
diff --git a/examples/tauri-app/ui/dist.zip → examples/executable-happ/ui/dist.zip b/examples/tauri-app/ui/dist.zip → examples/executable-happ/ui/dist.zip
diff --git a/examples/tauri-app/ui/index.html → examples/executable-happ/ui/index.html b/examples/tauri-app/ui/index.html → examples/executable-happ/ui/index.html
diff --git a/examples/tauri-app/ui/package.json → examples/executable-happ/ui/package.json b/examples/tauri-app/ui/package.json → examples/executable-happ/ui/package.json
diff --git a/examples/tauri-app/ui/src/contexts.ts → examples/executable-happ/ui/src/contexts.ts b/examples/tauri-app/ui/src/contexts.ts → examples/executable-happ/ui/src/contexts.ts
diff --git a/...tauri-app/ui/src/forum/posts/all-posts.ts → ...able-happ/ui/src/forum/posts/all-posts.ts b/...tauri-app/ui/src/forum/posts/all-posts.ts → ...able-happ/ui/src/forum/posts/all-posts.ts
diff --git a/...-app/ui/src/forum/posts/comment-detail.ts → ...happ/ui/src/forum/posts/comment-detail.ts b/...-app/ui/src/forum/posts/comment-detail.ts → ...happ/ui/src/forum/posts/comment-detail.ts
diff --git a/...p/ui/src/forum/posts/comments-for-post.ts → ...p/ui/src/forum/posts/comments-for-post.ts b/...p/ui/src/forum/posts/comments-for-post.ts → ...p/ui/src/forum/posts/comments-for-post.ts
diff --git a/...-app/ui/src/forum/posts/create-comment.ts → ...happ/ui/src/forum/posts/create-comment.ts b/...-app/ui/src/forum/posts/create-comment.ts → ...happ/ui/src/forum/posts/create-comment.ts
diff --git a/...uri-app/ui/src/forum/posts/create-post.ts → ...le-happ/ui/src/forum/posts/create-post.ts b/...uri-app/ui/src/forum/posts/create-post.ts → ...le-happ/ui/src/forum/posts/create-post.ts
diff --git a/...tauri-app/ui/src/forum/posts/edit-post.ts → ...able-happ/ui/src/forum/posts/edit-post.ts b/...tauri-app/ui/src/forum/posts/edit-post.ts → ...able-happ/ui/src/forum/posts/edit-post.ts
diff --git a/...uri-app/ui/src/forum/posts/post-detail.ts → ...le-happ/ui/src/forum/posts/post-detail.ts b/...uri-app/ui/src/forum/posts/post-detail.ts → ...le-happ/ui/src/forum/posts/post-detail.ts
diff --git a/...les/tauri-app/ui/src/forum/posts/types.ts → ...ecutable-happ/ui/src/forum/posts/types.ts b/...les/tauri-app/ui/src/forum/posts/types.ts → ...ecutable-happ/ui/src/forum/posts/types.ts
diff --git a/examples/tauri-app/ui/src/holochain-app.ts → ...s/executable-happ/ui/src/holochain-app.ts b/examples/tauri-app/ui/src/holochain-app.ts → ...s/executable-happ/ui/src/holochain-app.ts
diff --git a/examples/tauri-app/ui/tsconfig.json → examples/executable-happ/ui/tsconfig.json b/examples/tauri-app/ui/tsconfig.json → examples/executable-happ/ui/tsconfig.json
diff --git a/examples/tauri-app/ui/vite.config.ts → examples/executable-happ/ui/vite.config.ts b/examples/tauri-app/ui/vite.config.ts → examples/executable-happ/ui/vite.config.ts
diff --git a/examples/tauri-app/vite.config.js → examples/executable-happ/vite.config.js b/examples/tauri-app/vite.config.js → examples/executable-happ/vite.config.js
diff --git a/examples/tauri-app/workdir/happ.yaml → examples/executable-happ/workdir/happ.yaml b/examples/tauri-app/workdir/happ.yaml → examples/executable-happ/workdir/happ.yaml
diff --git a/examples/tauri-app/workdir/web-happ.yaml → ...les/executable-happ/workdir/web-happ.yaml b/examples/tauri-app/workdir/web-happ.yaml → ...les/executable-happ/workdir/web-happ.yaml
diff --git a/examples/holochain-runtime/README.md b/examples/holochain-runtime/README.md
@@ -0,0 +1 @@
+# Launcher