From 0087e951415f109b0502fe4cd2066bf1400934d1 Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Fri, 12 Jun 2020 21:34:48 +0300 Subject: [PATCH 1/9] Remove unused Error log view files --- src/lang/en.js | 5 ----- src/lang/es.js | 5 ----- src/lang/oc.js | 5 ----- src/lang/zh.js | 5 ----- src/views/errorLog/errorTestA.vue | 13 ------------ src/views/errorLog/errorTestB.vue | 11 ----------- src/views/errorLog/index.vue | 33 ------------------------------- 7 files changed, 77 deletions(-) delete mode 100644 src/views/errorLog/errorTestA.vue delete mode 100644 src/views/errorLog/errorTestB.vue delete mode 100644 src/views/errorLog/index.vue diff --git a/src/lang/en.js b/src/lang/en.js index e21a156d..9be8fe96 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -158,11 +158,6 @@ export default { confirm: 'Confirm', unfollow: 'Unfollow' }, - errorLog: { - tips: 'Please click the bug icon in the upper right corner', - description: 'Now the management system are basically the form of the spa, it enhances the user experience, but it also increases the possibility of page problems, a small negligence may lead to the entire page deadlock. Fortunately Vue provides a way to catch handling exceptions, where you can handle errors or report exceptions.', - documentation: 'Document introduction' - }, excel: { export: 'Export', selectedExport: 'Export Selected Items', diff --git a/src/lang/es.js b/src/lang/es.js index 25231eca..fd094b36 100755 --- a/src/lang/es.js +++ b/src/lang/es.js @@ -127,11 +127,6 @@ export default { cancel: 'Cancelar', confirm: 'Confirmar' }, - errorLog: { - tips: 'Please click the bug icon in the upper right corner', - description: 'Now the management system are basically the form of the spa, it enhances the user experience, but it also increases the possibility of page problems, a small negligence may lead to the entire page deadlock. Fortunately Vue provides a way to catch handling exceptions, where you can handle errors or report exceptions.', - documentation: 'Documento de introducción' - }, excel: { export: 'Exportar', selectedExport: 'Exportar seleccionados', diff --git a/src/lang/oc.js b/src/lang/oc.js index 088f5acb..e181ab86 100644 --- a/src/lang/oc.js +++ b/src/lang/oc.js @@ -128,11 +128,6 @@ export default { cancel: 'Anullar', confirm: 'Confirmar' }, - errorLog: { - tips: 'Mercés de clicar l’’icòna del babau amont a man drecha', - description: 'Ara que lo sistèma de gestion es coma un spa, melhora l’experiéncia dels utilizaire mas aumenta tanben lo risc de problèmas sus la pagina, una pichona negligéncia pòt menar a un blocatge complèt de la pagina. Urosament Vue fornís de manièras per gerir las excepcions, trobar las errors o senhalar las excepcions.', - documentation: 'Presentacion del document' - }, excel: { export: 'Exportar', selectedExport: 'Exportar los elements seleccionats', diff --git a/src/lang/zh.js b/src/lang/zh.js index a28771c5..7933d584 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -127,11 +127,6 @@ export default { cancel: '取 消', confirm: '确 定' }, - errorLog: { - tips: '请点击右上角bug小图标', - description: '现在的管理后台基本都是spa的形式了,它增强了用户体验,但同时也会增加页面出问题的可能性,可能一个小小的疏忽就导致整个页面的死锁。好在 Vue 官网提供了一个方法来捕获处理异常,你可以在其中进行错误处理或者异常上报。', - documentation: '文档介绍' - }, excel: { export: '导出', selectedExport: '导出已选择项', diff --git a/src/views/errorLog/errorTestA.vue b/src/views/errorLog/errorTestA.vue deleted file mode 100644 index 52654e0e..00000000 --- a/src/views/errorLog/errorTestA.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/src/views/errorLog/errorTestB.vue b/src/views/errorLog/errorTestB.vue deleted file mode 100644 index b04c2511..00000000 --- a/src/views/errorLog/errorTestB.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/src/views/errorLog/index.vue b/src/views/errorLog/index.vue deleted file mode 100644 index 47db4ae5..00000000 --- a/src/views/errorLog/index.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - - - From 14cf2a460c35ead7440ced8d1b0677d880d9a56b Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Sat, 13 Jun 2020 00:09:52 +0300 Subject: [PATCH 2/9] Update 401 Error Page --- src/lang/en.js | 6 +++ src/styles/index.scss | 37 ++++---------- src/views/errorPage/401.vue | 96 ++++++++++++------------------------- 3 files changed, 45 insertions(+), 94 deletions(-) diff --git a/src/lang/en.js b/src/lang/en.js index 9be8fe96..f73fe226 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -73,6 +73,12 @@ export default { mediaProxyCache: 'MediaProxy Cache', 'emoji-packs': 'Emoji packs' }, + errLog: { + error401: 'Oops! 401 Error', + unauth: 'Unauthorized', + back: 'Back', + login: 'Login' + }, navbar: { logOut: 'Log Out', dashboard: 'Dashboard', diff --git a/src/styles/index.scss b/src/styles/index.scss index b35df6ad..5a906d5b 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -22,8 +22,16 @@ label { html { height: 100%; box-sizing: border-box; + font-size: 62.5%; } +h1 { + font-size: 3.2em; +} + +h2 { + font-size: 2.4em; +} #app { height: 100%; } @@ -171,32 +179,3 @@ code { background: #d0d0d0; } } - -.link-type, -.link-type:focus { - color: #337ab7; - cursor: pointer; - - &:hover { - color: rgb(32, 160, 255); - } -} - -.filter-container { - padding-bottom: 10px; - - .filter-item { - display: inline-block; - vertical-align: middle; - margin-bottom: 10px; - } -} - -//refine vue-multiselect plugin -.multiselect { - line-height: 16px; -} - -.multiselect--active { - z-index: 1000 !important; -} diff --git a/src/views/errorPage/401.vue b/src/views/errorPage/401.vue index 2901c942..f57cae67 100644 --- a/src/views/errorPage/401.vue +++ b/src/views/errorPage/401.vue @@ -1,91 +1,57 @@ From a3f952b346a5f65a02d9412997ea07a3eb3daa86 Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Sun, 14 Jun 2020 01:05:27 +0300 Subject: [PATCH 3/9] Redo 404 Error page --- src/lang/en.js | 6 +- src/views/errorPage/404.vue | 236 ++++++------------------------------ 2 files changed, 40 insertions(+), 202 deletions(-) diff --git a/src/lang/en.js b/src/lang/en.js index f73fe226..d631bc8d 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -75,9 +75,13 @@ export default { }, errLog: { error401: 'Oops! 401 Error', + error404: 'Oops! 404 Error', + pageNotFound: 'Page not found', + correctUrl: 'Please make sure you URL is correct', unauth: 'Unauthorized', back: 'Back', - login: 'Login' + login: 'Login', + homePage: 'Home Page' }, navbar: { logOut: 'Log Out', diff --git a/src/views/errorPage/404.vue b/src/views/errorPage/404.vue index d20a4ef4..1ce4ab42 100644 --- a/src/views/errorPage/404.vue +++ b/src/views/errorPage/404.vue @@ -1,17 +1,13 @@