diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index 69fad35..0000000 --- a/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "bower_components" -} diff --git a/.circleci/config.yml b/.circleci/config.yml index 7425a1b..2fa170d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,6 @@ jobs: - run: npm install - run: sudo npm install -g bower - run: sudo npm install -g gulp - - run: bower install - run: gulp clean build - save_cache: key: v1-ariang-{{ .Environment.CIRCLE_SHA1 }} diff --git a/README.md b/README.md index e9d9e9e..13f8989 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,6 @@ Latest Daily Build: [https://github.com/mayswind/AriaNg-DailyBuild/archive/maste Make sure you have [Node.js](https://nodejs.org/), [NPM](https://www.npmjs.com/), [Gulp](https://gulpjs.com/) and [Bower](https://bower.io/) installed. Then download the source code, and follow these steps. $ npm install - $ bower install $ gulp clean build The builds will be placed in the dist directory. diff --git a/bower.json b/bower.json deleted file mode 100644 index 098c0f6..0000000 --- a/bower.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "private": true, - "name": "ariang", - "description": "AriaNg, a modern web frontend making aria2 easier to use.", - "main": "index.html", - "authors": [ - "MaysWind " - ], - "license": "MIT", - "keywords": [ - "aria2", - "Web", - "Frontend", - "UI" - ], - "homepage": "http://ariang.mayswind.net/", - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ], - "dependencies": { - "jquery": "3.3.1", - "bootstrap": "3.3.7", - "moment": "2.22.2", - "moment-timezone": "0.5.17", - "echarts": "3.8.5", - "font-awesome": "^4.7.0", - "admin-lte": "2.4.3", - "sweetalert": "^1.1.3", - "awesome-bootstrap-checkbox": "^0.3.7", - "jquery-slimscroll": "^1.3.8", - "bootstrap-contextmenu": "^0.3.4", - "angular": "1.6.10", - "angular-route": "1.6.10", - "angular-sanitize": "1.6.10", - "angular-touch": "1.6.10", - "angular-messages": "1.6.10", - "angular-cookies": "1.6.10", - "angular-animate": "1.6.10", - "angular-translate": "^2.18.1", - "angular-moment": "1.2.0", - "angular-websocket": "^2.0.0", - "angular-utf8-base64": "^0.0.5", - "angular-local-storage": "^0.7.1", - "angular-notification": "775ee861c1737b284588bcb878ba1f4e43c70c97", - "angular-ui-notification": "^0.3.6", - "angular-bittorrent-peerid": "^1.2.0", - "angular-busy": "^4.1.4", - "angular-promise-buttons": "^0.1.23", - "angular-clipboard": "^1.6.2", - "angular-input-dropdown": "mayswind/angular-input-dropdown#68670e39816698b3eb98c0e740a0efe77d5fbdd1", - "angularjs-dragula": "^2.0.0", - "ngSweetAlert": "^1.1.2" - }, - "resolutions": { - "jquery": "3.3.1", - "angular": "1.6.10" - } -} diff --git a/gulpfile.js b/gulpfile.js index c7e2578..81f914b 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -68,7 +68,7 @@ gulp.task('images', function () { gulp.task('fonts', function () { return gulp.src([ - 'bower_components/font-awesome/fonts/fontawesome-webfont.*' + 'node_modules/font-awesome/fonts/fontawesome-webfont.*' ]).pipe(gulp.dest('.tmp/fonts')) .pipe(gulp.dest('dist/fonts')); }); @@ -111,7 +111,7 @@ gulp.task('serve', ['styles', 'scripts', 'fonts'], function () { server: { baseDir: ['.tmp', 'src'], routes: { - '/bower_components': 'bower_components' + '/node_modules': 'node_modules' } } }); diff --git a/package.json b/package.json index 3c3bc2f..febaf2b 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,40 @@ "engines": { "node": ">=6" }, + "dependencies": { + "jquery": "3.3.1", + "bootstrap": "3.3.7", + "moment": "2.22.2", + "moment-timezone": "0.5.17", + "echarts": "3.8.5", + "font-awesome": "^4.7.0", + "admin-lte": "2.4.3", + "sweetalert": "^1.1.3", + "awesome-bootstrap-checkbox": "^0.3.7", + "jquery-slimscroll": "^1.3.8", + "bootstrap-contextmenu": "^1.0.0", + "angular": "1.6.10", + "angular-route": "1.6.10", + "angular-sanitize": "1.6.10", + "angular-touch": "1.6.10", + "angular-messages": "1.6.10", + "angular-cookies": "1.6.10", + "angular-animate": "1.6.10", + "angular-translate": "^2.18.1", + "angular-moment": "1.2.0", + "angular-websocket": "^2.0.0", + "angular-utf8-base64": "^0.0.5", + "angular-local-storage": "^0.7.1", + "angular-notification": "git://github.com/neoziro/angular-notification#775ee861c1737b284588bcb878ba1f4e43c70c97", + "angular-ui-notification": "^0.3.6", + "angular-bittorrent-peerid": "^1.2.0", + "angular-busy": "^4.1.4", + "angular-promise-buttons": "^0.1.23", + "angular-sweetalert": "^1.1.2", + "angular-clipboard": "^1.6.2", + "angular-input-dropdown": "git://github.com/mayswind/angular-input-dropdown#68670e39816698b3eb98c0e740a0efe77d5fbdd1", + "angularjs-dragula": "^2.0.0" + }, "devDependencies": { "browser-sync": "^2.23.6", "del": "^3.0.0", diff --git a/src/index.html b/src/index.html index 00365b7..66353d1 100644 --- a/src/index.html +++ b/src/index.html @@ -19,18 +19,18 @@ - + - - - - - - - - - + + + + + + + + + @@ -301,48 +301,48 @@ - + - - - - - - - + + + + + + + - + - - - - + + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/scripts/core/app.js b/src/scripts/core/app.js index a96869a..ae30c4f 100644 --- a/src/scripts/core/app.js +++ b/src/scripts/core/app.js @@ -11,7 +11,7 @@ 'pascalprecht.translate', 'angularMoment', 'ngWebSocket', - 'ab-base64', + 'utf8-base64', 'LocalStorageModule', 'notification', 'ui-notification',