Merge branch 'main' into 274-deep-linking-on-tauri

eslint.config.js

@@ -36,7 +36,10 @@ export default [
             ...hooksPlugin.configs.recommended.rules,
             'react/jsx-uses-react': 'off',
             'react/react-in-jsx-scope': 'off',
-            'no-console': ['warn', { allow: ['info', 'warn', 'debug', 'error'] }],
+            'no-console': [
+                'warn',
+                { allow: ['info', 'warn', 'debug', 'error', 'group', 'groupCollapsed', 'groupEnd'] },
+            ],
             'react/prop-types': 'off',
             '@typescript-eslint/no-explicit-any': 'warn',
             '@typescript-eslint/no-unused-vars': 'warn',

index.html

@@ -36,15 +36,19 @@
     function init() {
       glApp.init();
       time = performance.now() / 1000;
+
+      glApp.properties.lightPositionX = -5;
+      glApp.properties.lightPositionY = 4;
+      glApp.properties.lightPositionZ = 3;
+      glApp.properties.cameraOffsetX = (348 + 50) / window.innerWidth; // 348 is sidebar width with some padding
+
       window.addEventListener("resize", onResize);
-      glApp.stateManager.set('showVisual')
       onResize();
       animate();
     }
 
     function onResize() {
       glApp.setSize(window.innerWidth, window.innerHeight);
-      glApp.properties.cameraOffsetX = (348 + 10) / window.innerWidth; // 348 is sidebar width with some padding
     }
 
     function animate() {

package.json

@@ -1,7 +1,7 @@
 {
     "name": "tari-universe",
     "private": true,
-    "version": "0.2.5",
+    "version": "0.2.7",
     "type": "module",
     "scripts": {
         "dev": "vite dev --mode development",
@@ -14,7 +14,7 @@
     "dependencies": {
         "@floating-ui/react": "^0.26.23",
         "@tauri-apps/api": "^1",
-        "framer-motion": "^11.5.2",
+        "framer-motion": "^11.5.4",
         "globals": "^15.9.0",
         "i18next": "^23.14.0",
         "i18next-browser-languagedetector": "^8.0.0",
@@ -42,7 +42,7 @@
         "@typescript-eslint/parser": "^8.3.0",
         "@vitejs/plugin-react": "^4.2.1",
         "babel-plugin-styled-components": "^2.1.4",
-        "eslint": "^9.9.0",
+        "eslint": "^9.10.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-prettier": "^5.2.1",
         "eslint-plugin-react": "^7.35.2",
@@ -53,4 +53,4 @@
         "typescript-eslint": "^8.4.0",
         "vite": "^5.4.3"
     }
-}
+}

public/locales/cn/common.json

@@ -0,0 +1,20 @@
+{
+    "submit": "提交",
+    "cancel": "取消",
+    "temperature": "温度",
+    "max-temperature": "最高温度",
+    "usage": "使用",
+    "seconds": "片刻",
+    "copied": "复制",
+    "unknown": "未知",
+    "versions": "版本",
+    "version": "版本",
+    "resources": "资源",
+    "hashrate": "哈希率",
+    "utilization": "利用率",
+    "mode": "模式",
+    "day": "天",
+    "shutting-down": "停工..",
+    "tari-universe": "Tari宇宙",
+    "testnet": "测试网"
+}

public/locales/cn/components.json

@@ -0,0 +1,11 @@
+{
+    "field-error-message": {
+        "invalid": "字段无效",
+        "required": "必填字段",
+        "password-too-short": "密码必须至少包含8个字符",
+        "invalid-url": "必须是有效的URL地址",
+        "invalid-email": "输入有效的电子邮件地址",
+        "invalid-date": "日期无效",
+        "integers-only": "只允许整数"
+    }
+}

public/locales/cn/mining-view.json

@@ -0,0 +1,15 @@
+{
+  "floor": "地板",
+  "current-block-time": "当前区块时间",
+  "your-reward-is": "你的奖励是",
+  "connection-to-node-lost": "与矿工的连接丢失。请等待矿机重新连接或重启矿机.",
+  "mining-button-text": {
+    "starting-mining": "开始挖矿",
+    "start-mining": "开始挖矿",
+    "pause-mining": "暂停挖矿",
+    "changing-mode": "更改模式",
+    "cancel-mining": "取消挖矿",
+    "waiting-for-idle": "等待空闲",
+    "started-auto-mining": "自动挖矿开始"
+  }
+}

public/locales/cn/settings.json

@@ -0,0 +1,40 @@
+{
+  "settings": "设置",
+  "seed-words": "种子词",
+  "change-language": "更改语言",
+  "logs": "Logs",
+  "open-logs-directory": "打开日志目录",
+  "debug-info": "Debug",
+  "hardware-status": "硬件状态",
+  "update-versions": "更新版本",
+  "refresh-versions": "刷新版本",
+  "idle-timeout": {
+    "title": "机器被视为空闲的时间",
+    "placeholder": "输入空闲超时时间（秒）",
+    "max": "最大值为21600秒",
+    "min": "最小值为1秒"
+  },
+  "monero-address": {
+    "title": "Monero 地址",
+    "placeholder": "输入门罗地址"
+  },
+  "last-block-added-time": "最后添加到链时间的块",
+  "visual-mode": "视觉模式",
+  "pool-mining": "Pool 挖矿",
+  "pool-mining-description": "启用后，您将在矿池中挖矿并加入一组矿工（部落）.",
+  "cpu-mining-enabled": "CPU 挖矿",
+  "gpu-mining-enabled": "GPU 挖矿",
+  "p2pool-stats": "P2Pool状态",
+  "tribe": "部落",
+  "miners": "矿工",
+  "tribe-earnings": "部落收入",
+  "tribe-pool-height": "泳池高度",
+  "p2pool-hash-rate": "池哈希率",
+  "p2pool-total-earnings": "池总收益",
+  "p2pool-chain-tip": "链条尖端",
+  "p2pool-user-total-earnings": "总收入",
+  "yes": "是的",
+  "cancel": "取消",
+  "reset-settings": "重置",
+  "reset-permanently": "您确定要永久重置所有设置吗?"
+}

public/locales/cn/setup-view.json

@@ -0,0 +1,27 @@
+{
+    "setting-up": "正在建立tari机器...",
+    "this-might-take-a-few-minutes": "这需要几分钟",
+    "dont-worry": "别担心，你只需要做一次。",
+    "title": {
+        "starting-up": "启动",
+        "checking-latest-version-node": "检查节点的最新版本",
+        "checking-latest-version-mmproxy": "正在检查mmproxy的最新版本",
+        "checking-latest-version-wallet": "正在检查wallet最新版本",
+        "checking-latest-version-xmrig": "C正在检查xmrig最新版本",
+        "checking-latest-version-sha-p2pool": "正在sha-p2pool最新版本",
+        "waiting-for-wallet": "等待钱包",
+        "waiting-for-node": "等待节点同步",
+        "preparing-for-initial-sync": "准备初始同步",
+        "starting-mmproxy": "正在启动合并挖掘代理",
+        "starting-p2pool": "设置 P2Pool",
+        "application-started": "应用程序已启动",
+        "downloading": "D下载中",
+        "download-completed": "下载完成",
+        "waiting-for-header-sync": "正在等待标头同步. {{local_height}}/{{tip_height}} 标题已同步",
+        "waiting-for-block-sync": "等待块同步. {{local_height}}/{{tip_height}} 块同步完成"
+    },
+    "new-tari-version-available": "Tari Universe的新版本可用!",
+    "would-you-like-to-install": "你需要下载最新版tari宇宙吗？ {{version}} ",
+    "yes": "是",
+    "no": "不"
+}

public/locales/cn/sidebar.json

@@ -0,0 +1,9 @@
+{
+    "auto-miner":"自动采矿机",
+    "auto-miner-description":"当您的机器闲置时，自动矿机将打开您的矿机",
+    "next-milestone":"下一个里程碑",
+    "wallet-balance":"钱包余额",
+    "setup-scheduler":"安装计划程序",
+    "mining-schedules":"采矿时间表",
+    "mining-schedules-description":"安排您的采矿活动"
+}

public/locales/cn/tribes-view.json

@@ -0,0 +1,3 @@
+{
+    "title": "部落的观点"
+}

public/locales/en/airdrop.json

@@ -0,0 +1,12 @@
+{
+    "loginButton": "Log in to claim gems",
+    "logout": "Logout",
+    "permissionNoGems": {
+        "title": "Make Tari Universe better",
+        "text": "Tari Universe would like to use analytics to improve your experience."
+    },
+    "permission": {
+        "title": "Earn Gems & make Tari Universe better",
+        "text": "Tari Universe would like to use analytics to improve your experience and reward you with gems for mining."
+    }
+}

public/locales/en/components.json

@@ -8,4 +8,4 @@
         "invalid-date": "Date is invalid",
         "integers-only": "Only Integers Allowed"
     }
-}
+}

