From f34f7ed46f9cbd77c0affff7ec5f4c1a93b4fc27 Mon Sep 17 00:00:00 2001 From: Yoshihiro OKUMURA Date: Tue, 16 Jul 2019 10:57:36 +0900 Subject: [PATCH] apply cerebellum pf changes. --- package.json | 12 +- src/common/About.module.css | 13 - src/common/AppRoot.tsx | 12 +- src/common/CenterColumn.tsx | 78 +- src/common/Footer.module.css | 12 - src/common/Footer.tsx | 3 +- src/common/Header.module.css | 64 -- src/common/Header.tsx | 17 +- src/common/LeftColumn.tsx | 4 +- src/common/MainContent.tsx | 2 +- src/common/XoopsPathRedirect.tsx | 4 +- src/common/assets/theme/style.css | 144 ++- src/{common => custom}/About.tsx | 7 +- src/{common => custom}/blocks/Announce.tsx | 2 +- src/database/blocks/IndexTree.module.css | 8 +- .../item-type/binder/BinderDetail.tsx | 12 +- src/database/item-type/index.tsx | 13 +- .../item-type/memo/MemoAdvancedSearch.tsx | 28 + src/database/item-type/memo/MemoDetail.tsx | 33 + src/database/item-type/memo/MemoList.tsx | 30 + src/database/item-type/memo/MemoTop.tsx | 15 + src/database/item-type/memo/index.tsx | 13 + src/database/lib/AdvancedSearchQuery.ts | 4 +- src/database/lib/ItemUtil.ts | 7 +- src/functions.ts | 3 +- yarn.lock | 877 ++++++++---------- 26 files changed, 697 insertions(+), 720 deletions(-) delete mode 100644 src/common/About.module.css delete mode 100644 src/common/Footer.module.css delete mode 100644 src/common/Header.module.css rename src/{common => custom}/About.tsx (76%) rename src/{common => custom}/blocks/Announce.tsx (93%) create mode 100644 src/database/item-type/memo/MemoAdvancedSearch.tsx create mode 100644 src/database/item-type/memo/MemoDetail.tsx create mode 100644 src/database/item-type/memo/MemoList.tsx create mode 100644 src/database/item-type/memo/MemoTop.tsx create mode 100644 src/database/item-type/memo/index.tsx diff --git a/package.json b/package.json index a6f4241..0ad0100 100644 --- a/package.json +++ b/package.json @@ -6,23 +6,24 @@ "@types/async-lock": "^1.1.1", "@types/jest": "24.0.15", "@types/lokijs": "^1.5.2", - "@types/node": "12.0.10", + "@types/node": "12.6.3", "@types/rc-tree": "^1.11.3", - "@types/react": "16.8.22", + "@types/react": "16.8.23", "@types/react-dom": "16.8.4", "@types/react-helmet": "^5.0.8", "@types/react-html-parser": "^2.0.0", "@types/react-overlays": "^1.1.3", "@types/react-router-dom": "^4.3.4", "@types/react-router-hash-link": "^1.2.1", - "async-lock": "^1.2.0", + "@types/xregexp": "^3.0.30", + "async-lock": "^1.2.2", "axios": "^0.19.0", "lokijs": "^1.5.6", "moment": "^2.24.0", "rc-tree": "^2.1.0", "react": "^16.8.6", "react-app-polyfill": "^1.0.1", - "react-cookie": "^4.0.0", + "react-cookie": "^4.0.1", "react-dom": "^16.8.6", "react-ga": "^2.6.0", "react-helmet": "^5.2.1", @@ -33,7 +34,8 @@ "react-router-hash-link": "^1.2.1", "react-scripts": "3.0.1", "react-spinner-material": "^1.1.1", - "typescript": "3.5.2" + "typescript": "3.5.3", + "xregexp": "^4.2.4" }, "scripts": { "start": "react-scripts start", diff --git a/src/common/About.module.css b/src/common/About.module.css deleted file mode 100644 index 1d8fcd3..0000000 --- a/src/common/About.module.css +++ /dev/null @@ -1,13 +0,0 @@ -.notice { - color: red; - text-align: center; - margin: 10px 0; -} -.title { - margin-top: 25px; - border-bottom: solid 1px #cccccc; -} - -.content { - margin: 10px 0 10px 0; -} \ No newline at end of file diff --git a/src/common/AppRoot.tsx b/src/common/AppRoot.tsx index bde7fa2..d941fa5 100644 --- a/src/common/AppRoot.tsx +++ b/src/common/AppRoot.tsx @@ -71,14 +71,10 @@ class AppRoot extends Component { {Functions.mlang(Config.SITE_TITLE, lang)} - {Functions.mlang(Config.SITE_SLOGAN, lang)}
- - - - - - - -
+
+ + +