local-it/vikunja-frontend
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use message mixin for handling success and error messages (#51)

Browse source 
Use message mixin everywhere

Add mixin for success and error messages

Co-authored-by: kolaente <k@knt.li>
Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/51
This commit is contained in:
konrad 2020-01-30 21:47:08 +00:00
parent a0c4732f81
commit 1170e030f6
25 changed files with 94 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/App.vue
View file

@ -193,7 +193,6 @@
<script>
import auth from './auth'
import message from './message'
import router from './router'
import NamespaceService from './services/namespace'
@ -284,7 +283,7 @@
this.$set(this, 'namespaces', r)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
loadNamespacesIfNeeded(e) {

11
src/components/labels/ListLabels.vue
View file

@ -95,7 +95,6 @@
import LabelService from '../../services/label'
import LabelModel from '../../models/label'
import message from '../../message'
import auth from '../../auth'
export default {
@ -124,7 +123,7 @@
this.$set(this, 'labels', r)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
deleteLabel(label) {
@ -136,10 +135,10 @@
this.labels.splice(l, 1)
}
}
message.success({message: 'The label was successfully deleted.'}, this)
this.success({message: 'The label was successfully deleted.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
editLabelSubmit() {
@ -150,10 +149,10 @@
this.$set(this.labels, l, r)
}
}
message.success({message: 'The label was successfully updated.'}, this)
this.success({message: 'The label was successfully updated.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
editLabel(label) {

11
src/components/lists/EditList.vue
View file

@ -60,7 +60,6 @@
<script>
import auth from '../../auth'
import router from '../../router'
import message from '../../message'
import manageSharing from '../sharing/userTeam'
import LinkSharing from '../sharing/linkSharing';
@ -114,7 +113,7 @@
this.manageUsersComponent = 'manageSharing'
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
submit() {
@ -129,20 +128,20 @@
}
}
}
message.success({message: 'The list was successfully updated.'}, this)
this.success({message: 'The list was successfully updated.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
deleteList() {
this.listService.delete(this.list)
.then(() => {
message.success({message: 'The list was successfully deleted.'}, this)
this.success({message: 'The list was successfully deleted.'}, this)
router.push({name: 'home'})
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
}

5
src/components/lists/NewList.vue
View file

@ -26,7 +26,6 @@
<script>
import auth from '../../auth'
import router from '../../router'
import message from '../../message'
import ListService from '../../services/list'
import ListModel from '../../models/list'
@ -55,11 +54,11 @@
this.listService.create(this.list)
.then(response => {
this.$parent.loadNamespaces()
message.success({message: 'The list was successfully created.'}, this)
this.success({message: 'The list was successfully created.'}, this)
router.push({name: 'showList', params: {id: response.id}})
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
back() {

3
src/components/lists/ShowList.vue
View file

@ -19,7 +19,6 @@
<script>
import auth from '../../auth'
import router from '../../router'
import message from '../../message'
import ShowListTask from '../tasks/ShowListTasks'
import Gantt from '../tasks/Gantt'
@ -69,7 +68,7 @@
this.$set(this, 'list', r)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
}

7
src/components/migrator/wunderlist.vue
View file

@ -47,7 +47,6 @@
<script>
import WunderlistMigrationService from '../../services/migrator/wunderlist'
import message from '../../message'
export default {
name: 'wunderlist',
@ -77,7 +76,7 @@
this.migrate()
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
}
},
@ -88,7 +87,7 @@
this.authUrl = r.url
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
migrate() {
@ -99,7 +98,7 @@
this.message = r.message
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
.finally(() => {
this.isMigrating = false

11
src/components/namespaces/EditNamespace.vue
View file

@ -58,7 +58,6 @@
<script>
import auth from '../../auth'
import router from '../../router'
import message from '../../message'
import manageSharing from '../sharing/userTeam'
import NamespaceService from '../../services/namespace'
@ -111,7 +110,7 @@
this.manageUsersComponent = 'manageSharing'
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
submit() {
@ -124,20 +123,20 @@
this.$set(this.$parent.namespaces, n, r)
}
}
message.success({message: 'The namespace was successfully updated.'}, this)
this.success({message: 'The namespace was successfully updated.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
deleteNamespace() {
this.namespaceService.delete(this.namespace)
.then(() => {
message.success({message: 'The namespace was successfully deleted.'}, this)
this.success({message: 'The namespace was successfully deleted.'}, this)
router.push({name: 'home'})
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
}
}

5
src/components/namespaces/NewNamespace.vue
View file

@ -27,7 +27,6 @@
<script>
import auth from '../../auth'
import router from '../../router'
import message from '../../message'
import NamespaceModel from "../../models/namespace";
import NamespaceService from "../../services/namespace";
@ -55,11 +54,11 @@
this.namespaceService.create(this.namespace)
.then(() => {
this.$parent.loadNamespaces()
message.success({message: 'The namespace was successfully created.'}, this)
this.success({message: 'The namespace was successfully created.'}, this)
router.push({name: 'home'})
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
back() {

11
src/components/sharing/linkSharing.vue
View file

@ -104,7 +104,6 @@
</template>
<script>
import message from '../../message'
import rights from '../../models/rights'
import LinkShareService from '../../services/linkShare'
@ -155,7 +154,7 @@
this.linkShares = r
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
add() {
@ -163,22 +162,22 @@
this.linkShareService.create(newLinkShare)
.then(() => {
this.selectedRight = rights.READ
message.success({message: 'The link share was successfully created'}, this)
this.success({message: 'The link share was successfully created'}, this)
this.load()
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
remove() {
let linkshare = new LinkShareModel({id: this.linkIDToDelete, listID: this.listID})
this.linkShareService.delete(linkshare)
.then(() => {
message.success({message: 'The link share was successfully deleted'}, this)
this.success({message: 'The link share was successfully deleted'}, this)
this.load()
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
.finally(() => {
this.showDeleteModal = false

3
src/components/sharing/linkSharingAuth.vue
View file

@ -11,7 +11,6 @@
<script>
import auth from '../../auth'
import router from '../../router'
import message from '../../message'
export default {
name: 'linkSharingAuth',
@ -32,7 +31,7 @@
router.push({name: 'showList', params: {id: r.list_id}})
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
}
},

17
src/components/sharing/userTeam.vue
View file

@ -106,7 +106,6 @@
<script>
import auth from '../../auth'
import message from '../../message'
import multiselect from 'vue-multiselect'
import UserNamespaceService from '../../services/userNamespace'
@ -215,7 +214,7 @@
this.$set(this, 'sharables', r)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
deleteSharable() {
@ -236,10 +235,10 @@
this.sharables.splice(i, 1)
}
}
message.success({message: 'The ' + this.shareType + ' was successfully deleted from the ' + this.typeString + '.'}, this)
this.success({message: 'The ' + this.shareType + ' was successfully deleted from the ' + this.typeString + '.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
add(admin) {
@ -259,11 +258,11 @@
this.stuffService.create(this.stuffModel)
.then(() => {
message.success({message: 'The ' + this.shareType + ' was successfully added.'}, this)
this.success({message: 'The ' + this.shareType + ' was successfully added.'}, this)
this.load()
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
toggleType() {
@ -292,10 +291,10 @@
this.$set(this.sharables[i], 'right', r.right)
}
}
message.success({message: 'The ' + this.shareType + ' right was successfully updated.'}, this)
this.success({message: 'The ' + this.shareType + ' right was successfully updated.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
find(query) {
@ -309,7 +308,7 @@
this.$set(this, 'found', response)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
clearAll () {

12
src/components/tasks/ShowListTasks.vue
View file

@ -93,8 +93,6 @@
</template>
<script>
import message from '../../message'
import ListService from '../../services/list'
import TaskService from '../../services/task'
import ListModel from '../../models/list'
@ -155,10 +153,10 @@
this.tasks.push(r)
this.sortTasks()
this.newTaskText = ''
message.success({message: 'The task was successfully created.'}, this)
this.success({message: 'The task was successfully created.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
loadTasks(page) {
@ -198,7 +196,7 @@
}
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
loadTasksForPage(e) {
@ -217,10 +215,10 @@
this.taskService.update(task)
.then(() => {
this.sortTasks()
message.success({message: 'The task was successfully ' + (task.done ? '' : 'un-') + 'marked as done.'}, this)
this.success({message: 'The task was successfully ' + (task.done ? '' : 'un-') + 'marked as done.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
}

3
src/components/tasks/ShowTasks.vue
View file

@ -31,7 +31,6 @@
</template>
<script>
import router from '../../router'
import message from '../../message'
import TaskService from '../../services/task'
import PriorityLabel from './reusable/priorityLabel'
@ -81,7 +80,7 @@
this.$set(this, 'tasks', r)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
gotoList(lid) {

11
src/components/tasks/TaskDetailView.vue
View file

@ -261,7 +261,6 @@
</template>
<script>
import message from '../../message'
import TaskService from '../../services/task'
import TaskModel from '../../models/task'
import relationKinds from '../../models/relationKinds'
@ -361,17 +360,17 @@
this.activeFields.relatedTasks = Object.keys(this.task.related_tasks).length > 0
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
saveTask() {
this.taskService.update(this.task)
.then(r => {
this.$set(this, 'task', r)
message.success({message: 'The task was saved successfully.'}, this)
this.success({message: 'The task was saved successfully.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
setListAndNamespaceTitleFromParent() {
@ -393,11 +392,11 @@
deleteTask() {
this.taskService.delete(this.task)
.then(() => {
message.success({message: 'The task been deleted successfully.'}, this)
this.success({message: 'The task been deleted successfully.'}, this)
router.push({name: 'showList', params: {id: this.list.id}})
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
},

5
src/components/tasks/edit-task.vue
View file

@ -134,7 +134,6 @@
</template>
<script>
import message from '../../message'
import flatPickr from 'vue-flatpickr-component'
import 'flatpickr/dist/flatpickr.css'
import verte from 'verte'
@ -208,10 +207,10 @@
this.taskService.update(this.taskEditTask)
.then(r => {
this.$set(this, 'taskEditTask', r)
message.success({message: 'The task was successfully updated.'}, this)
this.success({message: 'The task was successfully updated.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
},

9
src/components/tasks/gantt-component.vue
View file

@ -126,7 +126,6 @@
<script>
import VueDragResize from 'vue-drag-resize'
import message from '../../message'
import EditTask from './edit-task'
import TaskService from '../../services/task'
@ -297,10 +296,10 @@
}
}
message.success({message: 'The task was successfully updated.'}, this)
this.success({message: 'The task was successfully updated.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
}, 100)
},
@ -332,10 +331,10 @@
this.tasksWithoutDates.push(this.addGantAttributes(r))
this.newTaskTitle = ''
this.hideCrateNewTask()
message.success({message: 'The task was successfully created.'}, this)
this.success({message: 'The task was successfully created.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
},

11
src/components/tasks/reusable/attachments.vue
View file

@ -76,7 +76,6 @@
<script>
import AttachmentService from '../../../services/attachment'
import AttachmentModel from '../../../models/attachment'
import message from '../../../message'
export default {
name: 'attachments',
@ -153,18 +152,18 @@
.then(r => {
if(r.success !== null) {
r.success.forEach(a => {
message.success({message: 'Successfully uploaded ' + a.file.name}, this)
this.success({message: 'Successfully uploaded ' + a.file.name}, this)
this.attachments.push(a)
})
}
if(r.errors !== null) {
r.errors.forEach(m => {
message.error(m, this)
this.error(m)
})
}
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
@ -177,10 +176,10 @@
this.attachments.splice(a, 1)
}
}
message.success(r, this)
this.success(r, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
.finally(() => {
this.showDeleteModal = false

11
src/components/tasks/reusable/editAssignees.vue
View file

@ -34,7 +34,6 @@
<script>
import {differenceWith} from 'lodash'
import message from '../../../message'
import multiselect from 'vue-multiselect'
import UserModel from '../../../models/user'
@ -88,10 +87,10 @@
const taskAssignee = new TaskAssigneeModel({user_id: user.id, task_id: this.taskID})
this.taskAssigneeService.create(taskAssignee)
.then(() => {
message.success({message: 'The user was successfully assigned.'}, this)
this.success({message: 'The user was successfully assigned.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
removeAssignee(user) {
@ -104,10 +103,10 @@
this.assignees.splice(a, 1)
}
}
message.success({message: 'The user was successfully unassigned.'}, this)
this.success({message: 'The user was successfully unassigned.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
findUser(query) {
@ -124,7 +123,7 @@
}))
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
clearAllFoundUsers() {

13
src/components/tasks/reusable/editLabels.vue
View file

@ -35,7 +35,6 @@
</template>
<script>
import message from '../../../message'
import { differenceWith } from 'lodash'
import multiselect from 'vue-multiselect'
@ -101,7 +100,7 @@
this.labelTimeout = null
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
}, 300)
},
@ -112,10 +111,10 @@
let labelTask = new LabelTaskModel({taskID: this.taskID, label_id: label.id})
this.labelTaskService.create(labelTask)
.then(() => {
message.success({message: 'The label was successfully added.'}, this)
this.success({message: 'The label was successfully added.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
removeLabel(label) {
@ -128,10 +127,10 @@
this.labels.splice(l, 1)
}
}
message.success({message: 'The label was successfully removed.'}, this)
this.success({message: 'The label was successfully removed.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
createAndAddLabel(title) {
@ -142,7 +141,7 @@
this.labels.push(r)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},

11
src/components/tasks/reusable/relatedTasks.vue
View file

@ -79,7 +79,6 @@
import TaskRelationModel from '../../../models/taskRelation'
import multiselect from 'vue-multiselect'
import message from '../../../message'
export default {
name: 'relatedTasks',
@ -138,7 +137,7 @@
this.$set(this, 'foundTasks', response)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
clearAllFoundTasks() {
@ -158,10 +157,10 @@
this.relatedTasks[this.newTaskRelationKind].push(this.newTaskRelationTask)
this.newTaskRelationKind = 'unset'
this.newTaskRelationTask = new TaskModel()
message.success({message: 'The task relation was created successfully'}, this)
this.success({message: 'The task relation was created successfully'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
removeTaskRelation() {
@ -179,10 +178,10 @@
}
}
})
message.success(r, this)
this.success(r, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
.finally(() => {
this.showDeleteModal = false

19
src/components/teams/EditTeam.vue
View file

@ -137,7 +137,6 @@
<script>
import auth from '../../auth'
import router from '../../router'
import message from '../../message'
import TeamService from '../../services/team'
import TeamModel from '../../models/team'
@ -190,37 +189,37 @@
}
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
submit() {
this.teamService.update(this.team)
.then(response => {
this.team = response
message.success({message: 'The team was successfully updated.'}, this)
this.success({message: 'The team was successfully updated.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
deleteTeam() {
this.teamService.delete(this.team)
.then(() => {
message.success({message: 'The team was successfully deleted.'}, this)
this.success({message: 'The team was successfully deleted.'}, this)
router.push({name: 'listTeams'})
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
deleteUser() {
this.teamMemberService.delete(this.member)
.then(() => {
message.success({message: 'The user was successfully deleted from the team.'}, this)
this.success({message: 'The user was successfully deleted from the team.'}, this)
this.loadTeam()
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
.finally(() => {
this.showUserDeleteModal = false
@ -230,10 +229,10 @@
this.teamMemberService.create(this.member)
.then(() => {
this.loadTeam()
message.success({message: 'The team member was successfully added.'}, this)
this.success({message: 'The team member was successfully added.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
toggleUserType(member) {

3
src/components/teams/ListTeams.vue
View file

@ -20,7 +20,6 @@
<script>
import auth from '../../auth'
import router from '../../router'
import message from '../../message'
import TeamService from '../../services/team'
export default {
@ -48,7 +47,7 @@
this.$set(this, 'teams', response)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
}

5
src/components/teams/NewTeam.vue
View file

@ -26,7 +26,6 @@
<script>
import auth from '../../auth'
import router from '../../router'
import message from '../../message'
import TeamModel from '../../models/team'
import TeamService from '../../services/team'
@ -54,10 +53,10 @@
this.teamService.create(this.team)
.then(response => {
router.push({name:'editTeam', params:{id: response.id}})
message.success({message: 'The team was successfully created.'}, this)
this.success({message: 'The team was successfully created.'}, this)
})
.catch(e => {
message.error(e, this)
this.error(e, this)
})
},
back() {

9
src/main.js
View file

@ -120,16 +120,19 @@ Vue.directive('focus', {
// Check the user's auth status when the app starts
auth.checkAuth()
// Format date mixin
// Mixins
import moment from 'moment'
import message from './message'
Vue.mixin({
methods: {
formatDateSince: date => moment(date).fromNow(),
formatDate: date => moment(date).format('LLL'),
error: (e, context) => message.error(e, context),
success: (s, context) => message.success(s, context),
}
})
new Vue({
router,
render: h => h(App)
router,
render: h => h(App)
}).$mount('#app')

1
src/message/index.js
View file

@ -40,5 +40,4 @@ export default {
context.loading = false
},
}