From a495fcf238b804fb6b884f81da9170aa1e0ebd8d Mon Sep 17 00:00:00 2001 From: Benature Date: Thu, 7 May 2020 22:10:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E7=9B=AE=E5=BD=95=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 10 +- README.md | 1 + WordReview/{ => WordReview}/__init__.py | 0 WordReview/{ => WordReview}/asgi.py | 0 WordReview/{ => WordReview}/settings.py | 0 WordReview/{ => WordReview}/urls.py | 0 WordReview/{ => WordReview}/wsgi.py | 0 {apps => WordReview/apps}/review/__init__.py | 0 {apps => WordReview/apps}/review/admin.py | 0 {apps => WordReview/apps}/review/apps.py | 0 {apps => WordReview/apps}/review/models.py | 0 .../apps}/review/src/init_db.py | 0 .../apps}/review/src/spider.py | 0 .../apps}/review/templates/calendar.pug | 0 .../apps}/review/templates/homepage.pug | 0 .../apps}/review/templates/import_db.pug | 0 .../apps}/review/templates/review.pug | 0 {apps => WordReview/apps}/review/tests.py | 0 {apps => WordReview/apps}/review/urls.py | 0 {apps => WordReview/apps}/review/views.py | 0 {apps => WordReview/apps}/src/util.py | 0 config.py => WordReview/config.py | 0 .../config_sample.conf | 0 installer.py => WordReview/installer.py | 0 manage.py => WordReview/manage.py | 0 .../static}/bootstrap/bootstrap.min.css | 0 {static => WordReview/static}/css/base.css | 0 .../static}/css/calendar.css | 0 .../static}/css/font-awesome.min.css | 0 .../static}/font/fontawesome/FontAwesome.otf | Bin .../font/fontawesome/fontawesome-webfont.eot | Bin .../font/fontawesome/fontawesome-webfont.svg | 0 .../font/fontawesome/fontawesome-webfont.ttf | Bin .../font/fontawesome/fontawesome-webfont.woff | Bin .../static/jquery}/jquery-3.5.1.min.js | 0 .../static}/jquery/jquery.tmpl.min.js | 0 {static => WordReview/static}/js/calendar.js | 0 .../static}/js/echarts.min.js | 0 {static => WordReview/static}/js/homepage.js | 0 {static => WordReview/static}/js/review.js | 0 .../static}/js/thirdParty/hotkeys.min.js | 0 {static => WordReview/static}/js/util.js | 0 {static => WordReview/static}/layer/layer.js | 0 .../static}/layer/mobile/layer.js | 0 .../static}/layer/mobile/need/layer.css | 0 .../static}/layer/theme/default/icon-ext.png | Bin .../static}/layer/theme/default/icon.png | Bin .../static}/layer/theme/default/layer.css | 0 .../static}/layer/theme/default/loading-0.gif | Bin .../static}/layer/theme/default/loading-1.gif | Bin .../static}/layer/theme/default/loading-2.gif | Bin {static => WordReview/static}/media/muyi.png | Bin .../static/media}/vocabulary.png | Bin .../static}/scss/review.scss | 2 +- {templates => WordReview/templates}/base.pug | 0 apps/review/migrations/__init__.py | 0 .../media => extension/img}/vocabulary.png | Bin .../js/background.js | 0 .../js/content-script.js | 0 .../js}/jquery-3.5.1.min.js | 0 {ChromeExtension => extension}/js/options.js | 0 {ChromeExtension => extension}/js/popup.js | 0 {ChromeExtension => extension}/js/util.js | 0 {ChromeExtension => extension}/manifest.json | 0 {ChromeExtension => extension}/options.html | 0 {ChromeExtension => extension}/popup.html | 0 index.html | 25 +- static/bootstrap/bootstrap-grid.css | 3719 ------ static/bootstrap/bootstrap-grid.css.map | 1 - static/bootstrap/bootstrap-grid.min.css | 7 - static/bootstrap/bootstrap-grid.min.css.map | 1 - static/bootstrap/bootstrap-reboot.css | 331 - static/bootstrap/bootstrap-reboot.css.map | 1 - static/bootstrap/bootstrap-reboot.min.css | 8 - static/bootstrap/bootstrap-reboot.min.css.map | 1 - static/bootstrap/bootstrap-select.css | 458 - static/bootstrap/bootstrap-select.js | 3144 ----- static/bootstrap/bootstrap.bundle.js | 7013 ----------- static/bootstrap/bootstrap.bundle.js.map | 1 - static/bootstrap/bootstrap.bundle.min.js | 7 - static/bootstrap/bootstrap.bundle.min.js.map | 1 - static/bootstrap/bootstrap.css | 10038 ---------------- static/bootstrap/bootstrap.css.map | 1 - static/bootstrap/bootstrap.js | 4435 ------- static/bootstrap/bootstrap.js.map | 1 - static/bootstrap/bootstrap.min.css.map | 1 - static/bootstrap/bootstrap.min.js | 7 - static/bootstrap/bootstrap.min.js.map | 1 - staticsfile/scss/review.css | 188 - 89 files changed, 21 insertions(+), 29382 deletions(-) rename WordReview/{ => WordReview}/__init__.py (100%) rename WordReview/{ => WordReview}/asgi.py (100%) rename WordReview/{ => WordReview}/settings.py (100%) rename WordReview/{ => WordReview}/urls.py (100%) rename WordReview/{ => WordReview}/wsgi.py (100%) rename {apps => WordReview/apps}/review/__init__.py (100%) rename {apps => WordReview/apps}/review/admin.py (100%) rename {apps => WordReview/apps}/review/apps.py (100%) rename {apps => WordReview/apps}/review/models.py (100%) rename {apps => WordReview/apps}/review/src/init_db.py (100%) rename {apps => WordReview/apps}/review/src/spider.py (100%) rename {apps => WordReview/apps}/review/templates/calendar.pug (100%) rename {apps => WordReview/apps}/review/templates/homepage.pug (100%) rename {apps => WordReview/apps}/review/templates/import_db.pug (100%) rename {apps => WordReview/apps}/review/templates/review.pug (100%) rename {apps => WordReview/apps}/review/tests.py (100%) rename {apps => WordReview/apps}/review/urls.py (100%) rename {apps => WordReview/apps}/review/views.py (100%) rename {apps => WordReview/apps}/src/util.py (100%) rename config.py => WordReview/config.py (100%) rename config_sample.conf => WordReview/config_sample.conf (100%) rename installer.py => WordReview/installer.py (100%) rename manage.py => WordReview/manage.py (100%) rename {static => WordReview/static}/bootstrap/bootstrap.min.css (100%) rename {static => WordReview/static}/css/base.css (100%) rename {static => WordReview/static}/css/calendar.css (100%) rename {static => WordReview/static}/css/font-awesome.min.css (100%) rename {static => WordReview/static}/font/fontawesome/FontAwesome.otf (100%) rename {static => WordReview/static}/font/fontawesome/fontawesome-webfont.eot (100%) rename {static => WordReview/static}/font/fontawesome/fontawesome-webfont.svg (100%) rename {static => WordReview/static}/font/fontawesome/fontawesome-webfont.ttf (100%) rename {static => WordReview/static}/font/fontawesome/fontawesome-webfont.woff (100%) rename {ChromeExtension/js => WordReview/static/jquery}/jquery-3.5.1.min.js (100%) rename {static => WordReview/static}/jquery/jquery.tmpl.min.js (100%) rename {static => WordReview/static}/js/calendar.js (100%) rename {static => WordReview/static}/js/echarts.min.js (100%) rename {static => WordReview/static}/js/homepage.js (100%) rename {static => WordReview/static}/js/review.js (100%) rename {static => WordReview/static}/js/thirdParty/hotkeys.min.js (100%) rename {static => WordReview/static}/js/util.js (100%) rename {static => WordReview/static}/layer/layer.js (100%) rename {static => WordReview/static}/layer/mobile/layer.js (100%) rename {static => WordReview/static}/layer/mobile/need/layer.css (100%) rename {static => WordReview/static}/layer/theme/default/icon-ext.png (100%) rename {static => WordReview/static}/layer/theme/default/icon.png (100%) rename {static => WordReview/static}/layer/theme/default/layer.css (100%) rename {static => WordReview/static}/layer/theme/default/loading-0.gif (100%) rename {static => WordReview/static}/layer/theme/default/loading-1.gif (100%) rename {static => WordReview/static}/layer/theme/default/loading-2.gif (100%) rename {static => WordReview/static}/media/muyi.png (100%) rename {ChromeExtension/img => WordReview/static/media}/vocabulary.png (100%) rename {static => WordReview/static}/scss/review.scss (98%) rename {templates => WordReview/templates}/base.pug (100%) delete mode 100644 apps/review/migrations/__init__.py rename {static/media => extension/img}/vocabulary.png (100%) rename {ChromeExtension => extension}/js/background.js (100%) rename {ChromeExtension => extension}/js/content-script.js (100%) rename {static/jquery => extension/js}/jquery-3.5.1.min.js (100%) rename {ChromeExtension => extension}/js/options.js (100%) rename {ChromeExtension => extension}/js/popup.js (100%) rename {ChromeExtension => extension}/js/util.js (100%) rename {ChromeExtension => extension}/manifest.json (100%) rename {ChromeExtension => extension}/options.html (100%) rename {ChromeExtension => extension}/popup.html (100%) delete mode 100644 static/bootstrap/bootstrap-grid.css delete mode 100644 static/bootstrap/bootstrap-grid.css.map delete mode 100644 static/bootstrap/bootstrap-grid.min.css delete mode 100644 static/bootstrap/bootstrap-grid.min.css.map delete mode 100644 static/bootstrap/bootstrap-reboot.css delete mode 100644 static/bootstrap/bootstrap-reboot.css.map delete mode 100644 static/bootstrap/bootstrap-reboot.min.css delete mode 100644 static/bootstrap/bootstrap-reboot.min.css.map delete mode 100644 static/bootstrap/bootstrap-select.css delete mode 100644 static/bootstrap/bootstrap-select.js delete mode 100644 static/bootstrap/bootstrap.bundle.js delete mode 100644 static/bootstrap/bootstrap.bundle.js.map delete mode 100644 static/bootstrap/bootstrap.bundle.min.js delete mode 100644 static/bootstrap/bootstrap.bundle.min.js.map delete mode 100644 static/bootstrap/bootstrap.css delete mode 100644 static/bootstrap/bootstrap.css.map delete mode 100644 static/bootstrap/bootstrap.js delete mode 100644 static/bootstrap/bootstrap.js.map delete mode 100644 static/bootstrap/bootstrap.min.css.map delete mode 100644 static/bootstrap/bootstrap.min.js delete mode 100644 static/bootstrap/bootstrap.min.js.map delete mode 100644 staticsfile/scss/review.css diff --git a/.gitignore b/.gitignore index ccac3e7c..cb0ec71f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,11 +14,11 @@ logs/ /media/ # config -/config.conf +WordReview/config.conf # PyInstaller -/build/ -/dist/ +WordReview/build/ +WordReview/dist/ *.spec # local @@ -27,4 +27,6 @@ data/ /backup/ /pypi/ WordReview.wiki/ -*_ig.* \ No newline at end of file +*_ig.* + +# WordReview/static/bootstrap \ No newline at end of file diff --git a/README.md b/README.md index 4476fd11..9a9d58e2 100644 --- a/README.md +++ b/README.md @@ -151,6 +151,7 @@ tain ### 更新日志 - 2020.05 + - update: 目录结构变更 @05-07 - feature: 区分渲染数据库`Words`和`Review`的`flag`难度标记 @05-07 - feature: `相关词`栏内对近期复习单词做高亮 @05-05 - 2020.04 diff --git a/WordReview/__init__.py b/WordReview/WordReview/__init__.py similarity index 100% rename from WordReview/__init__.py rename to WordReview/WordReview/__init__.py diff --git a/WordReview/asgi.py b/WordReview/WordReview/asgi.py similarity index 100% rename from WordReview/asgi.py rename to WordReview/WordReview/asgi.py diff --git a/WordReview/settings.py b/WordReview/WordReview/settings.py similarity index 100% rename from WordReview/settings.py rename to WordReview/WordReview/settings.py diff --git a/WordReview/urls.py b/WordReview/WordReview/urls.py similarity index 100% rename from WordReview/urls.py rename to WordReview/WordReview/urls.py diff --git a/WordReview/wsgi.py b/WordReview/WordReview/wsgi.py similarity index 100% rename from WordReview/wsgi.py rename to WordReview/WordReview/wsgi.py diff --git a/apps/review/__init__.py b/WordReview/apps/review/__init__.py similarity index 100% rename from apps/review/__init__.py rename to WordReview/apps/review/__init__.py diff --git a/apps/review/admin.py b/WordReview/apps/review/admin.py similarity index 100% rename from apps/review/admin.py rename to WordReview/apps/review/admin.py diff --git a/apps/review/apps.py b/WordReview/apps/review/apps.py similarity index 100% rename from apps/review/apps.py rename to WordReview/apps/review/apps.py diff --git a/apps/review/models.py b/WordReview/apps/review/models.py similarity index 100% rename from apps/review/models.py rename to WordReview/apps/review/models.py diff --git a/apps/review/src/init_db.py b/WordReview/apps/review/src/init_db.py similarity index 100% rename from apps/review/src/init_db.py rename to WordReview/apps/review/src/init_db.py diff --git a/apps/review/src/spider.py b/WordReview/apps/review/src/spider.py similarity index 100% rename from apps/review/src/spider.py rename to WordReview/apps/review/src/spider.py diff --git a/apps/review/templates/calendar.pug b/WordReview/apps/review/templates/calendar.pug similarity index 100% rename from apps/review/templates/calendar.pug rename to WordReview/apps/review/templates/calendar.pug diff --git a/apps/review/templates/homepage.pug b/WordReview/apps/review/templates/homepage.pug similarity index 100% rename from apps/review/templates/homepage.pug rename to WordReview/apps/review/templates/homepage.pug diff --git a/apps/review/templates/import_db.pug b/WordReview/apps/review/templates/import_db.pug similarity index 100% rename from apps/review/templates/import_db.pug rename to WordReview/apps/review/templates/import_db.pug diff --git a/apps/review/templates/review.pug b/WordReview/apps/review/templates/review.pug similarity index 100% rename from apps/review/templates/review.pug rename to WordReview/apps/review/templates/review.pug diff --git a/apps/review/tests.py b/WordReview/apps/review/tests.py similarity index 100% rename from apps/review/tests.py rename to WordReview/apps/review/tests.py diff --git a/apps/review/urls.py b/WordReview/apps/review/urls.py similarity index 100% rename from apps/review/urls.py rename to WordReview/apps/review/urls.py diff --git a/apps/review/views.py b/WordReview/apps/review/views.py similarity index 100% rename from apps/review/views.py rename to WordReview/apps/review/views.py diff --git a/apps/src/util.py b/WordReview/apps/src/util.py similarity index 100% rename from apps/src/util.py rename to WordReview/apps/src/util.py diff --git a/config.py b/WordReview/config.py similarity index 100% rename from config.py rename to WordReview/config.py diff --git a/config_sample.conf b/WordReview/config_sample.conf similarity index 100% rename from config_sample.conf rename to WordReview/config_sample.conf diff --git a/installer.py b/WordReview/installer.py similarity index 100% rename from installer.py rename to WordReview/installer.py diff --git a/manage.py b/WordReview/manage.py similarity index 100% rename from manage.py rename to WordReview/manage.py diff --git a/static/bootstrap/bootstrap.min.css b/WordReview/static/bootstrap/bootstrap.min.css similarity index 100% rename from static/bootstrap/bootstrap.min.css rename to WordReview/static/bootstrap/bootstrap.min.css diff --git a/static/css/base.css b/WordReview/static/css/base.css similarity index 100% rename from static/css/base.css rename to WordReview/static/css/base.css diff --git a/static/css/calendar.css b/WordReview/static/css/calendar.css similarity index 100% rename from static/css/calendar.css rename to WordReview/static/css/calendar.css diff --git a/static/css/font-awesome.min.css b/WordReview/static/css/font-awesome.min.css similarity index 100% rename from static/css/font-awesome.min.css rename to WordReview/static/css/font-awesome.min.css diff --git a/static/font/fontawesome/FontAwesome.otf b/WordReview/static/font/fontawesome/FontAwesome.otf similarity index 100% rename from static/font/fontawesome/FontAwesome.otf rename to WordReview/static/font/fontawesome/FontAwesome.otf diff --git a/static/font/fontawesome/fontawesome-webfont.eot b/WordReview/static/font/fontawesome/fontawesome-webfont.eot similarity index 100% rename from static/font/fontawesome/fontawesome-webfont.eot rename to WordReview/static/font/fontawesome/fontawesome-webfont.eot diff --git a/static/font/fontawesome/fontawesome-webfont.svg b/WordReview/static/font/fontawesome/fontawesome-webfont.svg similarity index 100% rename from static/font/fontawesome/fontawesome-webfont.svg rename to WordReview/static/font/fontawesome/fontawesome-webfont.svg diff --git a/static/font/fontawesome/fontawesome-webfont.ttf b/WordReview/static/font/fontawesome/fontawesome-webfont.ttf similarity index 100% rename from static/font/fontawesome/fontawesome-webfont.ttf rename to WordReview/static/font/fontawesome/fontawesome-webfont.ttf diff --git a/static/font/fontawesome/fontawesome-webfont.woff b/WordReview/static/font/fontawesome/fontawesome-webfont.woff similarity index 100% rename from static/font/fontawesome/fontawesome-webfont.woff rename to WordReview/static/font/fontawesome/fontawesome-webfont.woff diff --git a/ChromeExtension/js/jquery-3.5.1.min.js b/WordReview/static/jquery/jquery-3.5.1.min.js similarity index 100% rename from ChromeExtension/js/jquery-3.5.1.min.js rename to WordReview/static/jquery/jquery-3.5.1.min.js diff --git a/static/jquery/jquery.tmpl.min.js b/WordReview/static/jquery/jquery.tmpl.min.js similarity index 100% rename from static/jquery/jquery.tmpl.min.js rename to WordReview/static/jquery/jquery.tmpl.min.js diff --git a/static/js/calendar.js b/WordReview/static/js/calendar.js similarity index 100% rename from static/js/calendar.js rename to WordReview/static/js/calendar.js diff --git a/static/js/echarts.min.js b/WordReview/static/js/echarts.min.js similarity index 100% rename from static/js/echarts.min.js rename to WordReview/static/js/echarts.min.js diff --git a/static/js/homepage.js b/WordReview/static/js/homepage.js similarity index 100% rename from static/js/homepage.js rename to WordReview/static/js/homepage.js diff --git a/static/js/review.js b/WordReview/static/js/review.js similarity index 100% rename from static/js/review.js rename to WordReview/static/js/review.js diff --git a/static/js/thirdParty/hotkeys.min.js b/WordReview/static/js/thirdParty/hotkeys.min.js similarity index 100% rename from static/js/thirdParty/hotkeys.min.js rename to WordReview/static/js/thirdParty/hotkeys.min.js diff --git a/static/js/util.js b/WordReview/static/js/util.js similarity index 100% rename from static/js/util.js rename to WordReview/static/js/util.js diff --git a/static/layer/layer.js b/WordReview/static/layer/layer.js similarity index 100% rename from static/layer/layer.js rename to WordReview/static/layer/layer.js diff --git a/static/layer/mobile/layer.js b/WordReview/static/layer/mobile/layer.js similarity index 100% rename from static/layer/mobile/layer.js rename to WordReview/static/layer/mobile/layer.js diff --git a/static/layer/mobile/need/layer.css b/WordReview/static/layer/mobile/need/layer.css similarity index 100% rename from static/layer/mobile/need/layer.css rename to WordReview/static/layer/mobile/need/layer.css diff --git a/static/layer/theme/default/icon-ext.png b/WordReview/static/layer/theme/default/icon-ext.png similarity index 100% rename from static/layer/theme/default/icon-ext.png rename to WordReview/static/layer/theme/default/icon-ext.png diff --git a/static/layer/theme/default/icon.png b/WordReview/static/layer/theme/default/icon.png similarity index 100% rename from static/layer/theme/default/icon.png rename to WordReview/static/layer/theme/default/icon.png diff --git a/static/layer/theme/default/layer.css b/WordReview/static/layer/theme/default/layer.css similarity index 100% rename from static/layer/theme/default/layer.css rename to WordReview/static/layer/theme/default/layer.css diff --git a/static/layer/theme/default/loading-0.gif b/WordReview/static/layer/theme/default/loading-0.gif similarity index 100% rename from static/layer/theme/default/loading-0.gif rename to WordReview/static/layer/theme/default/loading-0.gif diff --git a/static/layer/theme/default/loading-1.gif b/WordReview/static/layer/theme/default/loading-1.gif similarity index 100% rename from static/layer/theme/default/loading-1.gif rename to WordReview/static/layer/theme/default/loading-1.gif diff --git a/static/layer/theme/default/loading-2.gif b/WordReview/static/layer/theme/default/loading-2.gif similarity index 100% rename from static/layer/theme/default/loading-2.gif rename to WordReview/static/layer/theme/default/loading-2.gif diff --git a/static/media/muyi.png b/WordReview/static/media/muyi.png similarity index 100% rename from static/media/muyi.png rename to WordReview/static/media/muyi.png diff --git a/ChromeExtension/img/vocabulary.png b/WordReview/static/media/vocabulary.png similarity index 100% rename from ChromeExtension/img/vocabulary.png rename to WordReview/static/media/vocabulary.png diff --git a/static/scss/review.scss b/WordReview/static/scss/review.scss similarity index 98% rename from static/scss/review.scss rename to WordReview/static/scss/review.scss index 3f094e71..0c61636d 100644 --- a/static/scss/review.scss +++ b/WordReview/static/scss/review.scss @@ -242,7 +242,7 @@ i{ .recent{ background-color: yellow; font-weight: bolder; - text-shadow: 0.2em 0.5em 0.1em rgb(29, 1, 1), + text-shadow: 0.5px 0.5px 0.1px #1d0101, // color: red; } } \ No newline at end of file diff --git a/templates/base.pug b/WordReview/templates/base.pug similarity index 100% rename from templates/base.pug rename to WordReview/templates/base.pug diff --git a/apps/review/migrations/__init__.py b/apps/review/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/static/media/vocabulary.png b/extension/img/vocabulary.png similarity index 100% rename from static/media/vocabulary.png rename to extension/img/vocabulary.png diff --git a/ChromeExtension/js/background.js b/extension/js/background.js similarity index 100% rename from ChromeExtension/js/background.js rename to extension/js/background.js diff --git a/ChromeExtension/js/content-script.js b/extension/js/content-script.js similarity index 100% rename from ChromeExtension/js/content-script.js rename to extension/js/content-script.js diff --git a/static/jquery/jquery-3.5.1.min.js b/extension/js/jquery-3.5.1.min.js similarity index 100% rename from static/jquery/jquery-3.5.1.min.js rename to extension/js/jquery-3.5.1.min.js diff --git a/ChromeExtension/js/options.js b/extension/js/options.js similarity index 100% rename from ChromeExtension/js/options.js rename to extension/js/options.js diff --git a/ChromeExtension/js/popup.js b/extension/js/popup.js similarity index 100% rename from ChromeExtension/js/popup.js rename to extension/js/popup.js diff --git a/ChromeExtension/js/util.js b/extension/js/util.js similarity index 100% rename from ChromeExtension/js/util.js rename to extension/js/util.js diff --git a/ChromeExtension/manifest.json b/extension/manifest.json similarity index 100% rename from ChromeExtension/manifest.json rename to extension/manifest.json diff --git a/ChromeExtension/options.html b/extension/options.html similarity index 100% rename from ChromeExtension/options.html rename to extension/options.html diff --git a/ChromeExtension/popup.html b/extension/popup.html similarity index 100% rename from ChromeExtension/popup.html rename to extension/popup.html diff --git a/index.html b/index.html index 8e951554..7000ac86 100644 --- a/index.html +++ b/index.html @@ -5,19 +5,19 @@ 单词复习 - - - - - - - - + + + + + + + + - - - + + + @@ -25,7 +25,8 @@