diff --git a/assets/macdj-dmg-background.png b/assets/macdj-dmg-background.png index 569e805..db35c8b 100644 Binary files a/assets/macdj-dmg-background.png and b/assets/macdj-dmg-background.png differ diff --git a/assets/macdj-dmg-background@2x.png b/assets/macdj-dmg-background@2x.png deleted file mode 100644 index 82aa6c6..0000000 Binary files a/assets/macdj-dmg-background@2x.png and /dev/null differ diff --git a/src/Gruntfile.js b/src/Gruntfile.js index e5d7487..33cf0ec 100644 --- a/src/Gruntfile.js +++ b/src/Gruntfile.js @@ -97,28 +97,22 @@ module.exports = function (grunt) { } }, - appdmg: { - options: { - title: '<%= pkg.productName %> Installer', - icon: '../assets/macdj.icns', - "background": "../assets/macdj-dmg-background.png", - "contents": [ - { "x": 750, "y": 375, "type": "link", "path": "/Applications" }, - { "x": 170, "y": 375, "type": "file", "path": "../builds/MacDJ-darwin-x64/MacDJ.app" } - ] - }, - target: '../builds/MacDJ.dmg' + exec: { + appdmg: { + cmd: 'appdmg ./appdmg.json ../builds/MacDJ-darwin-x64/MacDJ.dmg' + } } }); // load plugins grunt.loadNpmTasks('gruntify-eslint'); + grunt.loadNpmTasks('grunt-exec'); // register tasks grunt.registerTask('lint', ['eslint']); - grunt.registerTask('appdmg', ['appdmg']); + grunt.registerTask('appdmg', ['eslint', 'electron:osxBuild', 'exec:appdmg']); grunt.registerTask('build-osx', ['eslint', 'electron:osxBuild']); grunt.registerTask('build-win', ['eslint', 'electron:win32Build', 'electron:win64Build']); grunt.registerTask('build-all', ['eslint', 'electron:osxBuild', 'electron:win32Build', 'electron:win64Build']); -}; \ No newline at end of file +}; diff --git a/src/app/js/index.js b/src/app/js/index.js index 0d03bcf..2561c2f 100644 --- a/src/app/js/index.js +++ b/src/app/js/index.js @@ -24,6 +24,8 @@ function MainController($scope, $sce) { $scope.queue = {}; + $scope.dfm = []; + function updateClient(event, client) { $scope.client = client.user; $scope.prefix = client.prefix; @@ -44,14 +46,6 @@ function MainController($scope, $sce) { applyJS(); } - fetch('https://temp.discord.fm/libraries/json').then(r => r.json()) - .then(data => { - $scope.dfm = data; - console.log(data); - $scope.$apply(); - }) - .catch(e => $scope.dfm = []); - ipcRenderer.on('ready', updateClient); ipcRenderer.on('update', updateClient); diff --git a/src/appdmg.json b/src/appdmg.json new file mode 100644 index 0000000..73c068d --- /dev/null +++ b/src/appdmg.json @@ -0,0 +1,9 @@ +{ + "title": "MacDJ Installer", + "icon": "../assets/macdj.icns", + "background": "../assets/macdj-dmg-background.png", + "contents": [ + { "x": 486, "y": 285, "type": "link", "path": "/Applications" }, + { "x": 115, "y": 285, "type": "file", "path": "../builds/MacDJ-darwin-x64/MacDJ.app" } + ] +} diff --git a/src/package.json b/src/package.json index 14c586a..1a51b1a 100644 --- a/src/package.json +++ b/src/package.json @@ -26,14 +26,14 @@ "ytdl-core": "^0.7.17" }, "devDependencies": { + "appdmg": "^0.4.5", "electron-packager": "7.4.0", "electron-prebuilt": "^1.3.1", "grunt": "^1.0.1", "grunt-electron": "^4.0.0", + "grunt-electron-installer": "^2.1.0", + "grunt-exec": "^1.0.0", "gruntify-eslint": "^3.0.0", "load-grunt-tasks": "^3.5.0" - }, - "optionalDependencies": { - "grunt-appdmg": "^0.4.0" } }