cleaned up some code and simplified theme

reedoooo · May 4, 2024 · 2ad104f · 2ad104f
1 parent 6f1fe5f
commit 2ad104f
Show file tree

Hide file tree

Showing 90 changed files with 698 additions and 1,596 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ package-lock.json
 /src/assets/cards
 # production
 /build
+/future-additions
 
 # misc
 .DS_Store

diff --git a/.hintrc b/.hintrc
@@ -11,5 +11,11 @@
         ]
       }
     ]
-  }
+  },
+  "browserslist": [
+    "defaults",
+    "not ie 11",
+    "not ios_saf <= 14.8",
+    "not safari <= 14.1"
+  ]
 }
diff --git a/jsconfig.json b/jsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "baseUrl": "src"
   },
-  "include": ["src"],
+  "include": ["src", "future-additions/SearchSettings.jsx"],
   "exclude": ["node_modules, build"],
   "paths": {
     "/*": ["src/*"]

diff --git a/src/App.js b/src/App.js
@@ -12,8 +12,8 @@ import { CSSTransition, TransitionGroup } from 'react-transition-group';
 import LoadingOverlay from 'layout/REUSABLE_COMPONENTS/system-utils/LoadingOverlay';
 import { Route, Routes } from 'react-router-dom';
 import PrivateRoute from 'layout/navigation/PrivateRoute';
-import { ROUTE_CONFIG } from 'data/route-config';
 import LoginDialog from 'pages/LoginDialog';
+import { ROUTE_CONFIG } from 'data';
 
 // ==============================|| APP ||============================== //
 const LazyRoute = ({ componentName, ...rest }) => {

diff --git a/src/assets/css/index.css b/src/assets/css/index.css
@@ -11,7 +11,7 @@
   --primary: #6a59ff;
   --white: #ffffff;
   --bg: #f5f5f5;
-  --button-bg-color: #1976d2; /* Original color, but let's introduce a blue scheme */
+  /* --button-bg-color: #1976d2; Original color, but let's introduce a blue scheme */
   --button-hover-bg-color: #4a6da7; /* Subtle blue for hover state */
   --button-hover-border-color: #34597f; /* A darker blue for border on hover */
   --button-border-color: #6a59ff; /* Initial border color */
@@ -101,8 +101,8 @@ body {
 
 form {
   border-radius: 15px;
-  backdrop-filter: blur(5px);
   -webkit-backdrop-filter: blur(5px);
+  backdrop-filter: blur(5px);
   background-color: rgba(255, 255, 255, 0.13);
   justify-content: center;
   align-items: center;
@@ -163,8 +163,8 @@ button {
 
 .dialog-login {
   border-radius: 15px;
-  backdrop-filter: blur(5px);
   -webkit-backdrop-filter: blur(5px);
+  backdrop-filter: blur(5px);
   background-color: rgba(255, 255, 255, 0.13);
   justify-content: center;
   align-items: center;
@@ -196,8 +196,9 @@ button {
 .hero-section-container {
   background: rgba(189, 181, 181, 0.1);
   box-shadow: 0 4px 30px rgba(0, 0, 0, 0.1);
-  backdrop-filter: blur(5px);
   -webkit-backdrop-filter: blur(20px);
+  backdrop-filter: blur(5px);
+
   border: 1px solid rgba(255, 255, 255, 0.3);
   border-radius: 25px;
   /* padding: 30px 0px; */
@@ -306,9 +307,9 @@ button {
 /* }  */
 
 @media (max-width: 500px) {
-  .swiper_container {
+  /* .swiper_container {
     /* height: 47rem; */
-  }
+  /* } */ */
   .swiper-slide {
     width: 28rem !important;
     /* height: 36rem !important; */

diff --git a/src/assets/css/page.css b/src/assets/css/page.css
@@ -1,5 +1,5 @@
 .gradient-background {
-  background: linear-gradient(180deg, #0172af, #74febd);
+  /* background: linear-gradient(180deg, #0172af, #74febd); */
   background-size: 120% 120%;
   animation: gradient-animation 8s ease infinite;
 }

diff --git a/src/assets/themes/base/colors.jsx b/src/assets/themes/base/colors.jsx
@@ -13,10 +13,8 @@ import {
   primary,
   secondary,
   grey,
-  greenAccent,
   redAccent,
   blueAccent,
-  customDarkTheme,
   white,
   black,
   myGradients,
@@ -27,10 +25,8 @@ const colors = {
     default: '#f0f2f5',
     paper: '#fff',
   },
-  greenAccent: greenAccent,
   redAccent: redAccent,
   blueAccent: blueAccent,
-  customDarkTheme: customDarkTheme,
   // COLORS FOR CARD RARITY OVERLAY
   rarity,
   // CARD RARITY OVERLAYS
@@ -61,11 +57,11 @@ const colors = {
     main: '#f0f2f5',
     focus: '#f0f2f5',
   },
-  dark: {
-    main: '#344767',
-    focus: '#2c3c58',
-    state: '#191919',
-  },
+  // dark: {
+  //   main: '#344767',
+  //   focus: '#2c3c58',
+  //   state: '#191919',
+  // },
   gradients: {
     primary: {
       main: '#EC407A',
@@ -229,6 +225,17 @@ const colors = {
   tabs: {
     indicator: { boxShadow: '#ddd' },
   },
+  inputColors: {
+    borderColor: { main: '#d2d6da', focus: '#35d1f5' },
+    boxShadow: '#81e3f9',
+    error: '#fd5c70',
+    success: '#66d432',
+  },
+  dark: {
+    main: '#344767',
+    focus: '#344767',
+    state: '#191919',
+  },
   // inputBorderColor: {
   //   main: '#d2d6da',
   //   hover: '#b3b9c2',