From 782a5984704c39c45695d538f4ebb8d875877528 Mon Sep 17 00:00:00 2001 From: ppadti Date: Fri, 4 Aug 2023 16:40:38 +0530 Subject: [PATCH] Change folder structure and delete app.css file --- public/index.html | 2 +- src/App.tsx | 4 +- .../Assets/favicon/favicon.png | Bin .../Assets/fonts/RedHatDisplay-Medium.woff | Bin .../Assets/fonts/RedHatDisplay-Medium.woff2 | Bin .../Assets/fonts/RedHatText-Regular.woff | Bin .../Assets/fonts/RedHatText-Regular.woff2 | Bin .../Assets/fonts/overpass-bold.woff | Bin .../Assets/fonts/overpass-bold.woff2 | Bin .../Assets/fonts/overpass-light.woff | Bin .../Assets/fonts/overpass-light.woff2 | Bin .../Assets/images/Avatar_image.svg | 0 .../Assets/images/Kubernetes_image copy.png | Bin .../Assets/images/Kubernetes_image.png | Bin .../Assets/images/kruize_icon.png | Bin src/app.css | 64 ------------------ .../RegularSection.tsx | 0 src/app/RunExperiment/RunExperiment.tsx | 0 .../{ => common}/ContextStore/EnvState.tsx | 0 .../{ => common}/ContextStore/nodeContext.ts | 0 .../KruizeDropdown/KruizeDropdown.tsx | 0 .../{ => layout}/AppLayout/AppLayout.tsx | 8 +-- .../components/{ => layout}/Footer/Footer.tsx | 0 .../Footer/FooterTraditional.scss | 0 .../{ => components}/pages/About/About.tsx | 0 .../pages/AdvancedUser/LayerDefination.tsx | 0 .../pages/AdvancedUser/ObjectiveFunction.tsx | 0 .../pages/AdvancedUser/TrialSettings.tsx | 0 .../SRE_Analytics/MonitoringTable.tsx | 0 .../SRE_Analytics/RecommendationTables.tsx | 2 +- .../Analytics/SRE_Analytics/SREAnalytics.tsx | 0 .../pages/Analytics/SRE_Analytics/Table.tsx | 0 .../SRE_Analytics/UsecaseSelection.tsx | 2 +- .../User_Analytics/AnalyticsDeployment.tsx | 0 .../User_Analytics/AnalyticsNamespace.tsx | 0 .../User_Analytics/AnalyticsObjectType.tsx | 0 .../ContainerInfo/AnalyticsContainers.tsx | 0 .../ContainerInfo/BalanceTable.tsx | 0 .../ContainerInfo/Container1Details.tsx | 0 .../ContainerInfo/Container2Details.tsx | 0 .../ContainerInfo/CostTable.tsx | 0 .../ContainerInfo/PerformanceTable.tsx | 0 .../ContainerInfo/VerticalSlider.tsx | 0 .../User_Analytics/DeploymentsTreeView.tsx | 0 .../User_Analytics/ExperimentTable.tsx | 0 .../User_Analytics/UserAnalytics.tsx | 0 .../ExperimentStatus/ExperimentStatus.tsx | 0 .../MoreExperimentStuff/ExperimentDetails.tsx | 0 .../MoreExperimentStuff/Final_equation.tsx | 0 .../Resource_usage_details.tsx | 0 .../Response_time_details.tsx | 0 .../Throughput_details.tsx | 0 .../jsonFiles/listAutotuneTunables.json | 0 .../{ => pages}/FinishedStep/FinishedStep.tsx | 0 .../GenerateYaml/CodeEditorWithActions.tsx | 0 .../{ => pages}/GenerateYaml/ab.tsx | 0 .../HorizontalNav/HorizontalNav.tsx | 6 +- .../{ => pages}/NotFound/NotFound.tsx | 0 .../pages/RunExperiment/DefineGoals.tsx | 0 .../RunExperiment/DeploymentsDropdown.tsx | 2 +- .../pages/RunExperiment/NameSpaceDropDown.tsx | 2 +- .../AdvancedSection.tsx | 0 .../PerfComponents/Accordions.tsx | 0 .../PerfComponents/NumberValueComponent.tsx | 0 .../PerfComponents/UnitsOfTime.tsx | 0 .../PerformanceProfiles.tsx | 0 .../RegularSection.tsx | 2 +- .../pages/RunExperiment/RE.tsx | 2 +- .../pages/RunExperiment/RunExperiment.tsx | 8 +-- src/routes.tsx | 16 ++--- webpack.common.js | 2 +- 71 files changed, 29 insertions(+), 93 deletions(-) rename src/{app/components => }/Assets/favicon/favicon.png (100%) rename src/{app/components => }/Assets/fonts/RedHatDisplay-Medium.woff (100%) rename src/{app/components => }/Assets/fonts/RedHatDisplay-Medium.woff2 (100%) rename src/{app/components => }/Assets/fonts/RedHatText-Regular.woff (100%) rename src/{app/components => }/Assets/fonts/RedHatText-Regular.woff2 (100%) rename src/{app/components => }/Assets/fonts/overpass-bold.woff (100%) rename src/{app/components => }/Assets/fonts/overpass-bold.woff2 (100%) rename src/{app/components => }/Assets/fonts/overpass-light.woff (100%) rename src/{app/components => }/Assets/fonts/overpass-light.woff2 (100%) rename src/{app/components => }/Assets/images/Avatar_image.svg (100%) rename src/{app/components => }/Assets/images/Kubernetes_image copy.png (100%) rename src/{app/components => }/Assets/images/Kubernetes_image.png (100%) rename src/{app/components => }/Assets/images/kruize_icon.png (100%) delete mode 100644 src/app.css delete mode 100644 src/app/RunExperiment/PerformanceProfilePages/RegularSection.tsx delete mode 100644 src/app/RunExperiment/RunExperiment.tsx rename src/app/components/{ => common}/ContextStore/EnvState.tsx (100%) rename src/app/components/{ => common}/ContextStore/nodeContext.ts (100%) rename src/app/components/{ => common}/KruizeDropdown/KruizeDropdown.tsx (100%) rename src/app/components/{ => layout}/AppLayout/AppLayout.tsx (92%) rename src/app/components/{ => layout}/Footer/Footer.tsx (100%) rename src/app/components/{ => layout}/Footer/FooterTraditional.scss (100%) rename src/app/{ => components}/pages/About/About.tsx (100%) rename src/app/{ => components}/pages/AdvancedUser/LayerDefination.tsx (100%) rename src/app/{ => components}/pages/AdvancedUser/ObjectiveFunction.tsx (100%) rename src/app/{ => components}/pages/AdvancedUser/TrialSettings.tsx (100%) rename src/app/{ => components}/pages/Analytics/SRE_Analytics/MonitoringTable.tsx (100%) rename src/app/{ => components}/pages/Analytics/SRE_Analytics/RecommendationTables.tsx (99%) rename src/app/{ => components}/pages/Analytics/SRE_Analytics/SREAnalytics.tsx (100%) rename src/app/{ => components}/pages/Analytics/SRE_Analytics/Table.tsx (100%) rename src/app/{ => components}/pages/Analytics/SRE_Analytics/UsecaseSelection.tsx (98%) rename src/app/{ => components}/pages/Analytics/User_Analytics/AnalyticsDeployment.tsx (100%) rename src/app/{ => components}/pages/Analytics/User_Analytics/AnalyticsNamespace.tsx (100%) rename src/app/{ => components}/pages/Analytics/User_Analytics/AnalyticsObjectType.tsx (100%) rename src/app/{ => components}/pages/Analytics/User_Analytics/ContainerInfo/AnalyticsContainers.tsx (100%) rename src/app/{ => components}/pages/Analytics/User_Analytics/ContainerInfo/BalanceTable.tsx (100%) rename src/app/{ => components}/pages/Analytics/User_Analytics/ContainerInfo/Container1Details.tsx (100%) rename src/app/{ => components}/pages/Analytics/User_Analytics/ContainerInfo/Container2Details.tsx (100%) rename src/app/{ => components}/pages/Analytics/User_Analytics/ContainerInfo/CostTable.tsx (100%) rename src/app/{ => components}/pages/Analytics/User_Analytics/ContainerInfo/PerformanceTable.tsx (100%) rename src/app/{ => components}/pages/Analytics/User_Analytics/ContainerInfo/VerticalSlider.tsx (100%) rename src/app/{ => components}/pages/Analytics/User_Analytics/DeploymentsTreeView.tsx (100%) rename src/app/{ => components}/pages/Analytics/User_Analytics/ExperimentTable.tsx (100%) rename src/app/{ => components}/pages/Analytics/User_Analytics/UserAnalytics.tsx (100%) rename src/app/{ => components}/pages/ExperimentStatus/ExperimentStatus.tsx (100%) rename src/app/{ => components}/pages/ExperimentStatus/MoreExperimentStuff/ExperimentDetails.tsx (100%) rename src/app/{ => components}/pages/ExperimentStatus/MoreExperimentStuff/Final_equation.tsx (100%) rename src/app/{ => components}/pages/ExperimentStatus/MoreExperimentStuff/Resource_usage_details.tsx (100%) rename src/app/{ => components}/pages/ExperimentStatus/MoreExperimentStuff/Response_time_details.tsx (100%) rename src/app/{ => components}/pages/ExperimentStatus/MoreExperimentStuff/Throughput_details.tsx (100%) rename src/app/{ => components}/pages/ExperimentStatus/jsonFiles/listAutotuneTunables.json (100%) rename src/app/components/{ => pages}/FinishedStep/FinishedStep.tsx (100%) rename src/app/components/{ => pages}/GenerateYaml/CodeEditorWithActions.tsx (100%) rename src/app/components/{ => pages}/GenerateYaml/ab.tsx (100%) rename src/app/components/{ => pages}/HorizontalNav/HorizontalNav.tsx (94%) rename src/app/components/{ => pages}/NotFound/NotFound.tsx (100%) rename src/app/{ => components}/pages/RunExperiment/DefineGoals.tsx (100%) rename src/app/{ => components}/pages/RunExperiment/DeploymentsDropdown.tsx (96%) rename src/app/{ => components}/pages/RunExperiment/NameSpaceDropDown.tsx (95%) rename src/app/{ => components}/pages/RunExperiment/PerformanceProfilePages/AdvancedSection.tsx (100%) rename src/app/{ => components}/pages/RunExperiment/PerformanceProfilePages/PerfComponents/Accordions.tsx (100%) rename src/app/{ => components}/pages/RunExperiment/PerformanceProfilePages/PerfComponents/NumberValueComponent.tsx (100%) rename src/app/{ => components}/pages/RunExperiment/PerformanceProfilePages/PerfComponents/UnitsOfTime.tsx (100%) rename src/app/{ => components}/pages/RunExperiment/PerformanceProfilePages/PerformanceProfiles.tsx (100%) rename src/app/{ => components}/pages/RunExperiment/PerformanceProfilePages/RegularSection.tsx (97%) rename src/app/{ => components}/pages/RunExperiment/RE.tsx (97%) rename src/app/{ => components}/pages/RunExperiment/RunExperiment.tsx (94%) diff --git a/public/index.html b/public/index.html index fe11a0f..61a0538 100644 --- a/public/index.html +++ b/public/index.html @@ -12,7 +12,7 @@ -
+
diff --git a/src/App.tsx b/src/App.tsx index 567645c..bc7608f 100644 --- 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/src/app/components/Assets/favicon/favicon.png b/src/Assets/favicon/favicon.png similarity index 100% rename from src/app/components/Assets/favicon/favicon.png rename to src/Assets/favicon/favicon.png diff --git a/src/app/components/Assets/fonts/RedHatDisplay-Medium.woff b/src/Assets/fonts/RedHatDisplay-Medium.woff similarity index 100% rename from src/app/components/Assets/fonts/RedHatDisplay-Medium.woff rename to src/Assets/fonts/RedHatDisplay-Medium.woff diff --git a/src/app/components/Assets/fonts/RedHatDisplay-Medium.woff2 b/src/Assets/fonts/RedHatDisplay-Medium.woff2 similarity index 100% rename from src/app/components/Assets/fonts/RedHatDisplay-Medium.woff2 rename to src/Assets/fonts/RedHatDisplay-Medium.woff2 diff --git a/src/app/components/Assets/fonts/RedHatText-Regular.woff b/src/Assets/fonts/RedHatText-Regular.woff similarity index 100% rename from src/app/components/Assets/fonts/RedHatText-Regular.woff rename to src/Assets/fonts/RedHatText-Regular.woff diff --git a/src/app/components/Assets/fonts/RedHatText-Regular.woff2 b/src/Assets/fonts/RedHatText-Regular.woff2 similarity index 100% rename from src/app/components/Assets/fonts/RedHatText-Regular.woff2 rename to src/Assets/fonts/RedHatText-Regular.woff2 diff --git a/src/app/components/Assets/fonts/overpass-bold.woff b/src/Assets/fonts/overpass-bold.woff similarity index 100% rename from src/app/components/Assets/fonts/overpass-bold.woff rename to src/Assets/fonts/overpass-bold.woff diff --git a/src/app/components/Assets/fonts/overpass-bold.woff2 b/src/Assets/fonts/overpass-bold.woff2 similarity index 100% rename from src/app/components/Assets/fonts/overpass-bold.woff2 rename to src/Assets/fonts/overpass-bold.woff2 diff --git a/src/app/components/Assets/fonts/overpass-light.woff b/src/Assets/fonts/overpass-light.woff similarity index 100% rename from src/app/components/Assets/fonts/overpass-light.woff rename to src/Assets/fonts/overpass-light.woff diff --git a/src/app/components/Assets/fonts/overpass-light.woff2 b/src/Assets/fonts/overpass-light.woff2 similarity index 100% rename from src/app/components/Assets/fonts/overpass-light.woff2 rename to src/Assets/fonts/overpass-light.woff2 diff --git a/src/app/components/Assets/images/Avatar_image.svg b/src/Assets/images/Avatar_image.svg similarity index 100% rename from src/app/components/Assets/images/Avatar_image.svg rename to src/Assets/images/Avatar_image.svg diff --git a/src/app/components/Assets/images/Kubernetes_image copy.png b/src/Assets/images/Kubernetes_image copy.png similarity index 100% rename from src/app/components/Assets/images/Kubernetes_image copy.png rename to src/Assets/images/Kubernetes_image copy.png diff --git a/src/app/components/Assets/images/Kubernetes_image.png b/src/Assets/images/Kubernetes_image.png similarity index 100% rename from src/app/components/Assets/images/Kubernetes_image.png rename to src/Assets/images/Kubernetes_image.png diff --git a/src/app/components/Assets/images/kruize_icon.png b/src/Assets/images/kruize_icon.png similarity index 100% rename from src/app/components/Assets/images/kruize_icon.png rename to src/Assets/images/kruize_icon.png diff --git a/src/app.css b/src/app.css deleted file mode 100644 index 7a7d8fc..0000000 --- a/src/app.css +++ /dev/null @@ -1,64 +0,0 @@ -html, -body, -#root { - height: 100%; -} -.markdown { - font-size: medium !important; -} -.pf-c-content { - --pf-c-content--small--Color: red; /* changes all color to red */ - --pf-c-content--blockquote--BorderLeftColor: purple; /* changes all
left border color to purple */ - --pf-c-content--hr--BackgroundColor: lemonchiffon; /* changes a
color to lemonchiffon */ -} -.pf-c-slider__step-label { - word-break: normal; -} -.pf-c-button { - --pf-c-inline-edit__action--c-button--m-valid--m-plain--Color: blue; -} -.nav { - display: flex; - justify-content: space-between; - align-items: center; -} -.pf-c-button { - justify-items: right; -} - -@font-face { - font-family: 'RedHatDisplay'; - src: url('!!url-loader!@app/components/Assets/fonts/RedHatDisplay-Medium.woff') format('woff'), - url('!!url-loader!@app/components/Assets/fonts/RedHatDisplay-Medium.woff2') format('woff2'); - - font-weight: 400; - font-style: normal; -} - -@font-face { - font-family: 'RedHatTextRegular'; - src: url('!!url-loader!@app/components/Assets/fonts/RedHatText-Regular.woff') format('woff'), - url('!!url-loader!@app/components/Assets/fonts/RedHatText-Regular.woff2') format('woff2'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'overpass'; - src: url('!!url-loader!@app/components/Assets/fonts/overpass-light.woff') format('woff'), - url('!!url-loader!@app/components/Assets/fonts/overpass-light.woff2') format('woff2'); - font-weight: 400; - font-style: normal; -} - -@font-face { - font-family: 'overpass'; - src: url('!!url-loader!@app/components/Assets/fonts/overpass-bold.woff') format('woff'), - url('!!url-loader!@app/components/Assets/fonts/overpass-bold.woff2') format('woff2'); - font-weight: 700; - font-style: normal; -} - -body { - font-family: 'overpass', 'RedHatTextRegular', 'RedHatDisplay'; -} diff --git a/src/app/RunExperiment/PerformanceProfilePages/RegularSection.tsx b/src/app/RunExperiment/PerformanceProfilePages/RegularSection.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/RunExperiment/RunExperiment.tsx b/src/app/RunExperiment/RunExperiment.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/components/ContextStore/EnvState.tsx b/src/app/components/common/ContextStore/EnvState.tsx similarity index 100% rename from src/app/components/ContextStore/EnvState.tsx rename to src/app/components/common/ContextStore/EnvState.tsx diff --git a/src/app/components/ContextStore/nodeContext.ts b/src/app/components/common/ContextStore/nodeContext.ts similarity index 100% rename from src/app/components/ContextStore/nodeContext.ts rename to src/app/components/common/ContextStore/nodeContext.ts diff --git a/src/app/components/KruizeDropdown/KruizeDropdown.tsx b/src/app/components/common/KruizeDropdown/KruizeDropdown.tsx similarity index 100% rename from src/app/components/KruizeDropdown/KruizeDropdown.tsx rename to src/app/components/common/KruizeDropdown/KruizeDropdown.tsx diff --git a/src/app/components/AppLayout/AppLayout.tsx b/src/app/components/layout/AppLayout/AppLayout.tsx similarity index 92% rename from src/app/components/AppLayout/AppLayout.tsx rename to src/app/components/layout/AppLayout/AppLayout.tsx index 958d8c3..65f385b 100644 --- a/src/app/components/AppLayout/AppLayout.tsx +++ b/src/app/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 b/src/app/components/layout/Footer/Footer.tsx similarity index 100% rename from src/app/components/Footer/Footer.tsx rename to src/app/components/layout/Footer/Footer.tsx diff --git a/src/app/components/Footer/FooterTraditional.scss b/src/app/components/layout/Footer/FooterTraditional.scss similarity index 100% rename from src/app/components/Footer/FooterTraditional.scss rename to src/app/components/layout/Footer/FooterTraditional.scss diff --git a/src/app/pages/About/About.tsx b/src/app/components/pages/About/About.tsx similarity index 100% rename from src/app/pages/About/About.tsx rename to src/app/components/pages/About/About.tsx diff --git a/src/app/pages/AdvancedUser/LayerDefination.tsx b/src/app/components/pages/AdvancedUser/LayerDefination.tsx similarity index 100% rename from src/app/pages/AdvancedUser/LayerDefination.tsx rename to src/app/components/pages/AdvancedUser/LayerDefination.tsx diff --git a/src/app/pages/AdvancedUser/ObjectiveFunction.tsx b/src/app/components/pages/AdvancedUser/ObjectiveFunction.tsx similarity index 100% rename from src/app/pages/AdvancedUser/ObjectiveFunction.tsx rename to src/app/components/pages/AdvancedUser/ObjectiveFunction.tsx diff --git a/src/app/pages/AdvancedUser/TrialSettings.tsx b/src/app/components/pages/AdvancedUser/TrialSettings.tsx similarity index 100% rename from src/app/pages/AdvancedUser/TrialSettings.tsx rename to src/app/components/pages/AdvancedUser/TrialSettings.tsx diff --git a/src/app/pages/Analytics/SRE_Analytics/MonitoringTable.tsx b/src/app/components/pages/Analytics/SRE_Analytics/MonitoringTable.tsx similarity index 100% rename from src/app/pages/Analytics/SRE_Analytics/MonitoringTable.tsx rename to src/app/components/pages/Analytics/SRE_Analytics/MonitoringTable.tsx diff --git a/src/app/pages/Analytics/SRE_Analytics/RecommendationTables.tsx b/src/app/components/pages/Analytics/SRE_Analytics/RecommendationTables.tsx similarity index 99% rename from src/app/pages/Analytics/SRE_Analytics/RecommendationTables.tsx rename to src/app/components/pages/Analytics/SRE_Analytics/RecommendationTables.tsx index ec03925..ace67fe 100644 --- a/src/app/pages/Analytics/SRE_Analytics/RecommendationTables.tsx +++ b/src/app/components/pages/Analytics/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/src/app/pages/Analytics/SRE_Analytics/SREAnalytics.tsx b/src/app/components/pages/Analytics/SRE_Analytics/SREAnalytics.tsx similarity index 100% rename from src/app/pages/Analytics/SRE_Analytics/SREAnalytics.tsx rename to src/app/components/pages/Analytics/SRE_Analytics/SREAnalytics.tsx diff --git a/src/app/pages/Analytics/SRE_Analytics/Table.tsx b/src/app/components/pages/Analytics/SRE_Analytics/Table.tsx similarity index 100% rename from src/app/pages/Analytics/SRE_Analytics/Table.tsx rename to src/app/components/pages/Analytics/SRE_Analytics/Table.tsx diff --git a/src/app/pages/Analytics/SRE_Analytics/UsecaseSelection.tsx b/src/app/components/pages/Analytics/SRE_Analytics/UsecaseSelection.tsx similarity index 98% rename from src/app/pages/Analytics/SRE_Analytics/UsecaseSelection.tsx rename to src/app/components/pages/Analytics/SRE_Analytics/UsecaseSelection.tsx index 9bd39b8..0fe98b3 100644 --- a/src/app/pages/Analytics/SRE_Analytics/UsecaseSelection.tsx +++ b/src/app/components/pages/Analytics/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/src/app/pages/Analytics/User_Analytics/AnalyticsDeployment.tsx b/src/app/components/pages/Analytics/User_Analytics/AnalyticsDeployment.tsx similarity index 100% rename from src/app/pages/Analytics/User_Analytics/AnalyticsDeployment.tsx rename to src/app/components/pages/Analytics/User_Analytics/AnalyticsDeployment.tsx diff --git a/src/app/pages/Analytics/User_Analytics/AnalyticsNamespace.tsx b/src/app/components/pages/Analytics/User_Analytics/AnalyticsNamespace.tsx similarity index 100% rename from src/app/pages/Analytics/User_Analytics/AnalyticsNamespace.tsx rename to src/app/components/pages/Analytics/User_Analytics/AnalyticsNamespace.tsx diff --git a/src/app/pages/Analytics/User_Analytics/AnalyticsObjectType.tsx b/src/app/components/pages/Analytics/User_Analytics/AnalyticsObjectType.tsx similarity index 100% rename from src/app/pages/Analytics/User_Analytics/AnalyticsObjectType.tsx rename to src/app/components/pages/Analytics/User_Analytics/AnalyticsObjectType.tsx diff --git a/src/app/pages/Analytics/User_Analytics/ContainerInfo/AnalyticsContainers.tsx b/src/app/components/pages/Analytics/User_Analytics/ContainerInfo/AnalyticsContainers.tsx similarity index 100% rename from src/app/pages/Analytics/User_Analytics/ContainerInfo/AnalyticsContainers.tsx rename to src/app/components/pages/Analytics/User_Analytics/ContainerInfo/AnalyticsContainers.tsx diff --git a/src/app/pages/Analytics/User_Analytics/ContainerInfo/BalanceTable.tsx b/src/app/components/pages/Analytics/User_Analytics/ContainerInfo/BalanceTable.tsx similarity index 100% rename from src/app/pages/Analytics/User_Analytics/ContainerInfo/BalanceTable.tsx rename to src/app/components/pages/Analytics/User_Analytics/ContainerInfo/BalanceTable.tsx diff --git a/src/app/pages/Analytics/User_Analytics/ContainerInfo/Container1Details.tsx b/src/app/components/pages/Analytics/User_Analytics/ContainerInfo/Container1Details.tsx similarity index 100% rename from src/app/pages/Analytics/User_Analytics/ContainerInfo/Container1Details.tsx rename to src/app/components/pages/Analytics/User_Analytics/ContainerInfo/Container1Details.tsx diff --git a/src/app/pages/Analytics/User_Analytics/ContainerInfo/Container2Details.tsx b/src/app/components/pages/Analytics/User_Analytics/ContainerInfo/Container2Details.tsx similarity index 100% rename from src/app/pages/Analytics/User_Analytics/ContainerInfo/Container2Details.tsx rename to src/app/components/pages/Analytics/User_Analytics/ContainerInfo/Container2Details.tsx diff --git a/src/app/pages/Analytics/User_Analytics/ContainerInfo/CostTable.tsx b/src/app/components/pages/Analytics/User_Analytics/ContainerInfo/CostTable.tsx similarity index 100% rename from src/app/pages/Analytics/User_Analytics/ContainerInfo/CostTable.tsx rename to src/app/components/pages/Analytics/User_Analytics/ContainerInfo/CostTable.tsx diff --git a/src/app/pages/Analytics/User_Analytics/ContainerInfo/PerformanceTable.tsx b/src/app/components/pages/Analytics/User_Analytics/ContainerInfo/PerformanceTable.tsx similarity index 100% rename from src/app/pages/Analytics/User_Analytics/ContainerInfo/PerformanceTable.tsx rename to src/app/components/pages/Analytics/User_Analytics/ContainerInfo/PerformanceTable.tsx diff --git a/src/app/pages/Analytics/User_Analytics/ContainerInfo/VerticalSlider.tsx b/src/app/components/pages/Analytics/User_Analytics/ContainerInfo/VerticalSlider.tsx similarity index 100% rename from src/app/pages/Analytics/User_Analytics/ContainerInfo/VerticalSlider.tsx rename to src/app/components/pages/Analytics/User_Analytics/ContainerInfo/VerticalSlider.tsx diff --git a/src/app/pages/Analytics/User_Analytics/DeploymentsTreeView.tsx b/src/app/components/pages/Analytics/User_Analytics/DeploymentsTreeView.tsx similarity index 100% rename from src/app/pages/Analytics/User_Analytics/DeploymentsTreeView.tsx rename to src/app/components/pages/Analytics/User_Analytics/DeploymentsTreeView.tsx diff --git a/src/app/pages/Analytics/User_Analytics/ExperimentTable.tsx b/src/app/components/pages/Analytics/User_Analytics/ExperimentTable.tsx similarity index 100% rename from src/app/pages/Analytics/User_Analytics/ExperimentTable.tsx rename to src/app/components/pages/Analytics/User_Analytics/ExperimentTable.tsx diff --git a/src/app/pages/Analytics/User_Analytics/UserAnalytics.tsx b/src/app/components/pages/Analytics/User_Analytics/UserAnalytics.tsx similarity index 100% rename from src/app/pages/Analytics/User_Analytics/UserAnalytics.tsx rename to src/app/components/pages/Analytics/User_Analytics/UserAnalytics.tsx diff --git a/src/app/pages/ExperimentStatus/ExperimentStatus.tsx b/src/app/components/pages/ExperimentStatus/ExperimentStatus.tsx similarity index 100% rename from src/app/pages/ExperimentStatus/ExperimentStatus.tsx rename to src/app/components/pages/ExperimentStatus/ExperimentStatus.tsx diff --git a/src/app/pages/ExperimentStatus/MoreExperimentStuff/ExperimentDetails.tsx b/src/app/components/pages/ExperimentStatus/MoreExperimentStuff/ExperimentDetails.tsx similarity index 100% rename from src/app/pages/ExperimentStatus/MoreExperimentStuff/ExperimentDetails.tsx rename to src/app/components/pages/ExperimentStatus/MoreExperimentStuff/ExperimentDetails.tsx diff --git a/src/app/pages/ExperimentStatus/MoreExperimentStuff/Final_equation.tsx b/src/app/components/pages/ExperimentStatus/MoreExperimentStuff/Final_equation.tsx similarity index 100% rename from src/app/pages/ExperimentStatus/MoreExperimentStuff/Final_equation.tsx rename to src/app/components/pages/ExperimentStatus/MoreExperimentStuff/Final_equation.tsx diff --git a/src/app/pages/ExperimentStatus/MoreExperimentStuff/Resource_usage_details.tsx b/src/app/components/pages/ExperimentStatus/MoreExperimentStuff/Resource_usage_details.tsx similarity index 100% rename from src/app/pages/ExperimentStatus/MoreExperimentStuff/Resource_usage_details.tsx rename to src/app/components/pages/ExperimentStatus/MoreExperimentStuff/Resource_usage_details.tsx diff --git a/src/app/pages/ExperimentStatus/MoreExperimentStuff/Response_time_details.tsx b/src/app/components/pages/ExperimentStatus/MoreExperimentStuff/Response_time_details.tsx similarity index 100% rename from src/app/pages/ExperimentStatus/MoreExperimentStuff/Response_time_details.tsx rename to src/app/components/pages/ExperimentStatus/MoreExperimentStuff/Response_time_details.tsx diff --git a/src/app/pages/ExperimentStatus/MoreExperimentStuff/Throughput_details.tsx b/src/app/components/pages/ExperimentStatus/MoreExperimentStuff/Throughput_details.tsx similarity index 100% rename from src/app/pages/ExperimentStatus/MoreExperimentStuff/Throughput_details.tsx rename to src/app/components/pages/ExperimentStatus/MoreExperimentStuff/Throughput_details.tsx diff --git a/src/app/pages/ExperimentStatus/jsonFiles/listAutotuneTunables.json b/src/app/components/pages/ExperimentStatus/jsonFiles/listAutotuneTunables.json similarity index 100% rename from src/app/pages/ExperimentStatus/jsonFiles/listAutotuneTunables.json rename to src/app/components/pages/ExperimentStatus/jsonFiles/listAutotuneTunables.json diff --git a/src/app/components/FinishedStep/FinishedStep.tsx b/src/app/components/pages/FinishedStep/FinishedStep.tsx similarity index 100% rename from src/app/components/FinishedStep/FinishedStep.tsx rename to src/app/components/pages/FinishedStep/FinishedStep.tsx diff --git a/src/app/components/GenerateYaml/CodeEditorWithActions.tsx b/src/app/components/pages/GenerateYaml/CodeEditorWithActions.tsx similarity index 100% rename from src/app/components/GenerateYaml/CodeEditorWithActions.tsx rename to src/app/components/pages/GenerateYaml/CodeEditorWithActions.tsx diff --git a/src/app/components/GenerateYaml/ab.tsx b/src/app/components/pages/GenerateYaml/ab.tsx similarity index 100% rename from src/app/components/GenerateYaml/ab.tsx rename to src/app/components/pages/GenerateYaml/ab.tsx diff --git a/src/app/components/HorizontalNav/HorizontalNav.tsx b/src/app/components/pages/HorizontalNav/HorizontalNav.tsx similarity index 94% rename from src/app/components/HorizontalNav/HorizontalNav.tsx rename to src/app/components/pages/HorizontalNav/HorizontalNav.tsx index 4b2d9ac..dc378be 100644 --- a/src/app/components/HorizontalNav/HorizontalNav.tsx +++ b/src/app/components/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 b/src/app/components/pages/NotFound/NotFound.tsx similarity index 100% rename from src/app/components/NotFound/NotFound.tsx rename to src/app/components/pages/NotFound/NotFound.tsx diff --git a/src/app/pages/RunExperiment/DefineGoals.tsx b/src/app/components/pages/RunExperiment/DefineGoals.tsx similarity index 100% rename from src/app/pages/RunExperiment/DefineGoals.tsx rename to src/app/components/pages/RunExperiment/DefineGoals.tsx diff --git a/src/app/pages/RunExperiment/DeploymentsDropdown.tsx b/src/app/components/pages/RunExperiment/DeploymentsDropdown.tsx similarity index 96% rename from src/app/pages/RunExperiment/DeploymentsDropdown.tsx rename to src/app/components/pages/RunExperiment/DeploymentsDropdown.tsx index 90c4d81..ce69339 100644 --- a/src/app/pages/RunExperiment/DeploymentsDropdown.tsx +++ b/src/app/components/pages/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/src/app/pages/RunExperiment/NameSpaceDropDown.tsx b/src/app/components/pages/RunExperiment/NameSpaceDropDown.tsx similarity index 95% rename from src/app/pages/RunExperiment/NameSpaceDropDown.tsx rename to src/app/components/pages/RunExperiment/NameSpaceDropDown.tsx index eaa7176..976bcb1 100644 --- a/src/app/pages/RunExperiment/NameSpaceDropDown.tsx +++ b/src/app/components/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/src/app/pages/RunExperiment/PerformanceProfilePages/AdvancedSection.tsx b/src/app/components/pages/RunExperiment/PerformanceProfilePages/AdvancedSection.tsx similarity index 100% rename from src/app/pages/RunExperiment/PerformanceProfilePages/AdvancedSection.tsx rename to src/app/components/pages/RunExperiment/PerformanceProfilePages/AdvancedSection.tsx diff --git a/src/app/pages/RunExperiment/PerformanceProfilePages/PerfComponents/Accordions.tsx b/src/app/components/pages/RunExperiment/PerformanceProfilePages/PerfComponents/Accordions.tsx similarity index 100% rename from src/app/pages/RunExperiment/PerformanceProfilePages/PerfComponents/Accordions.tsx rename to src/app/components/pages/RunExperiment/PerformanceProfilePages/PerfComponents/Accordions.tsx diff --git a/src/app/pages/RunExperiment/PerformanceProfilePages/PerfComponents/NumberValueComponent.tsx b/src/app/components/pages/RunExperiment/PerformanceProfilePages/PerfComponents/NumberValueComponent.tsx similarity index 100% rename from src/app/pages/RunExperiment/PerformanceProfilePages/PerfComponents/NumberValueComponent.tsx rename to src/app/components/pages/RunExperiment/PerformanceProfilePages/PerfComponents/NumberValueComponent.tsx diff --git a/src/app/pages/RunExperiment/PerformanceProfilePages/PerfComponents/UnitsOfTime.tsx b/src/app/components/pages/RunExperiment/PerformanceProfilePages/PerfComponents/UnitsOfTime.tsx similarity index 100% rename from src/app/pages/RunExperiment/PerformanceProfilePages/PerfComponents/UnitsOfTime.tsx rename to src/app/components/pages/RunExperiment/PerformanceProfilePages/PerfComponents/UnitsOfTime.tsx diff --git a/src/app/pages/RunExperiment/PerformanceProfilePages/PerformanceProfiles.tsx b/src/app/components/pages/RunExperiment/PerformanceProfilePages/PerformanceProfiles.tsx similarity index 100% rename from src/app/pages/RunExperiment/PerformanceProfilePages/PerformanceProfiles.tsx rename to src/app/components/pages/RunExperiment/PerformanceProfilePages/PerformanceProfiles.tsx diff --git a/src/app/pages/RunExperiment/PerformanceProfilePages/RegularSection.tsx b/src/app/components/pages/RunExperiment/PerformanceProfilePages/RegularSection.tsx similarity index 97% rename from src/app/pages/RunExperiment/PerformanceProfilePages/RegularSection.tsx rename to src/app/components/pages/RunExperiment/PerformanceProfilePages/RegularSection.tsx index 221917a..1e7b7cb 100644 --- a/src/app/pages/RunExperiment/PerformanceProfilePages/RegularSection.tsx +++ b/src/app/components/pages/RunExperiment/PerformanceProfilePages/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 b/src/app/components/pages/RunExperiment/RE.tsx similarity index 97% rename from src/app/pages/RunExperiment/RE.tsx rename to src/app/components/pages/RunExperiment/RE.tsx index 23f2018..9c0bd12 100644 --- a/src/app/pages/RunExperiment/RE.tsx +++ b/src/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/src/app/pages/RunExperiment/RunExperiment.tsx b/src/app/components/pages/RunExperiment/RunExperiment.tsx similarity index 94% rename from src/app/pages/RunExperiment/RunExperiment.tsx rename to src/app/components/pages/RunExperiment/RunExperiment.tsx index e3db2d6..0afc23d 100644 --- a/src/app/pages/RunExperiment/RunExperiment.tsx +++ b/src/app/components/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 index ad3978e..18ac053 100644 --- 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 index fb5691e..b665352 100644 --- 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({