From 05a91960186124ae8d90cfabccd2154f032261fb Mon Sep 17 00:00:00 2001 From: "magigus-PC\\magigus" Date: Tue, 21 Feb 2017 20:57:04 +0200 Subject: [PATCH 01/34] reviewing updates --- gulpfile.js | 6 +- package.json | 21 +- resources/assets/js/App.vue | 43 ++-- resources/assets/js/components/Categories.vue | 19 +- resources/assets/js/components/Dropzone.vue | 198 +++++++++--------- .../assets/js/components/Editcategory.vue | 4 +- resources/assets/js/components/Editpost.vue | 12 +- resources/assets/js/components/Home.vue | 4 +- resources/assets/js/components/Posts.vue | 19 +- resources/assets/js/components/Users.vue | 66 +++--- .../assets/js/components/layouts/Navbar.vue | 2 +- .../assets/js/components/layouts/Sidebar.vue | 18 +- resources/assets/js/main.js | 96 +++++---- 13 files changed, 275 insertions(+), 233 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index f1d810d..9aac55e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,9 +1,11 @@ var elixir = require('laravel-elixir'); -elixir.config.js.browserify.watchify.options.poll = true; +// elixir.config.js.browserify.watchify.options.poll = true; // elixir.config.js.browserify.transformers.push({ // name: 'vueify' // }); +// require('laravel-elixir-vue-2'); +require('laravel-elixir-browserify-official'); require('laravel-elixir-vueify'); require('laravel-elixir-livereload'); @@ -20,7 +22,7 @@ require('laravel-elixir-livereload'); elixir(function(mix) { mix.less('../themes/clean-blog/clean-blog.less') - + mix.browserify('main.js') mix.browserify('theme.js') mix.version(['public/js/main.js', 'public/js/theme.js']); diff --git a/package.json b/package.json index be680e1..0deff7a 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "dev": "gulp watch" }, "devDependencies": { + "aliasify": "^2.1.0", "babel-core": "^6.9.1", "babel-loader": "^6.2.4", "babel-plugin-transform-runtime": "^6.9.0", @@ -16,20 +17,25 @@ "gulp": "^3.9.1", "gulp-livereload": "^3.8.1", "jquery": "^2.2.3", - "laravel-elixir": "^5.0.0", + "laravel-elixir": "^6.0.0-15", + "laravel-elixir-vue": "^0.1.4", + "laravel-elixir-browserify-official": "^0.1.3", "laravel-elixir-livereload": "^1.1.5-beta", - "laravel-elixir-vueify": "^1.0.3", + "laravel-elixir-vue-2": "^0.3.0", + "laravel-elixir-vueify": "^2.0.0", "pnotify": "^3.0.0", "sweetalert2": "^4.0.5", - "vue": "^1.0.25", + "vue": "^2.1.10", "vue-hot-reload-api": "^1.3.2", "vue-html-loader": "^1.2.2", "vue-loader": "^8.5.2", "vue-multiselect": "^0.3.0", "vue-resource": "0.8.0", - "vue-router": "^0.7.13", + "vue-router": "^2.2.1", "vue-style-loader": "^1.0.0", - "vueify": "^8.5.4", + "vueify": "^9.4.0", + "vuejs-paginator": "^1.0.15", + "watchify": "^3.9.0", "webpack": "^1.13.1" }, "name": "vuejs-news", @@ -45,6 +51,11 @@ "vue-multiselect": "^0.3.0", "vuejs-paginator": "^1.0.14" }, + "aliasify": { + "aliases": { + "vue": "vue/dist/vue.js" + } + }, "author": "Alex Kyriakidis ", "license": "MIT", "homepage": "https://github.com/vuedo/vuedo" diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index e4ecb5b..45ac8d6 100644 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -1,25 +1,27 @@ @@ -35,7 +37,6 @@ export default { components: { Navbar, Sidebar - }, - replace: false + } } diff --git a/resources/assets/js/components/Categories.vue b/resources/assets/js/components/Categories.vue index 4fce8c5..023979e 100644 --- a/resources/assets/js/components/Categories.vue +++ b/resources/assets/js/components/Categories.vue @@ -22,12 +22,12 @@ {{category.icon}}
- - + + View posts + + + Edit +
@@ -46,7 +46,7 @@ import { stack_bottomright, show_stack_success, show_stack_error, show_stack_info } from '../Pnotice.js' export default { - ready () { + mounted () { this.fetchCategories() }, data () { @@ -63,7 +63,7 @@ export default { createCategory () { this.$http({url: '/api/categories', method: 'POST'}).then(function (response) { show_stack_info('Creating Category...', response) - this.$router.go('/categories/' + response.data.hashid + '/edit') + this.$router.push('/categories/' + response.data.hashid + '/edit') }) }, deleteCategory (category) { @@ -76,7 +76,8 @@ export default { confirmButtonText: 'Yes, delete it!', cancelButtonText: 'No, keep it', }).then(function() { - self.categories.$remove(category) + // self.categories.$remove(category) + var index = self.categories.indexOf(category); self.categories.splice(index, 1) self.$http.delete('/api/categories/' + category.hashid, category).then(function (response) { swal( 'Deleted!', diff --git a/resources/assets/js/components/Dropzone.vue b/resources/assets/js/components/Dropzone.vue index a21df0d..8b3e8c6 100644 --- a/resources/assets/js/components/Dropzone.vue +++ b/resources/assets/js/components/Dropzone.vue @@ -1,126 +1,128 @@ diff --git a/resources/assets/js/components/Editcategory.vue b/resources/assets/js/components/Editcategory.vue index 8a59bda..daa1ecb 100644 --- a/resources/assets/js/components/Editcategory.vue +++ b/resources/assets/js/components/Editcategory.vue @@ -35,7 +35,7 @@ import { stack_bottomright, show_stack_success, show_stack_error } from '../Pnotice.js' export default { - ready(){ + mounted () { this.fetchCategory() }, data () { @@ -70,7 +70,7 @@ export default { cancelButtonText: 'No, keep it', }).then(function() { self.$http.delete('/api/categories/' + category.hashid, category).then(function (response) { - self.$router.go('/categories') + self.$router.push('/categories') swal( 'Deleted!', 'Your category has been deleted.', diff --git a/resources/assets/js/components/Editpost.vue b/resources/assets/js/components/Editpost.vue index 468baf0..678147f 100644 --- a/resources/assets/js/components/Editpost.vue +++ b/resources/assets/js/components/Editpost.vue @@ -1,9 +1,10 @@ diff --git a/resources/assets/js/components/layouts/Navbar.vue b/resources/assets/js/components/layouts/Navbar.vue index 7f74250..8d4635d 100644 --- a/resources/assets/js/components/layouts/Navbar.vue +++ b/resources/assets/js/components/layouts/Navbar.vue @@ -43,7 +43,7 @@