dev env tweaks

2022-03-19 18:56:58 -07:00 · 2022-03-19 18:56:58 -07:00 · d7c5fb7a70
commit d7c5fb7a70
parent d98bccdd1f
5 changed files with 189 additions and 286 deletions
--- a/brain/controller/APIControl.php
+++ b/brain/controller/APIControl.php
@ -23,7 +23,7 @@ class APIControl
        $filename = "";
        switch (isset($args["third"]) ? $args["third"] : "none") {
            case "status":
-                $result = AuthAPI::status();
+                    $result = AuthAPI::status();

                break;
            case "page":
--- a/brain/controller/DashControl.php
+++ b/brain/controller/DashControl.php
@ -2,14 +2,14 @@

 namespace brain\controller;

-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Slim\Views\Twig;
 use brain\data\Book;
 use brain\data\Session;
 use brain\data\Settings;
 use brain\data\Themes;
 use brain\utility\Setup;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Slim\Views\Twig;

 class DashControl
 {
@ -20,104 +20,104 @@ class DashControl
    ): ResponseInterface {
        $view = Twig::fromRequest($request);
        $pageOptions = [];
-        $template = "";
+        $template = '';
        if (Setup::status()) {
-            switch (isset($args["second"]) ? $args["second"] : "index") {
-                case "settings":
+            switch (isset($args['second']) ? $args['second'] : 'index') {
+                case 'settings':
                    if (Session::active()) {
                        $config = new Settings();
                        $settings = $config->getSettings();
-                        $themes = (new Themes())->getThemes(); //$config->getThemes();
-                        $template = "dash/settings.twig";
-                        $member = Session::get("member");
-                        $form_token = Session::get("form_token");
-                        $updated = new \Moment\Moment($settings["global"]["last_backup"]);
+                        $themes = (new Themes())->getThemes(); // $config->getThemes();
+                        $template = 'dash/settings.twig';
+                        $member = Session::get('member');
+                        $form_token = Session::get('form_token');
+                        $updated = new \Moment\Moment($settings['global']['last_backup']);
                        $pageOptions = [
-                        "title" => "Dash Settings",
-                        "private" => $settings["global"]["private"],
-                        "renderOnSave" => $settings["global"]["renderOnSave"],
-                        "background" => $settings["global"]["background"],
-                        "member" => $member,
-                        "ftoken" => $form_token,
-                        "siteTitle" => $settings["global"]["title"],
-                        "baseUrl" => $settings["global"]["base_url"],
-                        "desc" => $settings["global"]["descriptions"],
-                        "lastBackup" => $updated->format("Y M D d"),
-                        "currentTheme" => $settings["global"]["theme"],
-                        "themes" => $themes,
-                        "apiStatus" => isset($settings["global"]["externalAPI"])
-                          ? $settings["global"]["externalAPI"]
-                          : "false",
-                        "dynamicRenderStatus" => isset(
-                            $settings["global"]["dynamicRender"]
+                        'title' => 'Dash Settings',
+                        'private' => $settings['global']['private'],
+                        'renderOnSave' => $settings['global']['renderOnSave'],
+                        'background' => $settings['global']['background'],
+                        'member' => $member,
+                        'ftoken' => $form_token,
+                        'siteTitle' => $settings['global']['title'],
+                        'baseUrl' => $settings['global']['base_url'],
+                        'desc' => $settings['global']['descriptions'],
+                        'lastBackup' => $updated->format('Y M D d'),
+                        'currentTheme' => $settings['global']['theme'],
+                        'themes' => $themes,
+                        'apiStatus' => isset($settings['global']['externalAPI'])
+                          ? $settings['global']['externalAPI']
+                          : 'false',
+                        'dynamicRenderStatus' => isset(
+                            $settings['global']['dynamicRender']
                        )
-                          ? $settings["global"]["dynamicRender"]
-                          : "false",
-                          "mailOption" => $settings["email"]["active"],
-                          "mailConfig" => $settings["email"],
-                          "status" => Session::active(),
+                          ? $settings['global']['dynamicRender']
+                          : 'false',
+                          'mailOption' => $settings['email']['active'],
+                          'mailConfig' => $settings['email'],
+                          'status' => Session::active(),
                        ];
                    } else {
-                        header("Location: /dashboard");
-                        die();
+                        header('Location: /dashboard');
+                        exit();
                    }

                    break;
-                case "navigation":
+                case 'navigation':
                    if (Session::active()) {
                        $config = new Settings();
                        $settings = $config->getSettings();
-                        $template = "dash/navigation.twig";
+                        $template = 'dash/navigation.twig';
                        $pageOptions = [
-                        "title" => "Edit Dash Navigation",
-                        "status" => Session::active(),
-                        "menu" => $settings["menu"],
+                        'title' => 'Edit Dash Navigation',
+                        'status' => Session::active(),
+                        'menu' => $settings['menu'],
                        ];
                    } else {
-                        header("Location: /dashboard");
-                        die();
+                        header('Location: /dashboard');
+                        exit();
                    }
                    break;
-                case "pages":
+                case 'pages':
                    if (Session::active()) {
-                        $currentPage = isset($args["fourth"]) ? $args["fourth"] : 1;
-                        $filter = isset($args["third"]) ? $args["third"] : "all";
+                        $currentPage = isset($args['fourth']) ? $args['fourth'] : 1;
+                        $filter = isset($args['third']) ? $args['third'] : 'all';
                        $data = (new Book())->getPages($currentPage, 4, $filter);
-                        $template = "dash/book.twig";
+                        $template = 'dash/book.twig';
                        $pageOptions = [
-                        "title" => "Contents",
-                        "entryCount" => $data["entryCount"],
-                        "numOfPages" => $data["numOfPages"],
-                        "currentPage" => $currentPage,
-                        "filter" => $data["paginate"]["sort"],
-                        "stats" => $data["stats"],
-                        "pages" => $data["pages"],
-                        "paginate" => $data["paginate"],
-                        "status" => Session::active(),
+                        'title' => 'Contents',
+                        'entryCount' => $data['entryCount'],
+                        'numOfPages' => $data['numOfPages'],
+                        'currentPage' => $currentPage,
+                        'filter' => $data['paginate']['sort'],
+                        'stats' => $data['stats'],
+                        'pages' => $data['pages'],
+                        'paginate' => $data['paginate'],
+                        'status' => Session::active(),
                        ];
                    } else {
-                        header("Location: /dashboard");
-                        die();
+                        header('Location: /dashboard');
+                        exit();
                    }
                    break;
-                case "page":
+                case 'page':
                    if (Session::active()) {
-                        $template = "dash/page-edit.twig";
-                        $mode = $args["third"];
-                        $uuid = $args["fourth"];
+                        $template = 'dash/page-edit.twig';
+                        $mode = $args['third'];
+                        $uuid = $args['fourth'];

                        switch ($mode) {
-                            case "edit":
+                            case 'edit':
                                $page = (new Book())->findPageById($uuid);
                                $views = [];
-                                if (str_contains($page["layout"], "index")) {
+                                if (str_contains($page['layout'], 'index')) {
                                    $views = (new Themes())->getCustomIndex();
                                } else {
                                    $views = (new Themes())->getCustomViews();
                                }

-                                $imageList = explode(",", $page["feature"]);
-                                $fileList = explode(",", $page["files"]);
+                                $imageList = explode(',', $page['feature']);
+                                $fileList = explode(',', $page['files']);

                                $images = [];
                                $files = [];
@ -136,21 +136,21 @@ class DashControl
                                }

                                $pageOptions = [
-                                "title" => "Fipamo | Edit Page",
-                                "page" => $page,
-                                "mode" => $mode,
-                                "token" => Session::get("form_token"),
-                                "status" => Session::active(),
-                                "images" => $images,
-                                "files" => $files,
-                                "views" => $views,
+                                'title' => 'Fipamo | Edit Page',
+                                'page' => $page,
+                                'mode' => $mode,
+                                'token' => Session::get('form_token'),
+                                'status' => Session::active(),
+                                'images' => $images,
+                                'files' => $files,
+                                'views' => $views,
                                ];
                                break;
-                            case "preview":
+                            case 'preview':
                                $config = new Settings();
                                $settings = $config->getSettings();
                                $loader = new \Twig\Loader\FilesystemLoader(
-                                    "../content/themes"
+                                    '../content/themes'
                                );
                                $display = new \Twig\Environment($loader, []);

@ -158,59 +158,60 @@ class DashControl
                                $page = $book->findPageById($uuid);
                                $pageOptions = Sorting::page($page);
                                $preview =
-                                $settings["global"]["theme"] .
-                                "/" .
-                                $page["layout"] .
-                                ".twig";
+                                $settings['global']['theme'] .
+                                '/' .
+                                $page['layout'] .
+                                '.twig';
                                $html = $display->render($preview, $pageOptions);
                                $response->getBody()->write($html);
+
                                return $response;
                            break;
                            default:
                                $pageOptions = [
-                                "title" => "Fipamo | Create Page",
-                                "token" => Session::get("form_token"),
-                                "mode" => $mode,
-                                "status" => Session::active(),
+                                'title' => 'Fipamo | Create Page',
+                                'token' => Session::get('form_token'),
+                                'mode' => $mode,
+                                'status' => Session::active(),
                                ];
                                break;
                        }
                    } else {
-                        header("Location: /dashboard");
-                        die();
+                        header('Location: /dashboard');
+                        exit();
                    }
                    break;
-                case "logout":
+                case 'logout':
                    Session::kill();
-                    header("Location: /dashboard");
-                    die();
+                    header('Location: /dashboard');
+                    exit();
                break;
-                case "reset-password":
-                    $template = "dash/reset-password.twig";
+                case 'reset-password':
+                    $template = 'dash/reset-password.twig';
                    $pageOptions = [
-                    "title" => "Reset Password",
+                    'title' => 'Reset Password',
                    ];
                    break;

                default:
-                    $template = "dash/start.twig";
+                    $template = 'dash/start.twig';
                    if (Session::active()) {
                        $pageOptions = [
-                        "title" => "Welcome Back",
-                        "status" => Session::active(),
-                        "data" => (new Book())->getPages(1, 4),
+                        'title' => 'Welcome Back',
+                        'status' => Session::active(),
+                        'data' => (new Book())->getPages(1, 4),
                        ];
                    } else {
                        $pageOptions = [
-                        "title" => "Welcome to Fipamo",
-                        "status" => Session::active(),
+                        'title' => 'Welcome to Fipamo',
+                        'status' => Session::active(),
                        ];
                    }
                    break;
            }
        } else {
-            $template = "dash/init.twig";
-            $pageOptions = ["title" => "Fipamo Setup"];
+            $template = 'dash/init.twig';
+            $pageOptions = ['title' => 'Fipamo Setup'];
        }

        return $view->render($response, $template, $pageOptions);
--- a/package-lock.json
+++ b/package-lock.json
@ -25,10 +25,10 @@
      "devDependencies": {
        "@babel/preset-env": "^7.16.5",
        "babel-cli": "^6.26.0",
-        "eslint": "^8.5.0",
+        "eslint": "^8.11.0",
        "eslint-plugin-babel": "^5.3.1",
        "parcel": "^2.0.1",
-        "prettier": "^2.5.1"
+        "prettier": "^2.6.0"
      }
    },
    "node_modules/@babel/code-frame": {
@ -1820,15 +1820,15 @@
      }
    },
    "node_modules/@eslint/eslintrc": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz",
-      "integrity": "sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz",
+      "integrity": "sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==",
      "dependencies": {
        "ajv": "^6.12.4",
        "debug": "^4.3.2",
-        "espree": "^9.2.0",
+        "espree": "^9.3.1",
        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
+        "ignore": "^5.2.0",
        "import-fresh": "^3.2.1",
        "js-yaml": "^4.1.0",
        "minimatch": "^3.0.4",
@ -1839,9 +1839,9 @@
      }
    },
    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
-      "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+      "version": "13.13.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz",
+      "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==",
      "dependencies": {
        "type-fest": "^0.20.2"
      },
@ -1852,14 +1852,6 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/@eslint/eslintrc/node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
      "version": "0.20.2",
      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@ -3909,14 +3901,6 @@
      "resolved": "https://registry.npmjs.org/animejs/-/animejs-3.2.1.tgz",
      "integrity": "sha512-sWno3ugFryK5nhiDm/2BKeFCpZv7vzerWUcUPyAZLDhMek3+S/p418ldZJbJXo5ZUOpfm2kP2XRO4NJcULMy9A=="
    },