public/locales/pl/airdrop.json

@@ -0,0 +1,8 @@
+{
+    "loginButton": "Log in to claim gems",
+    "logout": "Logout",
+    "permission": {
+        "title": "Earn Gems & make Tari Universe better",
+        "text": "Tari Universe would like to use analytics to improve your experience and reward you with gems for mining."
+    }
+}

public/locales/tr/common.json

@@ -13,5 +13,8 @@
     "hashrate": "Hashrate",
     "utilization": "Fayda",
     "mode": "Mode",
-    "day": "Gün"
+    "day": "Gün",
+    "shutting-down": "Kapatılıyor..",
+    "tari-universe": "Tari Universe",
+    "testnet": "Testnet"
 }

public/locales/tr/mining-view.json

@@ -1,9 +1,5 @@
 {
     "floor": "Zemin",
-    "tribe": "Kadro",
-    "miners": "Madenciler",
-    "tribe-earnings": "Kadro kazançları",
-    "tribe-pool-height": "Havuz yüksekliği",
     "current-block-time": "Geçerli blok zamanı",
     "your-reward-is": "Ödülünüz",
     "connection-to-node-lost": "Madenciyle bağlantı kesildi. Lütfen madencinin yeniden bağlanmasını bekleyin veya madenciyi yeniden başlatın.",

public/locales/tr/settings.json

@@ -21,5 +21,20 @@
     "last-block-added-time": "Zincir zamanına eklenen son blok",
     "visual-mode": "Görsel mod",
     "pool-mining": "Havuz Madenciliği",
-    "pool-mining-description": "Etkinleştirildiğinde, bir havuzda madencilik yapacak ve bir grup madenciye (kadroya) katılacaksınız."
-}
+    "pool-mining-description": "Etkinleştirildiğinde, bir havuzda madencilik yapacak ve bir grup madenciye (kabileye) katılacaksınız.",
+    "cpu-mining-enabled": "CPU Madenciliği",
+    "gpu-mining-enabled": "GPU Madenciliği",
+    "p2pool-stats": "P2Pool İstatistikleri",
+    "tribe": "Kabile",
+    "miners": "Madenciler",
+    "tribe-earnings": "Kabile kazançları",
+    "tribe-pool-height": "Havuz yüksekliği",
+    "p2pool-hash-rate": "Havuz hash oranları",
+    "p2pool-total-earnings": "Toplam havuz kazançları",
+    "p2pool-chain-tip": "Zincir ucu",
+    "p2pool-user-total-earnings": "Toplam kazançlar",
+    "yes": "Evet",
+    "cancel": "İptal",
+    "reset-settings": "Ayarları sıfırla",
+    "reset-permanently": "Tüm ayarları kalıcı olarak sıfırlamak istediğinizden emin misiniz?"
+}