From f573d9fd5f93363cac6e9db9470e3e11699304f0 Mon Sep 17 00:00:00 2001
From: coltoneshaw <coltoneshaw@gmail.com>
Date: Sat, 14 Aug 2021 22:03:10 -0400
Subject: [PATCH] Added the version at the bottom of the settings page

---
 src/app/Components/Pages/Settings/Settings.scss | 7 +++++++
 tsconfig.json                                   | 1 +
 webpack.electron.js                             | 4 +++-
 webpack.preload.js                              | 4 +++-
 webpack.react.js                                | 3 ++-
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/app/Components/Pages/Settings/Settings.scss b/src/app/Components/Pages/Settings/Settings.scss
index 660089a2..3df07a4d 100644
--- a/src/app/Components/Pages/Settings/Settings.scss
+++ b/src/app/Components/Pages/Settings/Settings.scss
@@ -51,4 +51,11 @@
     overflow-x: scroll;
     align-self: center;
     width: 60%
+}
+
+.versionNumber{
+    width: 100%;
+    margin: 0 auto 0 auto;
+    font-weight: 300;
+    text-align: center;
 }
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index b2409673..b7423a58 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,6 +16,7 @@
       "es2021",
       "es6"
     ],
+    "resolveJsonModule": true,
     "target": "es5",                                /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */
     "module": "commonjs",                           /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
     // "lib": [],                                   /* Specify library files to be included in the compilation. */
diff --git a/webpack.electron.js b/webpack.electron.js
index f47305c7..d6a2f56a 100644
--- a/webpack.electron.js
+++ b/webpack.electron.js
@@ -9,7 +9,9 @@ module.exports = {
   target: 'electron-main',
   resolve: {
     alias: {
-      ['@']: path.resolve(__dirname, 'src')
+      ['@']: path.resolve(__dirname, 'src'),
+      ['#']: path.resolve(__dirname, '.')
+
     },
     extensions: ['.tsx', '.ts', '.js'],
   },
diff --git a/webpack.preload.js b/webpack.preload.js
index cf1fa0e2..6d873f0e 100644
--- a/webpack.preload.js
+++ b/webpack.preload.js
@@ -10,7 +10,9 @@ module.exports = {
   target: 'electron-main',
   resolve: {
     alias: {
-      ['@']: path.resolve(__dirname, 'src')
+      ['@']: path.resolve(__dirname, 'src'),
+      ['#']: path.resolve(__dirname, '.')
+
     },
     extensions: ['.tsx', '.ts', '.js'],
   },
diff --git a/webpack.react.js b/webpack.react.js
index c85ad406..18f8513b 100644
--- a/webpack.react.js
+++ b/webpack.react.js
@@ -13,7 +13,8 @@ module.exports = {
   },
   resolve: {
     alias: {
-      ['@']: path.resolve(__dirname, 'src')
+      ['@']: path.resolve(__dirname, 'src'),
+      ['#']: path.resolve(__dirname, '.')
     },
     extensions: ['.tsx', '.ts', '.js'],
   },