From 2d6d0fd8fb7f505300fc73f6117604c74cc6fb18 Mon Sep 17 00:00:00 2001 From: An Phan Date: Thu, 1 Dec 2016 17:54:28 +0700 Subject: [PATCH] Replace sweetalert with alertify --- gulpfile.js | 1 - package.json | 2 +- .../main-wrapper/main-content/playlist.vue | 12 +----- .../main-wrapper/main-content/profile.vue | 8 ---- .../main-wrapper/main-content/settings.vue | 23 ++---------- .../assets/js/components/shared/user-item.vue | 12 +----- resources/assets/js/stores/favorite.js | 16 ++++++-- resources/assets/js/stores/playlist.js | 17 +++++++-- resources/assets/js/stores/setting.js | 6 ++- resources/assets/js/stores/song.js | 3 +- resources/assets/js/stores/user.js | 5 +++ resources/assets/js/utils/alerts.js | 37 +++++++++++++++++++ resources/assets/js/utils/index.js | 1 + resources/assets/sass/app.scss | 2 +- resources/assets/sass/vendor/_alertify.scss | 19 ++++++++++ resources/assets/sass/vendor/_sweetalert.scss | 23 ------------ 16 files changed, 105 insertions(+), 82 deletions(-) create mode 100644 resources/assets/js/utils/alerts.js create mode 100644 resources/assets/sass/vendor/_alertify.scss delete mode 100644 resources/assets/sass/vendor/_sweetalert.scss diff --git a/gulpfile.js b/gulpfile.js index 797c6b17..23f02f64 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -35,7 +35,6 @@ elixir(function (mix) { 'resources/assets/css/**/*.css', 'node_modules/font-awesome/css/font-awesome.min.css', 'node_modules/rangeslider.js/dist/rangeslider.css', - 'node_modules/sweetalert/dist/sweetalert.css' ], 'public/css/vendors.css', './'); mix.version(['css/vendors.css', 'css/app.css', 'js/vendors.js', 'js/main.js']); diff --git a/package.json b/package.json index 36dc2f3e..980f3fdf 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "url": "https://github.com/phanan/koel" }, "dependencies": { + "alertify.js": "^1.0.12", "babel-plugin-lodash": "^2.2.1", "babel-plugin-transform-runtime": "^6.3.13", "babel-polyfill": "^6.9.1", @@ -39,7 +40,6 @@ "rangeslider.js": "^2.2.1", "select": "^1.0.6", "sinon": "^1.17.2", - "sweetalert": "^1.1.3", "vue": "^2.0.1", "vue-hot-reload-api": "^1.3.2", "vueify": "^9.1.0", diff --git a/resources/assets/js/components/main-wrapper/main-content/playlist.vue b/resources/assets/js/components/main-wrapper/main-content/playlist.vue index 399522af..a2866fc8 100644 --- a/resources/assets/js/components/main-wrapper/main-content/playlist.vue +++ b/resources/assets/js/components/main-wrapper/main-content/playlist.vue @@ -37,9 +37,7 @@