vikunja
/
frontend
Archived
6
39
Fork 49
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

Update dependencies (#40)
continuous-integration/drone/push Build is passing Details

This commit is contained in:
konrad 2019-12-15 20:42:40 +00:00
parent ce1a524429
commit 11d9aaae12
11 changed files with 1993 additions and 2431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.yml
View File

@ -14,7 +14,7 @@ steps:
pull: true
group: build-static
commands:
- yarn
- yarn --frozen-lockfile
- yarn run lint
- yarn run build
@ -34,7 +34,7 @@ steps:
pull: true
group: build-static
commands:
- yarn
- yarn --frozen-lockfile
- yarn run lint
- "echo '{\"VIKUNJA_API_BASE_URL\": \"/api/v1/\"}' > /drone/src/public/config.json" # Override config
- yarn run build
@ -89,7 +89,7 @@ steps:
pull: true
group: build-static
commands:
- yarn
- yarn --frozen-lockfile
- yarn run lint
- "echo '{\"VIKUNJA_API_BASE_URL\": \"/api/v1/\"}' > /drone/src/public/config.json" # Override config
- yarn run build

43
package.json
View File

@ -1,6 +1,6 @@
{
"name": "vikunja-frontend",
"version": "0.8.0",
"version": "0.10.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
@ -8,13 +8,13 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"bulma": "^0.7.1",
"bulma": "^0.8.0",
"copy-to-clipboard": "^3.2.0",
"lodash": "^4.17.11",
"lodash": "^4.17.15",
"register-service-worker": "^1.6.2",
"v-tooltip": "^2.0.0-rc.33",
"v-tooltip": "^2.0.2",
"verte": "^0.0.12",
"vue": "^2.5.17",
"vue": "^2.6.11",
"vue-drag-resize": "^1.3.2",
"vue-easymde": "^1.0.1"
},
@ -22,23 +22,24 @@
"@fortawesome/fontawesome-svg-core": "^1",
"@fortawesome/free-regular-svg-icons": "^5",
"@fortawesome/free-solid-svg-icons": "^5",
"@fortawesome/vue-fontawesome": "^0.1.1",
"@vue/cli": "^4.0.1",
"@vue/cli-plugin-babel": "^3.0.1",
"@vue/cli-plugin-eslint": "^3.0.1",
"@vue/cli-plugin-pwa": "^4.0.0",
"@vue/cli-service": "^3.9.2",
"@fortawesome/vue-fontawesome": "^0.1.9",
"@vue/cli": "^4.1.1",
"@vue/cli-plugin-babel": "^4.1.1",
"@vue/cli-plugin-eslint": "^4.1.1",
"@vue/cli-plugin-pwa": "^4.1.1",
"@vue/cli-service": "^4.1.1",
"axios": "^0.19.0",
"bulmaswatch": "^0.7.1",
"i": "^0.3.6",
"node-sass": "^4.9.3",
"npm": "^6.13.4",
"sass-loader": "^7.1.0",
"vue-flatpickr-component": "^8.1.2",
"vue-multiselect": "^2.1.0",
"vue-notification": "^1.3.13",
"vue-router": "^3.0.1",
"vue-template-compiler": "^2.5.17"
"babel-eslint": "^10.0.3",
"core-js": "^3.5.0",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^6.0.1",
"node-sass": "^4.13.0",
"sass-loader": "^8.0.0",
"vue-flatpickr-component": "^8.1.5",
"vue-multiselect": "^2.1.6",
"vue-notification": "^1.3.20",
"vue-router": "^3.1.3",
"vue-template-compiler": "^2.6.11"
},
"eslintConfig": {
"root": true,

5
src/components/global/easymde.vue
View File

@ -12,7 +12,10 @@
VueEasymde
},
props: {
value: '',
value: {
type: String,
default: '',
},
},
data() {
return {

20
src/components/sharing/userTeam.vue
View File

@ -128,10 +128,22 @@
export default {
name: 'userTeamShare',
props: {
type: '',
shareType: '',
id: 0,
userIsAdmin: false,
type: {
type: String,
default: '',
},
shareType: {
type: String,
default: '',
},
id: {
type: Number,
default: 0,
},
userIsAdmin: {
type: Boolean,
default: false,
},
},
data() {
return {

7
src/components/tasks/ShowTasks.vue
View File

@ -8,7 +8,7 @@
</template>
<div class="spinner" :class="{ 'is-loading': taskService.loading}"></div>
<div class="tasks" v-if="tasks && tasks.length > 0">
<div @click="gotoList(l.listID)" class="task" v-for="l in tasks" :key="l.id" v-if="!l.done">
<div @click="gotoList(l.listID)" class="task" v-for="l in undoneTasks" :key="l.id">
<label :for="l.id">
<div class="fancycheckbox">
<input type="checkbox" :id="l.id" :checked="l.done" style="display: none;" disabled>
@ -56,6 +56,11 @@
this.taskService = new TaskService()
this.loadPendingTasks()
},
computed: {
undoneTasks: function () {
return this.tasks.filter(t => !t.done)
}
},
methods: {
loadPendingTasks() {
let params = {sort_by: 'due_date_unix', order_by: 'desc'}

4
src/components/tasks/TaskDetailView.vue
View File

@ -252,14 +252,12 @@
import ListModel from '../../models/list'
import NamespaceModel from '../../models/namespace'
import PriorityLabel from './reusable/priorityLabel'
import priorites from '../../models/priorities'
import flatPickr from 'vue-flatpickr-component'
import 'flatpickr/dist/flatpickr.css'
import PrioritySelect from './reusable/prioritySelect'
import PercentDoneSelect from './reusable/percentDoneSelect'
import Easymde from '../global/easymde'
import EditLabels from './reusable/editLabels'
import EditAssignees from './reusable/editAssignees'
import Attachments from './reusable/attachments'
@ -276,10 +274,8 @@
Attachments,
EditAssignees,
EditLabels,
Easymde,
PercentDoneSelect,
PrioritySelect,
PriorityLabel,
flatPickr,
},
data() {

2
src/components/tasks/edit-task.vue
View File

@ -137,7 +137,6 @@
import message from '../../message'
import flatPickr from 'vue-flatpickr-component'
import 'flatpickr/dist/flatpickr.css'
import multiselect from 'vue-multiselect'
import verte from 'verte'
import 'verte/dist/verte.css'
@ -185,7 +184,6 @@
PercentDoneSelect,
PrioritySelect,
flatPickr,
multiselect,
verte,
},
props: {

2
src/components/tasks/reusable/editAssignees.vue
View File

@ -18,7 +18,7 @@
select-label="Assign this user"
:showNoOptions="false"
>
<template slot="tag" slot-scope="{ option, remove }">
<template slot="tag" slot-scope="{ option }">
<user :user="option" :show-username="false" :avatar-size="30"/>
<a @click="removeAssignee(option)" class="remove-assignee">
<icon icon="times"/>

2
src/components/tasks/reusable/editLabels.vue
View File

@ -20,7 +20,7 @@
@tag="createAndAddLabel"
tag-placeholder="Add this as new label"
>
<template slot="tag" slot-scope="{ option, remove }">
<template slot="tag" slot-scope="{ option }">
<span class="tag"
:style="{'background': option.hex_color, 'color': option.textColor}">
<span>{{ option.title }}</span>

28
src/components/tasks/reusable/relatedTasks.vue
View File

@ -40,20 +40,22 @@
</div>
</div>
<div class="related-tasks" v-for="(rts, kind ) in relatedTasks" :key="kind" v-if="rts.length > 0">
<span class="title">{{ relationKinds[kind] }}</span>
<div class="tasks noborder">
<div class="task" v-for="t in rts" :key="t.id">
<router-link :to="{ name: 'taskDetailView', params: { id: t.id } }">
<span class="tasktext" :class="{ 'done': t.done}">
{{t.text}}
</span>
</router-link>
<a class="remove" @click="() => {showDeleteModal = true; relationToDelete = {relation_kind: kind, other_task_id: t.id}}">
<icon icon="trash-alt"/>
</a>
<div class="related-tasks" v-for="(rts, kind ) in relatedTasks" :key="kind">
<template v-if="rts.length > 0">
<span class="title">{{ relationKinds[kind] }}</span>
<div class="tasks noborder">
<div class="task" v-for="t in rts" :key="t.id">
<router-link :to="{ name: 'taskDetailView', params: { id: t.id } }">
<span class="tasktext" :class="{ 'done': t.done}">
{{t.text}}
</span>
</router-link>
<a class="remove" @click="() => {showDeleteModal = true; relationToDelete = {relation_kind: kind, other_task_id: t.id}}">
<icon icon="trash-alt"/>
</a>
</div>
</div>
</div>
</template>
</div>
<p v-if="showNoRelationsNotice && Object.keys(relatedTasks).length === 0" class="none">No task relations yet.</p>

4305
yarn.lock
View File

File diff suppressed because it is too large Load Diff