From c2b9541f6e0be680a0493705353f8b86535f3005 Mon Sep 17 00:00:00 2001 From: winkidney Date: Thu, 13 Feb 2020 16:47:51 +0800 Subject: [PATCH 1/7] Refactor: Use shorter name for "My Collections" --- pinry-spa/src/components/PHeader.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinry-spa/src/components/PHeader.vue b/pinry-spa/src/components/PHeader.vue index 572ea44..2216fad 100644 --- a/pinry-spa/src/components/PHeader.vue +++ b/pinry-spa/src/components/PHeader.vue @@ -43,7 +43,7 @@ v-if="user.loggedIn" class="navbar-item has-dropdown is-hoverable"> - My Collections + My
Date: Thu, 13 Feb 2020 17:07:14 +0800 Subject: [PATCH 2/7] Feature: Add search icon to header --- pinry-spa/src/components/PHeader.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pinry-spa/src/components/PHeader.vue b/pinry-spa/src/components/PHeader.vue index 2216fad..8c725ea 100644 --- a/pinry-spa/src/components/PHeader.vue +++ b/pinry-spa/src/components/PHeader.vue @@ -73,6 +73,15 @@
+ + + +
Date: Fri, 14 Feb 2020 14:21:46 +0800 Subject: [PATCH 3/7] Feature: Add search-panel for Pinry --- pinry-spa/src/components/api.js | 4 + pinry-spa/src/components/search/SearchPanel.vue | 117 ++++++++++++++++++++++++ pinry-spa/src/router/index.js | 6 ++ pinry-spa/src/views/Search.vue | 43 +++++++++ 4 files changed, 170 insertions(+) create mode 100644 pinry-spa/src/components/search/SearchPanel.vue create mode 100644 pinry-spa/src/views/Search.vue diff --git a/pinry-spa/src/components/api.js b/pinry-spa/src/components/api.js index d64e46b..30d72a2 100644 --- a/pinry-spa/src/components/api.js +++ b/pinry-spa/src/components/api.js @@ -31,6 +31,10 @@ const Board = { const url = `${API_PREFIX}boards-auto-complete/?submitter__username=${username}`; return axios.get(url); }, + fetchSiteFullList() { + const url = `${API_PREFIX}boards-auto-complete/`; + return axios.get(url); + }, saveChanges(boardId, fieldsForm) { const url = `${API_PREFIX}boards/${boardId}/`; return axios.patch( diff --git a/pinry-spa/src/components/search/SearchPanel.vue b/pinry-spa/src/components/search/SearchPanel.vue new file mode 100644 index 0000000..381c5e9 --- /dev/null +++ b/pinry-spa/src/components/search/SearchPanel.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/pinry-spa/src/router/index.js b/pinry-spa/src/router/index.js index 6495f4e..2a98b30 100644 --- a/pinry-spa/src/router/index.js +++ b/pinry-spa/src/router/index.js @@ -7,6 +7,7 @@ import Pins4Board from '../views/Pins4Board.vue'; import Pins4Id from '../views/Pins4Id.vue'; import Boards4User from '../views/Boards4User.vue'; import PinCreate from '../views/PinCreate.vue'; +import Search from '../views/Search.vue'; Vue.use(VueRouter); @@ -46,6 +47,11 @@ const routes = [ name: 'pin-creation-from-url', component: PinCreate, }, + { + path: '/search', + name: 'search', + component: Search, + }, ]; const router = new VueRouter({ diff --git a/pinry-spa/src/views/Search.vue b/pinry-spa/src/views/Search.vue new file mode 100644 index 0000000..c0f4c83 --- /dev/null +++ b/pinry-spa/src/views/Search.vue @@ -0,0 +1,43 @@ + + + + + + From b7734ec232e4620bfbe7a6f8e06fa560f77c14b0 Mon Sep 17 00:00:00 2001 From: winkidney Date: Fri, 14 Feb 2020 15:43:37 +0800 Subject: [PATCH 4/7] Feature: Add search function to boards --- core/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/views.py b/core/views.py index 277db09..882aadb 100644 --- a/core/views.py +++ b/core/views.py @@ -36,7 +36,8 @@ class PinViewSet(viewsets.ModelViewSet): class BoardViewSet(viewsets.ModelViewSet): serializer_class = api.BoardSerializer - filter_backends = (DjangoFilterBackend, OrderingFilter) + filter_backends = (DjangoFilterBackend, OrderingFilter, SearchFilter) + search_fields = ("name", ) filter_fields = ("submitter__username", ) ordering_fields = ('-id', ) ordering = ('-id', ) From 7d402f5e37c7a07afda28ddad1e2e8902f39f4f0 Mon Sep 17 00:00:00 2001 From: winkidney Date: Fri, 14 Feb 2020 15:43:49 +0800 Subject: [PATCH 5/7] Feature: Add pin display UI and board diaplay UI --- pinry-spa/src/components/Boards.vue | 17 +++++++++--- pinry-spa/src/components/api.js | 5 ++++ pinry-spa/src/components/search/SearchPanel.vue | 35 ++++++++++++++----------- pinry-spa/src/views/Boards4User.vue | 8 +++--- pinry-spa/src/views/Search.vue | 18 ++++++++----- 5 files changed, 54 insertions(+), 29 deletions(-) diff --git a/pinry-spa/src/components/Boards.vue b/pinry-spa/src/components/Boards.vue index e0341cd..8bd64aa 100644 --- a/pinry-spa/src/components/Boards.vue +++ b/pinry-spa/src/components/Boards.vue @@ -118,9 +118,9 @@ export default { BoardEditorUI, }, data: initialData, - props: ['boardUsername'], + props: ['filters'], watch: { - boardUsername() { + filters() { this.reset(); }, }, @@ -206,7 +206,18 @@ export default { return; } this.status.loading = true; - const promise = API.fetchBoardForUser(this.boardUsername, this.status.offset); + let promise; + if (this.filters.boardUsername) { + promise = API.fetchBoardForUser( + this.filters.boardUsername, + this.status.offset, + ); + } else if (this.filters.boardNameContains) { + promise = API.Board.fetchListWhichContains( + this.filters.boardNameContains, + this.status.offset, + ); + } promise.then( (resp) => { const { results, next } = resp.data; diff --git a/pinry-spa/src/components/api.js b/pinry-spa/src/components/api.js index 30d72a2..4d912f0 100644 --- a/pinry-spa/src/components/api.js +++ b/pinry-spa/src/components/api.js @@ -35,6 +35,11 @@ const Board = { const url = `${API_PREFIX}boards-auto-complete/`; return axios.get(url); }, + fetchListWhichContains(text, offset = 0, limit = 50) { + const prefix = `${API_PREFIX}boards/?search=${text}`; + const url = `${prefix}&offset=${offset}&limit=${limit}`; + return axios.get(url); + }, saveChanges(boardId, fieldsForm) { const url = `${API_PREFIX}boards/${boardId}/`; return axios.patch( diff --git a/pinry-spa/src/components/search/SearchPanel.vue b/pinry-spa/src/components/search/SearchPanel.vue index 381c5e9..04f1f1f 100644 --- a/pinry-spa/src/components/search/SearchPanel.vue +++ b/pinry-spa/src/components/search/SearchPanel.vue @@ -3,11 +3,12 @@
- + + +
@@ -35,9 +44,9 @@ export default { selectedOption: [], options: { Tag: [], - Board: [], }, name: '', + boardText: '', selected: null, }; }, @@ -45,12 +54,19 @@ export default { selectOption(filterName) { if (filterName === 'Tag') { this.selectedOption = this.options.Tag; - } else { - this.selectedOption = this.options.Board; } }, }, watch: { + boardText(newVal) { + if (newVal === '') { + return; + } + this.$emit( + 'selected', + { filterType: this.filterType, selected: newVal }, + ); + }, filterType(newVal) { this.selectOption(newVal); }, @@ -75,17 +91,6 @@ export default { }, }, created() { - api.Board.fetchSiteFullList().then( - (resp) => { - const options = []; - resp.data.forEach( - (board) => { - options.push(board.name); - }, - ); - this.options.Board = options; - }, - ); api.Tag.fetchList().then( (resp) => { const options = []; diff --git a/pinry-spa/src/views/Boards4User.vue b/pinry-spa/src/views/Boards4User.vue index 14edc95..93c4f26 100644 --- a/pinry-spa/src/views/Boards4User.vue +++ b/pinry-spa/src/views/Boards4User.vue @@ -1,7 +1,7 @@ @@ -13,7 +13,7 @@ export default { name: 'Boards4User', data() { return { - username: '', + filters: { boardUsername: null }, }; }, components: { @@ -24,12 +24,12 @@ export default { this.initialize(); }, beforeRouteUpdate(to, from, next) { - this.username = to.params.username; + this.filters = { boardUsername: to.params.username }; next(); }, methods: { initialize() { - this.username = this.$route.params.username; + this.filters = { boardUsername: this.$route.params.username }; }, }, }; diff --git a/pinry-spa/src/views/Search.vue b/pinry-spa/src/views/Search.vue index c0f4c83..7f409c3 100644 --- a/pinry-spa/src/views/Search.vue +++ b/pinry-spa/src/views/Search.vue @@ -2,36 +2,40 @@
- - + +