diff --git a/.gitignore b/.gitignore index 12e128e..cc12328 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ .AppleDouble .LSOverride .idea -.vscode ._* .Spotlight-V100 .Trashes diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..473f63e --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,16 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Debug Main Process", + "type": "node", + "request": "launch", + "cwd": "${workspaceRoot}", + "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron", + "windows": { + "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd" + }, + "args": ["."] + } + ] +} diff --git a/package.json b/package.json index 381adbf..27da779 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "sonist", "version": "0.1.0", "description": "Music Player", - "main": "main.js", + "main": "src/main.js", "scripts": { "start": "electron ." }, diff --git a/css/app.css b/src/css/app.css similarity index 100% rename from css/app.css rename to src/css/app.css diff --git a/css/app.scss b/src/css/app.scss similarity index 100% rename from css/app.scss rename to src/css/app.scss diff --git a/css/desktop-lrc.css b/src/css/desktop-lrc.css similarity index 100% rename from css/desktop-lrc.css rename to src/css/desktop-lrc.css diff --git a/css/desktop-lrc.scss b/src/css/desktop-lrc.scss similarity index 100% rename from css/desktop-lrc.scss rename to src/css/desktop-lrc.scss diff --git a/css/modules.css b/src/css/modules.css similarity index 100% rename from css/modules.css rename to src/css/modules.css diff --git a/css/modules.scss b/src/css/modules.scss similarity index 100% rename from css/modules.scss rename to src/css/modules.scss diff --git a/css/var.scss b/src/css/var.scss similarity index 100% rename from css/var.scss rename to src/css/var.scss diff --git a/desktop-lrc.html b/src/desktop-lrc.html similarity index 100% rename from desktop-lrc.html rename to src/desktop-lrc.html diff --git a/images/album.png b/src/images/album.png similarity index 100% rename from images/album.png rename to src/images/album.png diff --git a/images/app.png b/src/images/app.png similarity index 100% rename from images/app.png rename to src/images/app.png diff --git a/images/avatar.jpg b/src/images/avatar.jpg similarity index 100% rename from images/avatar.jpg rename to src/images/avatar.jpg diff --git a/images/btn-close.svg b/src/images/btn-close.svg similarity index 100% rename from images/btn-close.svg rename to src/images/btn-close.svg diff --git a/images/btn-close_a.svg b/src/images/btn-close_a.svg similarity index 100% rename from images/btn-close_a.svg rename to src/images/btn-close_a.svg diff --git a/images/btn-grey.svg b/src/images/btn-grey.svg similarity index 100% rename from images/btn-grey.svg rename to src/images/btn-grey.svg diff --git a/images/btn-maxi.svg b/src/images/btn-maxi.svg similarity index 100% rename from images/btn-maxi.svg rename to src/images/btn-maxi.svg diff --git a/images/btn-maxi_a.svg b/src/images/btn-maxi_a.svg similarity index 100% rename from images/btn-maxi_a.svg rename to src/images/btn-maxi_a.svg diff --git a/images/btn-mini.svg b/src/images/btn-mini.svg similarity index 100% rename from images/btn-mini.svg rename to src/images/btn-mini.svg diff --git a/images/btn-mini_a.svg b/src/images/btn-mini_a.svg similarity index 100% rename from images/btn-mini_a.svg rename to src/images/btn-mini_a.svg diff --git a/images/disk.png b/src/images/disk.png similarity index 100% rename from images/disk.png rename to src/images/disk.png diff --git a/images/trays/trayTemplate.png b/src/images/trays/trayTemplate.png similarity index 100% rename from images/trays/trayTemplate.png rename to src/images/trays/trayTemplate.png diff --git a/images/trays/trayTemplate@2x.png b/src/images/trays/trayTemplate@2x.png similarity index 100% rename from images/trays/trayTemplate@2x.png rename to src/images/trays/trayTemplate@2x.png diff --git a/index.html b/src/index.html similarity index 100% rename from index.html rename to src/index.html diff --git a/js/api.js b/src/js/api.js similarity index 100% rename from js/api.js rename to src/js/api.js diff --git a/js/app.js b/src/js/app.js similarity index 100% rename from js/app.js rename to src/js/app.js diff --git a/js/desktop-lrc.js b/src/js/desktop-lrc.js similarity index 100% rename from js/desktop-lrc.js rename to src/js/desktop-lrc.js diff --git a/js/modules/artist.js b/src/js/modules/artist.js similarity index 100% rename from js/modules/artist.js rename to src/js/modules/artist.js diff --git a/js/modules/ktv.js b/src/js/modules/ktv.js similarity index 100% rename from js/modules/ktv.js rename to src/js/modules/ktv.js diff --git a/js/modules/local.js b/src/js/modules/local.js similarity index 100% rename from js/modules/local.js rename to src/js/modules/local.js diff --git a/js/modules/profile.js b/src/js/modules/profile.js similarity index 100% rename from js/modules/profile.js rename to src/js/modules/profile.js diff --git a/js/modules/search.js b/src/js/modules/search.js similarity index 100% rename from js/modules/search.js rename to src/js/modules/search.js diff --git a/lib/anot.next.js b/src/lib/anot.next.js similarity index 100% rename from lib/anot.next.js rename to src/lib/anot.next.js diff --git a/lib/audio/index.js b/src/lib/audio/index.js similarity index 100% rename from lib/audio/index.js rename to src/lib/audio/index.js diff --git a/lib/avatar/def.jpg b/src/lib/avatar/def.jpg similarity index 100% rename from lib/avatar/def.jpg rename to src/lib/avatar/def.jpg diff --git a/lib/avatar/index.js b/src/lib/avatar/index.js similarity index 100% rename from lib/avatar/index.js rename to src/lib/avatar/index.js diff --git a/lib/css/elem-ui.css b/src/lib/css/elem-ui.css similarity index 100% rename from lib/css/elem-ui.css rename to src/lib/css/elem-ui.css diff --git a/lib/css/form.css b/src/lib/css/form.css similarity index 100% rename from lib/css/form.css rename to src/lib/css/form.css diff --git a/lib/css/layer-normal.css b/src/lib/css/layer-normal.css similarity index 100% rename from lib/css/layer-normal.css rename to src/lib/css/layer-normal.css diff --git a/lib/css/pager.css b/src/lib/css/pager.css similarity index 100% rename from lib/css/pager.css rename to src/lib/css/pager.css diff --git a/lib/css/reset-basic.css b/src/lib/css/reset-basic.css similarity index 100% rename from lib/css/reset-basic.css rename to src/lib/css/reset-basic.css diff --git a/lib/drag/doc.md b/src/lib/drag/doc.md similarity index 100% rename from lib/drag/doc.md rename to src/lib/drag/doc.md diff --git a/lib/drag/index.js b/src/lib/drag/index.js similarity index 100% rename from lib/drag/index.js rename to src/lib/drag/index.js diff --git a/lib/form/index.js b/src/lib/form/index.js similarity index 100% rename from lib/form/index.js rename to src/lib/form/index.js diff --git a/lib/layer/Release.md b/src/lib/layer/Release.md similarity index 100% rename from lib/layer/Release.md rename to src/lib/layer/Release.md diff --git a/lib/layer/index.js b/src/lib/layer/index.js similarity index 100% rename from lib/layer/index.js rename to src/lib/layer/index.js diff --git a/lib/lyrics/index.js b/src/lib/lyrics/index.js similarity index 100% rename from lib/lyrics/index.js rename to src/lib/lyrics/index.js diff --git a/lib/pager/index.js b/src/lib/pager/index.js similarity index 100% rename from lib/pager/index.js rename to src/lib/pager/index.js diff --git a/lib/request/index.js b/src/lib/request/index.js similarity index 100% rename from lib/request/index.js rename to src/lib/request/index.js diff --git a/lib/request/lib/format.js b/src/lib/request/lib/format.js similarity index 100% rename from lib/request/lib/format.js rename to src/lib/request/lib/format.js diff --git a/lib/request/light.js b/src/lib/request/light.js similarity index 100% rename from lib/request/light.js rename to src/lib/request/light.js diff --git a/lib/store/index.js b/src/lib/store/index.js similarity index 100% rename from lib/store/index.js rename to src/lib/store/index.js diff --git a/main.js b/src/main.js similarity index 96% rename from main.js rename to src/main.js index 90e801d..04e228d 100644 --- a/main.js +++ b/src/main.js @@ -57,7 +57,7 @@ function createWindow() { height: 640, frame: false, resizable: false, - icon: './images/app.png', + icon: './src/images/app.png', webPreferences: { webSecurity: false, experimentalFeatures: true @@ -88,7 +88,7 @@ app.on('ready', () => { cb({ data: buf, mimeType: MIME_TYPES[ext] }) }) - tray = new Tray('./images/trays/trayTemplate.png') + tray = new Tray('./src/images/trays/trayTemplate.png') tray.on('click', _ => { win.show() diff --git a/views/artist.htm b/src/views/artist.htm similarity index 100% rename from views/artist.htm rename to src/views/artist.htm diff --git a/views/ktv.htm b/src/views/ktv.htm similarity index 100% rename from views/ktv.htm rename to src/views/ktv.htm diff --git a/views/local.htm b/src/views/local.htm similarity index 100% rename from views/local.htm rename to src/views/local.htm diff --git a/views/profile.htm b/src/views/profile.htm similarity index 100% rename from views/profile.htm rename to src/views/profile.htm diff --git a/views/search.htm b/src/views/search.htm similarity index 100% rename from views/search.htm rename to src/views/search.htm