about and new run gui

neferin12 · Apr 28, 2024 · 8cec8a5 · 8cec8a5
1 parent 7b556b8
commit 8cec8a5
Show file tree

Hide file tree

Showing 24 changed files with 894 additions and 494 deletions.
diff --git a/gui/tauri-gui/.yarn/install-state.gz b/gui/tauri-gui/.yarn/install-state.gz
diff --git a/gui/tauri-gui/components.d.ts b/gui/tauri-gui/components.d.ts
@@ -0,0 +1,37 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-components
+// Read more: https://github.com/vuejs/core/pull/3399
+export {}
+
+declare module 'vue' {
+  export interface GlobalComponents {
+    BButton: typeof import('bootstrap-vue-next')['BButton']
+    BCollapse: typeof import('bootstrap-vue-next')['BCollapse']
+    BContainer: typeof import('bootstrap-vue-next')['BContainer']
+    BDropdownItem: typeof import('bootstrap-vue-next')['BDropdownItem']
+    BForm: typeof import('bootstrap-vue-next')['BForm']
+    BFormCheckbox: typeof import('bootstrap-vue-next')['BFormCheckbox']
+    BFormGroup: typeof import('bootstrap-vue-next')['BFormGroup']
+    BFormInput: typeof import('bootstrap-vue-next')['BFormInput']
+    BInputGroup: typeof import('bootstrap-vue-next')['BInputGroup']
+    BInputGroupAppend: typeof import('bootstrap-vue-next')['BInputGroupAppend']
+    BNavbarBrand: typeof import('bootstrap-vue-next')['BNavbarBrand']
+    BNavbarNav: typeof import('bootstrap-vue-next')['BNavbarNav']
+    BNavbarToggle: typeof import('bootstrap-vue-next')['BNavbarToggle']
+    BNavForm: typeof import('bootstrap-vue-next')['BNavForm']
+    BNavItem: typeof import('bootstrap-vue-next')['BNavItem']
+    BNavItemDropdown: typeof import('bootstrap-vue-next')['BNavItemDropdown']
+    BTable: typeof import('bootstrap-vue-next')['BTable']
+    BTableSimple: typeof import('bootstrap-vue-next')['BTableSimple']
+    BTbody: typeof import('bootstrap-vue-next')['BTbody']
+    BTd: typeof import('bootstrap-vue-next')['BTd']
+    BTr: typeof import('bootstrap-vue-next')['BTr']
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
+  }
+  export interface ComponentCustomProperties {
+    vBColorMode: typeof import('bootstrap-vue-next')['vBColorMode']
+  }
+}
diff --git a/gui/tauri-gui/index.html b/gui/tauri-gui/index.html
@@ -4,9 +4,9 @@
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Vite App</title>
+    <title>RiSM GUI</title>
   </head>
-  <body>
+  <body data-bs-theme="dark">
     <div id="app"></div>
     <script type="module" src="/src/main.ts"></script>
   </body>

diff --git a/gui/tauri-gui/package.json b/gui/tauri-gui/package.json
@@ -6,25 +6,30 @@
   "scripts": {
     "dev": "vite",
     "tauri-dev": "yarn tauri dev",
-    "tauri-build": "yarn tauri build",
+    "tauri-build": "yarn tauri build -b deb",
     "build": "run-p type-check \"build-only {@}\" --",
     "preview": "vite preview",
     "build-only": "vite build",
     "type-check": "vue-tsc --build --force"
   },
   "dependencies": {
+    "@tauri-apps/api": "^1.5.4",
+    "bootstrap": "^5.3.3",
+    "bootstrap-vue-next": "^0.17.2",
     "pinia": "^2.1.7",
     "vue": "^3.4.21",
     "vue-router": "^4.3.0"
   },
   "devDependencies": {
     "@tauri-apps/cli": "^1.5.12",
     "@tsconfig/node20": "^20.1.4",
+    "@types/bootstrap": "^5",
     "@types/node": "^20.12.5",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vue/tsconfig": "^0.5.1",
     "npm-run-all2": "^6.1.2",
     "typescript": "~5.4.0",
+    "unplugin-vue-components": "^0.26.0",
     "vite": "^5.2.8",
     "vue-tsc": "^2.0.11"
   },

diff --git a/gui/tauri-gui/src-tauri/Cargo.lock b/gui/tauri-gui/src-tauri/Cargo.lock
diff --git a/gui/tauri-gui/src-tauri/Cargo.toml b/gui/tauri-gui/src-tauri/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "app"
 version = "0.1.0"
-description = "A Tauri App"
-authors = ["you"]
+description = "Graphical User Interface for RISM"
+authors = ["Julian Pollinger"]
 license = ""
 repository = ""
 default-run = "app"
@@ -17,11 +17,12 @@ tauri-build = { version = "1.5.1", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.6.2", features = [] }
+tauri = { version = "1.6.2", features = ["dialog-open"] }
 rism = { path = "../../../rust"}
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.
 # If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes.
 # DO NOT REMOVE!!
 custom-protocol = [ "tauri/custom-protocol" ]
+bundle_z3 = ["rism/static-link-z3"]
diff --git a/gui/tauri-gui/src-tauri/src/main.rs b/gui/tauri-gui/src-tauri/src/main.rs
@@ -1,8 +1,27 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
+const VERSION: &str = env!("CARGO_PKG_VERSION");
+
+#[tauri::command]
+fn get_version() -> String {
+  return String::from(VERSION);
+}
+
+#[tauri::command]
+fn uses_system_z3() -> bool {
+  #[cfg(feature = "bundle_z3")]
+  return false;
+
+  #[cfg(not(feature = "bundle_z3"))]
+  return true;
+}
+
+
 fn main() {
   tauri::Builder::default()
+      .invoke_handler(tauri::generate_handler![get_version,uses_system_z3])
     .run(tauri::generate_context!())
     .expect("error while running tauri application");
 }
+
diff --git a/gui/tauri-gui/src-tauri/tauri.conf.json b/gui/tauri-gui/src-tauri/tauri.conf.json
@@ -12,7 +12,10 @@
   },
   "tauri": {
     "allowlist": {
-      "all": false
+      "all": false,
+      "dialog": {
+        "open": true
+      }
     },
     "bundle": {
       "active": true,
@@ -56,10 +59,10 @@
     "windows": [
       {
         "fullscreen": false,
-        "height": 600,
-        "resizable": true,
+        "height": 650,
+        "resizable": false,
         "title": "RiSM",
-        "width": 800
+        "width": 1000
       }
     ]
   }