removed stylesheet for app, merge every global files into index.scss

tedpham3 · tedpham3 · commit 3fda80eff3bf · 2024-05-03T10:22:15.000-07:00
diff --git a/app/App.tsx b/app/App.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import Splash from './components/Splash/Splash';
 import DashboardContainer from './containers/DashboardContainer/DashboardContainer';
-import './stylesheets/scrollBar.scss';
+import './index.scss';
 
 
 // this is the fitness gram pacer test
diff --git a/app/charts/RequestTypesChart.tsx b/app/charts/RequestTypesChart.tsx
@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
 import Plot from 'react-plotly.js';
 import { CommsContext } from '../context/CommsContext';
-import '../stylesheets/index.scss';
+import '../index.scss';
 
 const RequestTypesChart: React.FC = React.memo(() => {
   const { commsData } = useContext(CommsContext);
diff --git a/app/components/About/styles.scss b/app/components/About/styles.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 
 .about {
   min-width: 421px;
@@ -72,4 +72,4 @@
 
 p {
   padding-left: 10px;
-}
+}
diff --git a/app/components/ApplicationsCard/styles.scss b/app/components/ApplicationsCard/styles.scss
@@ -1,5 +1,4 @@
-
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 
 .card {
   display: flex;
@@ -66,7 +65,6 @@
   }
 }
 
-
 #card-MongoDB {
   &:hover .databaseIconHeader {
     visibility: hidden;
@@ -245,4 +243,4 @@
 #serviceName {
   font-size: 11px;
   margin-top: 6px;
-}
+}
diff --git a/app/components/Contact/styles.scss b/app/components/Contact/styles.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 
 .contact {
   display: flex;
@@ -164,4 +164,4 @@ input[type='file'] {
   &:hover {
     color: blue !important;
   }
-}
+}
diff --git a/app/components/DashboardIcons/styles.scss b/app/components/DashboardIcons/styles.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 
 .dashboardIconWrapper {
   margin-right: 37px;
@@ -143,4 +143,4 @@
 .personIconArea .personTooltip {
   color: $gyellow;
   text-align: center;
-}
+}
diff --git a/app/components/FirstLaunch/styles.scss b/app/components/FirstLaunch/styles.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 
 .btns {
   display: flex;
@@ -22,7 +22,6 @@
   height: 100vh;
   opacity: 1;
 
-
   .logo-container {
     height: auto;
     width: 40%;
@@ -144,4 +143,4 @@
   100% {
     opacity: 1;
   }
-}
+}
diff --git a/app/components/Header/styles.scss b/app/components/Header/styles.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 .microservice-header {
   width: 100%;
   @include centerWithFlex(center);
@@ -209,4 +209,4 @@ label.select {
       background-color: #67688d;
     }
   }
-}
+}
diff --git a/app/components/Occupied/styles.scss b/app/components/Occupied/styles.scss
@@ -1,11 +1,11 @@
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 
 // MAIN DASHBOARD
 .dashboardArea {
   display: flex;
   flex-direction: column;
   justify-content: flex-start;
-  padding-top:2rem;
+  padding-top: 2rem;
 }
 
 // HEADER
@@ -103,6 +103,6 @@ select:-webkit-autofill:focus {
   text-decoration: none;
 }
 
-a{
+a {
   text-decoration: none;
-}
+}
diff --git a/app/components/Setting/styles.scss b/app/components/Setting/styles.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss'; 
+@import '../../index.scss';
 
 .settings {
   display: flex;
@@ -45,4 +45,4 @@
   color: $white;
   background-color: $black;
   box-shadow: $boxshadow2;
-}
+}
diff --git a/app/components/Splash/styles.scss b/app/components/Splash/styles.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss'; // Update the import path according to your project structure
+@import '../../index.scss'; // Update the import path according to your project structure
 
 #splash {
   display: flex;
diff --git a/app/components/WindowBar/styles.scss b/app/components/WindowBar/styles.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss'; 
+@import '../../index.scss';
 #titleBar {
   position: fixed;
   display: flex;
@@ -14,4 +14,4 @@
     margin: 9px 7px 0px;
     -webkit-app-region: no-drag;
   }
-}
+}
diff --git a/app/containers/AWSGraphsContainer/styles.scss b/app/containers/AWSGraphsContainer/styles.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 
 .AWS-container {
   margin-top: 40px;
diff --git a/app/containers/GraphsContainer/styles.scss b/app/containers/GraphsContainer/styles.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 
 .traceContainer {
   display: flex;
@@ -78,7 +78,6 @@
       font-weight: 580;
     }
   }
-  
 }
 
 /* Tablet */
@@ -111,7 +110,7 @@
     letter-spacing: 1.5px;
     font-weight: 450;
   }
-  
+
   to {
     background-color: $darkblue;
   }
