diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..2f1dbb2 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,28 @@ +[package] +name = "app" +version = "0.1.0" +description = "A Tauri App" +authors = ["you"] +license = "" +repository = "" +default-run = "app" +edition = "2021" +rust-version = "1.57" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[build-dependencies] +tauri-build = { version = "1.0.4", features = [] } + +[dependencies] +serde_json = "1.0" +serde = { version = "1.0", features = ["derive"] } +tauri = { version = "1.0.5", features = ["api-all"] } + +[features] +# by default Tauri runs in production mode +# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL +default = [ "custom-protocol" ] +# this feature is used used for production builds where `devPath` points to the filesystem +# DO NOT remove this +custom-protocol = [ "tauri/custom-protocol" ] diff --git a/README.md b/README.md index 759b670..da28059 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ # omm-client -Client of Oh My Mailbox \ No newline at end of file +Client of Oh My Mailbox + +### Compile application +```sh +bash build.sh +``` diff --git a/build.rs b/build.rs new file mode 100644 index 0000000..795b9b7 --- /dev/null +++ b/build.rs @@ -0,0 +1,3 @@ +fn main() { + tauri_build::build() +} diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 index 21134a3..89ee538 --- a/build.sh +++ b/build.sh @@ -3,8 +3,7 @@ cd $(dirname $0) function _build(){ - go generate || exit $? - go build -o "$1" . || exit $? + cargo tauri build || exit $? } -_build ./target/output-self +_build diff --git a/go.mod b/go.mod deleted file mode 100644 index 34e4301..0000000 --- a/go.mod +++ /dev/null @@ -1,7 +0,0 @@ -module gitee.ghink.com/ghink/omm-client - -go 1.18 - -require github.com/webview/webview v0.0.0-20220816141928-2ee04ccd0530 - -require github.com/go-chi/chi/v5 v5.0.7 // indirect diff --git a/go.sum b/go.sum deleted file mode 100644 index ae68f09..0000000 --- a/go.sum +++ /dev/null @@ -1,4 +0,0 @@ -github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= -github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= -github.com/webview/webview v0.0.0-20220816141928-2ee04ccd0530 h1:diPvLFzNaRG1c1Qh8s8jWQt/+l8HQs9iQgHvAV4N8q8= -github.com/webview/webview v0.0.0-20220816141928-2ee04ccd0530/go.mod h1:rpXAuuHgyEJb6kXcXldlkOjU6y4x+YcASKKXJNUhh0Y= diff --git a/icons/128x128.png b/icons/128x128.png new file mode 100644 index 0000000..6be5e50 Binary files /dev/null and b/icons/128x128.png differ diff --git a/icons/128x128@2x.png b/icons/128x128@2x.png new file mode 100644 index 0000000..e81bece Binary files /dev/null and b/icons/128x128@2x.png differ diff --git a/icons/32x32.png b/icons/32x32.png new file mode 100644 index 0000000..a437dd5 Binary files /dev/null and b/icons/32x32.png differ diff --git a/icons/Square107x107Logo.png b/icons/Square107x107Logo.png new file mode 100644 index 0000000..0ca4f27 Binary files /dev/null and b/icons/Square107x107Logo.png differ diff --git a/icons/Square142x142Logo.png b/icons/Square142x142Logo.png new file mode 100644 index 0000000..b81f820 Binary files /dev/null and b/icons/Square142x142Logo.png differ diff --git a/icons/Square150x150Logo.png b/icons/Square150x150Logo.png new file mode 100644 index 0000000..624c7bf Binary files /dev/null and b/icons/Square150x150Logo.png differ diff --git a/icons/Square284x284Logo.png b/icons/Square284x284Logo.png new file mode 100644 index 0000000..c021d2b Binary files /dev/null and b/icons/Square284x284Logo.png differ diff --git a/icons/Square30x30Logo.png b/icons/Square30x30Logo.png new file mode 100644 index 0000000..6219700 Binary files /dev/null and b/icons/Square30x30Logo.png differ diff --git a/icons/Square310x310Logo.png b/icons/Square310x310Logo.png new file mode 100644 index 0000000..f9bc048 Binary files /dev/null and b/icons/Square310x310Logo.png differ diff --git a/icons/Square44x44Logo.png b/icons/Square44x44Logo.png new file mode 100644 index 0000000..d5fbfb2 Binary files /dev/null and b/icons/Square44x44Logo.png differ diff --git a/icons/Square71x71Logo.png b/icons/Square71x71Logo.png new file mode 100644 index 0000000..63440d7 Binary files /dev/null and b/icons/Square71x71Logo.png differ diff --git a/icons/Square89x89Logo.png b/icons/Square89x89Logo.png new file mode 100644 index 0000000..f3f705a Binary files /dev/null and b/icons/Square89x89Logo.png differ diff --git a/icons/StoreLogo.png b/icons/StoreLogo.png new file mode 100644 index 0000000..4556388 Binary files /dev/null and b/icons/StoreLogo.png differ diff --git a/icons/icon.icns b/icons/icon.icns new file mode 100644 index 0000000..87f09b4 Binary files /dev/null and b/icons/icon.icns differ diff --git a/icons/icon.ico b/icons/icon.ico new file mode 100644 index 0000000..b3636e4 Binary files /dev/null and b/icons/icon.ico differ diff --git a/icons/icon.png b/icons/icon.png new file mode 100644 index 0000000..e1cd261 Binary files /dev/null and b/icons/icon.png differ diff --git a/main.go b/main.go deleted file mode 100644 index 92f9d76..0000000 --- a/main.go +++ /dev/null @@ -1,79 +0,0 @@ - -package main - -import ( - "embed" - "flag" - "fmt" - "io/fs" - "net" - "net/http" - "time" - - "github.com/go-chi/chi/v5" - "github.com/webview/webview" -) - - -//go:generate bash ./omm-front/build.sh -//go:embed all:omm-front/dist -var _dist embed.FS -var dist = func()(fs.FS){ - f, err := fs.Sub(_dist, "omm-front/dist") - must(err) - return f -}() - -var ( - debug bool = false - hostIP string = "127.0.0.1" -) - -func init(){ - flag.BoolVar(&debug, "debug", debug, "Debug flag") - flag.StringVar(&hostIP, "host", hostIP, "Web app host IP") - flag.Parse() -} - -func makeRouter()(r *chi.Mux){ - r = chi.NewRouter() - r.Handle("/W/*", http.StripPrefix("/W", http.FileServer(http.FS(dist)))) - return -} - -func main(){ - listener, err := net.ListenTCP("tcp4", &net.TCPAddr{IP: net.ParseIP(hostIP)}) - must(err) - addr := listener.Addr().(*net.TCPAddr) - if debug { - fmt.Println("Server addr:", addr.String()) - } - webRouter := makeRouter() - go func(){ - svr := &http.Server{ - Handler: webRouter, - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - } - if err := svr.Serve(listener); err != nil { - panic(err) - } - }() - - win := webview.New(debug) - defer win.Destroy() - win.SetTitle(fmt.Sprintf("Oh my mailbox v%s", VERSION)) - win.SetSize(950, 600, webview.HintNone) - navuri := "http://" + addr.String() + "/W/" - if debug { - fmt.Println("Navigate url:", navuri) - } - win.Navigate(navuri) - win.Run() -} - -func must(err error){ - if err != nil { - panic(err) - } -} diff --git a/omm-front b/omm-front index e72b154..87ac706 160000 --- a/omm-front +++ b/omm-front @@ -1 +1 @@ -Subproject commit e72b1540a5dc50f3a08d3b0abb2d580f371712ea +Subproject commit 87ac7062b83005c4dd3122f89f7597cd0fa22cfd diff --git a/src/main.rs b/src/main.rs new file mode 100644 index 0000000..d058ce6 --- /dev/null +++ b/src/main.rs @@ -0,0 +1,11 @@ + +#![cfg_attr( + all(not(debug_assertions), target_os = "windows"), + windows_subsystem = "windows" +)] + +fn main() { + tauri::Builder::default() + .run(tauri::generate_context!()) + .expect("error while running tauri application"); +} diff --git a/tauri.conf.json b/tauri.conf.json new file mode 100644 index 0000000..129b699 --- /dev/null +++ b/tauri.conf.json @@ -0,0 +1,65 @@ +{ + "build": { + "distDir": "./omm-front/dist/", + "beforeBuildCommand": "npm run build", + "beforeDevCommand": "npm run dev -- --port 13280", + "devPath": "http://127.0.0.1:13280" + }, + "package": { + "productName": "omm-client", + "version": "0.1.0" + }, + "tauri": { + "allowlist": { + "all": true + }, + "bundle": { + "active": true, + "category": "DeveloperTool", + "copyright": "", + "deb": { + "depends": [] + }, + "externalBin": [], + "icon": [ + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico" + ], + "identifier": "cc.ohmail", + "longDescription": "", + "macOS": { + "entitlements": null, + "exceptionDomain": "", + "frameworks": [], + "providerShortName": null, + "signingIdentity": null + }, + "resources": [], + "shortDescription": "", + "targets": "all", + "windows": { + "certificateThumbprint": null, + "digestAlgorithm": "sha256", + "timestampUrl": "" + } + }, + "security": { + "csp": null + }, + "updater": { + "active": false + }, + "windows": [ + { + "fullscreen": false, + "width": 1150, + "height": 680, + "resizable": true, + "title": "Oh My MailBox" + } + ] + } +} diff --git a/version.go b/version.go deleted file mode 100644 index bde73d4..0000000 --- a/version.go +++ /dev/null @@ -1,16 +0,0 @@ - -package main - -import ( - "fmt" -) - -const ( - MAJOR_VERSION = 0 - MINOR_VERSION = 1 - PATCH_VERSION = 0 -) - -var ( - VERSION = fmt.Sprintf("%d.%d.%d", MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION) -)