-    "node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
    "node_modules/ansi-escapes": {
      "version": "4.3.2",
      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@ -6619,17 +6603,6 @@
        "node": ">= 0.8"
      }
    },
-    "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dependencies": {
-        "ansi-colors": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
    "node_modules/entities": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
@ -6756,23 +6729,22 @@
      }
    },
    "node_modules/eslint": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.5.0.tgz",
-      "integrity": "sha512-tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.11.0.tgz",
+      "integrity": "sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==",
      "dependencies": {
-        "@eslint/eslintrc": "^1.0.5",
+        "@eslint/eslintrc": "^1.2.1",
        "@humanwhocodes/config-array": "^0.9.2",
        "ajv": "^6.10.0",
        "chalk": "^4.0.0",
        "cross-spawn": "^7.0.2",
        "debug": "^4.3.2",
        "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.0",
+        "eslint-scope": "^7.1.1",
        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.1.0",
-        "espree": "^9.2.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.1",
        "esquery": "^1.4.0",
        "esutils": "^2.0.2",
        "fast-deep-equal": "^3.1.3",
@ -6780,7 +6752,7 @@
        "functional-red-black-tree": "^1.0.1",
        "glob-parent": "^6.0.1",
        "globals": "^13.6.0",
-        "ignore": "^4.0.6",
+        "ignore": "^5.2.0",
        "import-fresh": "^3.0.0",
        "imurmurhash": "^0.1.4",
        "is-glob": "^4.0.0",
@ -6791,9 +6763,7 @@
        "minimatch": "^3.0.4",
        "natural-compare": "^1.4.0",
        "optionator": "^0.9.1",
-        "progress": "^2.0.0",
        "regexpp": "^3.2.0",
-        "semver": "^7.2.1",
        "strip-ansi": "^6.0.1",
        "strip-json-comments": "^3.1.0",
        "text-table": "^0.2.0",
@ -6948,9 +6918,9 @@
      }
    },
    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
