pake-cli 2.3.6 → 2.3.8

package/src-tauri/Cargo.toml

@@ -7,18 +7,19 @@ license = "MIT"
 repository = "https://github.com/tw93/Pake"
 default-run = "app"
 edition = "2021"
-rust-version = "1.63.0"
+rust-version = "1.78.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.5.0", features = [] }
+tauri-build = { version = "1.5.2", features = [] }
 
 [dependencies]
-serde_json = "1.0.108"
-serde = { version = "1.0.192", features = ["derive"] }
-tauri = { version = "1.5.2", features = ["api-all", "system-tray"] }
+serde_json = "1.0.116"
+serde = { version = "1.0.200", features = ["derive"] }
+tauri = { version = "1.6.3", features = ["api-all", "system-tray"] }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
+tauri-plugin-oauth = { git = "https://github.com/FabianLars/tauri-plugin-oauth", branch = "main" }
 
 [dev-dependencies]
 cargo-bloat = "0.11.1"
@@ -29,6 +30,6 @@ cli-build = []
 # 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
+# this feature is used for production builds where `devPath` points to the filesystem
 # DO NOT remove this
 custom-protocol = ["tauri/custom-protocol"]

package/src-tauri/pake.json

@@ -15,11 +15,6 @@
     "linux": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
     "windows": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
   },