@@ -130,7 +129,7 @@ nav {
     animation: FadeIn 1.5s ease-in-out forwards;
     color: white;
     margin: 0 16px;
-    
+
     &.selected {
       text-decoration: underline;
       text-underline-offset: 7px;
diff --git a/app/containers/MainContainer/styles.scss b/app/containers/MainContainer/styles.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 
 .main-container {
   background-color: $grey;
@@ -10,7 +10,6 @@
   transition: padding-left, 200ms;
   max-width: 100%;
 
-
   .main-routes {
     width: 100%;
     max-width: 100%;
@@ -27,4 +26,4 @@
     margin: 30px 0px;
     color: $background;
   }
-}
+}
diff --git a/app/containers/ModifyMetricsContainer/styles.scss b/app/containers/ModifyMetricsContainer/styles.scss
@@ -1,51 +1,50 @@
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 
 .metricsSelector {
-    max-width: 90%;
+  max-width: 90%;
 
-    h2 {
-        margin-bottom: 10px;
-    }
+  h2 {
+    margin-bottom: 10px;
+  }
 
-    p {
-        margin-bottom: 20px;
-        margin-left: 10px;
-    }
+  p {
+    margin-bottom: 20px;
+    margin-left: 10px;
+  }
 }
 
 .metricsSublist {
-    margin-left: 20px;
+  margin-left: 20px;
 }
 
-
 .modifyMetric {
+  display: flex;
+  gap: 1em;
+  margin: 10px;
+  align-items: center;
+
+  label {
     display: flex;
-    gap: 1em;
-    margin: 10px;
-    align-items: center;
-
-    label {
-        display: flex;
-        font-size: 1em;
-
-        &:hover {
-            font-weight: 550;
-            cursor: pointer;
-            color: royalblue;
-        }
-
-        &:active {
-            color: darkblue;
-        }
+    font-size: 1em;
+
+    &:hover {
+      font-weight: 550;
+      cursor: pointer;
+      color: royalblue;
     }
 
-    input {
-        height: 20px;
-        width: 20px;
-        margin-right: 10px;
+    &:active {
+      color: darkblue;
     }
+  }
+
+  input {
+    height: 20px;
+    width: 20px;
+    margin-right: 10px;
+  }
 }
 
 #changeDatabaseSettingsButton {
-    margin-bottom: 30px;
-}
+  margin-bottom: 30px;
+}
diff --git a/app/containers/SidebarContainer/styles.scss b/app/containers/SidebarContainer/styles.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 
 .sidebar-container {
   color: $background;
@@ -231,13 +231,13 @@
 }
 
 .example-button {
-  height:100px;
-  width:100px;
-  color:whitesmoke;
-  cursor:pointer;
+  height: 100px;
+  width: 100px;
+  color: whitesmoke;
+  cursor: pointer;
   font-weight: 600;
 }
 
 .example-button:hover {
-  color:blue;
-}
+  color: blue;
+}
diff --git a/app/index.scss b/app/index.scss
@@ -155,15 +155,15 @@ button {
   padding: 6px;
   // border: thin solid #24262f;
   border-radius: 3px;
-  background-color: #484e63;
+  // background-color: #484e63;
   color: #fff;
   // min-width: 105px;
   transition: 0.2s;
   cursor: pointer;
 }
 
 button:hover {
-  background-color: #24262f;
+  // background-color: #24262f;
 }
 
 // scrollBar styling
diff --git a/app/index.tsx b/app/index.tsx
@@ -4,7 +4,7 @@ import ReactDOM from 'react-dom';
 // REACT 18 Syntax below
 // import { createRoot } from 'react-dom/client';
 
-import './stylesheets/index.scss';
+import './index.scss';
 import { createTheme, ThemeProvider } from '@material-ui/core/';
 import App from './App';
 import WindowBar from './components/WindowBar/WindowBar';
diff --git a/app/modals/AddModal/AddModal.scss b/app/modals/AddModal/AddModal.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 
 .add-container {
   @include centerModal(30%, 500px);
@@ -57,8 +57,6 @@
       &:last-of-type {
         @include centerWithFlex($justify: flex-start, $align: flex-start);
       }
-
-
     }
 
     /* Submit button */
diff --git a/app/modals/AwsModal/AwsModal.scss b/app/modals/AwsModal/AwsModal.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 
 .add-container {
   @include centerModal(30%, 500px);
diff --git a/app/modals/EnvModal/EnvModal.scss b/app/modals/EnvModal/EnvModal.scss
@@ -1,4 +1,4 @@
-@import '../../stylesheets/index.scss';
+@import '../../index.scss';
 
 .add-container {
   @include centerModal(30%, 500px);
diff --git a/app/modals/ServicesModal/ServicesModal.scss b/app/modals/ServicesModal/ServicesModal.scss
diff --git a/app/modals/UserModal/UserModal.scss b/app/modals/UserModal/UserModal.scss
diff --git a/app/stylesheets/Home.scss b/app/stylesheets/Home.scss
diff --git a/app/stylesheets/constants.scss b/app/stylesheets/constants.scss
diff --git a/app/stylesheets/scrollBar.scss b/app/stylesheets/scrollBar.scss

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@import '../../stylesheets/index.scss';`
	`1`	`+@import '../../index.scss';`
`2`	`2`	`.microservice-header {`
`3`	`3`	`width: 100%;`
`4`	`4`	`@include centerWithFlex(center);`
`@@ -209,4 +209,4 @@ label.select {`
`209`	`209`	`background-color: #67688d;`
`210`	`210`	`}`
`211`	`211`	`}`
`212`		`-}`
	`212`	`+}`