Change folder structure and delete app.css file

kruize · Aug 4, 2023 · 782a598 · 782a598
1 parent 79ed517
commit 782a598
Show file tree

Hide file tree

Showing 71 changed files with 29 additions and 93 deletions.
diff --git a/public/index.html b/public/index.html
@@ -12,7 +12,7 @@
 
   <body>
     <noscript>Enabling JavaScript is required to run this app.</noscript>
-    <div id="root">
+    <div id="root" style="height: 100%;">
       <!-- <script type="text/javascript" src="SubmitButtonSearchInput.js"></script>
     <script type="text/typescript" src="FAQs.tsx"></script> -->
     </div>

diff --git a/src/App.tsx b/src/App.tsx
@@ -1,9 +1,9 @@
 import React, { useState } from 'react';
 import '@patternfly/react-core/dist/styles/base.css';
 import { BrowserRouter as Router } from 'react-router-dom';
-import './app.css';
+// import './app.css';
 import { AppRoutes } from './routes';
-import { AppLayout } from '@app/components/AppLayout/AppLayout';
+import { AppLayout } from '@app/components/layout/AppLayout/AppLayout';
 
 const App = () => {
   return (

diff --git a/...app/components/Assets/favicon/favicon.png → src/Assets/favicon/favicon.png b/...app/components/Assets/favicon/favicon.png → src/Assets/favicon/favicon.png
diff --git a/...ts/Assets/fonts/RedHatDisplay-Medium.woff → src/Assets/fonts/RedHatDisplay-Medium.woff b/...ts/Assets/fonts/RedHatDisplay-Medium.woff → src/Assets/fonts/RedHatDisplay-Medium.woff
diff --git a/...s/Assets/fonts/RedHatDisplay-Medium.woff2 → src/Assets/fonts/RedHatDisplay-Medium.woff2 b/...s/Assets/fonts/RedHatDisplay-Medium.woff2 → src/Assets/fonts/RedHatDisplay-Medium.woff2
diff --git a/...ents/Assets/fonts/RedHatText-Regular.woff → src/Assets/fonts/RedHatText-Regular.woff b/...ents/Assets/fonts/RedHatText-Regular.woff → src/Assets/fonts/RedHatText-Regular.woff
diff --git a/...nts/Assets/fonts/RedHatText-Regular.woff2 → src/Assets/fonts/RedHatText-Regular.woff2 b/...nts/Assets/fonts/RedHatText-Regular.woff2 → src/Assets/fonts/RedHatText-Regular.woff2
diff --git a/...omponents/Assets/fonts/overpass-bold.woff → src/Assets/fonts/overpass-bold.woff b/...omponents/Assets/fonts/overpass-bold.woff → src/Assets/fonts/overpass-bold.woff
diff --git a/...mponents/Assets/fonts/overpass-bold.woff2 → src/Assets/fonts/overpass-bold.woff2 b/...mponents/Assets/fonts/overpass-bold.woff2 → src/Assets/fonts/overpass-bold.woff2
diff --git a/...mponents/Assets/fonts/overpass-light.woff → src/Assets/fonts/overpass-light.woff b/...mponents/Assets/fonts/overpass-light.woff → src/Assets/fonts/overpass-light.woff
diff --git a/...ponents/Assets/fonts/overpass-light.woff2 → src/Assets/fonts/overpass-light.woff2 b/...ponents/Assets/fonts/overpass-light.woff2 → src/Assets/fonts/overpass-light.woff2
diff --git a/...components/Assets/images/Avatar_image.svg → src/Assets/images/Avatar_image.svg b/...components/Assets/images/Avatar_image.svg → src/Assets/images/Avatar_image.svg
diff --git a/...s/Assets/images/Kubernetes_image copy.png → src/Assets/images/Kubernetes_image copy.png b/...s/Assets/images/Kubernetes_image copy.png → src/Assets/images/Kubernetes_image copy.png
diff --git a/...onents/Assets/images/Kubernetes_image.png → src/Assets/images/Kubernetes_image.png b/...onents/Assets/images/Kubernetes_image.png → src/Assets/images/Kubernetes_image.png
diff --git a/.../components/Assets/images/kruize_icon.png → src/Assets/images/kruize_icon.png b/.../components/Assets/images/kruize_icon.png → src/Assets/images/kruize_icon.png
diff --git a/src/app.css b/src/app.css
diff --git a/src/app/RunExperiment/PerformanceProfilePages/RegularSection.tsx b/src/app/RunExperiment/PerformanceProfilePages/RegularSection.tsx
diff --git a/src/app/RunExperiment/RunExperiment.tsx b/src/app/RunExperiment/RunExperiment.tsx
diff --git a/src/app/components/ContextStore/EnvState.tsx → ...mponents/common/ContextStore/EnvState.tsx b/src/app/components/ContextStore/EnvState.tsx → ...mponents/common/ContextStore/EnvState.tsx
diff --git a/...pp/components/ContextStore/nodeContext.ts → ...onents/common/ContextStore/nodeContext.ts b/...pp/components/ContextStore/nodeContext.ts → ...onents/common/ContextStore/nodeContext.ts
diff --git a/...ponents/KruizeDropdown/KruizeDropdown.tsx → .../common/KruizeDropdown/KruizeDropdown.tsx b/...ponents/KruizeDropdown/KruizeDropdown.tsx → .../common/KruizeDropdown/KruizeDropdown.tsx
diff --git a/src/app/components/AppLayout/AppLayout.tsx → ...components/layout/AppLayout/AppLayout.tsx b/src/app/components/AppLayout/AppLayout.tsx → ...components/layout/AppLayout/AppLayout.tsx
@@ -10,11 +10,11 @@ import {
   PageSidebar,
   SkipToContent
 } from '@patternfly/react-core';
-import HorizontalNav from '@app/components/HorizontalNav/HorizontalNav';
-import Footer from '@app/components/Footer/Footer';
-import KruizeLogo from '!!url-loader!@app/components/Assets/images/kruize_icon.png';
+import KruizeLogo from '!!url-loader!src/Assets/images/kruize_icon.png';
 import { IAppRoute, IAppRouteGroup, routes } from 'src/routes';
-import EnvState from '../ContextStore/EnvState';
+import Footer from '../Footer/Footer';
+import HorizontalNav from '@app/components/pages/HorizontalNav/HorizontalNav';
+import EnvState from '@app/components/common/ContextStore/EnvState';
 
 interface IAppLayout {
   children: React.ReactNode;

diff --git a/src/app/components/Footer/Footer.tsx → src/app/components/layout/Footer/Footer.tsx b/src/app/components/Footer/Footer.tsx → src/app/components/layout/Footer/Footer.tsx
diff --git a/.../components/Footer/FooterTraditional.scss → ...ents/layout/Footer/FooterTraditional.scss b/.../components/Footer/FooterTraditional.scss → ...ents/layout/Footer/FooterTraditional.scss
diff --git a/src/app/pages/About/About.tsx → src/app/components/pages/About/About.tsx b/src/app/pages/About/About.tsx → src/app/components/pages/About/About.tsx
diff --git a/...pp/pages/AdvancedUser/LayerDefination.tsx → ...ts/pages/AdvancedUser/LayerDefination.tsx b/...pp/pages/AdvancedUser/LayerDefination.tsx → ...ts/pages/AdvancedUser/LayerDefination.tsx
diff --git a/.../pages/AdvancedUser/ObjectiveFunction.tsx → .../pages/AdvancedUser/ObjectiveFunction.tsx b/.../pages/AdvancedUser/ObjectiveFunction.tsx → .../pages/AdvancedUser/ObjectiveFunction.tsx
diff --git a/src/app/pages/AdvancedUser/TrialSettings.tsx → ...ents/pages/AdvancedUser/TrialSettings.tsx b/src/app/pages/AdvancedUser/TrialSettings.tsx → ...ents/pages/AdvancedUser/TrialSettings.tsx
diff --git a/...alytics/SRE_Analytics/MonitoringTable.tsx → ...alytics/SRE_Analytics/MonitoringTable.tsx b/...alytics/SRE_Analytics/MonitoringTable.tsx → ...alytics/SRE_Analytics/MonitoringTable.tsx
diff --git a/...cs/SRE_Analytics/RecommendationTables.tsx → ...cs/SRE_Analytics/RecommendationTables.tsx b/...cs/SRE_Analytics/RecommendationTables.tsx → ...cs/SRE_Analytics/RecommendationTables.tsx
@@ -1,4 +1,4 @@
-import nodeContext from '@app/components/ContextStore/nodeContext';
+import nodeContext from '@app/components/common/ContextStore/nodeContext';
 import { duration } from '@material-ui/core';
 import {
   TextContent,

diff --git a/.../Analytics/SRE_Analytics/SREAnalytics.tsx → .../Analytics/SRE_Analytics/SREAnalytics.tsx b/.../Analytics/SRE_Analytics/SREAnalytics.tsx → .../Analytics/SRE_Analytics/SREAnalytics.tsx
diff --git a/...p/pages/Analytics/SRE_Analytics/Table.tsx → ...s/pages/Analytics/SRE_Analytics/Table.tsx b/...p/pages/Analytics/SRE_Analytics/Table.tsx → ...s/pages/Analytics/SRE_Analytics/Table.tsx
diff --git a/...lytics/SRE_Analytics/UsecaseSelection.tsx → ...lytics/SRE_Analytics/UsecaseSelection.tsx b/...lytics/SRE_Analytics/UsecaseSelection.tsx → ...lytics/SRE_Analytics/UsecaseSelection.tsx
@@ -1,4 +1,4 @@
-import nodeContext from '@app/components/ContextStore/nodeContext';
+import nodeContext from '@app/components/common/ContextStore/nodeContext';
 import {
   Flex,
   TextContent,

diff --git a/...cs/User_Analytics/AnalyticsDeployment.tsx → ...cs/User_Analytics/AnalyticsDeployment.tsx b/...cs/User_Analytics/AnalyticsDeployment.tsx → ...cs/User_Analytics/AnalyticsDeployment.tsx
diff --git a/...ics/User_Analytics/AnalyticsNamespace.tsx → ...ics/User_Analytics/AnalyticsNamespace.tsx b/...ics/User_Analytics/AnalyticsNamespace.tsx → ...ics/User_Analytics/AnalyticsNamespace.tsx
diff --git a/...cs/User_Analytics/AnalyticsObjectType.tsx → ...cs/User_Analytics/AnalyticsObjectType.tsx b/...cs/User_Analytics/AnalyticsObjectType.tsx → ...cs/User_Analytics/AnalyticsObjectType.tsx
diff --git a/...ics/ContainerInfo/AnalyticsContainers.tsx → ...ics/ContainerInfo/AnalyticsContainers.tsx b/...ics/ContainerInfo/AnalyticsContainers.tsx → ...ics/ContainerInfo/AnalyticsContainers.tsx
diff --git a/..._Analytics/ContainerInfo/BalanceTable.tsx → ..._Analytics/ContainerInfo/BalanceTable.tsx b/..._Analytics/ContainerInfo/BalanceTable.tsx → ..._Analytics/ContainerInfo/BalanceTable.tsx
diff --git a/...ytics/ContainerInfo/Container1Details.tsx → ...ytics/ContainerInfo/Container1Details.tsx b/...ytics/ContainerInfo/Container1Details.tsx → ...ytics/ContainerInfo/Container1Details.tsx
diff --git a/...ytics/ContainerInfo/Container2Details.tsx → ...ytics/ContainerInfo/Container2Details.tsx b/...ytics/ContainerInfo/Container2Details.tsx → ...ytics/ContainerInfo/Container2Details.tsx
diff --git a/...ser_Analytics/ContainerInfo/CostTable.tsx → ...ser_Analytics/ContainerInfo/CostTable.tsx b/...ser_Analytics/ContainerInfo/CostTable.tsx → ...ser_Analytics/ContainerInfo/CostTable.tsx
diff --git a/...lytics/ContainerInfo/PerformanceTable.tsx → ...lytics/ContainerInfo/PerformanceTable.tsx b/...lytics/ContainerInfo/PerformanceTable.tsx → ...lytics/ContainerInfo/PerformanceTable.tsx
diff --git a/...nalytics/ContainerInfo/VerticalSlider.tsx → ...nalytics/ContainerInfo/VerticalSlider.tsx b/...nalytics/ContainerInfo/VerticalSlider.tsx → ...nalytics/ContainerInfo/VerticalSlider.tsx
diff --git a/...cs/User_Analytics/DeploymentsTreeView.tsx → ...cs/User_Analytics/DeploymentsTreeView.tsx b/...cs/User_Analytics/DeploymentsTreeView.tsx → ...cs/User_Analytics/DeploymentsTreeView.tsx
diff --git a/...lytics/User_Analytics/ExperimentTable.tsx → ...lytics/User_Analytics/ExperimentTable.tsx b/...lytics/User_Analytics/ExperimentTable.tsx → ...lytics/User_Analytics/ExperimentTable.tsx
diff --git a/...nalytics/User_Analytics/UserAnalytics.tsx → ...nalytics/User_Analytics/UserAnalytics.tsx b/...nalytics/User_Analytics/UserAnalytics.tsx → ...nalytics/User_Analytics/UserAnalytics.tsx
diff --git a/...ges/ExperimentStatus/ExperimentStatus.tsx → ...ges/ExperimentStatus/ExperimentStatus.tsx b/...ges/ExperimentStatus/ExperimentStatus.tsx → ...ges/ExperimentStatus/ExperimentStatus.tsx
diff --git a/...MoreExperimentStuff/ExperimentDetails.tsx → ...MoreExperimentStuff/ExperimentDetails.tsx b/...MoreExperimentStuff/ExperimentDetails.tsx → ...MoreExperimentStuff/ExperimentDetails.tsx
diff --git a/...us/MoreExperimentStuff/Final_equation.tsx → ...us/MoreExperimentStuff/Final_equation.tsx b/...us/MoreExperimentStuff/Final_equation.tsx → ...us/MoreExperimentStuff/Final_equation.tsx
diff --git a/...xperimentStuff/Resource_usage_details.tsx → ...xperimentStuff/Resource_usage_details.tsx b/...xperimentStuff/Resource_usage_details.tsx → ...xperimentStuff/Resource_usage_details.tsx
diff --git a/...ExperimentStuff/Response_time_details.tsx → ...ExperimentStuff/Response_time_details.tsx b/...ExperimentStuff/Response_time_details.tsx → ...ExperimentStuff/Response_time_details.tsx
diff --git a/...oreExperimentStuff/Throughput_details.tsx → ...oreExperimentStuff/Throughput_details.tsx b/...oreExperimentStuff/Throughput_details.tsx → ...oreExperimentStuff/Throughput_details.tsx
diff --git a/...tatus/jsonFiles/listAutotuneTunables.json → ...tatus/jsonFiles/listAutotuneTunables.json b/...tatus/jsonFiles/listAutotuneTunables.json → ...tatus/jsonFiles/listAutotuneTunables.json
diff --git a/.../components/FinishedStep/FinishedStep.tsx → ...nents/pages/FinishedStep/FinishedStep.tsx b/.../components/FinishedStep/FinishedStep.tsx → ...nents/pages/FinishedStep/FinishedStep.tsx
diff --git a/...ts/GenerateYaml/CodeEditorWithActions.tsx → ...es/GenerateYaml/CodeEditorWithActions.tsx b/...ts/GenerateYaml/CodeEditorWithActions.tsx → ...es/GenerateYaml/CodeEditorWithActions.tsx
diff --git a/src/app/components/GenerateYaml/ab.tsx → src/app/components/pages/GenerateYaml/ab.tsx b/src/app/components/GenerateYaml/ab.tsx → src/app/components/pages/GenerateYaml/ab.tsx
diff --git a/...omponents/HorizontalNav/HorizontalNav.tsx → ...nts/pages/HorizontalNav/HorizontalNav.tsx b/...omponents/HorizontalNav/HorizontalNav.tsx → ...nts/pages/HorizontalNav/HorizontalNav.tsx
@@ -1,11 +1,11 @@
 import React, { useState, useEffect, useContext } from 'react';
 import { Popover, Nav, TextContent, Avatar, Text, TextVariants, NavItem, NavList, Flex } from '@patternfly/react-core';
-import Kubernetes_image from '!!url-loader!@app/components/Assets/images/Kubernetes_image.png';
+import Kubernetes_image from '!!url-loader!src/Assets/images/Kubernetes_image.png';
 // import Kruize_logo from '!!url-loader!@app/assets/images/kruize_icon.png';
-import Avatar_image from '!!url-loader!@app/components/Assets/images/Avatar_image.svg';
+import Avatar_image from '!!url-loader!src/Assets/images/Avatar_image.svg';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
-import nodeContext from '@app/components/ContextStore/nodeContext';
+import nodeContext from '@app/components/common/ContextStore/nodeContext';
 
 const HorizontalNav = () => {
   const [activeItem, setActiveItem] = useState(0);

diff --git a/src/app/components/NotFound/NotFound.tsx → ...pp/components/pages/NotFound/NotFound.tsx b/src/app/components/NotFound/NotFound.tsx → ...pp/components/pages/NotFound/NotFound.tsx
diff --git a/src/app/pages/RunExperiment/DefineGoals.tsx → ...nents/pages/RunExperiment/DefineGoals.tsx b/src/app/pages/RunExperiment/DefineGoals.tsx → ...nents/pages/RunExperiment/DefineGoals.tsx
diff --git a/...ges/RunExperiment/DeploymentsDropdown.tsx → ...ges/RunExperiment/DeploymentsDropdown.tsx b/...ges/RunExperiment/DeploymentsDropdown.tsx → ...ges/RunExperiment/DeploymentsDropdown.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext } from 'react';
 import { Select, SelectOption, SelectVariant } from '@patternfly/react-core';
-import nodeContext from '@app/components/ContextStore/nodeContext';
+import nodeContext from '@app/components/common/ContextStore/nodeContext';
 
 const DeploymentsDropdown = (props: { data; setData }) => {
   const [deployments, setDeployments] = useState([]);

diff --git a/...pages/RunExperiment/NameSpaceDropDown.tsx → ...pages/RunExperiment/NameSpaceDropDown.tsx b/...pages/RunExperiment/NameSpaceDropDown.tsx → ...pages/RunExperiment/NameSpaceDropDown.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext } from 'react';
 import { Select, SelectOption, SelectVariant } from '@patternfly/react-core';
-import nodeContext from '@app/components/ContextStore/nodeContext';
+import nodeContext from '@app/components/common/ContextStore/nodeContext';
 
 const NameSpaceDropDown = (props: { data; setData }) => {
   const [namespaces, setNamespaces] = useState([]);

diff --git a/...rformanceProfilePages/AdvancedSection.tsx → ...rformanceProfilePages/AdvancedSection.tsx b/...rformanceProfilePages/AdvancedSection.tsx → ...rformanceProfilePages/AdvancedSection.tsx
diff --git a/...rofilePages/PerfComponents/Accordions.tsx → ...rofilePages/PerfComponents/Accordions.tsx b/...rofilePages/PerfComponents/Accordions.tsx → ...rofilePages/PerfComponents/Accordions.tsx
diff --git a/...s/PerfComponents/NumberValueComponent.tsx → ...s/PerfComponents/NumberValueComponent.tsx b/...s/PerfComponents/NumberValueComponent.tsx → ...s/PerfComponents/NumberValueComponent.tsx
diff --git a/...ofilePages/PerfComponents/UnitsOfTime.tsx → ...ofilePages/PerfComponents/UnitsOfTime.tsx b/...ofilePages/PerfComponents/UnitsOfTime.tsx → ...ofilePages/PerfComponents/UnitsOfTime.tsx
diff --git a/...manceProfilePages/PerformanceProfiles.tsx → ...manceProfilePages/PerformanceProfiles.tsx b/...manceProfilePages/PerformanceProfiles.tsx → ...manceProfilePages/PerformanceProfiles.tsx
diff --git a/...erformanceProfilePages/RegularSection.tsx → ...erformanceProfilePages/RegularSection.tsx b/...erformanceProfilePages/RegularSection.tsx → ...erformanceProfilePages/RegularSection.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext } from 'react';
 import { FormGroup, FormSelect, FormSelectOption, Form, FormSection, Checkbox } from '@patternfly/react-core';
-import nodeContext from '@app/components/ContextStore/nodeContext';
+import nodeContext from '@app/components/common/ContextStore/nodeContext';
 
 const RegularSection = () => {
   const Context = useContext(nodeContext);

diff --git a/src/app/pages/RunExperiment/RE.tsx → ...app/components/pages/RunExperiment/RE.tsx b/src/app/pages/RunExperiment/RE.tsx → ...app/components/pages/RunExperiment/RE.tsx
@@ -16,7 +16,7 @@ import {
 } from '@patternfly/react-core';
 import NameSpaceDropDown from './NameSpaceDropDown';
 import DeploymentsDropdown from './DeploymentsDropdown';
-import nodeContext from '@app/components/ContextStore/nodeContext';
+import nodeContext from '@app/components/common/ContextStore/nodeContext';
 
 const RE = (props: { setData; data }) => {
   const [exp_name, setExp_name] = useState('--');

diff --git a/...app/pages/RunExperiment/RunExperiment.tsx → ...nts/pages/RunExperiment/RunExperiment.tsx b/...app/pages/RunExperiment/RunExperiment.tsx → ...nts/pages/RunExperiment/RunExperiment.tsx
@@ -2,17 +2,17 @@ import React, { useState, useContext, useEffect } from 'react';
 import { Wizard, Grid, GridItem } from '@patternfly/react-core';
 import RE from './RE';
 import { ExperimentStatus } from '../ExperimentStatus/ExperimentStatus';
-import { CodeEditorWithActions } from '@app/components/GenerateYaml/CodeEditorWithActions';
-import nodeContext from '@app/components/ContextStore/nodeContext';
+import nodeContext from '@app/components/Common/ContextStore/nodeContext';
 import { DefineGoals } from './DefineGoals';
 import { PerformanceProfiles } from './PerformanceProfilePages/PerformanceProfiles';
-import { FinishedStep } from '@app/components/FinishedStep/FinishedStep';
-import EnvState from '@app/components/ContextStore/EnvState';
 import { Throughput_details } from '../ExperimentStatus/MoreExperimentStuff/Throughput_details';
 import { ExperimentDetails } from '../ExperimentStatus/MoreExperimentStuff/ExperimentDetails';
 import { Response_time_details } from '../ExperimentStatus/MoreExperimentStuff/Response_time_details';
 import { Resource_usage_details } from '../ExperimentStatus/MoreExperimentStuff/Resource_usage_details';
 import { Final_equation } from '../ExperimentStatus/MoreExperimentStuff/Final_equation';
+import { CodeEditorWithActions } from '../GenerateYaml/CodeEditorWithActions';
+import { FinishedStep } from '../FinishedStep/FinishedStep';
+import EnvState from '@app/components/common/ContextStore/EnvState';
 const dataa = {
   exp_name: '',
   namespace: '',

diff --git a/src/routes.tsx b/src/routes.tsx
@@ -4,15 +4,15 @@ import { InstallationGuide } from '@app/Documentation/InstallationGuide';
 import { FAQs } from './app/Documentation/FAQs';
 import { Glossary } from './app/Documentation/Glossary';
 import { CommunityCall } from './app/Documentation/CommunityCall';
-import { NotFound } from '@app/components/NotFound/NotFound';
 import { LastLocationProvider, useLastLocation } from 'react-router-last-location';
-import { About } from './app/pages/About/About';
-import { SREAnalytics } from './app/pages/Analytics/SRE_Analytics/SREAnalytics';
-import { UserAnalytics } from './app/pages/Analytics/User_Analytics/UserAnalytics';
-import { RunExperiment } from '@app/pages/RunExperiment/RunExperiment';
-import { ObjectiveFunction } from '@app/pages/AdvancedUser/ObjectiveFunction';
-import { LayerDefination } from '@app/pages/AdvancedUser/LayerDefination';
-import { TrialSettings } from '@app/pages/AdvancedUser/TrialSettings';
+import { About } from '@app/components/pages/About/About';
+import { RunExperiment } from '@app/components/pages/RunExperiment/RunExperiment';
+import { SREAnalytics } from '@app/components/pages/Analytics/SRE_Analytics/SREAnalytics';
+import { ObjectiveFunction } from '@app/components/pages/AdvancedUser/ObjectiveFunction';
+import { LayerDefination } from '@app/components/pages/AdvancedUser/LayerDefination';
+import { TrialSettings } from '@app/components/pages/AdvancedUser/TrialSettings';
+import { NotFound } from '@app/components/pages/NotFound/NotFound';
+import { UserAnalytics } from '@app/components/pages/Analytics/User_Analytics/UserAnalytics';
 
 let routeFocusTimer: number;
 export interface IAppRoute {

diff --git a/webpack.common.js b/webpack.common.js
@@ -351,7 +351,7 @@ module.exports = env => {
     plugins: [
       new HtmlWebpackPlugin({
         template: path.resolve(__dirname, 'public', 'index.html'),
-        favicon: path.resolve(__dirname, 'src/app/components/Assets/favicon', 'favicon.png')
+        favicon: path.resolve(__dirname, 'src/Assets/favicon', 'favicon.png')
 
       }),
       new Dotenv({