mirror of
https://github.com/System-End/hackatime-desktop.git
synced 2026-04-19 22:05:10 +00:00
Compare commits
13 commits
app-v1.7.1
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
832a610693 | ||
|
|
472867d58f | ||
|
|
d037bdb529 | ||
|
|
6509fc85e0 | ||
|
|
e84c1d6a37 | ||
|
|
a5746811a9 | ||
|
|
3688e39424 | ||
|
|
59008e3849 | ||
|
|
145b3b9422 | ||
|
|
ece57e2981 | ||
|
|
d0c183e71c | ||
|
|
1705082522 | ||
|
|
3ec4f3386a |
31 changed files with 369 additions and 134 deletions
2
.github/workflows/release.yaml
vendored
2
.github/workflows/release.yaml
vendored
|
|
@ -250,7 +250,7 @@ jobs:
|
||||||
- name: Generate update manifest
|
- name: Generate update manifest
|
||||||
id: generate_manifest
|
id: generate_manifest
|
||||||
env:
|
env:
|
||||||
DOWNLOAD_URL_BASE: 'https://pub-d35fbe65a5b5426bb6d62ff02a8c7d03.r2.dev'
|
DOWNLOAD_URL_BASE: 'https://desktop.hackatime.hackclub-assets.com'
|
||||||
VERSION: '${{ steps.get_version.outputs.version }}'
|
VERSION: '${{ steps.get_version.outputs.version }}'
|
||||||
run: >
|
run: >
|
||||||
# Read signatures into variables
|
# Read signatures into variables
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"app": "0.0.0",
|
"app": "0.0.0",
|
||||||
".": "1.7.1"
|
".": "1.7.5"
|
||||||
}
|
}
|
||||||
37
CHANGELOG.md
37
CHANGELOG.md
|
|
@ -1,5 +1,42 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.7.5](https://github.com/hackclub/hackatime-desktop/compare/app-v1.7.4...app-v1.7.5) (2025-10-24)
|
||||||
|
|
||||||
|
|
||||||
|
### 🐛 Bugfixes
|
||||||
|
|
||||||
|
* eliminate duplicate discord definitions ([472867d](https://github.com/hackclub/hackatime-desktop/commit/472867d58f306d70241b07b5f3135c34055ad555))
|
||||||
|
* make option enabled by default ([d037bdb](https://github.com/hackclub/hackatime-desktop/commit/d037bdb529a4a078a5d10f7daa68698da9726e5f))
|
||||||
|
|
||||||
|
## [1.7.4](https://github.com/hackclub/hackatime-desktop/compare/app-v1.7.3...app-v1.7.4) (2025-10-24)
|
||||||
|
|
||||||
|
|
||||||
|
### 🐛 Bugfixes
|
||||||
|
|
||||||
|
* update hackatime url ([e84c1d6](https://github.com/hackclub/hackatime-desktop/commit/e84c1d6a37fdef397189e8a9108f68d4ddb11641))
|
||||||
|
|
||||||
|
## [1.7.3](https://github.com/hackclub/hackatime-desktop/compare/app-v1.7.2...app-v1.7.3) (2025-10-24)
|
||||||
|
|
||||||
|
|
||||||
|
### 🐛 Bugfixes
|
||||||
|
|
||||||
|
* change hackatime icon ([3688e39](https://github.com/hackclub/hackatime-desktop/commit/3688e39424c6d3e1c0441fde81e8451feded8178))
|
||||||
|
* correct card alignment issues ([59008e3](https://github.com/hackclub/hackatime-desktop/commit/59008e3849753ccaac037657d65bad2a70387e3c))
|
||||||
|
|
||||||
|
|
||||||
|
### 👽 Miscellaneous
|
||||||
|
|
||||||
|
* add license ([ece57e2](https://github.com/hackclub/hackatime-desktop/commit/ece57e29811ca228a255bef7bfe3117c3e3d236d))
|
||||||
|
* add security policy ([145b3b9](https://github.com/hackclub/hackatime-desktop/commit/145b3b9422bb5b5095a6e5aa59aa66b749338b5a))
|
||||||
|
|
||||||
|
## [1.7.2](https://github.com/hackclub/hackatime-desktop/compare/app-v1.7.1...app-v1.7.2) (2025-10-10)
|
||||||
|
|
||||||
|
|
||||||
|
### 🐛 Bugfixes
|
||||||
|
|
||||||
|
* add manual oauth link copy for linux ([3ec4f33](https://github.com/hackclub/hackatime-desktop/commit/3ec4f3386a3e2bbf5a2c4bddc80bf28d789b9705))
|
||||||
|
* fix update popup not showing ([1705082](https://github.com/hackclub/hackatime-desktop/commit/17050825223327da6e603cfe21500cf78c74e215))
|
||||||
|
|
||||||
## [1.7.1](https://github.com/hackclub/hackatime-desktop/compare/app-v1.7.0...app-v1.7.1) (2025-10-10)
|
## [1.7.1](https://github.com/hackclub/hackatime-desktop/compare/app-v1.7.0...app-v1.7.1) (2025-10-10)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
21
LICENSE
Normal file
21
LICENSE
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2025 Hack Club
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
26
SECURITY.md
Normal file
26
SECURITY.md
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
# Security Policy
|
||||||
|
|
||||||
|
> **Note**: This security policy is specifically for the **Hackatime Desktop** application. For vulnerabilities related to the main Hackatime web app, please refer to the [hackclub/hackatime repository](https://github.com/hackclub/hackatime).
|
||||||
|
|
||||||
|
## Supported Versions
|
||||||
|
|
||||||
|
We are currently providing security updates for the following versions:
|
||||||
|
|
||||||
|
| Version | Supported |
|
||||||
|
| ------- | ------------------ |
|
||||||
|
| 1.x.x | :white_check_mark: |
|
||||||
|
|
||||||
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
|
If you discover a security vulnerability in this project, please report it through one of the following channels:
|
||||||
|
|
||||||
|
- **Email**: sebastian@hackclub.com or security@leafd.dev
|
||||||
|
- **Hack Club Slack**: Send a direct message to @lfd
|
||||||
|
|
||||||
|
Please include as much information as possible in your report:
|
||||||
|
- Description of the vulnerability
|
||||||
|
- Steps to reproduce
|
||||||
|
- Potential impact
|
||||||
|
- Any suggested fixes (optional)
|
||||||
|
|
||||||
|
Thank you for helping me keep this project secure :)
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "desktop",
|
"name": "desktop",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.7.1",
|
"version": "1.7.5",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"packageManager": "pnpm@10.18.0",
|
"packageManager": "pnpm@10.18.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
|
||||||
BIN
src-tauri/icons/128x128.png
(Stored with Git LFS)
BIN
src-tauri/icons/128x128.png
(Stored with Git LFS)
Binary file not shown.
BIN
src-tauri/icons/128x128@2x.png
(Stored with Git LFS)
BIN
src-tauri/icons/128x128@2x.png
(Stored with Git LFS)
Binary file not shown.
BIN
src-tauri/icons/32x32.png
(Stored with Git LFS)
BIN
src-tauri/icons/32x32.png
(Stored with Git LFS)
Binary file not shown.
BIN
src-tauri/icons/Square107x107Logo.png
(Stored with Git LFS)
BIN
src-tauri/icons/Square107x107Logo.png
(Stored with Git LFS)
Binary file not shown.
BIN
src-tauri/icons/Square142x142Logo.png
(Stored with Git LFS)
BIN
src-tauri/icons/Square142x142Logo.png
(Stored with Git LFS)
Binary file not shown.
BIN
src-tauri/icons/Square150x150Logo.png
(Stored with Git LFS)
BIN
src-tauri/icons/Square150x150Logo.png
(Stored with Git LFS)
Binary file not shown.
BIN
src-tauri/icons/Square284x284Logo.png
(Stored with Git LFS)
BIN
src-tauri/icons/Square284x284Logo.png
(Stored with Git LFS)
Binary file not shown.
BIN
src-tauri/icons/Square30x30Logo.png
(Stored with Git LFS)
BIN
src-tauri/icons/Square30x30Logo.png
(Stored with Git LFS)
Binary file not shown.
BIN
src-tauri/icons/Square310x310Logo.png
(Stored with Git LFS)
BIN
src-tauri/icons/Square310x310Logo.png
(Stored with Git LFS)
Binary file not shown.
BIN
src-tauri/icons/Square44x44Logo.png
(Stored with Git LFS)
BIN
src-tauri/icons/Square44x44Logo.png
(Stored with Git LFS)
Binary file not shown.
BIN
src-tauri/icons/Square71x71Logo.png
(Stored with Git LFS)
BIN
src-tauri/icons/Square71x71Logo.png
(Stored with Git LFS)
Binary file not shown.
BIN
src-tauri/icons/Square89x89Logo.png
(Stored with Git LFS)
BIN
src-tauri/icons/Square89x89Logo.png
(Stored with Git LFS)
Binary file not shown.
BIN
src-tauri/icons/StoreLogo.png
(Stored with Git LFS)
BIN
src-tauri/icons/StoreLogo.png
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 45 KiB |
BIN
src-tauri/icons/icon.png
(Stored with Git LFS)
BIN
src-tauri/icons/icon.png
(Stored with Git LFS)
Binary file not shown.
|
|
@ -283,26 +283,3 @@ pub async fn discord_rpc_auto_disconnect(
|
||||||
rpc_service.disconnect()
|
rpc_service.disconnect()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn get_discord_rpc_enabled(
|
|
||||||
discord_rpc_state: State<'_, Arc<tauri::async_runtime::Mutex<DiscordRpcService>>>,
|
|
||||||
) -> Result<bool, String> {
|
|
||||||
let rpc_service = discord_rpc_state.lock().await;
|
|
||||||
Ok(rpc_service.is_connected())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn set_discord_rpc_enabled(
|
|
||||||
enabled: bool,
|
|
||||||
discord_rpc_state: State<'_, Arc<tauri::async_runtime::Mutex<DiscordRpcService>>>,
|
|
||||||
) -> Result<(), String> {
|
|
||||||
let mut rpc_service = discord_rpc_state.lock().await;
|
|
||||||
|
|
||||||
if enabled {
|
|
||||||
|
|
||||||
let default_client_id = "1234567890123456789";
|
|
||||||
rpc_service.connect(default_client_id)
|
|
||||||
} else {
|
|
||||||
rpc_service.disconnect()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,11 @@ fn get_app_version(app: tauri::AppHandle) -> String {
|
||||||
app.package_info().version.to_string()
|
app.package_info().version.to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
fn get_current_os() -> String {
|
||||||
|
std::env::consts::OS.to_string()
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone, serde::Serialize)]
|
#[derive(Clone, serde::Serialize)]
|
||||||
struct LogEntry {
|
struct LogEntry {
|
||||||
ts: i64,
|
ts: i64,
|
||||||
|
|
@ -112,6 +117,7 @@ pub fn run() {
|
||||||
.invoke_handler(tauri::generate_handler![
|
.invoke_handler(tauri::generate_handler![
|
||||||
greet,
|
greet,
|
||||||
get_app_version,
|
get_app_version,
|
||||||
|
get_current_os,
|
||||||
get_recent_logs,
|
get_recent_logs,
|
||||||
|
|
||||||
database::get_platform_info,
|
database::get_platform_info,
|
||||||
|
|
@ -134,6 +140,10 @@ pub fn run() {
|
||||||
preferences::get_preferences,
|
preferences::get_preferences,
|
||||||
preferences::set_autostart_enabled,
|
preferences::set_autostart_enabled,
|
||||||
preferences::get_autostart_enabled,
|
preferences::get_autostart_enabled,
|
||||||
|
preferences::set_notifications_enabled,
|
||||||
|
preferences::get_notifications_enabled,
|
||||||
|
preferences::set_discord_rpc_enabled,
|
||||||
|
preferences::get_discord_rpc_enabled,
|
||||||
|
|
||||||
setup::setup_hackatime_macos_linux,
|
setup::setup_hackatime_macos_linux,
|
||||||
setup::setup_hackatime_windows,
|
setup::setup_hackatime_windows,
|
||||||
|
|
@ -160,8 +170,6 @@ pub fn run() {
|
||||||
discord_rpc::discord_rpc_update_from_heartbeat,
|
discord_rpc::discord_rpc_update_from_heartbeat,
|
||||||
discord_rpc::discord_rpc_auto_connect,
|
discord_rpc::discord_rpc_auto_connect,
|
||||||
discord_rpc::discord_rpc_auto_disconnect,
|
discord_rpc::discord_rpc_auto_disconnect,
|
||||||
discord_rpc::get_discord_rpc_enabled,
|
|
||||||
discord_rpc::set_discord_rpc_enabled,
|
|
||||||
|
|
||||||
projects::get_projects,
|
projects::get_projects,
|
||||||
projects::get_project_details,
|
projects::get_project_details,
|
||||||
|
|
|
||||||
|
|
@ -9,12 +9,16 @@ use crate::push_log;
|
||||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||||
pub struct Preferences {
|
pub struct Preferences {
|
||||||
pub autostart_enabled: bool,
|
pub autostart_enabled: bool,
|
||||||
|
pub notifications_enabled: bool,
|
||||||
|
pub discord_rpc_enabled: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for Preferences {
|
impl Default for Preferences {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
Self {
|
||||||
autostart_enabled: false,
|
autostart_enabled: true,
|
||||||
|
notifications_enabled: true,
|
||||||
|
discord_rpc_enabled: true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -86,3 +90,45 @@ pub fn get_autostart_enabled() -> Result<bool, String> {
|
||||||
Ok(preferences.autostart_enabled)
|
Ok(preferences.autostart_enabled)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn set_notifications_enabled(enabled: bool) -> Result<(), String> {
|
||||||
|
let mut preferences = load_preferences().unwrap_or_default();
|
||||||
|
preferences.notifications_enabled = enabled;
|
||||||
|
save_preferences(&preferences)?;
|
||||||
|
|
||||||
|
if enabled {
|
||||||
|
push_log("info", "backend", "Notifications enabled".to_string());
|
||||||
|
} else {
|
||||||
|
push_log("info", "backend", "Notifications disabled".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn get_notifications_enabled() -> Result<bool, String> {
|
||||||
|
let preferences = load_preferences().unwrap_or_default();
|
||||||
|
Ok(preferences.notifications_enabled)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn set_discord_rpc_enabled(enabled: bool) -> Result<(), String> {
|
||||||
|
let mut preferences = load_preferences().unwrap_or_default();
|
||||||
|
preferences.discord_rpc_enabled = enabled;
|
||||||
|
save_preferences(&preferences)?;
|
||||||
|
|
||||||
|
if enabled {
|
||||||
|
push_log("info", "backend", "Discord RPC enabled".to_string());
|
||||||
|
} else {
|
||||||
|
push_log("info", "backend", "Discord RPC disabled".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn get_discord_rpc_enabled() -> Result<bool, String> {
|
||||||
|
let preferences = load_preferences().unwrap_or_default();
|
||||||
|
Ok(preferences.discord_rpc_enabled)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,15 +45,32 @@ fn get_expected_config_content(api_key: &str, api_url: &str) -> String {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn normalize_config_content(content: &str) -> String {
|
fn check_config_has_required_values(content: &str, api_key: &str, api_url: &str) -> bool {
|
||||||
|
let normalized = content.replace("\r\n", "\n");
|
||||||
|
let mut found_api_url = false;
|
||||||
|
let mut found_api_key = false;
|
||||||
|
|
||||||
content
|
for line in normalized.lines() {
|
||||||
.replace("\r\n", "\n")
|
let trimmed = line.trim();
|
||||||
.lines()
|
|
||||||
.map(|line| line.trim())
|
if trimmed.starts_with("api_url") {
|
||||||
.filter(|line| !line.is_empty())
|
if let Some(value) = trimmed.split('=').nth(1) {
|
||||||
.collect::<Vec<_>>()
|
let value = value.trim();
|
||||||
.join("\n")
|
if value == api_url {
|
||||||
|
found_api_url = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if trimmed.starts_with("api_key") {
|
||||||
|
if let Some(value) = trimmed.split('=').nth(1) {
|
||||||
|
let value = value.trim();
|
||||||
|
if value == api_key {
|
||||||
|
found_api_key = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
found_api_url && found_api_key
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
|
@ -72,7 +89,7 @@ pub async fn check_wakatime_config(api_key: String, api_url: String) -> Result<W
|
||||||
};
|
};
|
||||||
|
|
||||||
let matches = if let Some(ref actual) = actual_content {
|
let matches = if let Some(ref actual) = actual_content {
|
||||||
normalize_config_content(actual) == normalize_config_content(&expected_content)
|
check_config_has_required_values(actual, &api_key, &api_url)
|
||||||
} else {
|
} else {
|
||||||
false
|
false
|
||||||
};
|
};
|
||||||
|
|
@ -136,23 +153,8 @@ pub async fn setup_hackatime_macos_linux(api_key: String, api_url: String) -> Re
|
||||||
let config_content = fs::read_to_string(&config_path)
|
let config_content = fs::read_to_string(&config_path)
|
||||||
.map_err(|e| format!("Failed to read config file: {}", e))?;
|
.map_err(|e| format!("Failed to read config file: {}", e))?;
|
||||||
|
|
||||||
let lines: Vec<&str> = config_content.lines().collect();
|
if !check_config_has_required_values(&config_content, &api_key, &api_url) {
|
||||||
let mut found_api_url = false;
|
return Err("Config file is missing required api_url and api_key values".to_string());
|
||||||
let mut found_api_key = false;
|
|
||||||
let mut found_heartbeat_rate = false;
|
|
||||||
|
|
||||||
for line in lines {
|
|
||||||
if line.starts_with("api_url =") {
|
|
||||||
found_api_url = true;
|
|
||||||
} else if line.starts_with("api_key =") {
|
|
||||||
found_api_key = true;
|
|
||||||
} else if line.starts_with("heartbeat_rate_limit_seconds =") {
|
|
||||||
found_heartbeat_rate = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !found_api_url || !found_api_key || !found_heartbeat_rate {
|
|
||||||
return Err("Config file is missing required fields".to_string());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(format!(
|
Ok(format!(
|
||||||
|
|
@ -191,23 +193,8 @@ pub async fn setup_hackatime_windows(api_key: String, api_url: String) -> Result
|
||||||
let config_content = fs::read_to_string(&config_path)
|
let config_content = fs::read_to_string(&config_path)
|
||||||
.map_err(|e| format!("Failed to read config file: {}", e))?;
|
.map_err(|e| format!("Failed to read config file: {}", e))?;
|
||||||
|
|
||||||
let lines: Vec<&str> = config_content.lines().collect();
|
if !check_config_has_required_values(&config_content, &api_key, &api_url) {
|
||||||
let mut found_api_url = false;
|
return Err("Config file is missing required api_url and api_key values".to_string());
|
||||||
let mut found_api_key = false;
|
|
||||||
let mut found_heartbeat_rate = false;
|
|
||||||
|
|
||||||
for line in lines {
|
|
||||||
if line.starts_with("api_url =") {
|
|
||||||
found_api_url = true;
|
|
||||||
} else if line.starts_with("api_key =") {
|
|
||||||
found_api_key = true;
|
|
||||||
} else if line.starts_with("heartbeat_rate_limit_seconds =") {
|
|
||||||
found_heartbeat_rate = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !found_api_url || !found_api_key || !found_heartbeat_rate {
|
|
||||||
return Err("Config file is missing required fields".to_string());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(format!(
|
Ok(format!(
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "Hackatime Desktop",
|
"productName": "Hackatime Desktop",
|
||||||
"version": "1.7.1",
|
"version": "1.7.5",
|
||||||
"identifier": "com.hackclub.hackatime",
|
"identifier": "com.hackclub.hackatime",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "pnpm dev",
|
"beforeDevCommand": "pnpm dev",
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"security": {
|
"security": {
|
||||||
"csp": "default-src 'self' ipc: http://ipc.localhost; connect-src 'self' ipc: http://ipc.localhost https://hackatime.hackclub.com https://pub-d35fbe65a5b5426bb6d62ff02a8c7d03.r2.dev wss://*.ingest.us.sentry.io https://us.i.posthog.com https://fonts.googleapis.com https://fonts.gstatic.com; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; img-src 'self' data: https:; font-src 'self' data: https://fonts.gstatic.com; worker-src 'self' blob:;"
|
"csp": "default-src 'self' ipc: http://ipc.localhost; connect-src 'self' ipc: http://ipc.localhost https://hackatime.hackclub.com https://desktop.hackatime.hackclub-assets.com wss://*.ingest.us.sentry.io https://us.i.posthog.com https://fonts.googleapis.com https://fonts.gstatic.com; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; img-src 'self' data: https:; font-src 'self' data: https://fonts.gstatic.com; worker-src 'self' blob:;"
|
||||||
},
|
},
|
||||||
"withGlobalTauri": true
|
"withGlobalTauri": true
|
||||||
},
|
},
|
||||||
|
|
@ -64,7 +64,7 @@
|
||||||
"updater": {
|
"updater": {
|
||||||
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDdERjg4QTFCNTJFMDk0MUQKUldRZGxPQlNHNHI0ZlRkMDN0MGI1MnllY1dUVStZalV3dVdhcTFuREx5SGtBc0txQ2xnTWs3WU4K",
|
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDdERjg4QTFCNTJFMDk0MUQKUldRZGxPQlNHNHI0ZlRkMDN0MGI1MnllY1dUVStZalV3dVdhcTFuREx5SGtBc0txQ2xnTWs3WU4K",
|
||||||
"endpoints": [
|
"endpoints": [
|
||||||
"https://pub-d35fbe65a5b5426bb6d62ff02a8c7d03.r2.dev/update-manifest.json"
|
"https://desktop.hackatime.hackclub-assets.com/update-manifest.json"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
103
src/App.vue
103
src/App.vue
|
|
@ -81,9 +81,11 @@ const sessionStats = ref<any>(null);
|
||||||
const presenceData = ref<any>(null);
|
const presenceData = ref<any>(null);
|
||||||
const presenceRefreshInterval = ref<ReturnType<typeof setInterval> | null>(null);
|
const presenceRefreshInterval = ref<ReturnType<typeof setInterval> | null>(null);
|
||||||
const presenceFetchInProgress = ref(false);
|
const presenceFetchInProgress = ref(false);
|
||||||
|
const updateCheckInterval = ref<ReturnType<typeof setInterval> | null>(null);
|
||||||
const oauthUrl = ref<string | null>(null);
|
const oauthUrl = ref<string | null>(null);
|
||||||
const nextPresenceFetchAllowedAt = ref<number>(0);
|
const nextPresenceFetchAllowedAt = ref<number>(0);
|
||||||
const lastPresenceFetchAt = ref<number>(0);
|
const lastPresenceFetchAt = ref<number>(0);
|
||||||
|
const currentOs = ref<string | null>(null);
|
||||||
|
|
||||||
const currentPage = ref<'home' | 'projects' | 'statistics' | 'settings'>('home');
|
const currentPage = ref<'home' | 'projects' | 'statistics' | 'settings'>('home');
|
||||||
|
|
||||||
|
|
@ -97,6 +99,8 @@ const updateData = ref<any>(null);
|
||||||
const showUpdateModal = ref(false);
|
const showUpdateModal = ref(false);
|
||||||
const isInstallingUpdate = ref(false);
|
const isInstallingUpdate = ref(false);
|
||||||
const currentVersion = ref<string>('1.5.1');
|
const currentVersion = ref<string>('1.5.1');
|
||||||
|
const lastUpdateCheckTime = ref<number>(0);
|
||||||
|
const updateCheckInProgress = ref(false);
|
||||||
|
|
||||||
|
|
||||||
const weeklyChartData = computed(() => {
|
const weeklyChartData = computed(() => {
|
||||||
|
|
@ -131,6 +135,7 @@ onMounted(async () => {
|
||||||
await loadAuthState();
|
await loadAuthState();
|
||||||
await loadApiConfig();
|
await loadApiConfig();
|
||||||
await loadHackatimeInfo();
|
await loadHackatimeInfo();
|
||||||
|
await loadCurrentOs();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const appVersion = await invoke("get_app_version") as string;
|
const appVersion = await invoke("get_app_version") as string;
|
||||||
|
|
@ -139,10 +144,9 @@ onMounted(async () => {
|
||||||
console.warn("Failed to get app version:", error);
|
console.warn("Failed to get app version:", error);
|
||||||
}
|
}
|
||||||
|
|
||||||
isDevMode.value = apiConfig.value.base_url.includes('localhost') ||
|
isDevMode.value = window.location.hostname === 'localhost' ||
|
||||||
apiConfig.value.base_url.includes('127.0.0.1') ||
|
window.location.hostname === '127.0.0.1' ||
|
||||||
window.location.hostname === 'localhost' ||
|
window.location.protocol === 'http:';
|
||||||
window.location.hostname === '127.0.0.1';
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const startUrls = await getCurrent();
|
const startUrls = await getCurrent();
|
||||||
|
|
@ -183,11 +187,17 @@ onMounted(async () => {
|
||||||
|
|
||||||
window.addEventListener('focus', async () => {
|
window.addEventListener('focus', async () => {
|
||||||
await loadAuthState();
|
await loadAuthState();
|
||||||
|
if (authState.value.is_authenticated) {
|
||||||
|
checkForUpdatesAndInstall();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
document.addEventListener('visibilitychange', async () => {
|
document.addEventListener('visibilitychange', async () => {
|
||||||
if (!document.hidden) {
|
if (!document.hidden) {
|
||||||
await loadAuthState();
|
await loadAuthState();
|
||||||
|
if (authState.value.is_authenticated) {
|
||||||
|
checkForUpdatesAndInstall();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -197,10 +207,12 @@ onMounted(async () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
checkForUpdatesAndInstall();
|
checkForUpdatesAndInstall();
|
||||||
|
startUpdateChecks();
|
||||||
});
|
});
|
||||||
|
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
stopPresenceRefresh();
|
stopPresenceRefresh();
|
||||||
|
stopUpdateChecks();
|
||||||
});
|
});
|
||||||
|
|
||||||
async function loadAuthState() {
|
async function loadAuthState() {
|
||||||
|
|
@ -333,6 +345,16 @@ async function loadHackatimeInfo() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function loadCurrentOs() {
|
||||||
|
try {
|
||||||
|
currentOs.value = await invoke("get_current_os") as string;
|
||||||
|
console.log("Current OS detected:", currentOs.value);
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Failed to detect current OS:", error);
|
||||||
|
currentOs.value = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function loadPresenceData() {
|
async function loadPresenceData() {
|
||||||
if (presenceFetchInProgress.value) {
|
if (presenceFetchInProgress.value) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -378,6 +400,24 @@ function stopPresenceRefresh() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function startUpdateChecks() {
|
||||||
|
if (updateCheckInterval.value) {
|
||||||
|
clearInterval(updateCheckInterval.value);
|
||||||
|
updateCheckInterval.value = null;
|
||||||
|
}
|
||||||
|
updateCheckInterval.value = setInterval(() => {
|
||||||
|
checkForUpdatesAndInstall();
|
||||||
|
}, 60 * 60 * 1000); // Check every hour
|
||||||
|
console.log("Started periodic update checks (every 60 minutes)");
|
||||||
|
}
|
||||||
|
|
||||||
|
function stopUpdateChecks() {
|
||||||
|
if (updateCheckInterval.value) {
|
||||||
|
clearInterval(updateCheckInterval.value);
|
||||||
|
updateCheckInterval.value = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
async function authenticate() {
|
async function authenticate() {
|
||||||
isLoading.value = true;
|
isLoading.value = true;
|
||||||
|
|
@ -490,12 +530,25 @@ async function handleDirectOAuthAuth(token?: string) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function checkForUpdatesAndInstall() {
|
async function checkForUpdatesAndInstall(retryCount = 0) {
|
||||||
if (isDevMode.value) {
|
|
||||||
console.info('[AUTO-UPDATE] Skipping auto-update check in development mode');
|
if (updateCheckInProgress.value) {
|
||||||
|
console.info('[AUTO-UPDATE] Update check already in progress, skipping');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const now = Date.now();
|
||||||
|
const timeSinceLastCheck = now - lastUpdateCheckTime.value;
|
||||||
|
const minInterval = 5 * 60 * 1000; // 5 minutes minimum between checks
|
||||||
|
|
||||||
|
if (timeSinceLastCheck < minInterval && lastUpdateCheckTime.value > 0) {
|
||||||
|
console.info(`[AUTO-UPDATE] Skipping update check, last check was ${Math.round(timeSinceLastCheck / 1000)}s ago`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
updateCheckInProgress.value = true;
|
||||||
|
lastUpdateCheckTime.value = now;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
console.info('[AUTO-UPDATE] Checking for updates...');
|
console.info('[AUTO-UPDATE] Checking for updates...');
|
||||||
const update = await check();
|
const update = await check();
|
||||||
|
|
@ -510,6 +563,19 @@ async function checkForUpdatesAndInstall() {
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('[AUTO-UPDATE] Auto-update check failed:', error);
|
console.error('[AUTO-UPDATE] Auto-update check failed:', error);
|
||||||
|
|
||||||
|
if (retryCount < 2) {
|
||||||
|
console.info(`[AUTO-UPDATE] Retrying update check in 10 seconds (attempt ${retryCount + 1}/3)`);
|
||||||
|
setTimeout(() => {
|
||||||
|
updateCheckInProgress.value = false;
|
||||||
|
checkForUpdatesAndInstall(retryCount + 1);
|
||||||
|
}, 10000);
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
console.error('[AUTO-UPDATE] Failed to check for updates after 3 attempts');
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
updateCheckInProgress.value = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -574,6 +640,7 @@ async function handleInstallNow() {
|
||||||
:isLoading="isLoading"
|
:isLoading="isLoading"
|
||||||
:isDevMode="isDevMode"
|
:isDevMode="isDevMode"
|
||||||
:oauthUrl="oauthUrl"
|
:oauthUrl="oauthUrl"
|
||||||
|
:currentOs="currentOs"
|
||||||
@authenticate="authenticate"
|
@authenticate="authenticate"
|
||||||
@handleDirectOAuthAuth="handleDirectOAuthAuth"
|
@handleDirectOAuthAuth="handleDirectOAuthAuth"
|
||||||
@openOAuthUrlManually="openOAuthUrlManually"
|
@openOAuthUrlManually="openOAuthUrlManually"
|
||||||
|
|
@ -694,17 +761,21 @@ async function handleInstallNow() {
|
||||||
<div v-if="authState.is_authenticated && userStats" class="w-64 min-w-64 flex flex-col responsive-full-width">
|
<div v-if="authState.is_authenticated && userStats" class="w-64 min-w-64 flex flex-col responsive-full-width">
|
||||||
<div class="card-3d-app h-full">
|
<div class="card-3d-app h-full">
|
||||||
<div class="rounded-[8px] border border-black p-4 card-3d-app-front h-full flex flex-col" style="background-color: #3D2C3E;">
|
<div class="rounded-[8px] border border-black p-4 card-3d-app-front h-full flex flex-col" style="background-color: #3D2C3E;">
|
||||||
<div class="flex items-center justify-between mb-4">
|
<div class="flex items-center justify-between mb-4">
|
||||||
<h2 class="text-white text-[16px] font-bold italic m-0" style="font-family: 'Outfit', sans-serif;">
|
<h2 class="text-white text-[16px] font-bold italic m-0" style="font-family: 'Outfit', sans-serif;">
|
||||||
leaderboard
|
leaderboard
|
||||||
</h2>
|
</h2>
|
||||||
<div class="flex gap-2 text-[10px]" style="font-family: 'Outfit', sans-serif;">
|
<div class="flex gap-2 text-[10px]" style="font-family: 'Outfit', sans-serif;">
|
||||||
<span class="text-white underline cursor-pointer">friends</span>
|
<span class="text-white underline cursor-pointer">friends</span>
|
||||||
<span class="text-white cursor-pointer">global</span>
|
<span class="text-white cursor-pointer">global</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center justify-center h-full">
|
||||||
|
<p class="text-white text-[18px] font-semibold opacity-60" style="font-family: 'Outfit', sans-serif;">
|
||||||
|
Coming Soon...
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- Leaderboard content would go here -->
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="card-3d">
|
<div class="card-3d">
|
||||||
<div class="rounded-[8px] border border-black p-6 card-3d-front h-full flex flex-col" style="background-color: #3D2C3E;">
|
<div class="rounded-[8px] border border-black p-6 card-3d-front h-full flex flex-col" style="background-color: #3D2C3E;">
|
||||||
<div class="flex items-start space-x-4 flex-1">
|
<div class="flex items-start space-x-4">
|
||||||
<div class="text-3xl">{{ icon }}</div>
|
<div class="text-3xl flex-shrink-0">{{ icon }}</div>
|
||||||
<div class="flex-1 flex flex-col">
|
<div class="flex-1 flex flex-col min-w-0">
|
||||||
<h3 class="text-lg font-semibold text-text-primary mb-2">{{ title }}</h3>
|
<h3 class="text-lg font-semibold text-text-primary mb-2">{{ title }}</h3>
|
||||||
<p class="text-text-secondary mb-3 flex-1">{{ description }}</p>
|
<p class="text-text-secondary mb-4 text-sm line-clamp-2">{{ description }}</p>
|
||||||
<div class="flex items-center justify-between">
|
<div class="mt-auto">
|
||||||
<div class="text-2xl font-bold" :style="{ color: color }">{{ value }}</div>
|
<div class="text-2xl font-bold mb-1" :style="{ color: color }">{{ value }}</div>
|
||||||
<div class="text-sm text-text-secondary">{{ trend }}</div>
|
<div class="text-sm text-text-secondary">{{ trend }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -83,6 +83,28 @@
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
|
<!-- Linux-specific OAuth URL copy section -->
|
||||||
|
<div v-if="currentOs === 'linux' && oauthUrl" class="mt-6 mb-6 p-4 bg-[#2A1F2B] border border-white/20 rounded-lg">
|
||||||
|
<p class="text-white/70 text-sm mb-3" style="font-family: 'Outfit', sans-serif;">
|
||||||
|
<strong>Linux:</strong> Copy the link to open in your browser manually
|
||||||
|
</p>
|
||||||
|
<div class="flex gap-2">
|
||||||
|
<input
|
||||||
|
:value="oauthUrl"
|
||||||
|
readonly
|
||||||
|
class="flex-1 p-3 bg-[#3D2C3E] border border-white/20 rounded-lg text-white font-mono text-xs focus:outline-none focus:border-[#E99682] transition-colors select-all"
|
||||||
|
@click="($event.target as HTMLInputElement)?.select()"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
@click="copyOAuthUrl"
|
||||||
|
class="px-4 py-3 rounded-lg border-2 border-[rgba(0,0,0,0.35)] font-bold text-sm transition-all bg-[#E99682] text-white hover:bg-[#d88672]"
|
||||||
|
style="font-family: 'Outfit', sans-serif;"
|
||||||
|
>
|
||||||
|
Copy
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
@click="cancelAuth"
|
@click="cancelAuth"
|
||||||
class="text-white/60 text-base hover:text-white transition-colors font-medium"
|
class="text-white/60 text-base hover:text-white transition-colors font-medium"
|
||||||
|
|
@ -108,12 +130,6 @@ const emit = defineEmits<{
|
||||||
openOAuthUrlManually: [];
|
openOAuthUrlManually: [];
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
defineProps<{
|
|
||||||
isLoading: boolean;
|
|
||||||
isDevMode: boolean;
|
|
||||||
oauthUrl: string | null;
|
|
||||||
}>();
|
|
||||||
|
|
||||||
const authInProgress = ref(false);
|
const authInProgress = ref(false);
|
||||||
const directToken = ref('');
|
const directToken = ref('');
|
||||||
|
|
||||||
|
|
@ -138,6 +154,25 @@ function handleDirectAuth() {
|
||||||
directToken.value = '';
|
directToken.value = '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
isLoading: boolean;
|
||||||
|
isDevMode: boolean;
|
||||||
|
oauthUrl: string | null;
|
||||||
|
currentOs: string | null;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
async function copyOAuthUrl() {
|
||||||
|
if (!props.oauthUrl) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.writeText(props.oauthUrl);
|
||||||
|
alert("OAuth URL copied to clipboard!");
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Failed to copy OAuth URL:", error);
|
||||||
|
alert("Failed to copy OAuth URL to clipboard");
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|
|
||||||
|
|
@ -45,9 +45,9 @@
|
||||||
<h4 class="font-medium text-text-primary mb-1">Notifications</h4>
|
<h4 class="font-medium text-text-primary mb-1">Notifications</h4>
|
||||||
<p class="text-sm text-text-secondary">Show desktop notifications</p>
|
<p class="text-sm text-text-secondary">Show desktop notifications</p>
|
||||||
</div>
|
</div>
|
||||||
<label class="switch">
|
<label class="switch" :class="{ 'opacity-50 cursor-not-allowed': isLoading }">
|
||||||
<input type="checkbox" checked>
|
<input type="checkbox" :checked="notificationsEnabled" :disabled="isLoading" @change="toggleNotifications">
|
||||||
<span class="slider"></span>
|
<span class="slider" :class="{ 'animate-pulse': isLoading }"></span>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -291,6 +291,7 @@ const emit = defineEmits<{
|
||||||
|
|
||||||
const discordRpcEnabled = ref(false);
|
const discordRpcEnabled = ref(false);
|
||||||
const autostartEnabled = ref(false);
|
const autostartEnabled = ref(false);
|
||||||
|
const notificationsEnabled = ref(false);
|
||||||
const isLoading = ref(false);
|
const isLoading = ref(false);
|
||||||
const appVersion = ref('...');
|
const appVersion = ref('...');
|
||||||
const isClearingCache = ref(false);
|
const isClearingCache = ref(false);
|
||||||
|
|
@ -565,6 +566,14 @@ async function loadAutostartState() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function loadNotificationsState() {
|
||||||
|
try {
|
||||||
|
notificationsEnabled.value = await invoke("get_notifications_enabled");
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Failed to load notifications state:", error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function toggleAutostart() {
|
async function toggleAutostart() {
|
||||||
if (isLoading.value) return;
|
if (isLoading.value) return;
|
||||||
|
|
||||||
|
|
@ -599,6 +608,23 @@ async function toggleDiscordRpc() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function toggleNotifications() {
|
||||||
|
if (isLoading.value) return;
|
||||||
|
|
||||||
|
isLoading.value = true;
|
||||||
|
try {
|
||||||
|
const newState = !notificationsEnabled.value;
|
||||||
|
await invoke("set_notifications_enabled", { enabled: newState });
|
||||||
|
notificationsEnabled.value = newState;
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Failed to toggle notifications:", error);
|
||||||
|
|
||||||
|
notificationsEnabled.value = !notificationsEnabled.value;
|
||||||
|
} finally {
|
||||||
|
isLoading.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function copyApiKey() {
|
function copyApiKey() {
|
||||||
emit('copyApiKey')
|
emit('copyApiKey')
|
||||||
}
|
}
|
||||||
|
|
@ -689,6 +715,7 @@ async function downloadAndInstallUpdate() {
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
loadDiscordRpcState();
|
loadDiscordRpcState();
|
||||||
loadAutostartState();
|
loadAutostartState();
|
||||||
|
loadNotificationsState();
|
||||||
try {
|
try {
|
||||||
appVersion.value = await getVersion();
|
appVersion.value = await getVersion();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue