Skip to content

Commit 7593066

Browse files
committed
fixup! Category: Add new category button to create new folders in current notes path for categories.
1 parent 2134307 commit 7593066

File tree

3 files changed

+30
-35
lines changed

3 files changed

+30
-35
lines changed

src/NotesService.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ export const setFavorite = (noteId, favorite) => {
341341

342342
export const findCategory = (categoryName) => {
343343
return axios
344-
.get(generateRemoteUrl(`dav/files/${getCurrentUser().uid}/${store.state.app.settings.notesPath}${categoryName}`))
344+
.get(generateRemoteUrl(`dav/files/${getCurrentUser().uid}/${store.state.app.settings.notesPath}/${categoryName}`))
345345
.then(response => {
346346
return categoryName
347347
})
@@ -360,10 +360,11 @@ export const createCategory = (categoryName) => {
360360
// Axios MKCOL workaround: https://github.com/axios/axios/issues/2220
361361
return axios
362362
.request({
363-
url: generateRemoteUrl(`dav/files/${getCurrentUser().uid}/${store.state.app.settings.notesPath}${categoryName}`),
363+
url: generateRemoteUrl(`dav/files/${getCurrentUser().uid}/${store.state.app.settings.notesPath}/${categoryName}`),
364364
method: 'MKCOL',
365365
})
366366
.then(response => {
367+
store.commit('addCategory', categoryName)
367368
return categoryName
368369
})
369370
.catch(err => {

src/components/CategoriesList.vue

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,5 @@
11
<template>
22
<Fragment>
3-
4-
<NcAppNavigationItem
5-
:title="title"
6-
class="app-navigation-noclose separator-below"
7-
:class="{ 'category-header': selectedCategory !== null }"
8-
:open.sync="open"
9-
:menu-open.sync="menuOpen"
10-
:allow-collapse="true"
11-
@click.prevent.stop="onToggleCategories"
12-
>
13-
<template #menu-icon>
14-
<AddIcon :size="20" @click="onToggleNewCategory" />
15-
</template>
16-
<template #actions>
17-
<NcActionText>
18-
<template #icon>
19-
<ErrorIcon v-if="createCategoryError" :size="20" />
20-
<AddIcon v-else-if="!createCategoryError" :size="20" />
21-
</template>
22-
{{ createCategoryError ? createCategoryError : t('notes', 'Create a new category') }}
23-
</NcActionText>
24-
<NcActionInput
25-
icon=""
26-
:value="t('notes', 'Category name')"
27-
@submit.prevent.stop="createNewCategory"
28-
>
29-
<template #icon>
30-
<FolderIcon :size="20" />
31-
</template>
32-
</NcActionInput>
33-
</template>
34-
353
<FolderIcon slot="icon" :size="20" />
364
<NcAppNavigationItem
375
:title="t('notes', 'All notes')"
@@ -44,7 +12,29 @@
4412
</NcAppNavigationCounter>
4513
</NcAppNavigationItem>
4614

47-
<NcAppNavigationCaption :title="t('notes', 'Categories')" />
15+
<NcAppNavigationCaption :title="t('notes', 'Categories')">
16+
<template #actionsTriggerIcon>
17+
<AddIcon slot="icon" :size="20" />
18+
</template>
19+
<template #actions>
20+
<NcActionText>
21+
<template #icon>
22+
<ErrorIcon v-if="createCategoryError" :size="20" />
23+
<AddIcon v-else-if="!createCategoryError" :size="20" />
24+
</template>
25+
{{ createCategoryError ? createCategoryError : t('notes', 'Create a new category') }}
26+
</NcActionText>
27+
<NcActionInput
28+
icon=""
29+
:value="t('notes', 'Category name')"
30+
@submit.prevent.stop="createNewCategory"
31+
>
32+
<template #icon>
33+
<FolderIcon :size="20" />
34+
</template>
35+
</NcActionInput>
36+
</template>
37+
</NcAppNavigationCaption>
4838

4939
<NcAppNavigationItem v-for="category in categories"
5040
:key="category.name"

src/store/notes.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,10 @@ const mutations = {
179179
state.categories = categories
180180
},
181181

182+
addCategory(state, category) {
183+
state.categories.push(category)
184+
},
185+
182186
setSelectedCategory(state, category) {
183187
state.selectedCategory = category
184188
},

0 commit comments

Comments
 (0)