From d24eae45f10e066d76febe97b445bab746f3e89c Mon Sep 17 00:00:00 2001 From: troyeguo <13820674+troyeguo@users.noreply.github.com> Date: Sun, 24 Jan 2021 12:08:56 +0800 Subject: [PATCH] Update to 1.2.0 Former-commit-id: e5a60d54360126da49f31c2dd891d79129ce0bf9 --- package.json | 36 +++++- src/assets/locales/en/translation.json | 2 +- src/assets/locales/tw/translation.json | 106 +++++++-------- src/assets/new.json | 1 + src/components/bookCardtem/bookCardItem.css | 38 ------ src/components/imageViewer/component.tsx | 4 +- src/components/imageViewer/index.tsx | 7 +- src/components/loadingDialog/index.tsx | 3 +- src/components/noteTag/noteTag.css | 2 +- src/components/searchBox/component.tsx | 4 +- src/components/settingDialog/component.tsx | 8 +- .../settingDialog/settingDialog.css | 2 +- src/components/tokenDialog/component.tsx | 4 +- src/components/updataDialog/component.tsx | 67 ---------- src/components/updataDialog/index.tsx | 5 - src/components/updataDialog/interface.tsx | 4 - src/components/updataDialog/updateDialog.css | 86 ------------ src/components/updateInfo/component.tsx | 122 ++++++++++++++---- src/components/updateInfo/index.tsx | 7 +- src/components/updateInfo/interface.tsx | 2 + src/components/updateInfo/updateInfo.css | 115 ++++++++++++++++- src/containers/backupDialog/component.tsx | 1 + src/containers/header/header.css | 2 +- src/pages/manager/component.tsx | 20 +-- src/pages/manager/index.tsx | 1 + src/pages/manager/interface.tsx | 1 + src/store/actions/manager.tsx | 3 + src/store/index.tsx | 1 + src/store/reducers/manager.tsx | 6 + 29 files changed, 341 insertions(+), 319 deletions(-) create mode 100644 src/assets/new.json delete mode 100644 src/components/updataDialog/component.tsx delete mode 100644 src/components/updataDialog/index.tsx delete mode 100644 src/components/updataDialog/interface.tsx delete mode 100644 src/components/updataDialog/updateDialog.css diff --git a/package.json b/package.json index 1551eceb..13f28349 100644 --- a/package.json +++ b/package.json @@ -99,8 +99,40 @@ }, "linux": { "icon": "assets/icons", - "category": "Office", - "target": "AppImage" + "target": [ + { + "target": "deb", + "arch": [ + "x64", + "ia32" + ] + }, + { + "target": "rpm", + "arch": [ + "x64", + "ia32" + ] + }, + { + "target": "tar.gz", + "arch": [ + "x64", + "ia32" + ] + }, + { + "target": "freebsd", + "arch": [ + "x64", + "ia32" + ] + }, + "AppImage", + "snap", + "pacman" + ], + "category": "Office" }, "portable": { "artifactName": "${productName}-${version}-Portable.${ext}" diff --git a/src/assets/locales/en/translation.json b/src/assets/locales/en/translation.json index 802b7469..e996efc3 100644 --- a/src/assets/locales/en/translation.json +++ b/src/assets/locales/en/translation.json @@ -165,7 +165,7 @@ "Publisher": "Publisher", "Added at": "Added at", "Margin": "Margin", - "Open link in browser": "Open link in browser", + "Open link in browser": "Open in browser", "Do you want to open this link in browser": "Do you want to open this link in browser", "Webdav Info": "Webdav is an easy to use and efficent backup solution, here we recommand using webdav service provided by jianguoyun", "Please Wait a moment": "Please Wait a moment", diff --git a/src/assets/locales/tw/translation.json b/src/assets/locales/tw/translation.json index eb49ffe8..fffc724a 100644 --- a/src/assets/locales/tw/translation.json +++ b/src/assets/locales/tw/translation.json @@ -171,62 +171,62 @@ "语言 / Language": "語言 / Language", "Cancel Successfully": "取消成功", "Dont't use mimical background": "不使用仿真背景", - "Please continue in desktop version": "仅客户端版本支持", - "Auto hide cursor when reading": "阅读时自动隐藏鼠标", - "Book not exsit": "书籍不存在", - "Delete this shelf": "删除此书架", - "This action will clear and remove this shelf": "此操作会清空并删除此书架", - "Delete this tag": "删除此标签", - "This action will clear and remove this tag": "此操作会清空并删除此标签", - "Scale": "页面缩放", - "Next Chapter": "下一章", - "Don't show footer": "不显示页脚", - "Don't show header": "不显示页眉", - "Default expand all content": "默认展开所有目录", - "Prev Chapter": "上一章", - "Current Reading Time": "本次阅读时间：{{count}}分钟", - "Finish Reading Time": "读完本章需要：{{count}}分钟", - "Book Page": "第{{count}}页", - "Current Chapter Pages": "本章页数", - "Chapter Redirect": "章节跳转", - "Continuous Scroll": "连续滚动", - "Chapter Scroll": "分章滚动", - "Only Desktop support this format": "仅客户端版本支持 mobi 和 txt 格式", - "Only Desktop support this service": "仅客户端支持该备份方式", - "Please Wait a moment": "请稍侯", + "Please continue in desktop version": "僅客戶端版本支持", + "Auto hide cursor when reading": "閱讀時自動隱藏鼠標", + "Book not exsit": "書籍不存在", + "Delete this shelf": "刪除此書架", + "This action will clear and remove this shelf": "此操作會清空並刪除此書架", + "Delete this tag": "刪除此標簽", + "This action will clear and remove this tag": "此操作會清空並刪除此標簽", + "Scale": "頁面縮放", + "Next Chapter": "下壹章", + "Don't show footer": "不顯示頁腳", + "Don't show header": "不顯示頁眉", + "Default expand all content": "默認展開所有目錄", + "Prev Chapter": "上壹章", + "Current Reading Time": "本次閱讀時間：{{count}}分鐘", + "Finish Reading Time": "讀完本章需要：{{count}}分鐘", + "Book Page": "第{{count}}頁", + "Current Chapter Pages": "本章頁數", + "Chapter Redirect": "章節跳轉", + "Continuous Scroll": "連續滾動", + "Chapter Scroll": "分章滾動", + "Only Desktop support this format": "僅客戶端版本支持 mobi 和 txt 格式", + "Only Desktop support this service": "僅客戶端支持該備份方式", + "Please Wait a moment": "請稍侯", - "It seems like you're lost": "你要访问的内容走丢了", - "Return to home": "返回主页", + "It seems like you're lost": "妳要訪問的內容走丟了", + "Return to home": "返回主頁", "Deleted Books": "我的回收", - "This action will move this book and its the notes, bookmarks and digests of this book to the recycle bin": "将本书以及本书的书签，笔记，书摘移至回收站", - "Delete All Books": "清空所有图书", - "This action will remove all the books in recycle bin,together with their notes, bookmarks and digests": "此操作会彻底删除回收站中的所有图书和它们的书签，笔记和书摘", - "Restore": "还原", - "Batch import only support epub or pdf files": "批量导入仅支持epub或pdf格式", - "Drag any book to the Deleted tab to add it to Recycle Bin": "将任意图书拖拽到我的回收标签页，将其添加到回收站", - "Empty Recycle Bin": "回收站为空", - "Sort by Duration": "按阅读时长", + "This action will move this book and its the notes, bookmarks and digests of this book to the recycle bin": "將本書以及本書的書簽，筆記，書摘移至回收站", + "Delete All Books": "清空所有圖書", + "This action will remove all the books in recycle bin,together with their notes, bookmarks and digests": "此操作會徹底刪除回收站中的所有圖書和它們的書簽，筆記和書摘", + "Restore": "還原", + "Batch import only support epub or pdf files": "批量導入僅支持epub或pdf格式", + "Drag any book to the Deleted tab to add it to Recycle Bin": "將任意圖書拖拽到我的回收標簽頁，將其添加到回收站", + "Empty Recycle Bin": "回收站為空", + "Sort by Duration": "按閱讀時長", "Sort by Author": "按作者名", - "Sort by Name": "按书名", - "Audio is not ready yet": "图书解析中，请稍后再试", - "Drop your books here": "拖拽图书到此处", - "Export": "导出", - "Text Color": "文字颜色", - "Search my notes": "搜索我的笔记", - "Search my digests": "搜索我的书摘", - "Sort by Percentage": "按阅读进度", + "Sort by Name": "按書名", + "Audio is not ready yet": "圖書解析中，請稍後再試", + "Drop your books here": "拖拽圖書到此處", + "Export": "導出", + "Text Color": "文字顏色", + "Search my notes": "搜索我的筆記", + "Search my digests": "搜索我的書摘", + "Sort by Percentage": "按閱讀進度", "Publisher": "出版商", - "Added at": "添加于", + "Added at": "添加於", "Description": "描述", - "Export Successfully": "导出成功", - "Too many images": "图书包含过多图片会严重影响解析速度", - "Margin": "页边距", - "Open link in browser": "使用浏览器打开", - "Server Address": "服务器地址", - "Username": "用户名", - "Password": "密码", - "Do you want to open this link in browser": "是否使用浏览器打开此链接", - "Webdav Info": "Webdav是一种简单高效的数据备份方式，这里推荐使用坚果云提供的Webdav服务", - "For better user experince, please visit this site on a computer": "Koodo Reader专为桌面端设计打造，暂未适配移动端，请在电脑上打开本网站", - "Sort by Recent": "按最近阅读" + "Export Successfully": "導出成功", + "Too many images": "圖書包含過多圖片會嚴重影響解析速度", + "Margin": "頁邊距", + "Open link in browser": "使用瀏覽器打開", + "Server Address": "服務器地址", + "Username": "用戶名", + "Password": "密碼", + "Do you want to open this link in browser": "是否使用瀏覽器打開此鏈接", + "Webdav Info": "Webdav是壹種簡單高效的數據備份方式，這裏推薦使用堅果雲提供的Webdav服務", + "For better user experince, please visit this site on a computer": "Koodo Reader專為桌面端設計打造，暫未適配移動端，請在電腦上打開本網站", + "Sort by Recent": "按最近閱讀" } diff --git a/src/assets/new.json b/src/assets/new.json new file mode 100644 index 00000000..59b9a5f6 --- /dev/null +++ b/src/assets/new.json @@ -0,0 +1 @@ +{"v":"4.9.0","fr":30,"ip":0,"op":38,"w":315,"h":280,"nm":"new","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"bodyband Konturen","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[157.5,129,0]},"a":{"a":0,"k":[157.5,140,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"n":"0p667_1_0p333_0","t":9,"s":[{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-14.5,52],[14.5,52],[14.5,52.25],[-14.5,52.25]],"c":true}],"e":[{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-14.5,-41],[14.5,-41],[14.5,52.25],[-14.5,52.25]],"c":true}]},{"t":19.111328125}]},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.871,0.702,0.271,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[160.5,184],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"topband Konturen","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[157.5,140,0]},"a":{"a":0,"k":[157.5,140,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"n":"0p667_1_0p333_0","t":16.777,"s":[{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-14.5,-14.5],[14.5,-14.5],[15.036,-14.207],[-13.964,-14.207]],"c":true}],"e":[{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-14.5,-14.5],[14.5,-14.5],[14.5,14.5],[-14.5,14.5]],"c":true}]},{"t":23}]},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,0.831,0.396,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[160.5,128.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"body Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[-13]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":5.432,"s":[-13],"e":[17.85]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":11.111,"s":[17.85],"e":[0]},{"t":16.2958984375}]},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"n":"0p667_1_0p333_0","t":0,"s":[162.125,247.599,0],"e":[162.125,145.599,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"n":"0p667_1_0p333_0","t":8.148,"s":[162.125,145.599,0],"e":[162.125,236.099,0],"to":[0,0,0],"ti":[0,0,0]},{"t":16.2958984375}]},"a":{"a":0,"k":[162.125,225.099,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":0,"s":[{"i":[[0,0],[0,0],[0,0],[-3.228,0],[0,0],[-2.75,0.062]],"o":[[0,0],[0,0],[4.75,-0.188],[0,0],[3.228,0],[0,0]],"v":[[56.25,46.5],[-54.75,46.5],[-55,46.688],[-49.658,46.5],[49.658,46.5],[56,46.688]],"c":true}],"e":[{"i":[[0,0],[0,0],[0,0],[-3.228,0],[0,0],[0,3.21]],"o":[[0,0],[0,0],[0,3.21],[0,0],[3.228,0],[0,0]],"v":[[55.5,-46.5],[-55.5,-46.5],[-55.5,40.688],[-49.658,46.5],[49.658,46.5],[55.5,40.688]],"c":true}]},{"t":3.7041015625}]},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.008,0.588,0.847,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[161.5,178.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"top Konturen","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":3.704,"s":[0],"e":[100]},{"t":4.4443359375}]},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":8.148,"s":[10],"e":[-23]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":14.074,"s":[-23],"e":[0]},{"t":20}]},"p":{"a":1,"k":[{"i":{"x":0.937,"y":0.946},"o":{"x":0.167,"y":0.167},"n":"0p937_0p946_0p167_0p167","t":0,"s":[160,177.5,0],"e":[150,34.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.097,"y":0},"o":{"x":0.084,"y":0.101},"n":"0p097_0_0p084_0p101","t":10.37,"s":[150,34.5,0],"e":[161,128.5,0],"to":[0,0,0],"ti":[0,0,0]},{"t":20}]},"a":{"a":0,"k":[161,128.5,0]},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0","0p667_1_0p333_0"],"t":0,"s":[0,0,100],"e":[58.621,58.621,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0","0p667_1_0p333_0"],"t":10.37,"s":[58.621,58.621,100],"e":[100,100,100]},{"t":20}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.219,0],[0,0],[0,-3.204],[0,0],[-3.219,0],[0,0],[0,3.204],[0,0]],"o":[[0,0],[-3.219,0],[0,0],[0,3.204],[0,0],[3.219,0],[0,0],[0,-3.204]],"v":[[61.174,-14.5],[-61.174,-14.5],[-67,-8.7],[-67,8.7],[-61.174,14.5],[61.174,14.5],[67,8.7],[67,-8.7]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.012,0.663,0.957,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[161,128.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"schleife/new Konturen","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[161,115,0]},"a":{"a":0,"k":[161,115,0]},"s":{"a":1,"k":[{"i":{"x":[0.029,0.029,0.833],"y":[1.656,1.656,-15.667]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p029_1p656_0p167_0p167","0p029_1p656_0p167_0p167","0p833_-15p667_0p167_16p667"],"t":23,"s":[0,0,100],"e":[100,100,100]},{"t":34}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[8.059,0],[1.667,-0.428],[-0.598,-1.849],[-1.278,0],[0,-4.797],[4.835,0],[0,0],[-8.693,2.139],[0.541,1.87],[3.006,-6.366],[4.932,3.716],[1.157,-1.595],[-1.586,-3.998],[0,0],[0,4.796],[-4.834,0],[-2.606,-1.934],[-1.272,1.478],[5.256,0],[0,-7.995],[-8.058,0],[0,0],[0,0],[0,7.995]],"o":[[-1.91,0],[0.541,1.87],[1.145,-0.282],[4.835,0],[0,4.796],[0,0],[2.097,-5.318],[-0.598,-1.849],[-9.385,2.413],[-2.071,-4.386],[-1.272,1.478],[5.152,3.823],[0,0],[-4.834,0],[0,-4.797],[3.679,0],[1.157,-1.595],[-3.498,-2.637],[-8.058,0],[0,7.995],[0,0],[0,0],[8.059,0],[0,-7.995]],"v":[[23.385,-14.5],[18.024,-13.831],[19.756,-8.259],[23.385,-8.7],[32.155,0],[23.385,8.7],[4.075,8.7],[19.756,-8.259],[18.024,-13.831],[0,3.422],[-10.322,-10.065],[-13.987,-5.478],[-4.083,8.7],[-23.385,8.7],[-32.154,0],[-23.385,-8.7],[-13.987,-5.478],[-10.322,-10.065],[-23.385,-14.5],[-38,0],[-23.385,14.5],[0,14.5],[23.385,14.5],[38,0]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,0.831,0.396,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[161,100.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"shadow Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[162,236,0]},"a":{"a":0,"k":[162,225,0]},"s":{"a":1,"k":[{"i":{"x":[0.115,0.115,0.833],"y":[1,1,-5.19]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p115_1_0p167_0p167","0p115_1_0p167_0p167","0p833_-5p19_0p167_16p667"],"t":0,"s":[0,0,100],"e":[100,100,100]},{"t":13}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-53.02,0],[0,-3.313],[53.02,0],[0,3.313]],"o":[[53.02,0],[0,3.313],[-53.02,0],[0,-3.313]],"v":[[0,-6],[96,0],[0,6],[-96,0]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.945,0.945,0.945,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[162,225],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Ebene 12 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":9,"s":[262],"e":[0]},{"t":29}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.359},"o":{"x":0.167,"y":0.167},"n":"0_0p359_0p167_0p167","t":9,"s":[157.5,140,0],"e":[95.449,44.997,0],"to":[0,0,0],"ti":[0,0,0]},{"t":29}]},"a":{"a":0,"k":[95.449,44.997,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":9,"s":[0,0,100],"e":[100,100,100]},{"t":29}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-2.18,-3.777],[2.178,-3.775],[4.359,0.001],[2.181,3.777],[-2.18,3.775],[-4.359,-0.001]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.012,0.663,0.957,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":1},"lc":1,"lj":1,"ml":4,"nm":"Kontur 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[95.449,44.997],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Ebene 13 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":3,"s":[-63],"e":[0]},{"t":23}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.564},"o":{"x":0.167,"y":0.167},"n":"0_0p564_0p167_0p167","t":3,"s":[157.5,140,0],"e":[248.067,112.75,0],"to":[0,0,0],"ti":[0,0,0]},{"t":23}]},"a":{"a":0,"k":[248.067,112.75,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":3,"s":[0,0,100],"e":[100,100,100]},{"t":23}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-1.53,-6.63],[4.974,-4.639],[6.505,1.99],[1.532,6.63],[-4.972,4.64],[-6.505,-1.989]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.012,0.663,0.957,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":1},"lc":1,"lj":1,"ml":4,"nm":"Kontur 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[248.067,112.75],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"Ebene 14 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[-200],"e":[0]},{"t":20}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.477},"o":{"x":0.167,"y":0.167},"n":"0_0p477_0p167_0p167","t":0,"s":[157.5,140,0],"e":[268.728,57.196,0],"to":[0,0,0],"ti":[0,0,0]},{"t":20}]},"a":{"a":0,"k":[120.728,247.196,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":0,"s":[0,0,100],"e":[100,100,100]},{"t":20}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-2.376,-3.394],[2.799,1.018],[-2.799,3.394]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.149,0.784,0.333,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":1},"lc":1,"lj":1,"ml":4,"nm":"Kontur 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[120.728,247.196],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Ebene 15 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":8,"s":[134],"e":[0]},{"t":28}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.547},"o":{"x":0.167,"y":0.167},"n":"0_0p547_0p167_0p167","t":8,"s":[157.5,140,0],"e":[61.63,139.445,0],"to":[0,0,0],"ti":[0,0,0]},{"t":28}]},"a":{"a":0,"k":[61.63,139.445,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":8,"s":[0,0,100],"e":[100,100,100]},{"t":28}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[4.37,-5.433],[4.286,5.433],[-4.37,1.022]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.149,0.784,0.333,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":1},"lc":1,"lj":1,"ml":4,"nm":"Kontur 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[61.63,139.445],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"Ebene 16 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":5,"s":[74],"e":[0]},{"t":25}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.387},"o":{"x":0.167,"y":0.167},"n":"0_0p387_0p167_0p167","t":5,"s":[157.5,140,0],"e":[183.561,32.661,0],"to":[0,0,0],"ti":[0,0,0]},{"t":25}]},"a":{"a":0,"k":[183.561,32.661,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":5,"s":[0,0,100],"e":[100,100,100]},{"t":25}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-2.146,0],[0,-2.147],[2.146,0],[0,2.147]],"o":[[2.146,0],[0,2.147],[-2.146,0],[0,-2.147]],"v":[[-0.001,-3.888],[3.886,0],[-0.001,3.888],[-3.887,0]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.039,0.314,0.392,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":1},"lc":1,"lj":1,"ml":4,"nm":"Kontur 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[183.561,32.661],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":"Ebene 17 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":12,"s":[29],"e":[0]},{"t":32}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.463},"o":{"x":0.167,"y":0.167},"n":"0_0p463_0p167_0p167","t":12,"s":[157.5,140,0],"e":[44.65,36.558,0],"to":[0,0,0],"ti":[0,0,0]},{"t":32}]},"a":{"a":0,"k":[214.65,244.558,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":12,"s":[0,0,100],"e":[100,100,100]},{"t":32}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.22,0],[0,-3.222],[3.22,0],[0,3.221]],"o":[[3.22,0],[0,3.221],[-3.22,0],[0,-3.222]],"v":[[0,-5.832],[5.829,0],[0,5.832],[-5.829,0]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.039,0.314,0.392,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":1},"lc":1,"lj":1,"ml":4,"nm":"Kontur 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[214.65,244.558],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":"Ebene 18 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":3,"s":[168],"e":[0]},{"t":23}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.243},"o":{"x":0.167,"y":0.167},"n":"0_0p243_0p167_0p167","t":3,"s":[157.5,140,0],"e":[294.925,112.226,0],"to":[0,0,0],"ti":[0,0,0]},{"t":23}]},"a":{"a":0,"k":[62.925,234.226,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":3,"s":[0,0,100],"e":[100,100,100]},{"t":23}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.209,0.131],[0,0],[0,0],[0.174,-0.142],[0,0],[0,0],[-0.093,-0.228],[0,0],[0,0],[-0.247,0.014],[0,0],[0,0],[-0.059,0.236],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.012,-0.223],[0,0],[0,0],[-0.238,-0.069],[0,0],[0,0],[-0.135,0.201],[0,0],[0,0],[0.155,0.19],[0,0],[0,0],[0.232,-0.083]],"v":[[2.206,-0.077],[1.1,-0.771],[1.036,-2.051],[0.544,-2.269],[-0.45,-1.461],[-1.706,-1.819],[-2.062,-1.431],[-1.568,-0.237],[-2.281,0.82],[-2.008,1.278],[-0.711,1.208],[0.105,2.221],[0.628,2.116],[0.938,0.878],[2.156,0.446]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,0.729,0.031,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[62.916,234.223],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":"Ebene 19 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":8,"s":[-209],"e":[0]},{"t":28}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.25},"o":{"x":0.167,"y":0.167},"n":"0_0p25_0p167_0p167","t":8,"s":[157.5,140,0],"e":[35.721,103.978,0],"to":[0,0,0],"ti":[0,0,0]},{"t":28}]},"a":{"a":0,"k":[35.721,103.978,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":8,"s":[0,0,100],"e":[100,100,100]},{"t":28}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.209,0.131],[0,0],[0,0],[0.174,-0.141],[0,0],[0,0],[-0.094,-0.227],[0,0],[0,0],[-0.247,0.014],[0,0],[0,0],[-0.059,0.237],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.012,-0.224],[0,0],[0,0],[-0.238,-0.068],[0,0],[0,0],[-0.135,0.2],[0,0],[0,0],[0.155,0.191],[0,0],[0,0],[0.231,-0.083]],"v":[[2.206,-0.078],[1.1,-0.771],[1.036,-2.051],[0.544,-2.27],[-0.45,-1.461],[-1.706,-1.82],[-2.062,-1.432],[-1.568,-0.238],[-2.281,0.82],[-2.008,1.278],[-0.711,1.207],[0.105,2.22],[0.628,2.115],[0.938,0.878],[2.156,0.446]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,0.729,0.031,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[35.712,103.975],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":15,"ty":4,"nm":"Ebene 20 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":7,"s":[275],"e":[0]},{"t":27}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.09},"o":{"x":0.167,"y":0.167},"n":"0_0p09_0p167_0p167","t":7,"s":[157.5,140,0],"e":[261.12,26.218,0],"to":[0,0,0],"ti":[0,0,0]},{"t":27}]},"a":{"a":0,"k":[261.12,26.218,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":7,"s":[0,0,100],"e":[100,100,100]},{"t":27}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.21,0.131],[0,0],[0,0],[0.174,-0.141],[0,0],[0,0],[-0.093,-0.228],[0,0],[0,0],[-0.247,0.014],[0,0],[0,0],[-0.059,0.236],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.011,-0.223],[0,0],[0,0],[-0.238,-0.068],[0,0],[0,0],[-0.135,0.2],[0,0],[0,0],[0.155,0.19],[0,0],[0,0],[0.232,-0.082]],"v":[[2.206,-0.078],[1.099,-0.771],[1.034,-2.052],[0.543,-2.27],[-0.45,-1.461],[-1.707,-1.82],[-2.062,-1.432],[-1.568,-0.238],[-2.281,0.82],[-2.009,1.278],[-0.711,1.207],[0.105,2.22],[0.628,2.115],[0.937,0.878],[2.155,0.445]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,0.729,0.031,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[261.111,26.215],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":16,"ty":4,"nm":"Ebene 21 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":3,"s":[132.9],"e":[0]},{"t":23}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.326},"o":{"x":0.167,"y":0.167},"n":"0_0p326_0p167_0p167","t":3,"s":[157.5,140,0],"e":[268.337,196.938,0],"to":[0,0,0],"ti":[0,0,0]},{"t":23}]},"a":{"a":0,"k":[252.337,213.938,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":3,"s":[0,0,100],"e":[100,100,100]},{"t":23}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.411,0.258],[0,0],[0,0],[0.34,-0.276],[0,0],[0,0],[-0.184,-0.446],[0,0],[0,0],[-0.483,0.027],[0,0],[0,0],[-0.116,0.463],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.022,-0.439],[0,0],[0,0],[-0.466,-0.133],[0,0],[0,0],[-0.265,0.392],[0,0],[0,0],[0.302,0.373],[0,0],[0,0],[0.454,-0.162]],"v":[[4.322,-0.152],[2.152,-1.51],[2.027,-4.017],[1.065,-4.447],[-0.882,-2.861],[-3.344,-3.565],[-4.038,-2.804],[-3.072,-0.465],[-4.468,1.607],[-3.935,2.505],[-1.392,2.366],[0.207,4.35],[1.231,4.145],[1.837,1.72],[4.222,0.874]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,0.729,0.031,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[252.32,213.932],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":17,"ty":4,"nm":"Ebene 22 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":13,"s":[-266],"e":[0]},{"t":33}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.337},"o":{"x":0.167,"y":0.167},"n":"0_0p337_0p167_0p167","t":13,"s":[157.5,140,0],"e":[133.395,26.515,0],"to":[0,0,0],"ti":[0,0,0]},{"t":33}]},"a":{"a":0,"k":[133.395,26.515,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":13,"s":[0,0,100],"e":[100,100,100]},{"t":33}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.411,0.258],[0,0],[0,0],[0.34,-0.277],[0,0],[0,0],[-0.183,-0.446],[0,0],[0,0],[-0.484,0.026],[0,0],[0,0],[-0.116,0.462],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.022,-0.438],[0,0],[0,0],[-0.466,-0.133],[0,0],[0,0],[-0.264,0.392],[0,0],[0,0],[0.302,0.373],[0,0],[0,0],[0.454,-0.162]],"v":[[4.322,-0.152],[2.152,-1.511],[2.027,-4.018],[1.065,-4.446],[-0.882,-2.861],[-3.344,-3.565],[-4.039,-2.804],[-3.072,-0.466],[-4.469,1.607],[-3.935,2.505],[-1.392,2.366],[0.207,4.35],[1.231,4.145],[1.837,1.72],[4.222,0.874]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,0.729,0.031,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[133.378,26.508],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":18,"ty":4,"nm":"Ebene 23 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":5,"s":[399],"e":[0]},{"t":25}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.478},"o":{"x":0.167,"y":0.167},"n":"0_0p478_0p167_0p167","t":5,"s":[157.5,140,0],"e":[257.258,159.497,0],"to":[0,0,0],"ti":[0,0,0]},{"t":25}]},"a":{"a":0,"k":[257.258,159.497,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":5,"s":[0,0,100],"e":[100,100,100]},{"t":25}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.721,-0.604],[0,0],[0,0],[-0.306,-0.794],[0,0],[0,0],[-0.932,0.071],[0,0],[0,0],[-0.241,0.908],[0,0],[0,0],[0.783,0.491],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.821,-0.221],[0,0],[0,0],[-0.524,0.78],[0,0],[0,0],[0.566,0.723],[0,0],[0,0],[0.869,-0.333],[0,0],[0,0],[-0.027,-0.935]],"v":[[2.281,-8.697],[-1.528,-5.509],[-6.23,-6.781],[-7.598,-5.261],[-5.84,-0.719],[-8.615,3.403],[-7.627,5.141],[-2.732,4.758],[0.255,8.578],[2.232,8.133],[3.5,3.356],[8.121,1.595],[8.357,-0.417],[4.245,-2.989],[4.113,-7.897]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,0.729,0.031,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[257.231,159.483],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":19,"ty":4,"nm":"Ebene 24 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":11,"s":[-212],"e":[0]},{"t":31}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.748},"o":{"x":0.167,"y":0.167},"n":"0_0p748_0p167_0p167","t":11,"s":[157.5,140,0],"e":[97.064,84.204,0],"to":[0,0,0],"ti":[0,0,0]},{"t":31}]},"a":{"a":0,"k":[97.064,84.204,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":11,"s":[0,0,100],"e":[100,100,100]},{"t":31}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.675,-0.565],[0,0],[0,0],[-0.287,-0.743],[0,0],[0,0],[-0.872,0.067],[0,0],[0,0],[-0.226,0.849],[0,0],[0,0],[0.734,0.459],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.77,-0.208],[0,0],[0,0],[-0.491,0.73],[0,0],[0,0],[0.53,0.677],[0,0],[0,0],[0.814,-0.312],[0,0],[0,0],[-0.026,-0.875]],"v":[[2.135,-8.142],[-1.43,-5.157],[-5.831,-6.348],[-7.113,-4.926],[-5.467,-0.674],[-8.064,3.186],[-7.141,4.812],[-2.557,4.454],[0.239,8.029],[2.09,7.613],[3.277,3.141],[7.602,1.493],[7.822,-0.391],[3.974,-2.799],[3.851,-7.393]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,0.729,0.031,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[97.039,84.191],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":20,"ty":4,"nm":"Ebene 25 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":3,"s":[-256],"e":[0]},{"t":23}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.718},"o":{"x":0.167,"y":0.167},"n":"0_0p718_0p167_0p167","t":3,"s":[157.5,140,0],"e":[78.559,168.874,0],"to":[0,0,0],"ti":[0,0,0]},{"t":23}]},"a":{"a":0,"k":[78.559,168.874,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":3,"s":[0,0,100],"e":[100,100,100]},{"t":23}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.516,-0.432],[0,0],[0,0],[-0.219,-0.569],[0,0],[0,0],[-0.668,0.051],[0,0],[0,0],[-0.173,0.65],[0,0],[0,0],[0.562,0.351],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.588,-0.159],[0,0],[0,0],[-0.376,0.559],[0,0],[0,0],[0.405,0.518],[0,0],[0,0],[0.623,-0.239],[0,0],[0,0],[-0.02,-0.669]],"v":[[1.633,-6.229],[-1.096,-3.945],[-4.463,-4.856],[-5.442,-3.768],[-4.183,-0.516],[-6.17,2.436],[-5.463,3.681],[-1.958,3.407],[0.182,6.143],[1.598,5.824],[2.507,2.403],[5.814,1.142],[5.984,-0.299],[3.04,-2.141],[2.945,-5.656]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,0.729,0.031,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[78.54,168.865],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":21,"ty":4,"nm":"Ebene 26 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":17,"s":[50],"e":[18]},{"t":37}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.897},"o":{"x":0.167,"y":0.167},"n":"0_0p897_0p167_0p167","t":17,"s":[157.5,140,0],"e":[155.771,214.44,0],"to":[0,0,0],"ti":[0,0,0]},{"t":37}]},"a":{"a":0,"k":[155.771,214.44,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.008,1.008,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,15.952]},"n":["0p042_1p008_0p167_0p167","0p042_1p008_0p167_0p167","0p833_-26p778_0p167_15p952"],"t":17,"s":[0,0,100],"e":[67,67,100]},{"t":37}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.312,-0.183],[0,0],[0,0],[0.227,-1.177],[0,0],[0,0],[-1.168,-0.61],[0,0],[0,0],[-0.967,0.904],[0,0],[0,0],[0.57,1.171],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.816,-0.879],[0,0],[0,0],[-1.21,0.541],[0,0],[0,0],[0.137,1.287],[0,0],[0,0],[1.289,0.251],[0,0],[0,0],[0.665,-1.137]],"v":[[10.542,-8.02],[3.609,-7.053],[-1.06,-12.084],[-3.829,-11.291],[-5.121,-4.55],[-11.514,-1.696],[-11.632,1.119],[-5.496,4.318],[-4.779,11.114],[-2.084,12.058],[2.999,7.295],[9.835,8.642],[11.62,6.414],[8.627,0.269],[12.136,-5.695]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,0.729,0.031,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[155.828,214.455],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":22,"ty":4,"nm":"Ebene 27 Konturen","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":11,"s":[-239],"e":[0]},{"t":31}]},"p":{"a":1,"k":[{"i":{"x":0,"y":0.5},"o":{"x":0.167,"y":0.167},"n":"0_0p5_0p167_0p167","t":11,"s":[157.5,140,0],"e":[219.606,61.933,0],"to":[0,0,0],"ti":[0,0,0]},{"t":31}]},"a":{"a":0,"k":[219.606,61.933,0]},"s":{"a":1,"k":[{"i":{"x":[0.042,0.042,0.833],"y":[1.006,1.006,-26.778]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"n":["0p042_1p006_0p167_0p167","0p042_1p006_0p167_0p167","0p833_-26p778_0p167_16p667"],"t":11,"s":[0,0,100],"e":[100,100,100]},{"t":31}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.946,-0.131],[0,0],[0,0],[0.163,-0.849],[0,0],[0,0],[-0.842,-0.44],[0,0],[0,0],[-0.697,0.652],[0,0],[0,0],[0.411,0.845],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.588,-0.633],[0,0],[0,0],[-0.872,0.39],[0,0],[0,0],[0.099,0.928],[0,0],[0,0],[0.929,0.181],[0,0],[0,0],[0.479,-0.819]],"v":[[7.601,-5.783],[2.602,-5.086],[-0.764,-8.713],[-2.76,-8.141],[-3.693,-3.281],[-8.301,-1.223],[-8.387,0.807],[-3.962,3.114],[-3.445,8.013],[-1.503,8.694],[2.163,5.259],[7.09,6.23],[8.378,4.624],[6.219,0.195],[8.749,-4.107]],"c":true}},"nm":"Pfad 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,0.729,0.031,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fläche 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[219.647,61.944],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformieren"}],"nm":"Gruppe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0}]} \ No newline at end of file diff --git a/src/components/bookCardtem/bookCardItem.css b/src/components/bookCardtem/bookCardItem.css index c8edf611..45d5fbf3 100644 --- a/src/components/bookCardtem/bookCardItem.css +++ b/src/components/bookCardtem/bookCardItem.css @@ -137,41 +137,3 @@ z-index: 2; text-shadow: 0px 0px 5px rgba(75, 75, 75, 0.6); } -.book-item-cover-img { - width: 90px; - height: 100px; - background: linear-gradient( - 197deg, - rgba(45, 162, 255, 1) 0%, - rgba(105, 235, 222, 1) 100% - ); - margin-left: 15px; - opacity: 1; - display: flex; - align-items: center; - justify-content: center; -} -.book-item-cover-title { - height: 30px; - font-size: 8px; - line-height: 15px; - color: rgba(75, 75, 75, 1); - opacity: 1; - float: left; - font-size: 14px; - height: 15px; - - line-height: 30px; - color: black; - opacity: 1; - width: 150px; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - position: absolute; - top: 115px; - left: 15px; - font-weight: 600; - width: 106px; - height: 38px; -} diff --git a/src/components/imageViewer/component.tsx b/src/components/imageViewer/component.tsx index 33c061e2..61a6b7e9 100644 --- a/src/components/imageViewer/component.tsx +++ b/src/components/imageViewer/component.tsx @@ -4,7 +4,7 @@ import "./imageViewer.css"; import { ImageViewerProps, ImageViewerStates } from "./interface"; import StyleUtil from "../../utils/styleUtil"; import FileSaver from "file-saver"; -import { withNamespaces } from "react-i18next"; + const isElectron = require("is-electron"); declare var window: any; @@ -202,4 +202,4 @@ class ImageViewer extends React.Component { } } -export default withNamespaces()(ImageViewer as any); +export default ImageViewer; diff --git a/src/components/imageViewer/index.tsx b/src/components/imageViewer/index.tsx index 66b51be6..c521d1db 100644 --- a/src/components/imageViewer/index.tsx +++ b/src/components/imageViewer/index.tsx @@ -1,10 +1,13 @@ import { connect } from "react-redux"; import { stateType } from "../../store"; import ImageViewer from "./component"; - +import { withNamespaces } from "react-i18next"; const mapStateToProps = (state: stateType) => { return {}; }; const actionCreator = {}; -export default connect(mapStateToProps, actionCreator)(ImageViewer); +export default connect( + mapStateToProps, + actionCreator +)(withNamespaces()(ImageViewer as any)); diff --git a/src/components/loadingDialog/index.tsx b/src/components/loadingDialog/index.tsx index d9ed0d41..2d412c1d 100644 --- a/src/components/loadingDialog/index.tsx +++ b/src/components/loadingDialog/index.tsx @@ -1,4 +1,4 @@ -import React, { useEffect } from "react"; +import React from "react"; import "./loadingDialog.css"; import Lottie from "react-lottie"; import animationData from "../../assets/loading.json"; @@ -12,7 +12,6 @@ const defaultOptions = { }, }; const LoadingDialog = (props) => { - useEffect(() => {}, []); return (
diff --git a/src/components/noteTag/noteTag.css b/src/components/noteTag/noteTag.css index 9deacb31..6b694b8b 100644 --- a/src/components/noteTag/noteTag.css +++ b/src/components/noteTag/noteTag.css @@ -24,7 +24,7 @@ color: #4b4b4b; opacity: 1; margin-left: 10px; - font-weight: 600; + font-weight: 500; } .tag-container { display: inline-block; diff --git a/src/components/searchBox/component.tsx b/src/components/searchBox/component.tsx index a0d7f2d5..f521191f 100644 --- a/src/components/searchBox/component.tsx +++ b/src/components/searchBox/component.tsx @@ -2,7 +2,7 @@ import React from "react"; import "./searchBox.css"; import OtherUtil from "../../utils/otherUtil"; -import { Trans, withNamespaces } from "react-i18next"; +import { Trans } from "react-i18next"; import { SearchBoxProps } from "./interface"; class SearchBox extends React.Component { componentDidMount() { @@ -137,4 +137,4 @@ class SearchBox extends React.Component { } } -export default withNamespaces()(SearchBox as any); +export default SearchBox; diff --git a/src/components/settingDialog/component.tsx b/src/components/settingDialog/component.tsx index 2f127ffb..81cf487e 100644 --- a/src/components/settingDialog/component.tsx +++ b/src/components/settingDialog/component.tsx @@ -4,7 +4,7 @@ import "./settingDialog.css"; import { SettingInfoProps, SettingInfoState } from "./interface"; import { Trans } from "react-i18next"; import i18n from "../../i18n"; -import { updateLog } from "../../constants/updateLog"; +import { version } from "../../../package.json"; import OtherUtil from "../../utils/otherUtil"; const isElectron = require("is-electron"); @@ -85,11 +85,7 @@ class SettingDialog extends React.Component<

