Skip to content

Commit

Permalink
update dependencies / maintainance
Browse files Browse the repository at this point in the history
  • Loading branch information
korelstar committed Apr 30, 2020
1 parent b5b9181 commit 8186e74
Show file tree
Hide file tree
Showing 8 changed files with 780 additions and 977 deletions.
6 changes: 3 additions & 3 deletions css/print.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@media print {
#header,
#app-navigation,
.app-navigation,
#note-container .action-buttons {
display: none !important;
}

#content {
.content {
display: block;
padding: 0;
color: #000;
Expand All @@ -17,7 +17,7 @@
font-size: 10pt !important;
}

#app-content {
.app-content {
margin-left: 0 !important;
}
}
1,661 changes: 742 additions & 919 deletions package-lock.json

Large diffs are not rendered by default.

32 changes: 17 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@
"dependencies": {
"@nextcloud/axios": "^1.3.2",
"@nextcloud/dialogs": "^1.2.2",
"@nextcloud/moment": "^1.1.0",
"@nextcloud/vue": "^1.4.1",
"easymde": "^2.9.0",
"@nextcloud/event-bus": "^1.1.4",
"@nextcloud/moment": "^1.1.1",
"@nextcloud/router": "^1.0.2",
"@nextcloud/vue": "^2.0.0",
"easymde": "^2.10.1",
"markdown-it": "^10.0.0",
"vue": "^2.6.11",
"vue-observe-visibility": "^0.4.6",
"vue-router": "^3.1.6",
"vuex": "^3.1.3"
"vuex": "^3.3.0"
},
"browserslist": [
"extends @nextcloud/browserslist-config"
Expand All @@ -30,35 +32,35 @@
"node": ">=10.0.0"
},
"devDependencies": {
"@babel/core": "^7.9.0",
"@babel/core": "^7.9.6",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/preset-env": "^7.9.0",
"@babel/preset-env": "^7.9.6",
"@nextcloud/browserslist-config": "^1.0.0",
"@nextcloud/eslint-config": "^2.0.0",
"@nextcloud/eslint-plugin": "^1.1.0",
"@nextcloud/eslint-plugin": "^1.4.0",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
"core-js": "^3.6.4",
"css-loader": "^3.4.2",
"core-js": "^3.6.5",
"css-loader": "^3.5.3",
"eslint": "^6.8.0",
"eslint-config-standard": "^12.0.0",
"eslint-import-resolver-webpack": "^0.12.1",
"eslint-loader": "^3.0.3",
"eslint-loader": "^3.0.4",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^6.2.2",
"file-loader": "^6.0.0",
"node-sass": "^4.13.1",
"node-sass": "^4.14.0",
"sass-loader": "^8.0.2",
"stylelint": "^13.2.1",
"stylelint": "^13.3.3",
"stylelint-config-recommended-scss": "^4.2.0",
"stylelint-scss": "^3.16.0",
"url-loader": "^4.0.0",
"stylelint-scss": "^3.17.1",
"url-loader": "^4.1.0",
"vue-loader": "^15.9.1",
"vue-template-compiler": "^2.6.11",
"webpack": "^4.42.1",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11",
"webpack-merge": "^4.2.2"
}
Expand Down
4 changes: 2 additions & 2 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ import {
Content,
} from '@nextcloud/vue'
import { showSuccess } from '@nextcloud/dialogs'
import { emit } from '@nextcloud/event-bus'
import { fetchNotes, noteExists, createNote, undoDeleteNote } from './NotesService'
import { openNavbar } from './nextcloud'
import AppSettings from './components/AppSettings'
import NavigationList from './components/NavigationList'
import store from './store'
Expand Down Expand Up @@ -186,7 +186,7 @@ export default {
onSearch(query) {
this.filter.search = query
openNavbar()
emit('toggle-navigation', { open: true })
},
onResetSearch() {
Expand Down
10 changes: 6 additions & 4 deletions src/NotesService.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import AppGlobal from './mixins/AppGlobal'
import store from './store'
import axios from '@nextcloud/axios'
import { generateUrl } from '@nextcloud/router'
import { showError } from '@nextcloud/dialogs'

import AppGlobal from './mixins/AppGlobal'
import store from './store'

const t = AppGlobal.methods.t

function url(url) {
url = `/apps/notes${url}`
return OC.generateUrl(url)
url = `apps/notes${url}`
return generateUrl(url)
}

function handleSyncError(message) {
Expand Down
9 changes: 7 additions & 2 deletions src/components/Note.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,12 @@ import {
ActionButton,
AppContent,
Tooltip,
isMobile,
} from '@nextcloud/vue'
import { showError } from '@nextcloud/dialogs'
import { emit } from '@nextcloud/event-bus'
import { fetchNote, saveNote, saveNoteManually } from '../NotesService'
import { closeNavbar } from '../nextcloud'
import TheEditor from './EditorEasyMDE'
import ThePreview from './EditorMarkdownIt'
import store from '../store'
Expand All @@ -80,6 +81,8 @@ export default {
tooltip: Tooltip,
},
mixins: [isMobile],
props: {
noteId: {
type: String,
Expand Down Expand Up @@ -134,7 +137,9 @@ export default {
fetchData() {
store.commit('setSidebarOpen', false)
closeNavbar()
if (this.isMobile) {
emit('toggle-navigation', { open: false })
}
this.onUpdateTitle(this.title)
this.loading = true
Expand Down
31 changes: 0 additions & 31 deletions src/nextcloud.js

This file was deleted.

4 changes: 3 additions & 1 deletion src/router.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import Vue from 'vue'
import Router from 'vue-router'
import { generateUrl } from '@nextcloud/router'

import Loading from './components/Loading'
import Welcome from './components/Welcome'
import Note from './components/Note'
Expand All @@ -9,7 +11,7 @@ Vue.use(Router)

export default new Router({
mode: 'history',
base: OC.generateUrl('/apps/notes'),
base: generateUrl('apps/notes'),
linkActiveClass: 'active',
routes: [
{
Expand Down

0 comments on commit 8186e74

Please sign in to comment.