Merge pull request #35 from tobspr-games/dengr1065/more-cleanups

Various cleanups
tobspr-games · Jun 25, 2024 · ddc4513 · ddc4513
2 parents 031a7c0 + 4bf8011
commit ddc4513
Show file tree

Hide file tree

Showing 20 changed files with 39 additions and 738 deletions.
diff --git a/electron/index.js b/electron/index.js
@@ -149,7 +149,7 @@ function createWindow() {
 
     //// END SECURITY
 
-    win.webContents.on("new-window", (event, pth) => {
+    win.webContents.on("will-navigate", (event, pth) => {
         event.preventDefault();
 
         if (pth.startsWith("https://")) {

diff --git a/gulp/config.js b/gulp/config.js
@@ -1,5 +1,5 @@
-import path from "path/posix";
 import BrowserSync from "browser-sync";
+import path from "path/posix";
 
 export const baseDir = path.resolve("..");
 export const buildFolder = path.join(baseDir, "build");
@@ -25,12 +25,6 @@ export const browserSync = BrowserSync.create();
 
 const envVars = [
     "SHAPEZ_CLI_SERVER_HOST",
-    "SHAPEZ_CLI_ALPHA_FTP_USER",
-    "SHAPEZ_CLI_ALPHA_FTP_PW",
-    "SHAPEZ_CLI_STAGING_FTP_USER",
-    "SHAPEZ_CLI_STAGING_FTP_PW",
-    "SHAPEZ_CLI_LIVE_FTP_USER",
-    "SHAPEZ_CLI_LIVE_FTP_PW",
     "SHAPEZ_CLI_APPLE_ID",
     "SHAPEZ_CLI_APPLE_CERT_NAME",
     "SHAPEZ_CLI_GITHUB_USER",

diff --git a/gulp/ftp.js b/gulp/ftp.js
diff --git a/gulp/loader.strip_block.js b/gulp/loader.strip_block.js
diff --git a/gulp/mod.js b/gulp/mod.js
diff --git a/gulp/preloader/preloader.css b/gulp/preloader/preloader.css
@@ -36,14 +36,11 @@ body {
     text-decoration: none;
     text-size-adjust: 100%;
     letter-spacing: normal;
-    scrollbar-width: 6px;
     -webkit-font-smoothing: antialiased;
     -webkit-touch-callout: none;
     /* prevent callout to copy image, etc when tap to hold */
     -webkit-text-size-adjust: none;
     /* prevent webkit from resizing text to fit */
-    scrollbar-face-color: #888;
-    scrollbar-track-color: rgba(255, 255, 255, 0.1);
 }
 
 #ll_fp {

diff --git a/gulp/tasks.js b/gulp/tasks.js
@@ -1,37 +1,35 @@
+import childProcess from "child_process";
+import delEmpty from "delete-empty";
 import gulp from "gulp";
-import path from "path/posix";
 import pathNative from "path";
-import delEmpty from "delete-empty";
-import childProcess from "child_process";
+import path from "path/posix";
 import { promisify } from "util";
-const exec = promisify(childProcess.exec);
 import { BUILD_VARIANTS } from "./build_variants.js";
 import {
-    baseDir,
+    browserSync,
     buildFolder,
     buildOutputFolder,
-    browserSync,
-    rawImageResourcesGlobs,
-    nonImageResourcesGlobs,
     imageResourcesGlobs,
+    nonImageResourcesGlobs,
+    rawImageResourcesGlobs,
 } from "./config.js";
+const exec = promisify(childProcess.exec);
 
 // Load other plugins
 import gulpClean from "gulp-clean";
 import gulpWebserver from "gulp-webserver";
 
-import * as imgres from "./image-resources.js";
 import * as css from "./css.js";
-import * as sounds from "./sounds.js";
-import * as localConfig from "./local-config.js";
-import js from "./js.js";
-import * as html from "./html.js";
-import * as ftp from "./ftp.js";
 import * as docs from "./docs.js";
+import * as html from "./html.js";
+import * as imgres from "./image-resources.js";
+import js from "./js.js";
+import * as localConfig from "./local-config.js";
+import * as sounds from "./sounds.js";
 import standalone from "./standalone.js";
 import * as translations from "./translations.js";
 
-export { imgres, css, sounds, localConfig, js, html, ftp, docs, standalone, translations };
+export { css, docs, html, imgres, js, localConfig, sounds, standalone, translations };
 
 /////////////////////  BUILD TASKS  /////////////////////
 
@@ -272,12 +270,8 @@ for (const variant in BUILD_VARIANTS) {
 
 // Deploying!
 export const deploy = {
-    staging: gulp.series(
-        utils.requireCleanWorkingTree,
-        build["web-shapezio-beta"].full,
-        ftp.upload.staging.all
-    ),
-    prod: gulp.series(utils.requireCleanWorkingTree, build["web-shapezio"].full, ftp.upload.prod.all),
+    staging: gulp.series(utils.requireCleanWorkingTree, build["web-shapezio-beta"].full),
+    prod: gulp.series(utils.requireCleanWorkingTree, build["web-shapezio"].full),
 };
 
 export const main = {

diff --git a/package.json b/package.json
@@ -70,7 +70,6 @@
         "gulp-postcss": "^8.0.0",
         "gulp-rename": "^2.0.0",
         "gulp-sass-lint": "^1.4.0",
-        "gulp-sftp": "git+https://[email protected]/webksde/gulp-sftp",
         "gulp-webserver": "^0.9.1",
         "gulp-yaml": "^2.0.4",
         "imagemin-gifsicle": "^7.0.0",

diff --git a/src/css/common.scss b/src/css/common.scss
@@ -25,9 +25,7 @@ html {
     // scroll-behavior: smooth;
     background: $mainBgColor;
     // Disable zooming and thus
-    -ms-touch-action: pan-x, pan-y;
     touch-action: pan-x, pan-y;
-    -ms-content-zooming: none;
     top: 0;
     left: 0;
     bottom: 0;
@@ -41,8 +39,6 @@ html {
 body {
     color: #555;
     user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
     background: inherit !important;
     text-transform: none;
     white-space: normal;
@@ -56,45 +52,11 @@ body {
     text-decoration: none;
     text-size-adjust: 100%;
     letter-spacing: normal;
-    scrollbar-width: 6px;
     -webkit-font-smoothing: antialiased;
-    // -webkit-overflow-scrolling: touch; /* stop scrolling immediately */
     -webkit-touch-callout: none;
     /* prevent callout to copy image, etc when tap to hold */
-    -webkit-text-size-adjust: none;
-    /* prevent webkit from resizing text to fit */
-    // Internet explorer
-    scrollbar-face-color: #888;
-    scrollbar-track-color: rgba(255, 255, 255, 0.1);
-    // Firefox
-    scrollbar-color: #cdd0d4 rgba(#000, 0.05);
     overflow: hidden;
     @include Text;
-    &.externalAdOpen {
-        &::before {
-            text-transform: uppercase;
-            @include SuperSmallText;
-            content: "Loading Advertisement...";
-            color: #333;
-            position: fixed;
-            top: 0;
-            pointer-events: all;
-            left: 0;
-            right: 0;
-            bottom: 0;
-            background: rgba(50, 60, 70, 0.8);
-            z-index: 999999;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            color: #fff;
-            @include InlineAnimation(1s ease-in-out infinite) {
-                50% {
-                    transform: scale(1.05);
-                }
-            }
-        }
-    }
     // For recording the bg video
     // filter: blur(5px);
     // &::after {
@@ -217,11 +179,6 @@ button {
     /* WebKit/Blink Browsers */
 }
 
-::-moz-selection {
-    background: $colorGreenBright;
-    /* Gecko Browsers */
-}
-
 input[type="text"],
 input[type="email"] {
     @include S(padding, 11px, 12px);
@@ -292,7 +249,6 @@ i {
 
 input {
     user-select: text;
-    -moz-user-select: text;
     pointer-events: all;
     cursor: text;
     border-radius: 0;
@@ -308,7 +264,6 @@ canvas {
     letter-spacing: 0 !important;
     transform: translateZ(0);
     backface-visibility: hidden;
-    -webkit-backface-visibility: hidden;
 }
 
 .fontPreload {
@@ -666,7 +621,6 @@ input.rangeInput {
 
     &::-webkit-slider-thumb {
         appearance: none;
-        -webkit-appearance: none;
         box-shadow: inset 0 0 0 D(10px) $themeColor;
         border-radius: 50%;
 
@@ -721,17 +675,3 @@ iframe {
     pointer-events: all;
     user-select: all;
 }
-
-// Steam overlay fix
-#steamOverlayCanvasFix {
-    position: fixed;
-    top: 0px;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    width: 100%;
-    height: 100%;
-    opacity: 0.01;
-    pointer-events: none;
-    z-index: -1;
-}