diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile deleted file mode 100644 index ff7a2046..00000000 --- a/.gitpod.Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM gitpod/workspace-full-vnc -RUN sudo apt-get update && \ - sudo apt-get install -y libgtk-3-dev && \ - sudo rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index 6499bad0..00000000 --- a/.gitpod.yml +++ /dev/null @@ -1,2 +0,0 @@ -image: - file: .gitpod.Dockerfile \ No newline at end of file diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 725da1eb..00000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,132 +0,0 @@ -# Contributor Covenant Code of Conduct - -Translations for this Code of Conduct and the original ContributorCovenant organisation can be found below. -* [Translations](https://www.contributor-covenant.org/translations) -* [ContributorCovenant](https://github.com/EthicalSource/contributor_covenant0) - -## Our Pledge - -We as members, contributors, and leaders pledge to make participation in our -community a harassment-free experience for everyone, regardless of age, body -size, visible or invisible disability, ethnicity, sex characteristics, gender -identity and expression, level of experience, education, socio-economic status, -nationality, personal appearance, race, religion, or sexual identity -and orientation. - -We pledge to act and interact in ways that contribute to an open, welcoming, -diverse, inclusive, and healthy community. - -## Our Standards - -Examples of behavior that contributes to a positive environment for our -community include: - -* Demonstrating empathy and kindness toward other people -* Being respectful of differing opinions, viewpoints, and experiences -* Giving and gracefully accepting constructive feedback -* Accepting responsibility and apologizing to those affected by our mistakes, - and learning from the experience -* Focusing on what is best not just for us as individuals, but for the - overall community - -Examples of unacceptable behavior include: - -* The use of sexualized language or imagery, and sexual attention or - advances of any kind -* Trolling, insulting or derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or email - address, without their explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Enforcement Responsibilities - -Community leaders are responsible for clarifying and enforcing our standards of -acceptable behavior and will take appropriate and fair corrective action in -response to any behavior that they deem inappropriate, threatening, offensive, -or harmful. - -Community leaders have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions that are -not aligned to this Code of Conduct, and will communicate reasons for moderation -decisions when appropriate. - -## Scope - -This Code of Conduct applies within all community spaces, and also applies when -an individual is officially representing the community in public spaces. -Examples of representing our community include using an official e-mail address, -posting via an official social media account, or acting as an appointed -representative at an online or offline event. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported to the community leaders responsible for enforcement at -cryptofyre@protonmail.com. -All complaints will be reviewed and investigated promptly and fairly. - -All community leaders are obligated to respect the privacy and security of the -reporter of any incident. - -## Enforcement Guidelines - -Community leaders will follow these Community Impact Guidelines in determining -the consequences for any action they deem in violation of this Code of Conduct: - -### 1. Correction - -**Community Impact**: Use of inappropriate language or other behavior deemed -unprofessional or unwelcome in the community. - -**Consequence**: A private, written warning from community leaders, providing -clarity around the nature of the violation and an explanation of why the -behavior was inappropriate. A public apology may be requested. - -### 2. Warning - -**Community Impact**: A violation through a single incident or series -of actions. - -**Consequence**: A warning with consequences for continued behavior. No -interaction with the people involved, including unsolicited interaction with -those enforcing the Code of Conduct, for a specified period of time. This -includes avoiding interactions in community spaces as well as external channels -like social media. Violating these terms may lead to a temporary or -permanent ban. - -### 3. Temporary Ban - -**Community Impact**: A serious violation of community standards, including -sustained inappropriate behavior. - -**Consequence**: A temporary ban from any sort of interaction or public -communication with the community for a specified period of time. No public or -private interaction with the people involved, including unsolicited interaction -with those enforcing the Code of Conduct, is allowed during this period. -Violating these terms may lead to a permanent ban. - -### 4. Permanent Ban - -**Community Impact**: Demonstrating a pattern of violation of community -standards, including sustained inappropriate behavior, harassment of an -individual, or aggression toward or disparagement of classes of individuals. - -**Consequence**: A permanent ban from any sort of public interaction within -the community. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], -version 2.0, available at -https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. - -Community Impact Guidelines were inspired by [Mozilla's code of conduct -enforcement ladder](https://github.com/mozilla/diversity). - -[homepage]: https://www.contributor-covenant.org - -For answers to common questions about this code of conduct, see the FAQ at -https://www.contributor-covenant.org/faq. Translations are available at -https://www.contributor-covenant.org/translations. diff --git a/SECURITY.md b/SECURITY.md deleted file mode 100644 index 0bd87806..00000000 --- a/SECURITY.md +++ /dev/null @@ -1,16 +0,0 @@ -# Security Policy - -## Supported Versions - -Use this section to tell people about which versions of your project are -currently being supported with security updates. - -| Version | Supported | -| ------- | ------------------ | -| 2.0.0 > | :white_check_mark: | -| 1.5.9 | :x: | -| < 1.5.8 | :x: | - -## Reporting a Vulnerability - -Submit an issue or contact me in the Discussions tab and ill look into it. diff --git a/dockerfile b/dockerfile deleted file mode 100644 index ff7a2046..00000000 --- a/dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM gitpod/workspace-full-vnc -RUN sudo apt-get update && \ - sudo apt-get install -y libgtk-3-dev && \ - sudo rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/index.js b/index.js index 5722fcf2..4c821223 100644 --- a/index.js +++ b/index.js @@ -1,43 +1,15 @@ require('v8-compile-cache'); -const {app, session} = require('electron'); - -// Initialize the Preferences so verbose doesnt fuck up -const appFuncs = require('./resources/functions/app-init'); -app.ame = appFuncs() - -// Run all the Before App is Ready Stuff -app.ame.init.LoggingInit(); -app.ame.handler.LaunchHandler(); -app.ame.handler.InstanceHandler(); -app.ame.init.BaseInit(); -app.ame.wsapi.InitWebSockets() -app.ame.wsapi.InitWebServer() +const {app} = require('electron'); // Creating the Application Window and Calling all the Functions function CreateWindow() { if (app.isQuiting) { app.quit(); return; } - app.win = app.ame.win.CreateBrowserWindow() // Create the BrowserWindow /** CIDER **/ - const cider = require("./resources/functions/cider-win") - cider.CreateBrowserWindow() + const ciderwin = require("./resources/functions/cider-base") + app.win = ciderwin + app.win.CreateBrowserWindow() /** CIDER **/ - app.ame.handler.WindowStateHandler(); // Handling the Window - app.ame.handler.PlaybackStateHandler(); // Playback Change Listener - app.ame.handler.MediaStateHandler(); // Media Change Listener - app.ame.handler.LyricsHandler(); // Lyrics Handling - app.ame.handler.AudioHandler(); // Exclusive Audio Stuff - app.ame.handler.GoogleCastHandler(); // Chromecast - app.ame.handler.RendererListenerHandlers(); // Renderer Listeners - app.ame.handler.SettingsHandler(); // Handles updates to settings - - if (process.platform === 'win32' && app.transparency) { app.win.show() } // Show the window so SetThumbarButtons doesnt break - app.ame.win.SetButtons() // Set Inactive Thumbnail Toolbar Icons or TouchBar - app.ame.win.SetApplicationMenu() - app.ame.win.SetTaskList() - app.ame.utils.checkForUpdates() - - app.ame.win.HandleBrowserWindow(); } @@ -47,66 +19,32 @@ function CreateWindow() { app.on('ready', () => { if (app.isQuiting) { app.quit(); return; } - - // Apple Header tomfoolery. - session.defaultSession.webRequest.onHeadersReceived((details, callback) => { - if(details.url.match(/^https:\/\/store-\d{3}\.blobstore\.apple\.com/) || details.url.startsWith("https://store-037.blobstore.apple.com")){ - details.responseHeaders['Access-Control-Allow-Origin'] = '*';} - if(details.url.includes('encoderWorker.umd.js')){ - details.responseHeaders['Content-Type'] = `text/javascript`; - } - details.responseHeaders['Content-Security-Policy'] = 'unsafe-inline' - callback({ responseHeaders: details.responseHeaders }) - }) - - const {AppReady} = require('./resources/functions/init') - AppReady() - console.log('[Apple-Music-Electron] Application is Ready. Creating Window.') + console.log('[Cider] Application is Ready. Creating Window.') CreateWindow() }); -// macOS Activate Handler -app.on('activate', () => { - if (app.win === null) { - CreateWindow() - } else { - app.win.show() - } -}) - app.on('before-quit', () => { - console.verbose('before-quit'); app.isQuiting = true; - app.ame.mpris.clearActivity(); - app.ame.discord.disconnect(); console.warn('---------------------------------------------------------------------'); console.warn(`${app.getName()} has closed.`); console.warn('---------------------------------------------------------------------'); }); -app.on('will-quit', () => { console.verbose('will-quit'); }) -app.on('quit', () => { console.verbose('quit'); }) -app.on("window-all-closed", () => { console.verbose('window-all-closed'); if (process.platform !== 'darwin') app.quit(); }); - // Widevine Stuff app.on('widevine-ready', (version, lastVersion) => { if (null !== lastVersion) { - console.log('[Apple-Music-Electron][Widevine] Widevine ' + version + ', upgraded from ' + lastVersion + ', is ready to be used!') + console.log('[Cider][Widevine] Widevine ' + version + ', upgraded from ' + lastVersion + ', is ready to be used!') } else { - console.log('[Apple-Music-Electron][Widevine] Widevine ' + version + ' is ready to be used!') + console.log('[Cider][Widevine] Widevine ' + version + ' is ready to be used!') } }) -app.on('page-title-updated', function(e) { - e.preventDefault() -}); - app.on('widevine-update-pending', (currentVersion, pendingVersion) => { - console.log('[Apple-Music-Electron][Widevine] Widevine ' + currentVersion + ' is ready to be upgraded to ' + pendingVersion + '!') + console.log('[Cider][Widevine] Widevine ' + currentVersion + ' is ready to be upgraded to ' + pendingVersion + '!') }) app.on('widevine-error', (error) => { - console.log('[Apple-Music-Electron][Widevine] Widevine installation encountered an error: ' + error) + console.log('[Cider][Widevine] Widevine installation encountered an error: ' + error) app.exit() }) \ No newline at end of file diff --git a/resources/apple-music-electron.desktop b/oldshit/resources/apple-music-electron.desktop similarity index 100% rename from resources/apple-music-electron.desktop rename to oldshit/resources/apple-music-electron.desktop diff --git a/resources/appx/Square150x150Logo.png b/oldshit/resources/appx/Square150x150Logo.png similarity index 100% rename from resources/appx/Square150x150Logo.png rename to oldshit/resources/appx/Square150x150Logo.png diff --git a/resources/appx/Square44x44Logo.png b/oldshit/resources/appx/Square44x44Logo.png similarity index 100% rename from resources/appx/Square44x44Logo.png rename to oldshit/resources/appx/Square44x44Logo.png diff --git a/resources/appx/Wide310x150Logo.png b/oldshit/resources/appx/Wide310x150Logo.png similarity index 100% rename from resources/appx/Wide310x150Logo.png rename to oldshit/resources/appx/Wide310x150Logo.png diff --git a/resources/appx/logo.png b/oldshit/resources/appx/logo.png similarity index 100% rename from resources/appx/logo.png rename to oldshit/resources/appx/logo.png diff --git a/resources/content/oobe/oobe.webm b/oldshit/resources/content/oobe/oobe.webm similarity index 100% rename from resources/content/oobe/oobe.webm rename to oldshit/resources/content/oobe/oobe.webm diff --git a/resources/content/startup.webm b/oldshit/resources/content/startup.webm similarity index 100% rename from resources/content/startup.webm rename to oldshit/resources/content/startup.webm diff --git a/resources/css/ameframework.css b/oldshit/resources/css/ameframework.css similarity index 100% rename from resources/css/ameframework.css rename to oldshit/resources/css/ameframework.css diff --git a/resources/css/custom-stylesheet.css b/oldshit/resources/css/custom-stylesheet.css similarity index 100% rename from resources/css/custom-stylesheet.css rename to oldshit/resources/css/custom-stylesheet.css diff --git a/resources/css/frame_Windows.css b/oldshit/resources/css/frame_Windows.css similarity index 100% rename from resources/css/frame_Windows.css rename to oldshit/resources/css/frame_Windows.css diff --git a/resources/css/frame_macOS_emulation.css b/oldshit/resources/css/frame_macOS_emulation.css similarity index 100% rename from resources/css/frame_macOS_emulation.css rename to oldshit/resources/css/frame_macOS_emulation.css diff --git a/resources/css/frame_macOS_emulation_right.css b/oldshit/resources/css/frame_macOS_emulation_right.css similarity index 100% rename from resources/css/frame_macOS_emulation_right.css rename to oldshit/resources/css/frame_macOS_emulation_right.css diff --git a/resources/css/lyricer.css b/oldshit/resources/css/lyricer.css similarity index 100% rename from resources/css/lyricer.css rename to oldshit/resources/css/lyricer.css diff --git a/resources/css/macosScrollbar.css b/oldshit/resources/css/macosScrollbar.css similarity index 100% rename from resources/css/macosScrollbar.css rename to oldshit/resources/css/macosScrollbar.css diff --git a/resources/css/streamerMode.css b/oldshit/resources/css/streamerMode.css similarity index 100% rename from resources/css/streamerMode.css rename to oldshit/resources/css/streamerMode.css diff --git a/resources/css/transparency.css b/oldshit/resources/css/transparency.css similarity index 100% rename from resources/css/transparency.css rename to oldshit/resources/css/transparency.css diff --git a/resources/entitlements.mac.plist b/oldshit/resources/entitlements.mac.plist similarity index 100% rename from resources/entitlements.mac.plist rename to oldshit/resources/entitlements.mac.plist diff --git a/resources/functions/app-init.js b/oldshit/resources/functions/app-init.js similarity index 100% rename from resources/functions/app-init.js rename to oldshit/resources/functions/app-init.js diff --git a/resources/functions/handler.js b/oldshit/resources/functions/handler.js similarity index 100% rename from resources/functions/handler.js rename to oldshit/resources/functions/handler.js diff --git a/resources/functions/init.js b/oldshit/resources/functions/init.js similarity index 100% rename from resources/functions/init.js rename to oldshit/resources/functions/init.js diff --git a/resources/functions/load.js b/oldshit/resources/functions/load.js similarity index 100% rename from resources/functions/load.js rename to oldshit/resources/functions/load.js diff --git a/resources/functions/media/discordrpc.js b/oldshit/resources/functions/media/discordrpc.js similarity index 100% rename from resources/functions/media/discordrpc.js rename to oldshit/resources/functions/media/discordrpc.js diff --git a/resources/functions/media/lastfm.js b/oldshit/resources/functions/media/lastfm.js similarity index 100% rename from resources/functions/media/lastfm.js rename to oldshit/resources/functions/media/lastfm.js diff --git a/resources/functions/media/mpris.js b/oldshit/resources/functions/media/mpris.js similarity index 100% rename from resources/functions/media/mpris.js rename to oldshit/resources/functions/media/mpris.js diff --git a/resources/functions/splash.js b/oldshit/resources/functions/splash.js similarity index 100% rename from resources/functions/splash.js rename to oldshit/resources/functions/splash.js diff --git a/resources/functions/utils.js b/oldshit/resources/functions/utils.js similarity index 100% rename from resources/functions/utils.js rename to oldshit/resources/functions/utils.js diff --git a/resources/functions/win.js b/oldshit/resources/functions/win.js similarity index 100% rename from resources/functions/win.js rename to oldshit/resources/functions/win.js diff --git a/resources/functions/wsapi.js b/oldshit/resources/functions/wsapi.js similarity index 100% rename from resources/functions/wsapi.js rename to oldshit/resources/functions/wsapi.js diff --git a/resources/html/cast_device.html b/oldshit/resources/html/cast_device.html similarity index 100% rename from resources/html/cast_device.html rename to oldshit/resources/html/cast_device.html diff --git a/resources/html/eq.html b/oldshit/resources/html/eq.html similarity index 100% rename from resources/html/eq.html rename to oldshit/resources/html/eq.html diff --git a/resources/html/itunes_remote.html b/oldshit/resources/html/itunes_remote.html similarity index 100% rename from resources/html/itunes_remote.html rename to oldshit/resources/html/itunes_remote.html diff --git a/resources/html/oobe.html b/oldshit/resources/html/oobe.html similarity index 100% rename from resources/html/oobe.html rename to oldshit/resources/html/oobe.html diff --git a/resources/html/outputdevice.html b/oldshit/resources/html/outputdevice.html similarity index 100% rename from resources/html/outputdevice.html rename to oldshit/resources/html/outputdevice.html diff --git a/resources/html/preferences-footer.html b/oldshit/resources/html/preferences-footer.html similarity index 100% rename from resources/html/preferences-footer.html rename to oldshit/resources/html/preferences-footer.html diff --git a/resources/html/preferences-main.html b/oldshit/resources/html/preferences-main.html similarity index 100% rename from resources/html/preferences-main.html rename to oldshit/resources/html/preferences-main.html diff --git a/resources/html/theme-options.html b/oldshit/resources/html/theme-options.html similarity index 100% rename from resources/html/theme-options.html rename to oldshit/resources/html/theme-options.html diff --git a/resources/html/usermenu.html b/oldshit/resources/html/usermenu.html similarity index 100% rename from resources/html/usermenu.html rename to oldshit/resources/html/usermenu.html diff --git a/resources/html/zoo.html b/oldshit/resources/html/zoo.html similarity index 100% rename from resources/html/zoo.html rename to oldshit/resources/html/zoo.html diff --git a/resources/js/MusicKitInterop.js b/oldshit/resources/js/MusicKitInterop.js similarity index 100% rename from resources/js/MusicKitInterop.js rename to oldshit/resources/js/MusicKitInterop.js diff --git a/resources/js/OpusMediaRecorder.umd.js b/oldshit/resources/js/OpusMediaRecorder.umd.js similarity index 100% rename from resources/js/OpusMediaRecorder.umd.js rename to oldshit/resources/js/OpusMediaRecorder.umd.js diff --git a/resources/js/WSAPI_Interop.js b/oldshit/resources/js/WSAPI_Interop.js similarity index 100% rename from resources/js/WSAPI_Interop.js rename to oldshit/resources/js/WSAPI_Interop.js diff --git a/resources/js/backButton.js b/oldshit/resources/js/backButton.js similarity index 100% rename from resources/js/backButton.js rename to oldshit/resources/js/backButton.js diff --git a/resources/js/checkAuth.js b/oldshit/resources/js/checkAuth.js similarity index 100% rename from resources/js/checkAuth.js rename to oldshit/resources/js/checkAuth.js diff --git a/resources/js/custom.js b/oldshit/resources/js/custom.js similarity index 100% rename from resources/js/custom.js rename to oldshit/resources/js/custom.js diff --git a/resources/js/encoderWorker.umd.js b/oldshit/resources/js/encoderWorker.umd.js similarity index 100% rename from resources/js/encoderWorker.umd.js rename to oldshit/resources/js/encoderWorker.umd.js diff --git a/resources/js/eq.js b/oldshit/resources/js/eq.js similarity index 100% rename from resources/js/eq.js rename to oldshit/resources/js/eq.js diff --git a/resources/js/frame_Windows.js b/oldshit/resources/js/frame_Windows.js similarity index 100% rename from resources/js/frame_Windows.js rename to oldshit/resources/js/frame_Windows.js diff --git a/resources/js/frame_macOS.js b/oldshit/resources/js/frame_macOS.js similarity index 100% rename from resources/js/frame_macOS.js rename to oldshit/resources/js/frame_macOS.js diff --git a/resources/js/lyrics.js b/oldshit/resources/js/lyrics.js similarity index 100% rename from resources/js/lyrics.js rename to oldshit/resources/js/lyrics.js diff --git a/resources/js/pluginSystem.js b/oldshit/resources/js/pluginSystem.js similarity index 100% rename from resources/js/pluginSystem.js rename to oldshit/resources/js/pluginSystem.js diff --git a/resources/js/settingsPage.js b/oldshit/resources/js/settingsPage.js similarity index 100% rename from resources/js/settingsPage.js rename to oldshit/resources/js/settingsPage.js diff --git a/resources/js/tests.js b/oldshit/resources/js/tests.js similarity index 100% rename from resources/js/tests.js rename to oldshit/resources/js/tests.js diff --git a/resources/js/utils.js b/oldshit/resources/js/utils.js similarity index 100% rename from resources/js/utils.js rename to oldshit/resources/js/utils.js diff --git a/resources/js/vue.js b/oldshit/resources/js/vue.js similarity index 100% rename from resources/js/vue.js rename to oldshit/resources/js/vue.js diff --git a/resources/lfmApiCredentials.json b/oldshit/resources/lfmApiCredentials.json similarity index 100% rename from resources/lfmApiCredentials.json rename to oldshit/resources/lfmApiCredentials.json diff --git a/resources/lyrics/Vibrant.js b/oldshit/resources/lyrics/Vibrant.js similarity index 100% rename from resources/lyrics/Vibrant.js rename to oldshit/resources/lyrics/Vibrant.js diff --git a/resources/lyrics/index.html b/oldshit/resources/lyrics/index.html similarity index 100% rename from resources/lyrics/index.html rename to oldshit/resources/lyrics/index.html diff --git a/resources/lyrics/musixmatch.html b/oldshit/resources/lyrics/musixmatch.html similarity index 100% rename from resources/lyrics/musixmatch.html rename to oldshit/resources/lyrics/musixmatch.html diff --git a/resources/lyrics/netease.html b/oldshit/resources/lyrics/netease.html similarity index 100% rename from resources/lyrics/netease.html rename to oldshit/resources/lyrics/netease.html diff --git a/resources/lyrics/youtube.html b/oldshit/resources/lyrics/youtube.html similarity index 100% rename from resources/lyrics/youtube.html rename to oldshit/resources/lyrics/youtube.html diff --git a/resources/splash/index.html b/oldshit/resources/splash/index.html similarity index 100% rename from resources/splash/index.html rename to oldshit/resources/splash/index.html diff --git a/resources/themes/README.md b/oldshit/resources/themes/README.md similarity index 100% rename from resources/themes/README.md rename to oldshit/resources/themes/README.md diff --git a/resources/themes/Template.css b/oldshit/resources/themes/Template.css similarity index 100% rename from resources/themes/Template.css rename to oldshit/resources/themes/Template.css diff --git a/resources/themes/acrylic.css b/oldshit/resources/themes/acrylic.css similarity index 100% rename from resources/themes/acrylic.css rename to oldshit/resources/themes/acrylic.css diff --git a/resources/themes/blurple.css b/oldshit/resources/themes/blurple.css similarity index 100% rename from resources/themes/blurple.css rename to oldshit/resources/themes/blurple.css diff --git a/resources/themes/dracula.css b/oldshit/resources/themes/dracula.css similarity index 100% rename from resources/themes/dracula.css rename to oldshit/resources/themes/dracula.css diff --git a/resources/themes/jungle.css b/oldshit/resources/themes/jungle.css similarity index 100% rename from resources/themes/jungle.css rename to oldshit/resources/themes/jungle.css diff --git a/resources/themes/nord.css b/oldshit/resources/themes/nord.css similarity index 100% rename from resources/themes/nord.css rename to oldshit/resources/themes/nord.css diff --git a/resources/themes/oled.css b/oldshit/resources/themes/oled.css similarity index 100% rename from resources/themes/oled.css rename to oldshit/resources/themes/oled.css diff --git a/resources/themes/spotify.css b/oldshit/resources/themes/spotify.css similarity index 100% rename from resources/themes/spotify.css rename to oldshit/resources/themes/spotify.css diff --git a/resources/web-remote/ameframework.css b/oldshit/resources/web-remote/ameframework.css similarity index 100% rename from resources/web-remote/ameframework.css rename to oldshit/resources/web-remote/ameframework.css diff --git a/resources/web-remote/assets/Grabber.svg b/oldshit/resources/web-remote/assets/Grabber.svg similarity index 100% rename from resources/web-remote/assets/Grabber.svg rename to oldshit/resources/web-remote/assets/Grabber.svg diff --git a/resources/web-remote/assets/arrow-left.svg b/oldshit/resources/web-remote/assets/arrow-left.svg similarity index 100% rename from resources/web-remote/assets/arrow-left.svg rename to oldshit/resources/web-remote/assets/arrow-left.svg diff --git a/resources/web-remote/assets/backward.svg b/oldshit/resources/web-remote/assets/backward.svg similarity index 100% rename from resources/web-remote/assets/backward.svg rename to oldshit/resources/web-remote/assets/backward.svg diff --git a/resources/web-remote/assets/forward.svg b/oldshit/resources/web-remote/assets/forward.svg similarity index 100% rename from resources/web-remote/assets/forward.svg rename to oldshit/resources/web-remote/assets/forward.svg diff --git a/resources/web-remote/assets/infinity.svg b/oldshit/resources/web-remote/assets/infinity.svg similarity index 100% rename from resources/web-remote/assets/infinity.svg rename to oldshit/resources/web-remote/assets/infinity.svg diff --git a/resources/web-remote/assets/list.svg b/oldshit/resources/web-remote/assets/list.svg similarity index 100% rename from resources/web-remote/assets/list.svg rename to oldshit/resources/web-remote/assets/list.svg diff --git a/resources/web-remote/assets/pause.svg b/oldshit/resources/web-remote/assets/pause.svg similarity index 100% rename from resources/web-remote/assets/pause.svg rename to oldshit/resources/web-remote/assets/pause.svg diff --git a/resources/web-remote/assets/play.svg b/oldshit/resources/web-remote/assets/play.svg similarity index 100% rename from resources/web-remote/assets/play.svg rename to oldshit/resources/web-remote/assets/play.svg diff --git a/resources/web-remote/assets/quote-right.svg b/oldshit/resources/web-remote/assets/quote-right.svg similarity index 100% rename from resources/web-remote/assets/quote-right.svg rename to oldshit/resources/web-remote/assets/quote-right.svg diff --git a/resources/web-remote/assets/repeat.svg b/oldshit/resources/web-remote/assets/repeat.svg similarity index 100% rename from resources/web-remote/assets/repeat.svg rename to oldshit/resources/web-remote/assets/repeat.svg diff --git a/resources/web-remote/assets/search.svg b/oldshit/resources/web-remote/assets/search.svg similarity index 100% rename from resources/web-remote/assets/search.svg rename to oldshit/resources/web-remote/assets/search.svg diff --git a/resources/web-remote/assets/shuffle.svg b/oldshit/resources/web-remote/assets/shuffle.svg similarity index 100% rename from resources/web-remote/assets/shuffle.svg rename to oldshit/resources/web-remote/assets/shuffle.svg diff --git a/resources/web-remote/assets/volume-down.svg b/oldshit/resources/web-remote/assets/volume-down.svg similarity index 100% rename from resources/web-remote/assets/volume-down.svg rename to oldshit/resources/web-remote/assets/volume-down.svg diff --git a/resources/web-remote/assets/volume-up.svg b/oldshit/resources/web-remote/assets/volume-up.svg similarity index 100% rename from resources/web-remote/assets/volume-up.svg rename to oldshit/resources/web-remote/assets/volume-up.svg diff --git a/resources/web-remote/icon-192x192.png b/oldshit/resources/web-remote/icon-192x192.png similarity index 100% rename from resources/web-remote/icon-192x192.png rename to oldshit/resources/web-remote/icon-192x192.png diff --git a/resources/web-remote/icon-256x256.png b/oldshit/resources/web-remote/icon-256x256.png similarity index 100% rename from resources/web-remote/icon-256x256.png rename to oldshit/resources/web-remote/icon-256x256.png diff --git a/resources/web-remote/icon-384x384.png b/oldshit/resources/web-remote/icon-384x384.png similarity index 100% rename from resources/web-remote/icon-384x384.png rename to oldshit/resources/web-remote/icon-384x384.png diff --git a/resources/web-remote/icon-512x512.png b/oldshit/resources/web-remote/icon-512x512.png similarity index 100% rename from resources/web-remote/icon-512x512.png rename to oldshit/resources/web-remote/icon-512x512.png diff --git a/resources/web-remote/index.html b/oldshit/resources/web-remote/index.html similarity index 99% rename from resources/web-remote/index.html rename to oldshit/resources/web-remote/index.html index f0022935..c66c2839 100644 --- a/resources/web-remote/index.html +++ b/oldshit/resources/web-remote/index.html @@ -10,7 +10,7 @@ - + @@ -226,7 +226,7 @@
- + Search by song, album, artist, or lyrics.
@@ -855,7 +855,7 @@ - + diff --git a/resources/web-remote/index.js b/oldshit/resources/web-remote/index.js similarity index 100% rename from resources/web-remote/index.js rename to oldshit/resources/web-remote/index.js diff --git a/resources/web-remote/manifest.json b/oldshit/resources/web-remote/manifest.json similarity index 100% rename from resources/web-remote/manifest.json rename to oldshit/resources/web-remote/manifest.json diff --git a/resources/web-remote/sortable.min.js b/oldshit/resources/web-remote/sortable.min.js similarity index 100% rename from resources/web-remote/sortable.min.js rename to oldshit/resources/web-remote/sortable.min.js diff --git a/resources/web-remote/style.css b/oldshit/resources/web-remote/style.css similarity index 94% rename from resources/web-remote/style.css rename to oldshit/resources/web-remote/style.css index 88f11e8c..53fff2a0 100644 --- a/resources/web-remote/style.css +++ b/oldshit/resources/web-remote/style.css @@ -262,27 +262,27 @@ input[type=range].web-slider::-webkit-slider-runnable-track { } .playback-button--small.search { - background-image: url("./assets/search.svg"); + background-image: url("oldshit/resources/web-remote/assets/search.svg"); } .playback-button--small.queue { - background-image: url("./assets/list.svg"); + background-image: url("oldshit/resources/web-remote/assets/list.svg"); } .playback-button--small.lyrics { - background-image: url("./assets/quote-right.svg"); + background-image: url("oldshit/resources/web-remote/assets/quote-right.svg"); } .playback-button--small.autoplay { - background-image: url("./assets/infinity.svg"); + background-image: url("oldshit/resources/web-remote/assets/infinity.svg"); } .playback-button--small.shuffle { - background-image: url("./assets/shuffle.svg"); + background-image: url("oldshit/resources/web-remote/assets/shuffle.svg"); } .playback-button--small.repeat { - background-image: url("./assets/repeat.svg"); + background-image: url("oldshit/resources/web-remote/assets/repeat.svg"); } .playback-button--small.repeat.repeatOne { @@ -290,19 +290,19 @@ input[type=range].web-slider::-webkit-slider-runnable-track { } .playback-button.pause { - background-image: url('./assets/pause.svg'); + background-image: url('oldshit/resources/web-remote/assets/pause.svg'); } .playback-button.play { - background-image: url('./assets/play.svg'); + background-image: url('oldshit/resources/web-remote/assets/play.svg'); } .playback-button.next { - background-image: url('./assets/forward.svg'); + background-image: url('oldshit/resources/web-remote/assets/forward.svg'); } .playback-button.previous { - background-image: url('./assets/backward.svg'); + background-image: url('oldshit/resources/web-remote/assets/backward.svg'); } .playback-buttons { @@ -320,12 +320,12 @@ input[type=range].web-slider::-webkit-slider-runnable-track { } .player-volume-glyph.decrease { - background-image: url("./assets/volume-down.svg"); + background-image: url("oldshit/resources/web-remote/assets/volume-down.svg"); opacity: 0.5; } .player-volume-glyph.increase { - background-image: url("./assets/volume-up.svg"); + background-image: url("oldshit/resources/web-remote/assets/volume-up.svg"); opacity: 0.5; } @@ -382,7 +382,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track { background-size: 16px; background-position: center; background-repeat: no-repeat; - background-image: url("./assets/arrow-left.svg"); + background-image: url("oldshit/resources/web-remote/assets/arrow-left.svg"); border: 0px; border-radius: 0px; } @@ -476,7 +476,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track { align-items: center; background-size: contain; background-repeat: no-repeat; - background-image: url('./assets/Grabber.svg'); + background-image: url('oldshit/resources/web-remote/assets/Grabber.svg'); cursor: grab; } diff --git a/resources/web-remote/vue.js b/oldshit/resources/web-remote/vue.js similarity index 100% rename from resources/web-remote/vue.js rename to oldshit/resources/web-remote/vue.js diff --git a/resources/web-remote/vuedraggable.umd.min.js b/oldshit/resources/web-remote/vuedraggable.umd.min.js similarity index 100% rename from resources/web-remote/vuedraggable.umd.min.js rename to oldshit/resources/web-remote/vuedraggable.umd.min.js diff --git a/package.json b/package.json index bcdc65dd..5c366e3f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "cider", - "applicationId": "Cider", - "productName": "Cider", + "name": "cider-test", + "applicationId": "Cider-Test", + "productName": "Cider-Test", "version": "1.0.0", "description": "A new look into listening and enjoying music in style and performance.", "license": "MIT", diff --git a/resources/cider-ui-tests/index.html b/resources/cider-ui-tests/index.html index 2b74dc67..12ae50bd 100644 --- a/resources/cider-ui-tests/index.html +++ b/resources/cider-ui-tests/index.html @@ -103,9 +103,9 @@
-
-
-
+
+
+
diff --git a/resources/functions/cider-win.js b/resources/functions/cider-base.js similarity index 55% rename from resources/functions/cider-win.js rename to resources/functions/cider-base.js index a2143be2..bc5891c9 100644 --- a/resources/functions/cider-win.js +++ b/resources/functions/cider-base.js @@ -3,16 +3,28 @@ const {join, resolve} = require("path") const getPort = require("get-port"); const express = require("express"); const path = require("path"); +const windowStateKeeper = require("electron-window-state"); + +const CiderBase = { -const CiderWin = { CreateBrowserWindow() { + // Set default window sizes + const mainWindowState = windowStateKeeper({ + defaultWidth: 1024, + defaultHeight: 600 + }); + let win = null const options = { - width: 1024, - height: 600, + icon: join(__dirname, `../icons/icon.ico`), + width: mainWindowState.width, + height: mainWindowState.height, + x: mainWindowState.x, + y: mainWindowState.y, minWidth: 844, minHeight: 410, frame: false, + title: "Cider", vibrancy: 'dark', hasShadow: false, webPreferences: { @@ -23,10 +35,13 @@ const CiderWin = { allowRunningInsecureContent: true, enableRemoteModule: true, sandbox: true, - nativeWindowOpen: true + nativeWindowOpen: true, + contextIsolation: false, + preload: join(__dirname, '../preload/cider-preload.js') } + } - CiderWin.InitWebServer() + CiderBase.InitWebServer() if (process.platform === "darwin" || process.platform === "linux") { win = new BrowserWindow(options) } else { @@ -39,6 +54,31 @@ const CiderWin = { win.on("closed", () => { win = null }) + + // Register listeners on Window to track size and position of the Window. + mainWindowState.manage(win); + + // IPC stuff + + ipcMain.on('close', () => { // listen for close event + win.close(); + }) + + ipcMain.on('maximize', () => { // listen for maximize event + if (win.maximizable) { + win.maximize(); + win.maximizable = false; + } else { + win.unmaximize(); + win.maximizable = true; + } + }) + + ipcMain.on('minimize', () => { // listen for minimize event + win.minimize(); + }) + + return win }, async InitWebServer() { const webRemotePort = await getPort({port : 9000}); @@ -51,7 +91,7 @@ const CiderWin = { webapp.listen(webRemotePort, function () { console.log(`Web Remote listening on port ${webRemotePort}`); }); - } + }, } -module.exports = CiderWin; \ No newline at end of file +module.exports = CiderBase; \ No newline at end of file diff --git a/resources/preload/cider-preload.js b/resources/preload/cider-preload.js new file mode 100644 index 00000000..0c1240f1 --- /dev/null +++ b/resources/preload/cider-preload.js @@ -0,0 +1,7 @@ +const electron = require('electron') + +console.log('preload is in baby') + +process.once('loaded', () => { + global.ipcRenderer = electron.ipcRenderer; +}); \ No newline at end of file