Skip to content

Improving folder structure #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: mvp_demo
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Change folder structure and delete app.css file
  • Loading branch information
ppadti committed Aug 30, 2023
commit 1186b8feebe9cc6554fdc8cab2118a9c0ffa6f51
5 changes: 4 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@

<body>
<noscript>Enabling JavaScript is required to run this app.</noscript>
<div id="root" style="height: 100%"></div>
<div id="root" style="height: 100%">
<!-- <script type="text/javascript" src="SubmitButtonSearchInput.js"></script>
<script type="text/typescript" src="FAQs.tsx"></script> -->
</div>
</body>
</html>
4 changes: 2 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
64 changes: 0 additions & 64 deletions src/app.css

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import nodeContext from '@app/components/ContextStore/nodeContext';
import nodeContext from '@app/components/common/ContextStore/nodeContext';
import {
Flex,
TextContent,
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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([]);
Expand Down
Original file line number Diff line number Diff line change
@@ -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([]);
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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('--');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: '',
Expand Down
16 changes: 8 additions & 8 deletions src/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down