diff --git a/package.json b/package.json index 90f064b..52e8c72 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "dev": "neu run", "build": "npm run clean_dist && neu build && npm run move_files && npm run move_bgs && npm run rename_exe", - "move_files": "cp -r ./ext ./dist/GrassClipper && cp -r ./proxy ./dist/GrassClipper && cp install.cmd ./dist/GrassClipper && cp -r ./scripts ./dist/GrassClipper", + "move_files": "cp -r ./proxy ./dist/GrassClipper && cp install.cmd ./dist/GrassClipper && cp -r ./scripts ./dist/GrassClipper", "move_bgs": "mkdir dist\\GrassClipper\\resources\\bg\\private && cp -r ./resources/bg/private ./dist/GrassClipper/resources/bg", "rename_exe": "mv ./dist/GrassClipper/GrassClipper-win_x64.exe ./dist/GrassClipper/GrassClipper.exe", "clean_dist": "rm -rf ./dist" diff --git a/resources/bg/private/1.png b/resources/bg/private/1.png index ab34051..eabb74f 100644 Binary files a/resources/bg/private/1.png and b/resources/bg/private/1.png differ diff --git a/resources/bg/private/default.png b/resources/bg/private/default.png new file mode 100644 index 0000000..752e6ff Binary files /dev/null and b/resources/bg/private/default.png differ diff --git a/resources/index.html b/resources/index.html index 9e821fa..3c0d759 100644 --- a/resources/index.html +++ b/resources/index.html @@ -4,6 +4,7 @@ + diff --git a/resources/js/hoverEvt.js b/resources/js/hoverEvt.js new file mode 100644 index 0000000..169fc5f --- /dev/null +++ b/resources/js/hoverEvt.js @@ -0,0 +1,21 @@ +document.addEventListener('DOMContentLoaded', async () => { + const firstHalf = document.querySelector('#firstHalf') + const secondHalf = document.querySelector('#secondHalf') + + // Listen to hovers + firstHalf.addEventListener('mouseover', () => { + secondHalf.classList.add('darken') + }) + + firstHalf.addEventListener('mouseout', () => { + secondHalf.classList.remove('darken') + }) + + secondHalf.addEventListener('mouseover', () => { + firstHalf.classList.add('darken') + }) + + secondHalf.addEventListener('mouseout', () => { + firstHalf.classList.remove('darken') + }) +}) \ No newline at end of file diff --git a/resources/js/index.js b/resources/js/index.js index 029ce4e..6b5e569 100644 --- a/resources/js/index.js +++ b/resources/js/index.js @@ -1,6 +1,5 @@ Neutralino.init(); - document.addEventListener('DOMContentLoaded', async () => { setBackgroundImage(); displayGenshinFolder(); @@ -47,6 +46,9 @@ async function handleGenshinFolderNotSet() { // Set buttons to greyed out and disable document.querySelector('#genshinPath').innerHTML = 'Not set' + // Set official server background to default + document.querySelector('#firstHalf').style.backgroundImage = `url("../bg/private/default.png")` + const offBtn = document.querySelector('#playOfficial') const privBtn = document.querySelector('#playPrivate') @@ -106,7 +108,7 @@ async function setBackgroundImage() { document.querySelector('#firstHalf').style.backgroundImage = `url("../bg/official/${image}")` } - const privImages = (await Neutralino.filesystem.readDirectory(NL_CWD + '/resources/bg/private')).filter(file => file.type === 'FILE') + const privImages = (await Neutralino.filesystem.readDirectory(NL_CWD + '/resources/bg/private')).filter(file => file.type === 'FILE' && !file.entry.includes('default')) const privImage = privImages[Math.floor(Math.random() * privImages.length)].entry // Set the background image diff --git a/resources/style/index.css b/resources/style/index.css index c84e720..79666bb 100644 --- a/resources/style/index.css +++ b/resources/style/index.css @@ -7,6 +7,10 @@ body { font-family: Arial, Helvetica, sans-serif; } +.darken { + filter: brightness(0.6); +} + #controlBar { display: flex; flex-direction: row; @@ -66,7 +70,6 @@ body { margin-left: auto !important; } - .playBtn:hover, .smolBtn:hover { cursor: pointer; } @@ -142,6 +145,12 @@ body { width: 100%; background-repeat: no-repeat; background-size: cover; + + transition: width 0.2s ease-in-out, filter 0.2s ease-in-out; +} + +#firstHalf:hover, #secondHalf:hover { + width: calc(100% + 150px); } #firstHalf {