-      "integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
      "dependencies": {
        "esrecurse": "^4.3.0",
        "estraverse": "^5.2.0"
@ -6960,9 +6930,9 @@
      }
    },
    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
-      "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
      }
@ -7008,14 +6978,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/eslint/node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
    "node_modules/eslint/node_modules/is-extglob": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@ -7079,20 +7041,6 @@
        "node": ">= 0.8.0"
      }
    },
-    "node_modules/eslint/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
    "node_modules/eslint/node_modules/shebang-command": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@ -7171,13 +7119,13 @@
      }
    },
    "node_modules/espree": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.2.0.tgz",
-      "integrity": "sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg==",
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz",
+      "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
      "dependencies": {
-        "acorn": "^8.6.0",
+        "acorn": "^8.7.0",
        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^3.1.0"
+        "eslint-visitor-keys": "^3.3.0"
      },
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@ -7195,9 +7143,9 @@
      }
    },
    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
-      "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
      }
@ -8506,7 +8454,6 @@
      "version": "5.2.0",
      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true,
      "engines": {
        "node": ">= 4"
      }
@ -9628,6 +9575,7 @@
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
      "dependencies": {
        "yallist": "^4.0.0"
      },
@ -11560,15 +11508,18 @@
      }
    },
    "node_modules/prettier": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
