Project structure and fixed 2 bugs

.gitignore

@@ -2,9 +2,9 @@ node_modules
 out
 history.json
 
-src-tauri/target
-src-tauri/Cargo.lock
-src-tauri/gen
+rust-src/target
+rust-src/Cargo.lock
+rust-src/gen
 
 # Added by cargo
 

README.md

@@ -1,4 +1,19 @@
 # Yomea Project
-Yomea is currently in development state, at this point only Windows builds are shipped. Of course, you can ship your own builds by cloning this repository on your own machine but i do not guarantee compatibility. Your PRs to this project are welcomed.
+Yomea is currently in development state, at this point no builds are shipped by developer.<br>
+
+> [!NOTE]
+> But heads up, you can build your own local builds by cloning this repository.<br>
+
+**Also your PRs to this project are welcomed.**
+
+## Steps to build this repository
+
+> [!NOTE]
+> Make sure you have installed `git` and `curl`.
+
+**1.** Firstly clone Yomea repository onto your machine.
+```bash
+git clone https://github.com/YomoSK/yomea
+```
 
 [Website](https://yomea.dev)

public/topbar.html

@@ -0,0 +1 @@
+<h1>Yomea Project</h1>

src-tauri/Cargo.toml → rust-src/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
-name = "app"
+name = "yomea"
 version = "0.1.0"
-description = "A Tauri App"
-authors = ["you"]
+description = "Web browser"
+authors = ["Yomo"]
 license = ""
-repository = ""
+repository = "https://github.com/YomoSK/yomea"
 edition = "2021"
 rust-version = "1.77.2"
 

rust-src/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+   tauri_build::build();
+}

rust-src/components/topbar.html

@@ -0,0 +1 @@
+<p>Yomea Project</p>

src-tauri/src/lib.rs → rust-src/src/lib.rs

@@ -1,5 +1,4 @@
-#[cfg_attr(mobile, tauri::mobile_entry_point)]
-use tauri::{Builder, WindowBuilder, WebviewBuilder, WebviewUrl, LogicalPosition, LogicalSize};
+use tauri::{Builder, LogicalPosition, LogicalSize, WebviewBuilder, WebviewUrl, WindowBuilder};
 use serde_json::Value;
 
 pub fn run() {
@@ -8,34 +7,39 @@ pub fn run() {
 
    Builder::default()
       .setup(move |app| {
+         let topbarcomponent = "topbar.html".into();
+
+         let width = size.get("width").and_then(Value::as_f64).unwrap();
+         let height = size.get("height").and_then(Value::as_f64).unwrap();
+
          let window = WindowBuilder::new(app, "main")
             .title(title)
-            .inner_size(size.get("width").and_then(Value::as_f64).unwrap(), size.get("height").and_then(Value::as_f64).unwrap())
+            .inner_size(width, height)
             .build()?;
 
          let topbar = WebviewBuilder::new(
             "topbar",
-            WebviewUrl::External("https://google.com/".parse().unwrap())
+            WebviewUrl::App(topbarcomponent)
          );
 
          let webview = WebviewBuilder::new(
             "webview",
-            WebviewUrl::External("https://yomea.dev/".parse().unwrap())
+            WebviewUrl::External("https://google.com/".parse().unwrap())
          );
 
          window.add_child(
             topbar.auto_resize(),
             LogicalPosition::new(0.0, 0.0),
-            LogicalSize::new(size.get("width").and_then(Value::as_f64).unwrap(), 60.0)
+            LogicalSize::new(width, 60.0)
          )?;
 
          window.add_child(
             webview.auto_resize(),
             LogicalPosition::new(0.0, 60.0),
-            LogicalSize::new(size.get("width").and_then(Value::as_f64).unwrap(), size.get("height").and_then(Value::as_f64).unwrap() - 60.0)
+            LogicalSize::new(width, height - 60.0)
          )?;
 
-         // window.maximize()?;
+         window.set_size(LogicalSize::new(width, height))?;
 
          Ok(())
       })

src-tauri/src/main.rs → rust-src/src/main.rs

@@ -1,4 +1,3 @@
-// Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 fn main() {

rust-src/tauri.conf.json

@@ -0,0 +1,24 @@
+{
+   "$schema": "https://schema.tauri.app/config/2.0.0-rc",
+   "productName": "yomea",
+   "version": "0.1.0",
+   "identifier": "me.Yomo.Yomea",
+   "app": {
+      "withGlobalTauri": true,
+      "security": {
+         "csp": null
+      }
+   },
+   "bundle": {
+      "active": true,
+      "targets": "all",
+      "windows": {
+         "webviewInstallMode": {
+            "type": "offlineInstaller"
+         }
+      }
+   },
+   "build": {
+      "frontendDist": "./components"
+   }
+}