Skip to content

Commit

Permalink
reorganized directories
Browse files Browse the repository at this point in the history
  • Loading branch information
jcw780 committed Jun 25, 2020
1 parent c5a7bb9 commit 968ff60
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/components/Charts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import 'chartjs-plugin-annotation';
import {Button, Collapse, Row, Col} from 'react-bootstrap';

import * as T from './commonTypes';
import DownloadButton from './DownloadButton';
import GeneralTooltip from './Tooltips';
import DownloadButton from './UtilityComponents/DownloadButton';
import GeneralTooltip from './UtilityComponents/Tooltips';

// chartConfigs type
interface chartDataOption{data: Record<string, any>, options: Record<string, any>}
Expand Down
2 changes: 1 addition & 1 deletion src/components/SettingsBar/SettingsBarInternal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {ToggleButtonGroup, ToggleButton, Container, Col, Row} from 'react-bootst
import BootstrapSwitchButton from 'bootstrap-switch-button-react';

import * as T from '../commonTypes';
import {ParameterForm} from '../ParameterForm';
import {ParameterForm} from '../UtilityComponents/ParameterForm';

class CalculationRadio extends React.PureComponent<{settings: T.settingsT}, {value: number}>{
constructor(props){
Expand Down
2 changes: 1 addition & 1 deletion src/components/ShellForms/ShellForms.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import clonedeep from 'lodash.clonedeep';

import * as T from '../commonTypes';
import * as S from './Types';
import {ParameterForm} from '../ParameterForm';
import {ParameterForm} from '../UtilityComponents/ParameterForm';
import DefaultShips from './DefaultForms'
import {ShellParametersT} from './ShellParameters';

Expand Down
6 changes: 3 additions & 3 deletions src/components/ShellForms/ShellParameters.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import {Form, Col, Row} from 'react-bootstrap';
import clonedeep from 'lodash.clonedeep';

import * as S from './Types';
import {ParameterForm} from '../ParameterForm';
import DownloadButton from '../DownloadButton';
import {ParameterForm} from '../UtilityComponents/ParameterForm';
import DownloadButton from '../UtilityComponents/DownloadButton';

const GeneralTooltip = React.lazy(() => import('../Tooltips'));
const GeneralTooltip = React.lazy(() => import('../UtilityComponents/Tooltips'));

interface shellParametersProps {handleValueChange: any, formLabels : S.formLabelsT, formData: S.formDataT}
export class ShellParameters extends React.PureComponent<shellParametersProps>{
Expand Down
2 changes: 1 addition & 1 deletion src/components/ShellForms/Types.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ParameterForm from '../ParameterForm';
import ParameterForm from '../UtilityComponents/ParameterForm';

export enum labelI {name, unit, ref, description}
export type labelT = [string, string,React.RefObject<ParameterForm>, string | JSX.Element];
Expand Down
4 changes: 2 additions & 2 deletions src/components/TargetForms.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import React, {Suspense} from 'react';
import {Row, Col, Button, Modal, Container} from 'react-bootstrap';

import * as T from './commonTypes';
import {ParameterForm} from './ParameterForm';
import {ParameterForm} from './UtilityComponents/ParameterForm';
//import GeneralTooltip from './Tooltips';
const GeneralTooltip = React.lazy(() => import('./Tooltips'));
const GeneralTooltip = React.lazy(() => import('./UtilityComponents/Tooltips'));

interface refAngleFormProps {
newValue: string[], index: number, keyProp : number,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import {InputGroup, Form} from 'react-bootstrap';

import * as T from './commonTypes';
import * as T from '../commonTypes';

interface parameterFormState {value: string, invalid: boolean}
interface parameterFormProps {
Expand Down
File renamed without changes.

0 comments on commit 968ff60

Please sign in to comment.