-      "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.0.tgz",
+      "integrity": "sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==",
      "dev": true,
      "bin": {
        "prettier": "bin-prettier.js"
      },
      "engines": {
        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
      }
    },
    "node_modules/prismjs": {
@ -11599,14 +11550,6 @@
      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
      "dev": true
    },
-    "node_modules/progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
    "node_modules/psl": {
      "version": "1.8.0",
      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
@ -14389,7 +14332,8 @@
    "node_modules/yallist": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
    },
    "node_modules/yaml": {
      "version": "1.10.2",
@ -15658,15 +15602,15 @@
      }
    },
    "@eslint/eslintrc": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz",
-      "integrity": "sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz",
+      "integrity": "sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==",
      "requires": {
        "ajv": "^6.12.4",
        "debug": "^4.3.2",
-        "espree": "^9.2.0",
+        "espree": "^9.3.1",
        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
+        "ignore": "^5.2.0",
        "import-fresh": "^3.2.1",
        "js-yaml": "^4.1.0",
        "minimatch": "^3.0.4",
@ -15674,18 +15618,13 @@
      },
      "dependencies": {
        "globals": {
-          "version": "13.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
-          "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+          "version": "13.13.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz",
+          "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==",
          "requires": {
            "type-fest": "^0.20.2"
          }
        },
-        "ignore": {
-          "version": "4.0.6",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
-        },
        "type-fest": {
          "version": "0.20.2",
          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@ -17104,11 +17043,6 @@
      "resolved": "https://registry.npmjs.org/animejs/-/animejs-3.2.1.tgz",
      "integrity": "sha512-sWno3ugFryK5nhiDm/2BKeFCpZv7vzerWUcUPyAZLDhMek3+S/p418ldZJbJXo5ZUOpfm2kP2XRO4NJcULMy9A=="
    },
-    "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="
-    },
    "ansi-escapes": {
      "version": "4.3.2",
      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@ -19404,14 +19338,6 @@
      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
      "dev": true
    },
-    "enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "requires": {
-        "ansi-colors": "^4.1.1"
-      }
-    },
    "entities": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
@ -19510,23 +19436,22 @@
      }
    },
    "eslint": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.5.0.tgz",