-  "menu": {
-    "macos": false,
-    "linux": false,
-    "windows": false
-  },
   "system_tray": {
     "macos": false,
     "linux": true,

package/src-tauri/src/app/config.rs

@@ -47,16 +47,10 @@ pub type FunctionON = PlatformSpecific<bool>;
 pub struct PakeConfig {
     pub windows: Vec<WindowConfig>,
     pub user_agent: UserAgent,
-    pub menu: FunctionON,
     pub system_tray: FunctionON,
 }
 
 impl PakeConfig {
-    pub fn show_menu(&self) -> bool {
-        self.menu.copied()
-    }
-
-    #[cfg(not(target_os = "macos"))]
     pub fn show_system_tray(&self) -> bool {
         self.system_tray.copied()
     }

package/src-tauri/src/app/menu.rs

@@ -1,114 +1,30 @@
-use tauri::MenuItem;
-
-use tauri::{CustomMenuItem, Menu, Submenu, WindowMenuEvent};
-
-#[cfg(any(target_os = "linux", target_os = "windows"))]
-use tauri::{Manager, SystemTray, SystemTrayEvent, SystemTrayMenu};
-
-#[cfg(any(target_os = "linux", target_os = "windows"))]
+use tauri::{CustomMenuItem,Manager, SystemTray, SystemTrayEvent, SystemTrayMenu};
 use tauri_plugin_window_state::{AppHandleExt, StateFlags};
 
-pub fn get_menu() -> Menu {
-    let close = CustomMenuItem::new("close".to_string(), "Close Window").accelerator("CmdOrCtrl+W");
-    let goto_url_item = CustomMenuItem::new("goto_url".to_string(), "Go to URL...")
-        .accelerator("CmdOrCtrl+Shift+L");
-    let first_menu = Menu::new()
-        .add_native_item(MenuItem::Copy)
-        .add_native_item(MenuItem::Cut)
-        .add_native_item(MenuItem::Paste)
-        .add_native_item(MenuItem::Undo)
-        .add_native_item(MenuItem::Redo)
-        .add_native_item(MenuItem::SelectAll)
-        .add_native_item(MenuItem::Separator)
-        .add_item(goto_url_item)
-        .add_native_item(MenuItem::Separator)
-        .add_native_item(MenuItem::EnterFullScreen)
-        .add_native_item(MenuItem::Minimize)
-        .add_native_item(MenuItem::Hide)
-        .add_native_item(MenuItem::HideOthers)
-        .add_native_item(MenuItem::ShowAll)
-        .add_native_item(MenuItem::Separator)
-        .add_item(close)
-        .add_native_item(MenuItem::Quit);
-
-    let app_menu = Submenu::new("File", first_menu);
-    Menu::new().add_submenu(app_menu)
-}
-
-pub fn menu_event_handle(event: WindowMenuEvent) {
-    if event.menu_item_id() == "close" {
-        event.window().minimize().expect("can't minimize window");
-    }
-
-    if event.menu_item_id() == "goto_url" {
-        let js_code = "showUrlModal();";
-        event.window().eval(js_code).unwrap();
-    }
-}
-
-#[cfg(any(target_os = "linux", target_os = "windows"))]
-pub fn get_system_tray(show_menu: bool) -> SystemTray {
-    let hide_app = CustomMenuItem::new("hide_app".to_string(), "Hide App");
-    let show_app = CustomMenuItem::new("show_app".to_string(), "Show App");
+pub fn get_system_tray() -> SystemTray {
+    let hide_app = CustomMenuItem::new("hide_app".to_string(), "Hide");
+    let show_app = CustomMenuItem::new("show_app".to_string(), "Show");
     let quit = CustomMenuItem::new("quit".to_string(), "Quit");
-    let about = CustomMenuItem::new("about".to_string(), "About");
-    let tray_menu = SystemTrayMenu::new().add_item(hide_app).add_item(show_app);
-    if show_menu {
-        let hide_menu = CustomMenuItem::new("hide_menu".to_string(), "Hide Menu");
-        let show_menu = CustomMenuItem::new("show_menu".to_string(), "Show Menu");
-        let tray_menu = tray_menu
-            .add_item(hide_menu)
-            .add_item(show_menu)
-            .add_item(quit)
-            .add_item(about);
-        SystemTray::new().with_menu(tray_menu)
-    } else {
-        let tray_menu = tray_menu.add_item(quit).add_item(about);
-        SystemTray::new().with_menu(tray_menu)
-    }
+    let tray_menu = SystemTrayMenu::new()
+        .add_item(show_app)
+        .add_item(hide_app)
+        .add_item(quit);
+    SystemTray::new().with_menu(tray_menu)
 }
 
-#[cfg(any(target_os = "linux", target_os = "windows"))]
 pub fn system_tray_handle(app: &tauri::AppHandle, event: SystemTrayEvent) {
     if let SystemTrayEvent::MenuItemClick { tray_id: _, id, .. } = event {
         match id.as_str() {
             "hide_app" => {
-                app.get_window("pake").unwrap().hide().unwrap();
+                app.get_window("pake").unwrap().minimize().unwrap();
             }
             "show_app" => {
                 app.get_window("pake").unwrap().show().unwrap();
             }
-            "hide_menu" => {
-                app.get_window("pake")
-                    .unwrap()
-                    .menu_handle()
-                    .hide()
-                    .unwrap();
-            }
-            "show_menu" => {
-                app.get_window("pake")
-                    .unwrap()
-                    .menu_handle()
-                    .show()
-                    .unwrap();
-            }
             "quit" => {
                 let _res = app.save_window_state(StateFlags::all());
                 std::process::exit(0);
             }
-            // ignore about for now, because about_pake.html have be erased.
-            // "about" => {
-            //     let _about_window = WindowBuilder::new(
-            //         app,
-            //         "about",
-            //         WindowUrl::App(std::path::PathBuf::from("about_pake.html")),
-            //     )
-            //     .resizable(true)
-            //     .title("About")
-            //     .inner_size(600.0, 400.0)
-            //     .build()
-            //     .expect("can't open about!");
-            // }
             _ => {}
         }
     };

package/src-tauri/src/inject/component.js

@@ -1,132 +1,4 @@
 document.addEventListener('DOMContentLoaded', () => {
-  // Create a modal
-  const modalHtml = `
-  <div id="pakeUrlModal" class="pake-modal">
-    <div class="pake-modal-container">
-      <div class="pake-modal-content">
-        <label for="pakeUrlInput">Enter URL to navigate anywhere</label>
-        <input type="text" id="pakeUrlInput" />
-        <button id="pakeUrlSubmit">Submit</button>
-        <button id="pakeUrlClose">Close</button>
-      </div>
-    </div>
-  </div>
-  `;
-
-  const modalStyle = `
-  .pake-modal {
-    display: none;
-    position: fixed;
-    z-index: 1000;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.4);
-  }
-
-  .pake-modal-container {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: 100%;
-  }
-
-  .pake-modal-content {
-    background-color: #fff;
-    padding: 20px;
-    border-radius: 10px;
-    width: 80%;
-    max-width: 400px;
-    font-size:14px;
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1), 0 1px 3px rgba(0, 0, 0, 0.08);
-  }
-
-  .pake-modal-content label {
-    display: block;
-    color: #11182B;
-    margin-bottom: 12px;
-    font-weight: bold;
-  }
-
-  .pake-modal-content input[type="text"] {
-    width: 90%;
-    padding: 8px;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    font-size: 14px;
-    margin-bottom: 12px;
-    outline: none;
-  }
-
-  .pake-modal-content button {
-    background: #11182B;
-    color: #FFF;
-    padding: 6px 14px;
-    border-radius: 4px;
-    cursor: pointer;
-    margin-right: 4px;
-    font-size:14px;
-    border: 1px solid #11182B;
-  }
-
-  #pakeUrlClose{
-    background: #fff;
-    color: #11182B;
-  }
-
-  #pakeUrlInput {
-    min-width: 320px;
-    text-align: left;
-    min-height: 30px;
-  }
-  `;
-
-  const modalDiv = document.createElement('div');
-  modalDiv.innerHTML = modalHtml;
-  document.body.appendChild(modalDiv);
-
-  const modalStyleElement = document.createElement('style');
-  modalStyleElement.innerText = modalStyle;
-  document.head.appendChild(modalStyleElement);
-
-  const urlModal = document.getElementById('pakeUrlModal');
-  const urlInput = document.getElementById('pakeUrlInput');
-  const urlSubmit = document.getElementById('pakeUrlSubmit');
-  const urlClose = document.getElementById('pakeUrlClose');
-
-  urlSubmit.onclick = function() {
-    const url = urlInput.value;
-    if (url) {
-      window.location.href = url;
-    }
-  };
-
-  urlClose.onclick = function() {
-    urlModal.style.display = 'none';
-  };
-
-  urlInput.addEventListener('keydown', function(event) {
-    if (event.key === 'Enter') {
-      const url = urlInput.value;
-      if (url) {
-        window.location.href = url;
-      }
-    }
-  });
-
-  document.addEventListener('keydown', function(event) {
-    if (event.key === 'Escape' && urlModal.style.display === 'block') {
-      urlModal.style.display = 'none';
-    }
-  });
-
-  window.showUrlModal = function() {
-    urlModal.style.display = 'block';
-    urlInput.focus();
-  };
-
   // Toast
   function pakeToast(msg) {
     const m = document.createElement('div');

package/src-tauri/src/inject/event.js

@@ -63,10 +63,13 @@ document.addEventListener('DOMContentLoaded', () => {
   const appWindow = tauri.window.appWindow;
   const invoke = tauri.tauri.invoke;
 
-  const topDom = document.createElement('div');
-  topDom.id = 'pack-top-dom';
-  document.body.appendChild(topDom);
-  const domEl = document.getElementById('pack-top-dom');
+  if(!document.getElementById('pake-top-dom')){
+    const topDom = document.createElement('div');
+    topDom.id = 'pake-top-dom';
+    document.body.appendChild(topDom);
+  }
+
+  const domEl = document.getElementById('pake-top-dom');
 
   domEl.addEventListener('touchstart', () => {
     appWindow.startDragging().then();

package/src-tauri/src/inject/style.js

@@ -312,7 +312,7 @@ window.addEventListener('DOMContentLoaded', _event => {
     }
 
     #__next .overflow-hidden>.overflow-x-hidden .scrollbar-trigger > nav {
-      padding-top: 30px;
+      padding-top: 12px;
     }
 
     #__next > div.relative.z-0.flex.h-full.w-full.overflow-hidden > div.relative.flex.h-full.max-w-full.flex-1.flex-col.overflow-hidden > main > div.flex.h-full.flex-col > div.flex-1.overflow-hidden > div > div.absolute.left-0.right-0 > div > div.flex.items-center.gap-2 > button{
@@ -320,6 +320,16 @@ window.addEventListener('DOMContentLoaded', _event => {
       margin-right: -10px;
     }
 
+    #__next > div.relative.z-0.flex.h-full.w-full.overflow-hidden > div.dark.flex-shrink-0.overflow-x-hidden.bg-black > div > div > div > div > nav > div.flex.flex-col.pt-2.empty\\:hidden.dark\\:border-white\\/20 > a,
+    #__next > div.relative.z-0.flex.h-full.w-full.overflow-hidden > div.relative.flex.h-full.max-w-full.flex-1.flex-col.overflow-hidden > main > div.group.fixed.bottom-3.right-3.z-10.hidden.gap-1.lg\\:flex > div,
+    #__next > div.relative.z-0.flex.h-full.w-full.overflow-hidden > div.flex-shrink-0.overflow-x-hidden.bg-token-sidebar-surface-primary > div > div > div > div > nav > div.flex.flex-col.pt-2.empty\\:hidden.dark\\:border-white\\/20 > a {
+      display: none;
+    }
+
+    #__next .md\\:px-\\[60px\\].text-token-text-secondary.text-xs.text-center.py-2.px-2.relative{
+      visibility:hidden;
+    }
+
     #__next>div>div>.flex.h-screen.w-full.flex-col.items-center {
       padding-top: 20px;
     }
@@ -373,12 +383,12 @@ window.addEventListener('DOMContentLoaded', _event => {
       top: 28px;
     }
 
-    #pack-top-dom:active {
+    #pake-top-dom:active {
       cursor: grabbing;
       cursor: -webkit-grabbing;
     }
 
-    #pack-top-dom{
+    #pake-top-dom{
       position:fixed;
       background:transparent;
       top:0;
@@ -388,7 +398,7 @@ window.addEventListener('DOMContentLoaded', _event => {
       -webkit-app-region: drag;
       user-select: none;
       -webkit-user-select: none;
-      z-index: 90000;
+      z-index: 99999;
     }
 
     @media (max-width:767px){

package/src-tauri/src/main.rs

@@ -1,46 +1,36 @@
 #![cfg_attr(
-    all(not(debug_assertions), target_os = "windows"),
-    windows_subsystem = "windows"
+all(not(debug_assertions), target_os = "windows"),
+windows_subsystem = "windows"
 )]
 
 mod app;
 mod util;
 
-use app::{invoke, menu, window};
+use app::{invoke, window, menu};
 use invoke::{download_file, download_file_by_binary};
-use menu::{get_menu, menu_event_handle};
+use menu::{get_system_tray, system_tray_handle};
 use tauri_plugin_window_state::Builder as windowStatePlugin;
 use util::{get_data_dir, get_pake_config};
 use window::get_window;
 
 pub fn run_app() {
     let (pake_config, tauri_config) = get_pake_config();
-    let show_menu = pake_config.show_menu();
-    let menu = get_menu();
     let data_dir = get_data_dir(tauri_config);
 
     let mut tauri_app = tauri::Builder::default();
 
-    if show_menu {
-        tauri_app = tauri_app.menu(menu).on_menu_event(menu_event_handle);
-    }
-
-    #[cfg(not(target_os = "macos"))]
-    {
-        use menu::{get_system_tray, system_tray_handle};
-
-        let show_system_tray = pake_config.show_system_tray();
-        let system_tray = get_system_tray(show_menu);
+    let show_system_tray = pake_config.show_system_tray();
+    let system_tray = get_system_tray();
 
-        if show_system_tray {
-            tauri_app = tauri_app
-                .system_tray(system_tray)
-                .on_system_tray_event(system_tray_handle);
-        }
+    if show_system_tray {
+        tauri_app = tauri_app
+            .system_tray(system_tray)
+            .on_system_tray_event(system_tray_handle);
     }
 
     tauri_app
         .plugin(windowStatePlugin::default().build())
+        .plugin(tauri_plugin_oauth::init())
         .invoke_handler(tauri::generate_handler![
             download_file,
             download_file_by_binary
@@ -56,6 +46,7 @@ pub fn run_app() {
                 #[cfg(target_os = "macos")]
                 {
                     event.window().minimize().unwrap();
+                    event.window().hide().unwrap();
                 }
 
                 #[cfg(not(target_os = "macos"))]

package/src-tauri/tauri.conf.json

@@ -19,7 +19,7 @@
     },
     "systemTray": {
       "iconPath": "png/icon_512.png",
-      "iconAsTemplate": true
+      "iconAsTemplate": false
     },
     "allowlist": {
       "all": true,