From 93d61ced55e7e1c486cdbe6c02c16435ca698860 Mon Sep 17 00:00:00 2001 From: Balaji Vijayakumar Date: Thu, 8 Dec 2022 22:28:46 +0530 Subject: migrate from gulp to esbuild for faster builds (#815) --- .../app/Controllers/Http/ImageController.js | 3 ++- .../app/Controllers/Http/UserController.js | 6 +++-- src/internal-server/public/js/transfer.js | 2 +- src/styles/animations.scss | 2 ++ src/styles/globals.scss | 26 ++++++++++++++++++++++ src/styles/main.scss | 3 ++- src/styles/vertical.scss | 1 + 7 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 src/styles/globals.scss (limited to 'src') diff --git a/src/internal-server/app/Controllers/Http/ImageController.js b/src/internal-server/app/Controllers/Http/ImageController.js index 731f181e0..5b8337c49 100644 --- a/src/internal-server/app/Controllers/Http/ImageController.js +++ b/src/internal-server/app/Controllers/Http/ImageController.js @@ -19,7 +19,8 @@ class ImageController { try { await fs.access(iconPath); - } catch { + } catch (error) { + console.log(error); // File not available. return response.status(404).send({ status: "Icon doesn't exist", diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js index fb1a19db6..9a9d76636 100644 --- a/src/internal-server/app/Controllers/Http/UserController.js +++ b/src/internal-server/app/Controllers/Http/UserController.js @@ -25,7 +25,8 @@ const apiRequest = (url, route, method, auth) => }) .then(data => data.json()) .then(json => resolve(json)); - } catch { + } catch (error) { + console.log(error); reject(); } }); @@ -255,7 +256,8 @@ class UserController { let file; try { file = JSON.parse(request.input('file')); - } catch { + } catch (error) { + console.log(error); return response.send( 'Could not import: Invalid file, could not read file', ); diff --git a/src/internal-server/public/js/transfer.js b/src/internal-server/public/js/transfer.js index 36fdbd61a..e3b3f92a2 100644 --- a/src/internal-server/public/js/transfer.js +++ b/src/internal-server/public/js/transfer.js @@ -2,7 +2,7 @@ const submitBtn = document.querySelector('#submit'); const fileInput = document.querySelector('#file'); const fileOutput = document.querySelector('#fileoutput'); -fileInput?.addEventListener('change', () => { +fileInput.addEventListener('change', () => { const reader = new FileReader(); reader.addEventListener('load', () => { const text = reader.result; diff --git a/src/styles/animations.scss b/src/styles/animations.scss index b121af7d2..35125dec5 100644 --- a/src/styles/animations.scss +++ b/src/styles/animations.scss @@ -1,3 +1,5 @@ +@import "./globals.scss"; + // FadeIn .fadeIn-appear { opacity: .01; } diff --git a/src/styles/globals.scss b/src/styles/globals.scss new file mode 100644 index 000000000..b6a7949c2 --- /dev/null +++ b/src/styles/globals.scss @@ -0,0 +1,26 @@ +$raw-theme-brand-primary: "114,102,240"; +$raw-theme-brand-success: "92,184,92"; +$raw-theme-brand-info: "91,192,222"; +$raw-theme-brand-warning: "255,159,0"; +$raw-theme-brand-danger: "217,83,79"; +$raw-theme-gray-dark: "55,58,60"; +$raw-theme-gray: "85,89,92"; +$raw-theme-gray-light: "129,138,145"; +$raw-theme-gray-lighter: "236,238,239"; +$raw-theme-gray-lightest: "247,247,249"; +$raw-theme-border-radius: 6px; +$raw-theme-border-radius-small: 3px; +$raw-theme-sidebar-width: 68px; +$raw-theme-text-color: "55,58,60"; +$raw-theme-transition-time: .5s; +$raw-theme-inset-shadow: inset 0 2px 5px rgba(0, 0, 0, .03); +$raw-dark-theme-black: "26,26,26"; +$raw-dark-theme-gray-darkest: "30,30,30"; +$raw-dark-theme-gray-darker: "45,47,49"; +$raw-dark-theme-gray-dark: "56,58,59"; +$raw-dark-theme-gray: "71,73,75"; +$raw-dark-theme-gray-light: "81,83,85"; +$raw-dark-theme-gray-lighter: "138,139,139"; +$raw-dark-theme-gray-lightest: "255,255,255"; +$raw-dark-theme-gray-smoke: "206,208,209"; +$raw-dark-theme-text-color: "255,255,255"; diff --git a/src/styles/main.scss b/src/styles/main.scss index e6278efd0..8369c9298 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,6 +1,7 @@ -@import './node_modules/electron-react-titlebar/assets/style'; +@import '../../node_modules/electron-react-titlebar/assets/style'; // modules +@import './globals.scss'; @import './reset.scss'; @import './util.scss'; @import './layout.scss'; diff --git a/src/styles/vertical.scss b/src/styles/vertical.scss index 87bbae1b0..dd2ae4ed1 100644 --- a/src/styles/vertical.scss +++ b/src/styles/vertical.scss @@ -1,3 +1,4 @@ +@import './globals.scss'; @import './config.scss'; $sidebar-width: 75px; -- cgit v1.2.3-54-g00ecf