Version - {updateLog.version} -

-

- Date - {updateLog.date} + {version}

{ } } -export default withNamespaces()(TokenDialog as any); +export default TokenDialog; diff --git a/src/components/updataDialog/component.tsx b/src/components/updataDialog/component.tsx deleted file mode 100644 index 5dacd7f5..00000000 --- a/src/components/updataDialog/component.tsx +++ /dev/null @@ -1,67 +0,0 @@ -//更新提示弹窗 -import React from "react"; -import "./updateDialog.css"; -import { UpdateInfoProps, UpdateInfoState } from "./interface"; -import { Trans } from "react-i18next"; -import { updateLog } from "../../constants/updateLog"; - -class UpdateDialog extends React.Component { - constructor(props: UpdateInfoProps) { - super(props); - this.state = { downlownLink: "" }; - } - renderList = (arr: any[]) => { - return arr.map((item, index) => { - return ( -
  • - {index + 1 + ". "} - {item} -
    • - ); - }); - }; - - render() { - return ( -
    -

    - What's new about this version -

    -

    - Version - {updateLog.version} -

    -

    - Date - {updateLog.date} -

    - -
    -

    - What's New -

    -
      - {this.renderList(updateLog.new)} -
    -

    - What's been fixed -

    -
      - {this.renderList(updateLog.fix)} -
    -
    - -
    { - this.props.handleUpdateDialog(); - }} - > - Confirm -
    -
    - ); - } -} - -export default UpdateDialog; diff --git a/src/components/updataDialog/index.tsx b/src/components/updataDialog/index.tsx deleted file mode 100644 index dbcc61b4..00000000 --- a/src/components/updataDialog/index.tsx +++ /dev/null @@ -1,5 +0,0 @@ -//左下角的图标外链 -import UpdateDialog from "./component"; -import { withNamespaces } from "react-i18next"; - -export default withNamespaces()(UpdateDialog as any); diff --git a/src/components/updataDialog/interface.tsx b/src/components/updataDialog/interface.tsx deleted file mode 100644 index 6fb16cea..00000000 --- a/src/components/updataDialog/interface.tsx +++ /dev/null @@ -1,4 +0,0 @@ -export interface UpdateInfoProps { - handleUpdateDialog: () => void; -} -export interface UpdateInfoState {} diff --git a/src/components/updataDialog/updateDialog.css b/src/components/updataDialog/updateDialog.css deleted file mode 100644 index be7d84cd..00000000 --- a/src/components/updataDialog/updateDialog.css +++ /dev/null @@ -1,86 +0,0 @@ -.update-dialog-container { - width: 346px; - height: 480px; - position: absolute; - left: calc(50% - 173px); - top: calc(50% - 240px); - overflow: hidden; - background: rgba(255, 255, 255, 1); - box-shadow: 0px 0px 16px rgba(0, 0, 0, 0.34); - opacity: 1; - z-index: 20; - animation: popup 0.1s ease-in-out 0s 1; -} -.update-dialog-title { - font-size: 20px; - font-weight: 600; - line-height: 15px; - color: rgba(75, 75, 75, 1); - opacity: 1; - margin: 20px 0px 10px; - text-align: center; - width: 346px; -} -.update-dialog-new-title, -.update-dialog-fix-title { - font-size: 20px; - font-weight: 500; - line-height: 15px; - color: rgba(75, 75, 75, 1); - opacity: 1; - margin-top: 10px; - margin-left: 20px; -} -.update-dialog-list { - font-size: 16px; - line-height: 18px; - color: rgba(149, 149, 149, 1); - opacity: 1; - margin: 7px; -} -.update-dialog-new-container, -.update-dialog-fix-container { - margin: 20px 30px; -} -.update-dialog-info { - margin-top: 10px; - height: 330px; - overflow-y: scroll; - width: 346px; -} -.update-dialog-illustration { - width: 200px; - position: absolute; - bottom: 0px; - right: 0px; - z-index: 20; -} -.update-dialog-container-button { - width: 75px; - height: 32px; - background: rgba(75, 75, 75, 1); - opacity: 1; - line-height: 32px; - text-align: center; - color: white; - margin: 12px 130px; - position: absolute; - cursor: pointer; - z-index: 25; -} -.update-dialog-url { - width: 200px; - font-size: 14px; - position: absolute; - bottom: 6px; - left: 10px; - user-select: text; - z-index: 30; - line-height: 16px; -} -.update-dialog-subtitle { - font-size: 13px; - margin: 5px; - text-align: center; - color: rgba(75, 75, 75, 1); -} diff --git a/src/components/updateInfo/component.tsx b/src/components/updateInfo/component.tsx index f95ca74c..9779591a 100644 --- a/src/components/updateInfo/component.tsx +++ b/src/components/updateInfo/component.tsx @@ -2,27 +2,46 @@ import React from "react"; import "./updateInfo.css"; import { UpdateInfoProps, UpdateInfoState } from "./interface"; -import { updateLog } from "../../constants/updateLog"; +import { version } from "../../../package.json"; import { Trans } from "react-i18next"; import axios from "axios"; +import Lottie from "react-lottie"; +import animationData from "../../assets/new.json"; +import copy from "copy-text-to-clipboard"; const isElectron = require("is-electron"); +const defaultOptions = { + loop: false, + autoplay: true, + animationData: animationData, + rendererSettings: { + preserveAspectRatio: "xMidYMid slice", + }, +}; declare var window: any; class UpdateInfo extends React.Component { constructor(props: UpdateInfoProps) { super(props); - this.state = { downlownLink: "" }; + this.state = { + downlownLink: "", + updateLog: "", + }; } componentDidMount() { + console.log(this.state.updateLog, "this.state.updateLog"); !this.props.currentBook.key && axios .get("https://koodo.960960.xyz/api/update") .then((res) => { console.log(res); const download = res.data.download; - const version = res.data.log.version; - if (this.compareVersion(updateLog.version, version)) { + const newVersion = res.data.log.version; + + if (version !== newVersion) { + this.setState({ updateLog: res.data.log }); + this.props.handleNewDialog(true); + navigator.platform.indexOf("Linux") > -1 ? this.setState({ downlownLink: download[2].url }) : navigator.platform.indexOf("Mac") > -1 @@ -34,33 +53,88 @@ class UpdateInfo extends React.Component { console.log(err); }); } - + renderList = (arr: any[]) => { + return arr.map((item, index) => { + return ( +
  • + {index + 1 + ". "} + {item} +
    • + ); + }); + }; handleJump = () => { isElectron() && window.require("electron").shell.openExternal(this.state.downlownLink); }; - compareVersion = (ver1: string, ver2: string) => { - const ver1Arr = ver1.split("."); - const ver2Arr = ver2.split("."); - - for (let i = 0; i < ver1Arr.length; i++) { - if (parseInt(ver1Arr[i]) < parseInt(ver2Arr[i])) { - return true; - } - } - return false; + handleClose = () => { + this.setState({ updateLog: "" }); + this.props.handleNewDialog(false); }; render() { return ( -
    { - this.handleJump(); - }} - > - New Version Available -
    + <> +
    { + this.handleJump(); + }} + > + New Version Available +
    + {this.state.updateLog && ( +
    +
    + New Version Available +
    +
    + { + this.handleClose(); + }} + > +
    +
    +
    + +
    +
    { + this.handleJump(); + }} + > + Open link in browser +
    +
    { + copy(this.state.downlownLink); + this.props.handleMessage("Copy Successfully"); + this.props.handleMessageBox(true); + }} + > + Copy Link +
    + +

    + What's New +

    +
      + {this.renderList(this.state.updateLog.new)} +
    +

    + What's been fixed +

    +
      + {this.renderList(this.state.updateLog.fix)} +
    +
    +
    + )} + ); } } diff --git a/src/components/updateInfo/index.tsx b/src/components/updateInfo/index.tsx index f578d192..a6ae42d0 100644 --- a/src/components/updateInfo/index.tsx +++ b/src/components/updateInfo/index.tsx @@ -1,6 +1,10 @@ //左下角的图标外链 import { connect } from "react-redux"; -import { handleMessageBox, handleMessage } from "../../store/actions/manager"; +import { + handleMessageBox, + handleMessage, + handleNewDialog, +} from "../../store/actions/manager"; import UpdateInfo from "./component"; import { withNamespaces } from "react-i18next"; import { stateType } from "../../store"; @@ -14,6 +18,7 @@ const mapStateToProps = (state: stateType) => { const actionCreator = { handleMessageBox, handleMessage, + handleNewDialog, }; export default connect( mapStateToProps, diff --git a/src/components/updateInfo/interface.tsx b/src/components/updateInfo/interface.tsx index 363704b4..35cbabc1 100644 --- a/src/components/updateInfo/interface.tsx +++ b/src/components/updateInfo/interface.tsx @@ -4,7 +4,9 @@ export interface UpdateInfoProps { books: BookModel[]; handleMessage: (message: string) => void; handleMessageBox: (isShow: boolean) => void; + handleNewDialog: (isShowNew: boolean) => void; } export interface UpdateInfoState { downlownLink: string; + updateLog: any; } diff --git a/src/components/updateInfo/updateInfo.css b/src/components/updateInfo/updateInfo.css index bc00e25b..817053c6 100644 --- a/src/components/updateInfo/updateInfo.css +++ b/src/components/updateInfo/updateInfo.css @@ -3,10 +3,121 @@ height: 50px; display: flex; align-items: center; - position: relative; - left: 380px; + position: absolute; + left: 590px; top: 18px; color: blue; cursor: pointer; /* bottom: 120px; */ } +.new-version { + width: 346px; + height: 480px; + position: absolute; + left: calc(50% - 173px); + top: calc(50% - 240px); + overflow: hidden; + background: rgba(255, 255, 255, 1); + box-shadow: 0px 0px 16px rgba(0, 0, 0, 0.34); + opacity: 1; + z-index: 20; + animation: popup 0.1s ease-in-out 0s 1; +} +.new-version-title { + font-size: 20px; + font-weight: 500; + line-height: 15px; + color: rgba(75, 75, 75, 1); + opacity: 1; + margin: 20px 0px 10px; + text-align: center; + width: 346px; +} +.new-version-open { + margin-left: 100px; + margin-top: -10px; + width: 138px; + padding: 0px 10px; + height: 42px; + background: rgba(75, 75, 75, 1); + opacity: 1; + border-radius: 25px; + line-height: 42px; + text-align: center; + color: white; + cursor: pointer; + z-index: 50; + transition: 0.1s; +} +.new-version-copy { + margin-left: 142px; + margin-top: 5px; + color: rgba(75, 75, 75, 1); + cursor: pointer; + font-size: 17px; + font-weight: 500; + line-height: 25px; +} +.update-dialog-new-title, +.update-dialog-fix-title { + font-size: 20px; + font-weight: 500; + line-height: 15px; + color: rgba(75, 75, 75, 1); + opacity: 1; + margin-top: 10px; + margin-left: 20px; +} +.update-dialog-list { + font-size: 16px; + line-height: 18px; + color: rgba(149, 149, 149, 1); + opacity: 1; + margin: 7px; +} +.update-dialog-new-container, +.update-dialog-fix-container { + margin: 20px 30px; +} +.update-dialog-info { + margin-top: 10px; + height: 330px; + overflow-y: scroll; + width: 346px; +} +.update-dialog-illustration { + width: 200px; + position: absolute; + bottom: 0px; + right: 0px; + z-index: 20; +} +.update-dialog-container-button { + width: 75px; + height: 32px; + background: rgba(75, 75, 75, 1); + opacity: 1; + line-height: 32px; + text-align: center; + color: white; + margin: 12px 130px; + position: absolute; + cursor: pointer; + z-index: 25; +} +.update-dialog-url { + width: 200px; + font-size: 14px; + position: absolute; + bottom: 6px; + left: 10px; + user-select: text; + z-index: 30; + line-height: 16px; +} +.update-dialog-subtitle { + font-size: 13px; + margin: 5px; + text-align: center; + color: rgba(75, 75, 75, 1); +} diff --git a/src/containers/backupDialog/component.tsx b/src/containers/backupDialog/component.tsx index 882cf7ed..72e6cd60 100644 --- a/src/containers/backupDialog/component.tsx +++ b/src/containers/backupDialog/component.tsx @@ -85,6 +85,7 @@ class BackupDialog extends React.Component< case 3: if (!isElectron()) { this.showMessage("Only Desktop support this service"); + break; } if (!OtherUtil.getReaderConfig("webdav_token")) { this.props.handleTokenDialog(true); diff --git a/src/containers/header/header.css b/src/containers/header/header.css index dd6e0fda..e8540c66 100644 --- a/src/containers/header/header.css +++ b/src/containers/header/header.css @@ -111,7 +111,7 @@ text-decoration: underline; width: 200px; position: absolute; - left: 530px; + left: 690px; top: 29px; cursor: pointer; color: blue; diff --git a/src/pages/manager/component.tsx b/src/pages/manager/component.tsx index d1499b09..a94a87b0 100644 --- a/src/pages/manager/component.tsx +++ b/src/pages/manager/component.tsx @@ -13,8 +13,6 @@ import { ManagerProps, ManagerState } from "./interface"; import { Trans } from "react-i18next"; import OtherUtil from "../../utils/otherUtil"; import AddFavorite from "../../utils/addFavorite"; -import { updateLog } from "../../constants/updateLog"; -import UpdateDialog from "../../components/updataDialog"; import SettingDialog from "../../components/settingDialog"; import { isMobileOnly } from "react-device-detect"; import { Route, Switch, Redirect } from "react-router-dom"; @@ -82,19 +80,13 @@ class Manager extends React.Component { } componentDidMount() { setTimeout(() => { - this.setState({ - isUpdated: OtherUtil.getReaderConfig("version") !== updateLog.version, - }); this.props.handleFirst(OtherUtil.getReaderConfig("isFirst") || "yes"); }, 1000); if (is_touch_device() && !OtherUtil.getReaderConfig("isTouch")) { OtherUtil.setReaderConfig("isTouch", "yes"); } } - handleUpdateDialog = () => { - this.setState({ isUpdated: false }); - OtherUtil.setReaderConfig("version", updateLog.version); - }; + handleDrag = (isDrag: boolean) => { this.setState({ isDrag }); }; @@ -104,9 +96,6 @@ class Manager extends React.Component { render() { let { books } = this.props; - const updateDialogProps = { - handleUpdateDialog: this.handleUpdateDialog, - }; if (isMobileOnly) { return ( <> @@ -159,12 +148,12 @@ class Manager extends React.Component { {this.props.isShowLoading && } {(this.props.isSettingOpen || this.props.isBackup || + this.props.isShowNew || this.props.isOpenDeleteDialog || this.props.isOpenEditDialog || this.props.isOpenAddDialog || this.props.isShowLoading || - this.props.isFirst === "yes" || - (this.state.isUpdated && this.props.isFirst === "no")) && ( + this.props.isFirst === "yes") && (
    )} @@ -172,9 +161,6 @@ class Manager extends React.Component { {this.props.isSortDisplay && } {this.props.isBackup && } {this.props.isFirst === "yes" && } - {this.state.isUpdated && this.props.isFirst === "no" && ( - - )} {this.props.isSettingOpen && } {(!books || books.length === 0) && this.state.totalBooks ? ( diff --git a/src/pages/manager/index.tsx b/src/pages/manager/index.tsx index 8b7be3dd..49fc9bff 100644 --- a/src/pages/manager/index.tsx +++ b/src/pages/manager/index.tsx @@ -31,6 +31,7 @@ const mapStateToProps = (state: stateType) => { isBookSort: state.manager.isBookSort, isSortDisplay: state.manager.isSortDisplay, isShowLoading: state.manager.isShowLoading, + isShowNew: state.manager.isShowNew, isMessage: state.manager.isMessage, isBackup: state.backupPage.isBackup, isFirst: state.manager.isFirst, diff --git a/src/pages/manager/interface.tsx b/src/pages/manager/interface.tsx index 938c717b..e45d93f5 100644 --- a/src/pages/manager/interface.tsx +++ b/src/pages/manager/interface.tsx @@ -20,6 +20,7 @@ export interface ManagerProps extends RouteComponentProps { isBackup: boolean; isSettingOpen: boolean; isShowLoading: boolean; + isShowNew: boolean; dragItem: string; handleFetchBooks: () => void; handleFetchNotes: () => void; diff --git a/src/store/actions/manager.tsx b/src/store/actions/manager.tsx index 691e23d9..b3c9e495 100644 --- a/src/store/actions/manager.tsx +++ b/src/store/actions/manager.tsx @@ -41,6 +41,9 @@ export function handleSortDisplay(isSortDisplay: boolean) { export function handleLoadingDialog(isShowLoading: boolean) { return { type: "HANDLE_SHOW_LOADING", payload: isShowLoading }; } +export function handleNewDialog(isShowNew: boolean) { + return { type: "HANDLE_SHOW_NEW", payload: isShowNew }; +} export function handleBookSort(isBookSort: boolean) { return { type: "HANDLE_BOOK_SORT", payload: isBookSort }; } diff --git a/src/store/index.tsx b/src/store/index.tsx index f928270b..3ceb8023 100644 --- a/src/store/index.tsx +++ b/src/store/index.tsx @@ -41,6 +41,7 @@ export type stateType = { isList: string; isSortDisplay: boolean; isShowLoading: boolean; + isShowNew: boolean; bookSortCode: { sort: number; order: number }; noteSortCode: { sort: number; order: number }; isMessage: boolean; diff --git a/src/store/reducers/manager.tsx b/src/store/reducers/manager.tsx index 91519f70..fcc41ae6 100644 --- a/src/store/reducers/manager.tsx +++ b/src/store/reducers/manager.tsx @@ -11,6 +11,7 @@ const initState = { isList: "card", isSortDisplay: false, isShowLoading: false, + isShowNew: false, bookSortCode: { sort: 0, order: 1 }, noteSortCode: OtherUtil.getNoteSortCode(), isMessage: false, @@ -76,6 +77,11 @@ export function manager( ...state, isShowLoading: action.payload, }; + case "HANDLE_SHOW_NEW": + return { + ...state, + isShowNew: action.payload, + }; case "HANDLE_MESSAGE": return { ...state,