-      "integrity": "sha512-tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.11.0.tgz",
+      "integrity": "sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==",
      "requires": {
-        "@eslint/eslintrc": "^1.0.5",
+        "@eslint/eslintrc": "^1.2.1",
        "@humanwhocodes/config-array": "^0.9.2",
        "ajv": "^6.10.0",
        "chalk": "^4.0.0",
        "cross-spawn": "^7.0.2",
        "debug": "^4.3.2",
        "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.0",
+        "eslint-scope": "^7.1.1",
        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.1.0",
-        "espree": "^9.2.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.1",
        "esquery": "^1.4.0",
        "esutils": "^2.0.2",
        "fast-deep-equal": "^3.1.3",
@ -19534,7 +19459,7 @@
        "functional-red-black-tree": "^1.0.1",
        "glob-parent": "^6.0.1",
        "globals": "^13.6.0",
-        "ignore": "^4.0.6",
+        "ignore": "^5.2.0",
        "import-fresh": "^3.0.0",
        "imurmurhash": "^0.1.4",
        "is-glob": "^4.0.0",
@ -19545,9 +19470,7 @@
        "minimatch": "^3.0.4",
        "natural-compare": "^1.4.0",
        "optionator": "^0.9.1",
-        "progress": "^2.0.0",
        "regexpp": "^3.2.0",
-        "semver": "^7.2.1",
        "strip-ansi": "^6.0.1",
        "strip-json-comments": "^3.1.0",
        "text-table": "^0.2.0",
@ -19605,18 +19528,18 @@
          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
        },
        "eslint-scope": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
-          "integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==",
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+          "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
          "requires": {
            "esrecurse": "^4.3.0",
            "estraverse": "^5.2.0"
          }
        },
        "eslint-visitor-keys": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
-          "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA=="
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="
        },
        "estraverse": {
          "version": "5.3.0",
@ -19644,11 +19567,6 @@
          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
        },
-        "ignore": {
-          "version": "4.0.6",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
-        },
        "is-extglob": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@ -19694,14 +19612,6 @@
          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
        "shebang-command": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@ -19792,13 +19702,13 @@
      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
    },
    "espree": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.2.0.tgz",
-      "integrity": "sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg==",
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz",
+      "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
      "requires": {
-        "acorn": "^8.6.0",
+        "acorn": "^8.7.0",
        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^3.1.0"
+        "eslint-visitor-keys": "^3.3.0"
      },
      "dependencies": {
        "acorn": {
@ -19807,9 +19717,9 @@
          "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="
        },
        "eslint-visitor-keys": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
-          "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA=="
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="
        }
      }
    },
@ -20815,8 +20725,7 @@
    "ignore": {
      "version": "5.2.0",
      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
    },
    "immutable": {
      "version": "4.0.0",
@ -21671,6 +21580,7 @@
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
      "requires": {
        "yallist": "^4.0.0"
      }
@ -23124,9 +23034,9 @@
      "optional": true
    },
    "prettier": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
-      "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.0.tgz",
+      "integrity": "sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==",
      "dev": true
    },
    "prismjs": {
@ -23151,11 +23061,6 @@
      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
      "dev": true
    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-    },
    "psl": {
      "version": "1.8.0",
      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
@ -25372,7 +25277,8 @@
    "yallist": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
    },
    "yaml": {
      "version": "1.10.2",
--- a/package.json
+++ b/package.json
@ -10,10 +10,10 @@
  "devDependencies": {
    "@babel/preset-env": "^7.16.5",
    "babel-cli": "^6.26.0",
-    "eslint": "^8.5.0",
+    "eslint": "^8.11.0",
    "eslint-plugin-babel": "^5.3.1",
    "parcel": "^2.0.1",
-    "prettier": "^2.5.1"
+    "prettier": "^2.6.0"
  },
  "dependencies": {
    "@babel/core": "^7.16.5",
--- a/src/styles/main/_structure.sass
+++ b/src/styles/main/_structure.sass
@ -47,16 +47,15 @@ svg.icons
      animation: spin 2s linear infinite
    @-moz-keyframes spin
      100%
-        -moz-transform: rotate(360deg)
+      -moz-transform: rotate(360deg)
    @-webkit-keyframes spin
      100%
-        -webkit-transform: rotate(360deg)
+      -webkit-transform: rotate(360deg)
    @keyframes spin
      100%
        -webkit-transform: rotate(360deg)
        transform: rotate(360deg)

-    
    .notify-icon
      background: $black
      padding: 8px 5px 5px 5px
@ -148,8 +147,6 @@ svg.icons
                svg
                  fill: $secondary

-                
-
 /* Mozilla based browsers */
 ::-moz-selection
  background-color: $highlight
@ -174,7 +171,6 @@ svg.icons
  background-color: $highlight
  color: $white

-
 //Responsive
@media only screen and (max-width: 901px)
  .main-container