From 73847022e2b9f608f2b6cab25f1d005f952f1556 Mon Sep 17 00:00:00 2001 From: Michael Weimann Date: Tue, 21 Sep 2021 23:56:17 +0200 Subject: [PATCH] implement search layout #32 #33 #35 --- .reuse/dep5 | 2 +- LICENSES/MIT.txt | 9 - package-lock.json | 16 ++ package.json | 1 + .../img/bootstrap-icons-1.5.0/pencil.license | 1 - public/img/bootstrap-icons-1.5.0/pencil.svg | 3 - public/img/bootstrap-icons-1.5.0/plus-lg.svg | 3 - .../bootstrap-icons-1.5.0/plus-lg.svg.license | 1 - public/img/bootstrap-icons-1.5.0/search.svg | 3 - .../bootstrap-icons-1.5.0/search.svg.license | 1 - public/img/bootstrap-icons-1.5.0/trash.svg | 4 - .../bootstrap-icons-1.5.0/trash.svg.license | 1 - src/App.vue | 4 +- src/assets/global.scss | 7 + src/assets/img/wtf-header-bg.jpg | Bin 0 -> 109328 bytes src/assets/variables.scss | 2 + src/components/AutoComplete.vue | 5 +- src/components/Avatar.vue | 37 ++++ src/components/Navbar.vue | 40 ++-- src/components/ProfileList.vue | 5 +- src/components/SearchResult.vue | 54 ++++++ src/components/Spinner.vue | 9 + src/main.js | 1 + src/{store.js => store/index.js} | 5 + src/store/search.js | 100 ++++++++++ src/views/Index.vue | 80 ++++---- src/views/Search.vue | 183 +++++++++++------- 27 files changed, 412 insertions(+), 165 deletions(-) delete mode 100644 LICENSES/MIT.txt delete mode 100644 public/img/bootstrap-icons-1.5.0/pencil.license delete mode 100644 public/img/bootstrap-icons-1.5.0/pencil.svg delete mode 100644 public/img/bootstrap-icons-1.5.0/plus-lg.svg delete mode 100644 public/img/bootstrap-icons-1.5.0/plus-lg.svg.license delete mode 100644 public/img/bootstrap-icons-1.5.0/search.svg delete mode 100644 public/img/bootstrap-icons-1.5.0/search.svg.license delete mode 100644 public/img/bootstrap-icons-1.5.0/trash.svg delete mode 100644 public/img/bootstrap-icons-1.5.0/trash.svg.license create mode 100644 src/assets/img/wtf-header-bg.jpg create mode 100644 src/components/Avatar.vue create mode 100644 src/components/SearchResult.vue create mode 100644 src/components/Spinner.vue rename src/{store.js => store/index.js} (95%) create mode 100644 src/store/search.js diff --git a/.reuse/dep5 b/.reuse/dep5 index 688310d..3bf3a5c 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -11,7 +11,7 @@ Files: .browserslistrc .dockerignore .eslintrc.js .gitignore Copyright: WTF Kooperative eG License: AGPL-3.0-or-later -Files: src/assets/img/wtf_logo* +Files: src/assets/img/wtf* Copyright: WTF Kooperative eG License: LicenseRef-WTF diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt deleted file mode 100644 index 2071b23..0000000 --- a/LICENSES/MIT.txt +++ /dev/null @@ -1,9 +0,0 @@ -MIT License - -Copyright (c) - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/package-lock.json b/package-lock.json index 5ce9315..24de910 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "@vue/compiler-sfc": "^3.0.0", "babel-eslint": "^10.1.0", "bootstrap": "^5.0.1", + "bootstrap-icons": "^1.5.0", "core-js": "^3.6.5", "eslint": "^6.7.2", "eslint-plugin-vue": "^7.0.0", @@ -2854,6 +2855,15 @@ "@popperjs/core": "^2.10.1" } }, + "node_modules/bootstrap-icons": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.5.0.tgz", + "integrity": "sha512-44feMc7DE1Ccpsas/1wioN8ewFJNquvi5FewA06wLnqct7CwMdGDVy41ieHaacogzDqLfG8nADIvMNp9e4bfbA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz?cache=0&sync_timestamp=1614010713935&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbrace-expansion%2Fdownload%2Fbrace-expansion-1.1.11.tgz", @@ -17155,6 +17165,12 @@ "dev": true, "requires": {} }, + "bootstrap-icons": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.5.0.tgz", + "integrity": "sha512-44feMc7DE1Ccpsas/1wioN8ewFJNquvi5FewA06wLnqct7CwMdGDVy41ieHaacogzDqLfG8nADIvMNp9e4bfbA==", + "dev": true + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz?cache=0&sync_timestamp=1614010713935&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbrace-expansion%2Fdownload%2Fbrace-expansion-1.1.11.tgz", diff --git a/package.json b/package.json index 088c008..a476688 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "@vue/compiler-sfc": "^3.0.0", "babel-eslint": "^10.1.0", "bootstrap": "^5.0.1", + "bootstrap-icons": "^1.5.0", "core-js": "^3.6.5", "eslint": "^6.7.2", "eslint-plugin-vue": "^7.0.0", diff --git a/public/img/bootstrap-icons-1.5.0/pencil.license b/public/img/bootstrap-icons-1.5.0/pencil.license deleted file mode 100644 index 290774b..0000000 --- a/public/img/bootstrap-icons-1.5.0/pencil.license +++ /dev/null @@ -1 +0,0 @@ -SPDX-License-Identifier: MIT \ No newline at end of file diff --git a/public/img/bootstrap-icons-1.5.0/pencil.svg b/public/img/bootstrap-icons-1.5.0/pencil.svg deleted file mode 100644 index f8dbfeb..0000000 --- a/public/img/bootstrap-icons-1.5.0/pencil.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/public/img/bootstrap-icons-1.5.0/plus-lg.svg b/public/img/bootstrap-icons-1.5.0/plus-lg.svg deleted file mode 100644 index 1723f2f..0000000 --- a/public/img/bootstrap-icons-1.5.0/plus-lg.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/public/img/bootstrap-icons-1.5.0/plus-lg.svg.license b/public/img/bootstrap-icons-1.5.0/plus-lg.svg.license deleted file mode 100644 index 290774b..0000000 --- a/public/img/bootstrap-icons-1.5.0/plus-lg.svg.license +++ /dev/null @@ -1 +0,0 @@ -SPDX-License-Identifier: MIT \ No newline at end of file diff --git a/public/img/bootstrap-icons-1.5.0/search.svg b/public/img/bootstrap-icons-1.5.0/search.svg deleted file mode 100644 index d3dc7ca..0000000 --- a/public/img/bootstrap-icons-1.5.0/search.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/public/img/bootstrap-icons-1.5.0/search.svg.license b/public/img/bootstrap-icons-1.5.0/search.svg.license deleted file mode 100644 index 290774b..0000000 --- a/public/img/bootstrap-icons-1.5.0/search.svg.license +++ /dev/null @@ -1 +0,0 @@ -SPDX-License-Identifier: MIT \ No newline at end of file diff --git a/public/img/bootstrap-icons-1.5.0/trash.svg b/public/img/bootstrap-icons-1.5.0/trash.svg deleted file mode 100644 index 0ba7218..0000000 --- a/public/img/bootstrap-icons-1.5.0/trash.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/public/img/bootstrap-icons-1.5.0/trash.svg.license b/public/img/bootstrap-icons-1.5.0/trash.svg.license deleted file mode 100644 index 290774b..0000000 --- a/public/img/bootstrap-icons-1.5.0/trash.svg.license +++ /dev/null @@ -1 +0,0 @@ -SPDX-License-Identifier: MIT \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index e221db0..477a9e1 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,8 +12,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later