From 04038253cf135df240c29ea570057ff2685b9ccb Mon Sep 17 00:00:00 2001 From: spylecym <1262965753@qq.com> Date: Fri, 14 Jul 2023 11:29:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/site/en/download.html | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/public/site/en/download.html b/public/site/en/download.html index ba7d9788e..88daae000 100644 --- a/public/site/en/download.html +++ b/public/site/en/download.html @@ -345,41 +345,6 @@ const getItem = (key)=> { } return record.value; } -/* 获取仓库的更新信息处理函数 */ -const setHrefUrl = (data,name,dom)=>{ - const url = data[0].assets.find(file => file.name.includes(name)); - const link = document.getElementById(dom); - link.href = url.browser_download_url; -} -const logsItem = getItem('logs_dowmload_en') -const updates = document.getElementById('releases'); -if(!logsItem) { - fetch('https://api.github.com/repos/kuaifan/dootask/releases') - .then(response => response.json()) - .then(data => { - setHrefUrl(data,'arm64.dmg','arm64Link') - setHrefUrl(data,'x64.dmg','x64Link') - setHrefUrl(data,'arm64.exe','winx64Link') - const releases = data.slice(0, 5).map((item,index) => { - const { tag_name, created_at } = item; - const date = created_at.split('T')[0]; - return ` -
  • -
    DooTask ${tag_name} update
    - ${date} -
  • - `; - }).join(''); - let record = {value: releases, expired: new Date().getTime() + 30 * 60 * 1000}; - localStorage.setItem('logs_dowmload_en', JSON.stringify(record)) - updates.innerHTML = releases; - }) - .catch(error => { - console.error(error); - }); -}else{ - updates.innerHTML = logsItem; -} /* 滑动到可视区域执行动画 */ const boxes = document.querySelectorAll('.dow-animate-box'); const animateBoxes = ()=> { From 1ca7e257ee057966c6e7171e1da9feafa29741ad Mon Sep 17 00:00:00 2001 From: zzb-zzb <2673983214@qq.com> Date: Fri, 14 Jul 2023 18:48:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E4=BD=BF=E7=94=A8=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/site/css/help.css | 2 +- public/site/en/help.html | 324 ++++++++++++++++-- .../site/img/light/help_pic_creat_task1.png | Bin 0 -> 40523 bytes .../site/img/light/help_pic_creat_task10.png | Bin 0 -> 65468 bytes .../site/img/light/help_pic_creat_task2.png | Bin 0 -> 37116 bytes .../site/img/light/help_pic_creat_task3.png | Bin 0 -> 41944 bytes .../site/img/light/help_pic_creat_task4.png | Bin 0 -> 51190 bytes .../site/img/light/help_pic_creat_task5.png | Bin 0 -> 39676 bytes .../site/img/light/help_pic_creat_task6.png | Bin 0 -> 49215 bytes .../site/img/light/help_pic_creat_task7.png | Bin 0 -> 60452 bytes .../site/img/light/help_pic_creat_task8.png | Bin 0 -> 54735 bytes .../site/img/light/help_pic_creat_task9.png | Bin 0 -> 56898 bytes public/site/img/light/help_pic_file1.png | Bin 0 -> 70951 bytes public/site/img/light/help_pic_file2.png | Bin 0 -> 73660 bytes public/site/img/light/help_pic_file3.png | Bin 0 -> 177328 bytes public/site/img/light/help_pic_file4.png | Bin 0 -> 57967 bytes public/site/img/light/help_pic_file5.png | Bin 0 -> 70636 bytes public/site/img/light/help_pic_login1.png | Bin 0 -> 16705 bytes public/site/img/light/help_pic_login2.png | Bin 0 -> 16592 bytes public/site/img/light/help_pic_login3.png | Bin 0 -> 23961 bytes .../site/img/light/help_pic_new_project1.png | Bin 0 -> 44198 bytes .../site/img/light/help_pic_new_project2.png | Bin 0 -> 35539 bytes .../site/img/light/help_pic_new_project3.png | Bin 0 -> 53533 bytes .../site/img/light/help_pic_new_project4.png | Bin 0 -> 50269 bytes .../site/img/light/help_pic_new_project5.png | Bin 0 -> 38340 bytes .../site/img/light/help_pic_new_project6.png | Bin 0 -> 40547 bytes .../site/img/light/help_pic_new_project7.png | Bin 0 -> 51831 bytes public/site/img/light/help_pic_note1.png | Bin 0 -> 73585 bytes public/site/img/light/help_pic_note2.png | Bin 0 -> 79410 bytes public/site/img/light/help_pic_register1.png | Bin 0 -> 16502 bytes public/site/img/light/help_pic_register2.png | Bin 0 -> 18995 bytes public/site/img/light/help_pic_set1.png | Bin 0 -> 25486 bytes public/site/img/light/help_pic_set2.png | Bin 0 -> 31636 bytes public/site/img/light/help_pic_set3.png | Bin 0 -> 31826 bytes public/site/img/light/help_pic_set4.png | Bin 0 -> 29075 bytes public/site/img/light/help_pic_set5.png | Bin 0 -> 23633 bytes public/site/img/light/help_pic_set6.png | Bin 0 -> 21843 bytes public/site/img/light/help_pic_set7.png | Bin 0 -> 22622 bytes public/site/img/light/help_pic_set8.png | Bin 0 -> 68844 bytes public/site/img/light/help_pic_team1.png | Bin 0 -> 65815 bytes public/site/img/light/help_pic_team10.png | Bin 0 -> 66371 bytes public/site/img/light/help_pic_team11.png | Bin 0 -> 68828 bytes public/site/img/light/help_pic_team12.png | Bin 0 -> 26204 bytes public/site/img/light/help_pic_team13.png | Bin 0 -> 22543 bytes public/site/img/light/help_pic_team14.png | Bin 0 -> 27810 bytes public/site/img/light/help_pic_team15.png | Bin 0 -> 29761 bytes public/site/img/light/help_pic_team2.png | Bin 0 -> 182349 bytes public/site/img/light/help_pic_team3.png | Bin 0 -> 66180 bytes public/site/img/light/help_pic_team4.png | Bin 0 -> 40209 bytes public/site/img/light/help_pic_team5.png | Bin 0 -> 64972 bytes public/site/img/light/help_pic_team6.png | Bin 0 -> 64906 bytes public/site/img/light/help_pic_team7.png | Bin 0 -> 38181 bytes public/site/img/light/help_pic_team8.png | Bin 0 -> 66305 bytes public/site/img/light/help_pic_team9.png | Bin 0 -> 148287 bytes public/site/zh/help.html | 322 +++++++++++++++-- 55 files changed, 580 insertions(+), 68 deletions(-) create mode 100644 public/site/img/light/help_pic_creat_task1.png create mode 100644 public/site/img/light/help_pic_creat_task10.png create mode 100644 public/site/img/light/help_pic_creat_task2.png create mode 100644 public/site/img/light/help_pic_creat_task3.png create mode 100644 public/site/img/light/help_pic_creat_task4.png create mode 100644 public/site/img/light/help_pic_creat_task5.png create mode 100644 public/site/img/light/help_pic_creat_task6.png create mode 100644 public/site/img/light/help_pic_creat_task7.png create mode 100644 public/site/img/light/help_pic_creat_task8.png create mode 100644 public/site/img/light/help_pic_creat_task9.png create mode 100644 public/site/img/light/help_pic_file1.png create mode 100644 public/site/img/light/help_pic_file2.png create mode 100644 public/site/img/light/help_pic_file3.png create mode 100644 public/site/img/light/help_pic_file4.png create mode 100644 public/site/img/light/help_pic_file5.png create mode 100644 public/site/img/light/help_pic_login1.png create mode 100644 public/site/img/light/help_pic_login2.png create mode 100644 public/site/img/light/help_pic_login3.png create mode 100644 public/site/img/light/help_pic_new_project1.png create mode 100644 public/site/img/light/help_pic_new_project2.png create mode 100644 public/site/img/light/help_pic_new_project3.png create mode 100644 public/site/img/light/help_pic_new_project4.png create mode 100644 public/site/img/light/help_pic_new_project5.png create mode 100644 public/site/img/light/help_pic_new_project6.png create mode 100644 public/site/img/light/help_pic_new_project7.png create mode 100644 public/site/img/light/help_pic_note1.png create mode 100644 public/site/img/light/help_pic_note2.png create mode 100644 public/site/img/light/help_pic_register1.png create mode 100644 public/site/img/light/help_pic_register2.png create mode 100644 public/site/img/light/help_pic_set1.png create mode 100644 public/site/img/light/help_pic_set2.png create mode 100644 public/site/img/light/help_pic_set3.png create mode 100644 public/site/img/light/help_pic_set4.png create mode 100644 public/site/img/light/help_pic_set5.png create mode 100644 public/site/img/light/help_pic_set6.png create mode 100644 public/site/img/light/help_pic_set7.png create mode 100644 public/site/img/light/help_pic_set8.png create mode 100644 public/site/img/light/help_pic_team1.png create mode 100644 public/site/img/light/help_pic_team10.png create mode 100644 public/site/img/light/help_pic_team11.png create mode 100644 public/site/img/light/help_pic_team12.png create mode 100644 public/site/img/light/help_pic_team13.png create mode 100644 public/site/img/light/help_pic_team14.png create mode 100644 public/site/img/light/help_pic_team15.png create mode 100644 public/site/img/light/help_pic_team2.png create mode 100644 public/site/img/light/help_pic_team3.png create mode 100644 public/site/img/light/help_pic_team4.png create mode 100644 public/site/img/light/help_pic_team5.png create mode 100644 public/site/img/light/help_pic_team6.png create mode 100644 public/site/img/light/help_pic_team7.png create mode 100644 public/site/img/light/help_pic_team8.png create mode 100644 public/site/img/light/help_pic_team9.png diff --git a/public/site/css/help.css b/public/site/css/help.css index c1f6d6b24..2ae1be8d7 100644 --- a/public/site/css/help.css +++ b/public/site/css/help.css @@ -22,7 +22,7 @@ } .help-l { - display: none; + display: block; padding: 24px; background: var(--bg-fa-color); border-radius: 8px; diff --git a/public/site/en/help.html b/public/site/en/help.html index 74e17d0ad..f15d2342f 100644 --- a/public/site/en/help.html +++ b/public/site/en/help.html @@ -117,16 +117,16 @@
    Projects
    1. - Understand Project + Understand Project
    2. - Create project + Create project
    3. - Task List + Task List
    4. - Project Progress + Project Progress
    @@ -134,16 +134,16 @@
    Mission
    1. - Use of tasks + Use of tasks
    2. - Task Priority + Task Priority
    3. - Comments & News + Comments & News
    4. - Subtasks + Subtasks
    @@ -151,16 +151,16 @@
    Team
    1. - Team and Members + Team and Members
    2. - Member Grouping + Member Grouping
    3. - Team Management + Team Management
    4. - Team Setup + Team Setup
    @@ -168,13 +168,13 @@
    Files
    1. - File Type + File Type
    2. - Shared Files + Shared Files
    3. - Access Permissions + Access Permissions
    @@ -293,16 +293,16 @@
    Projects
    1. - Understand Project + Understand Project
    2. - Create project + Create project
    3. - Task List + Task List
    4. - Project Progress + Project Progress
    @@ -310,16 +310,16 @@
    Mission
    1. - Use of tasks + Use of tasks
    2. - Task Priority + Task Priority
    3. - Comments & News + Comments & News
    4. - Subtasks + Subtasks
    @@ -327,16 +327,16 @@
    Team
    1. - Team and Members + Team and Members
    2. - Member Grouping + Member Grouping
    3. - Team Management + Team Management
    4. - Team Setup + Team Setup
    @@ -344,13 +344,13 @@
    Files
    1. - File Type + File Type
    2. - Shared Files + Shared Files
    3. - Access Permissions + Access Permissions
    @@ -365,15 +365,15 @@
    Just starting out with DooTask? No problem, this primer is for you!
    - diff --git a/public/site/en/log.html b/public/site/en/log.html index 40b2eb920..048f4b373 100644 --- a/public/site/en/log.html +++ b/public/site/en/log.html @@ -168,7 +168,7 @@
  • @@ -184,14 +184,14 @@ Logs
    -
    +
    Logs
      -
      +

      DooTask Update Log

        -
        +
        @@ -209,7 +209,21 @@ + diff --git a/public/site/en/price.html b/public/site/en/price.html index 970796eb1..deee6d6e5 100644 --- a/public/site/en/price.html +++ b/public/site/en/price.html @@ -281,7 +281,7 @@
      • diff --git a/public/site/en/product.html b/public/site/en/product.html index aeccb1b9e..8da784923 100644 --- a/public/site/en/product.html +++ b/public/site/en/product.html @@ -458,7 +458,7 @@
      • diff --git a/public/site/en/solutions.html b/public/site/en/solutions.html index 0779f7051..9452e0ae1 100644 --- a/public/site/en/solutions.html +++ b/public/site/en/solutions.html @@ -173,7 +173,7 @@
      • diff --git a/public/site/index.html b/public/site/index.html index 0b92ed671..3ac3764f7 100644 --- a/public/site/index.html +++ b/public/site/index.html @@ -184,7 +184,7 @@
      • diff --git a/public/site/js/common.js b/public/site/js/common.js index e2d8d9e5e..a0a216b3e 100644 --- a/public/site/js/common.js +++ b/public/site/js/common.js @@ -198,7 +198,7 @@ window.addEventListener('scroll', () => { }); /* 去登录函数 */ const goToLoginHandle = ()=>{ - window.location.href = `https://demo.dootask.com` + window.location.href = `https://www.dootask.com/manage/dashboard` } const openInNewTab = (url)=> { const win = window.open(url, '_blank'); diff --git a/public/site/zh/about.html b/public/site/zh/about.html index ac8c882aa..8bdf5a0b0 100644 --- a/public/site/zh/about.html +++ b/public/site/zh/about.html @@ -202,7 +202,7 @@
      • diff --git a/public/site/zh/download.html b/public/site/zh/download.html index 33de2ec2b..159b61a93 100644 --- a/public/site/zh/download.html +++ b/public/site/zh/download.html @@ -212,7 +212,7 @@
      • @@ -317,8 +317,46 @@ + + diff --git a/public/site/zh/index.html b/public/site/zh/index.html index 60c22cb9b..5b5bdcea8 100644 --- a/public/site/zh/index.html +++ b/public/site/zh/index.html @@ -183,7 +183,7 @@
      • diff --git a/public/site/zh/log.html b/public/site/zh/log.html index 8f14108dc..5c4821027 100644 --- a/public/site/zh/log.html +++ b/public/site/zh/log.html @@ -168,7 +168,7 @@
      • @@ -184,7 +184,7 @@ 更新日志
        -
        +
        更新日志
          @@ -208,8 +208,23 @@
          + + diff --git a/public/site/zh/price.html b/public/site/zh/price.html index c3d9e2f15..4b92a29e4 100644 --- a/public/site/zh/price.html +++ b/public/site/zh/price.html @@ -282,7 +282,7 @@
        • diff --git a/public/site/zh/product.html b/public/site/zh/product.html index eb32cbd40..e61fed782 100644 --- a/public/site/zh/product.html +++ b/public/site/zh/product.html @@ -155,9 +155,9 @@

          多平台应用

        • - - 一个产品,多种强大的工具 - + + 一个产品,多种强大的工具 +
        • diff --git a/public/site/zh/solutions.html b/public/site/zh/solutions.html index 1639d2015..08e34c129 100644 --- a/public/site/zh/solutions.html +++ b/public/site/zh/solutions.html @@ -173,7 +173,7 @@
        • From a6d9617e7fc64d4a3455f02d8ac3cea924800944 Mon Sep 17 00:00:00 2001 From: gwok Date: Fri, 14 Jul 2023 21:46:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=94=B9=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AF=B7=E6=B1=82=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/SystemController.php | 11 ++++------- public/site/en/download.html | 2 +- public/site/en/log.html | 4 ++-- public/site/zh/download.html | 4 ++-- public/site/zh/log.html | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index e8f098f9f..c8a1271c0 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -881,18 +881,18 @@ class SystemController extends AbstractController } /** - * @api {get} api/system/get/showitem 19. 首页显示ITEM + * @api {get} api/system/get/updatelog 19. 获取更新日志 * - * @apiDescription 用于判断首页是否显示:pro、github、更新日志... + * @apiDescription 获取更新日志 * @apiVersion 1.0.0 * @apiGroup system - * @apiName get__showitem + * @apiName get__updatelog * * @apiSuccess {Number} ret 返回状态码(1正确、0错误) * @apiSuccess {String} msg 返回信息(错误描述) * @apiSuccess {Object} data 返回数据 */ - public function get__showitem() + public function get__updatelog() { $logPath = base_path('CHANGELOG.md'); $logContent = ""; @@ -905,10 +905,7 @@ class SystemController extends AbstractController } } return Base::retSuccess('success', [ - 'pro' => str_contains(Request::getHost(), "dootask.com") || str_contains(Request::getHost(), "127.0.0.1"), - 'github' => env('GITHUB_URL') ?: false, 'updateLog' => $logContent ?: false, - 'updateVer' => $logVersion, ]); } diff --git a/public/site/en/download.html b/public/site/en/download.html index 1309c813d..565f6376c 100644 --- a/public/site/en/download.html +++ b/public/site/en/download.html @@ -365,7 +365,7 @@ animateBoxes(); const logsItem = getItem('logs_dowmload_en') const updates = document.getElementById('releases'); if(!logsItem) { - const url = "http://192.168.100.122:2222/api/system/get/showitem" + const url = "https://www.dootask.com/api/system/get/updatelog" axios.get(url).then(res=>{ const changelog=res.data.data.updateLog const regex = /## \[(.*?)\]\n([\s\S]*?)(?=\n\n## \[|$)/g; diff --git a/public/site/en/log.html b/public/site/en/log.html index 048f4b373..52b333cc0 100644 --- a/public/site/en/log.html +++ b/public/site/en/log.html @@ -350,7 +350,7 @@ function domHandle (html){ } const logs = getItem('logs') if(!logs) { - const url = "http://192.168.100.122:2222/api/system/get/showitem" + const url = "https://www.dootask.com/api/system/get/updatelog" axios.get(url).then(res=>{ const changelog=res.data.data.updateLog const md = new markdownit(); @@ -385,7 +385,7 @@ document.addEventListener("DOMContentLoaded", function() { } }); } - + }); diff --git a/public/site/zh/download.html b/public/site/zh/download.html index 159b61a93..17925c0fe 100644 --- a/public/site/zh/download.html +++ b/public/site/zh/download.html @@ -326,7 +326,7 @@ window.onload = function(){ const logsItem = getItem('logs_dowmload_zh') const updates = document.getElementById('releases'); if(!logsItem) { - const url = "http://192.168.100.122:2222/api/system/get/showitem" + const url = "https://www.dootask.com/api/system/get/updatelog" axios.get(url).then(res=>{ const changelog=res.data.data.updateLog const regex = /## \[(.*?)\]\n([\s\S]*?)(?=\n\n## \[|$)/g; @@ -399,7 +399,7 @@ animateBoxes(); const logsItem = getItem('logs_dowmload_zh') const updates = document.getElementById('releases'); if(!logsItem) { - const url = "http://192.168.100.122:2222/api/system/get/showitem" + const url = "https://www.dootask.com/api/system/get/updatelog" axios.get(url).then(res=>{ const changelog=res.data.data.updateLog const regex = /## \[(.*?)\]\n([\s\S]*?)(?=\n\n## \[|$)/g; diff --git a/public/site/zh/log.html b/public/site/zh/log.html index 5c4821027..ae7ad438c 100644 --- a/public/site/zh/log.html +++ b/public/site/zh/log.html @@ -350,7 +350,7 @@ const domHandle = (html)=>{ } const logs = getItem('logs') if(!logs) { - const url = "http://192.168.100.122:2222/api/system/get/showitem" + const url = "https://www.dootask.com/api/system/get/updatelog" axios.get(url).then(res=>{ const changelog=res.data.data.updateLog const md = new markdownit();