From 361fe53a7e8a48e42ac8d7f4c07f33bf4ed178e2 Mon Sep 17 00:00:00 2001 From: Starscouts Date: Sun, 14 Jul 2024 14:28:01 +0200 Subject: Fixes for Windows --- .gitignore | 0 .idea/.gitignore | 0 .idea/compiler.xml | 0 .idea/deployment.xml | 0 .idea/discord.xml | 0 .idea/faunerie.iml | 0 .idea/inspectionProfiles/Project_Default.xml | 0 .idea/jsLibraryMappings.xml | 0 .idea/modules.xml | 0 .idea/php.xml | 0 .idea/sshConfigs.xml | 0 .idea/vcs.xml | 0 .idea/webServers.xml | 0 LICENSE | 0 README.md | 5 +- ai/server.py | 0 bootstrap/bootstrap.bundle.min.js | 0 bootstrap/bootstrap.bundle.min.js.map | 0 bootstrap/bootstrap.min.css | 0 bootstrap/bootstrap.min.css.map | 0 build.bat | 11 ++++ build.sh | 0 dom/app.css | 20 ++++++- dom/index.html | 60 +++++++++++---------- e621/categories.png | Bin e621/csv2json.js | 0 e621/match.js | 0 e621/package-lock.json | 0 e621/package.json | 0 e621/parse.js | 0 e621/update.js | 0 intimate/TODO.md | 0 intimate/bs5/bootstrap.bundle.min.js | 0 intimate/bs5/bootstrap.bundle.min.js.map | 0 intimate/bs5/bootstrap.min.css | 0 intimate/bs5/bootstrap.min.css.map | 0 intimate/build.sh | 3 -- intimate/default.toml | 0 intimate/fullscreen.html | 0 intimate/index.html | 1 + intimate/index.js | 14 ++--- intimate/loader.svg | 0 intimate/package-lock.json | 0 intimate/package.json | 0 intimate/src/actions.js | 0 intimate/src/display.js | 0 intimate/src/fetcher.js | 1 + intimate/src/keyboard.js | 0 logo/logo-mac.png | Bin logo/logo-round.ico | Bin logo/logo-round.png | Bin logo/logo-updater-mac.png | Bin logo/logo-updater-round.ico | Bin logo/logo-updater-round.png | Bin logo/logo-updater.icns | Bin logo/logo-updater.png | Bin logo/logo.icns | Bin logo/logo.png | Bin logo/placeholder.jpg | Bin main.js | 18 ++++--- package-lock.json | 8 +-- package.json | 5 +- sql/.idea/.gitignore | 0 sql/.idea/inspectionProfiles/Project_Default.xml | 0 sql/.idea/inspectionProfiles/profiles_settings.xml | 0 sql/.idea/misc.xml | 0 sql/.idea/modules.xml | 0 sql/.idea/pgsql.iml | 0 sql/doall.sh | 0 sql/mac/LICENSE | 0 sql/mac/README.md | 0 sql/mac/binding.gyp | 0 sql/mac/deps/common-sqlite.gypi | 0 sql/mac/deps/extract.js | 0 sql/mac/deps/sqlite3.gyp | 0 sql/mac/lib/sqlite3-binding.js | 0 sql/mac/lib/sqlite3.d.ts | 0 sql/mac/lib/sqlite3.js | 0 sql/mac/lib/trace.js | 0 sql/mac/package.json | 0 sql/main.py | 0 sql/win/LICENSE | 0 sql/win/README.md | 0 sql/win/binding.gyp | 0 sql/win/deps/common-sqlite.gypi | 0 sql/win/deps/extract.js | 0 sql/win/deps/sqlite3.gyp | 0 sql/win/lib/sqlite3-binding.js | 0 sql/win/lib/sqlite3.d.ts | 0 sql/win/lib/sqlite3.js | 0 sql/win/lib/trace.js | 0 sql/win/package.json | 0 src/FaunerieAI.ts | 0 src/FaunerieActions.ts | 0 src/FaunerieApp.ts | 4 ++ src/FaunerieAppDisplay.ts | 0 src/FaunerieDataStore.ts | 0 src/FaunerieDerpibooru.ts | 0 src/FaunerieLoader.ts | 0 src/FaunerieSearch.ts | 0 src/FaunerieSettings.ts | 0 src/FaunerieUtilities.ts | 0 src/index.ts | 0 src/tsconfig.json | 0 updater/main.js | 0 updater/menu/16x16@2x.png | Bin updater/package-lock.json | 0 updater/package.json | 0 updater/sql | 1 - updater/tray/16x16Template@2x.png | Bin 110 files changed, 96 insertions(+), 55 deletions(-) mode change 100755 => 100644 .gitignore mode change 100755 => 100644 .idea/.gitignore mode change 100755 => 100644 .idea/compiler.xml mode change 100755 => 100644 .idea/deployment.xml mode change 100755 => 100644 .idea/discord.xml mode change 100755 => 100644 .idea/faunerie.iml mode change 100755 => 100644 .idea/inspectionProfiles/Project_Default.xml mode change 100755 => 100644 .idea/jsLibraryMappings.xml mode change 100755 => 100644 .idea/modules.xml mode change 100755 => 100644 .idea/php.xml mode change 100755 => 100644 .idea/sshConfigs.xml mode change 100755 => 100644 .idea/vcs.xml mode change 100755 => 100644 .idea/webServers.xml mode change 100755 => 100644 LICENSE mode change 100755 => 100644 README.md mode change 100755 => 100644 ai/server.py mode change 100755 => 100644 bootstrap/bootstrap.bundle.min.js mode change 100755 => 100644 bootstrap/bootstrap.bundle.min.js.map mode change 100755 => 100644 bootstrap/bootstrap.min.css mode change 100755 => 100644 bootstrap/bootstrap.min.css.map create mode 100644 build.bat mode change 100755 => 100644 build.sh mode change 100755 => 100644 dom/app.css mode change 100755 => 100644 dom/index.html mode change 100755 => 100644 e621/categories.png mode change 100755 => 100644 e621/csv2json.js mode change 100755 => 100644 e621/match.js mode change 100755 => 100644 e621/package-lock.json mode change 100755 => 100644 e621/package.json mode change 100755 => 100644 e621/parse.js mode change 100755 => 100644 e621/update.js mode change 100755 => 100644 intimate/TODO.md mode change 100755 => 100644 intimate/bs5/bootstrap.bundle.min.js mode change 100755 => 100644 intimate/bs5/bootstrap.bundle.min.js.map mode change 100755 => 100644 intimate/bs5/bootstrap.min.css mode change 100755 => 100644 intimate/bs5/bootstrap.min.css.map mode change 100755 => 100644 intimate/build.sh mode change 100755 => 100644 intimate/default.toml mode change 100755 => 100644 intimate/fullscreen.html mode change 100755 => 100644 intimate/index.html mode change 100755 => 100644 intimate/index.js mode change 100755 => 100644 intimate/loader.svg mode change 100755 => 100644 intimate/package-lock.json mode change 100755 => 100644 intimate/package.json mode change 100755 => 100644 intimate/src/actions.js mode change 100755 => 100644 intimate/src/display.js mode change 100755 => 100644 intimate/src/fetcher.js mode change 100755 => 100644 intimate/src/keyboard.js mode change 100755 => 100644 logo/logo-mac.png mode change 100755 => 100644 logo/logo-round.ico mode change 100755 => 100644 logo/logo-round.png mode change 100755 => 100644 logo/logo-updater-mac.png mode change 100755 => 100644 logo/logo-updater-round.ico mode change 100755 => 100644 logo/logo-updater-round.png mode change 100755 => 100644 logo/logo-updater.icns mode change 100755 => 100644 logo/logo-updater.png mode change 100755 => 100644 logo/logo.icns mode change 100755 => 100644 logo/logo.png mode change 100755 => 100644 logo/placeholder.jpg mode change 100755 => 100644 main.js mode change 100755 => 100644 package-lock.json mode change 100755 => 100644 package.json mode change 100755 => 100644 sql/.idea/.gitignore mode change 100755 => 100644 sql/.idea/inspectionProfiles/Project_Default.xml mode change 100755 => 100644 sql/.idea/inspectionProfiles/profiles_settings.xml mode change 100755 => 100644 sql/.idea/misc.xml mode change 100755 => 100644 sql/.idea/modules.xml mode change 100755 => 100644 sql/.idea/pgsql.iml mode change 100755 => 100644 sql/doall.sh mode change 100755 => 100644 sql/mac/LICENSE mode change 100755 => 100644 sql/mac/README.md mode change 100755 => 100644 sql/mac/binding.gyp mode change 100755 => 100644 sql/mac/deps/common-sqlite.gypi mode change 100755 => 100644 sql/mac/deps/extract.js mode change 100755 => 100644 sql/mac/deps/sqlite3.gyp mode change 100755 => 100644 sql/mac/lib/sqlite3-binding.js mode change 100755 => 100644 sql/mac/lib/sqlite3.d.ts mode change 100755 => 100644 sql/mac/lib/sqlite3.js mode change 100755 => 100644 sql/mac/lib/trace.js mode change 100755 => 100644 sql/mac/package.json mode change 100755 => 100644 sql/main.py mode change 100755 => 100644 sql/win/LICENSE mode change 100755 => 100644 sql/win/README.md mode change 100755 => 100644 sql/win/binding.gyp mode change 100755 => 100644 sql/win/deps/common-sqlite.gypi mode change 100755 => 100644 sql/win/deps/extract.js mode change 100755 => 100644 sql/win/deps/sqlite3.gyp mode change 100755 => 100644 sql/win/lib/sqlite3-binding.js mode change 100755 => 100644 sql/win/lib/sqlite3.d.ts mode change 100755 => 100644 sql/win/lib/sqlite3.js mode change 100755 => 100644 sql/win/lib/trace.js mode change 100755 => 100644 sql/win/package.json mode change 100755 => 100644 src/FaunerieAI.ts mode change 100755 => 100644 src/FaunerieActions.ts mode change 100755 => 100644 src/FaunerieApp.ts mode change 100755 => 100644 src/FaunerieAppDisplay.ts mode change 100755 => 100644 src/FaunerieDataStore.ts mode change 100755 => 100644 src/FaunerieDerpibooru.ts mode change 100755 => 100644 src/FaunerieLoader.ts mode change 100755 => 100644 src/FaunerieSearch.ts mode change 100755 => 100644 src/FaunerieSettings.ts mode change 100755 => 100644 src/FaunerieUtilities.ts mode change 100755 => 100644 src/index.ts mode change 100755 => 100644 src/tsconfig.json mode change 100755 => 100644 updater/main.js mode change 100755 => 100644 updater/menu/16x16@2x.png mode change 100755 => 100644 updater/package-lock.json mode change 100755 => 100644 updater/package.json delete mode 120000 updater/sql mode change 100755 => 100644 updater/tray/16x16Template@2x.png diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/.idea/.gitignore b/.idea/.gitignore old mode 100755 new mode 100644 diff --git a/.idea/compiler.xml b/.idea/compiler.xml old mode 100755 new mode 100644 diff --git a/.idea/deployment.xml b/.idea/deployment.xml old mode 100755 new mode 100644 diff --git a/.idea/discord.xml b/.idea/discord.xml old mode 100755 new mode 100644 diff --git a/.idea/faunerie.iml b/.idea/faunerie.iml old mode 100755 new mode 100644 diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml old mode 100755 new mode 100644 diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml old mode 100755 new mode 100644 diff --git a/.idea/modules.xml b/.idea/modules.xml old mode 100755 new mode 100644 diff --git a/.idea/php.xml b/.idea/php.xml old mode 100755 new mode 100644 diff --git a/.idea/sshConfigs.xml b/.idea/sshConfigs.xml old mode 100755 new mode 100644 diff --git a/.idea/vcs.xml b/.idea/vcs.xml old mode 100755 new mode 100644 diff --git a/.idea/webServers.xml b/.idea/webServers.xml old mode 100755 new mode 100644 diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 index 67b5128..b27e993 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A browser and search engine for local copies of various image boards (e621, Derpibooru, Furbooru, ...) ## Development -Assuming you are using macOS or Linux. Other POSIX systems won't work as Electron does not have binaries for these. +Assuming you are using macOS, Windows or Linux. Other POSIX systems won't work as Electron does not have binaries for these. ### Cloning ``` @@ -27,5 +27,6 @@ npm run debug-updater ### Building ``` # This will run 'npm audit fix' and 'npm install' to update dependencies if needed -npm run release +npm run release-unix # For Unix systems +npm run release-win # For Windows ``` diff --git a/ai/server.py b/ai/server.py old mode 100755 new mode 100644 diff --git a/bootstrap/bootstrap.bundle.min.js b/bootstrap/bootstrap.bundle.min.js old mode 100755 new mode 100644 diff --git a/bootstrap/bootstrap.bundle.min.js.map b/bootstrap/bootstrap.bundle.min.js.map old mode 100755 new mode 100644 diff --git a/bootstrap/bootstrap.min.css b/bootstrap/bootstrap.min.css old mode 100755 new mode 100644 diff --git a/bootstrap/bootstrap.min.css.map b/bootstrap/bootstrap.min.css.map old mode 100755 new mode 100644 diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..7374a92 --- /dev/null +++ b/build.bat @@ -0,0 +1,11 @@ +del /s /q build + +cd src || exit +npx tsc +cd .. || exit + +npx electron-packager . Faunerie --ignore sql/win --ignore sql/preprocessed.db --ignore updater --ignore intimate --ignore sql/preprocessed.db --ignore sql/preprocessed2.db --ignore e621 --overwrite --platform=darwin --arch=arm64 --icon=./logo/logo.icns --out=./build +npx electron-packager . Faunerie --ignore sql/mac --ignore sql/preprocessed.db --ignore updater --ignore intimate --ignore sql/preprocessed.db --ignore sql/preprocessed2.db --ignore e621 --overwrite --platform=win32 --arch=x64 --icon=./logo/logo-round.ico --out=./build + +npx electron-packager ./updater "Faunerie Updater" --ignore sql/win --ignore sql/preprocessed.db --ignore sql/preprocessed2.db --overwrite --platform=darwin --arch=arm64 --icon=./logo/logo-updater.icns --out=./build +npx electron-packager ./updater "Faunerie Updater" --ignore sql/mac --ignore sql/preprocessed.db --ignore sql/preprocessed2.db --overwrite --platform=win32 --arch=x64 --icon=./logo/logo-updater-round.ico --out=./build diff --git a/build.sh b/build.sh old mode 100755 new mode 100644 diff --git a/dom/app.css b/dom/app.css old mode 100755 new mode 100644 index c4893d2..10054af --- a/dom/app.css +++ b/dom/app.css @@ -14,11 +14,11 @@ code { } #search { - font-family: 'JetBrains Mono', monospace; + font-family: 'Iosevka', 'JetBrains Mono', monospace; } #search::placeholder { - font-family: var(--bs-body-font-family) !important; + font-family: var(--bs-body-font-family), sans-serif !important; color: rgba(255, 255, 255, .5); } @@ -412,3 +412,19 @@ select:active, select:focus { #preview-parts-list:has(.preview-tag-zone:hover) .preview-tag-zone:not(:hover):not(.hover), #preview-parts-list:has(.preview-tag-zone.hover) .preview-tag-zone:not(:hover):not(.hover) { opacity: .75 !important; } + +::-webkit-scrollbar { + width: 8px; +} + +::-webkit-scrollbar-track { + background-color: transparent; +} + +::-webkit-scrollbar-thumb { + background-color: rgba(255, 255, 255, .05); +} + +::-webkit-scrollbar-thumb:hover { + background-color: rgba(255, 255, 255, .1); +} diff --git a/dom/index.html b/dom/index.html old mode 100755 new mode 100644 index 4239a1d..a7b95b5 --- a/dom/index.html +++ b/dom/index.html @@ -90,8 +90,8 @@ -
-
+
+