Skip to content

Commit

Permalink
refactor: move components to common/components
Browse files Browse the repository at this point in the history
  • Loading branch information
AdamNowotny committed Aug 29, 2024
1 parent 8238a3f commit f5c4d57
Show file tree
Hide file tree
Showing 25 changed files with 28 additions and 24 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/dashboard/components/dashboardTheme.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Theme, ViewConfigContext } from 'components/react-types';
import { Theme, ViewConfigContext } from 'common/components/react-types';
import React, { useContext } from 'react';
import darkTheme from '../themes/dark/dark';
import lightTheme from '../themes/light/light';
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/components/pipelines/build.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ViewConfigContext } from 'common/components/react-types';
import { CIBuild } from 'common/types';
import React, { useContext, useEffect, useState } from 'react';
import { Badge, OverlayTrigger, Tooltip } from 'react-bootstrap';
import { ViewConfigContext } from '../../../components/react-types';
import './build.css';

const Changes = ({ build }: { build: CIBuild }) => {
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/components/pipelines/pipelines.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CIBuild, ServiceStateItem } from 'common/types';
import { ServiceStateContext, ViewConfigContext } from 'components/react-types';
import { ServiceStateContext, ViewConfigContext } from 'common/components/react-types';
import React, { useContext } from 'react';
import Build from './build';
import './pipelines.css';
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/dashboard.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'bootstrap/dist/css/bootstrap.css';
import core from 'common/core';
import logger from 'common/logger';
import PageContext from 'components/pageContext';
import PageContext from 'common/components/pageContext';
import 'font-awesome/scss/font-awesome.scss';
import * as React from 'react';
import { createRoot } from 'react-dom/client';
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/popup.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'bootstrap/dist/css/bootstrap.css';
import core from 'common/core';
import logger from 'common/logger';
import PageContext from 'components/pageContext';
import PageContext from 'common/components/pageContext';
import 'font-awesome/scss/font-awesome.scss';
import * as React from 'react';
import { createRoot } from 'react-dom/client';
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/themes/dark/dark.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Pipelines from 'dashboard/components/pipelines/pipelines';
import Navbar from 'dashboard/components/popupNavbar';
import { ThemeProps } from 'components/react-types';
import { ThemeProps } from 'common/components/react-types';
import React from 'react';
import './dark.css';

Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/themes/light/light.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Pipelines from 'dashboard/components/pipelines/pipelines';
import Navbar from 'dashboard/components/popupNavbar';
import { ThemeProps } from 'components/react-types';
import { ThemeProps } from 'common/components/react-types';
import React from 'react';
import './light.css';

Expand Down
2 changes: 1 addition & 1 deletion src/options/components/optionsNavbar/optionsNavBar.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import core from 'common/core';
import { CIServiceSettings } from 'common/types';
import OnOffSwitch from 'components/onOffSwitch/onOffSwitch';
import OnOffSwitch from 'common/components/onOffSwitch';
import React, { useState } from 'react';
import { Col, Nav, Navbar, NavDropdown } from 'react-bootstrap';
import './optionsNavbar.css';
Expand Down
2 changes: 1 addition & 1 deletion src/options/components/sidebar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CIServiceSettings } from 'common/types';
import { ServiceTypesContext, SettingsContext } from 'components/react-types';
import { ServiceTypesContext, SettingsContext } from 'common/components/react-types';
import React, { useContext } from 'react';
import { Nav } from 'react-bootstrap';
import { NavLink } from 'react-router-dom';
Expand Down
2 changes: 1 addition & 1 deletion src/options/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
ServiceContext,
ServiceTypesContext,
SettingsContext,
} from 'components/react-types';
} from 'common/components/react-types';
import 'font-awesome/scss/font-awesome.scss';
import OptionsNavBar from 'options/components/optionsNavbar/optionsNavBar';
import React, { useContext } from 'react';
Expand Down
2 changes: 1 addition & 1 deletion src/options/options.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import core from 'common/core';
import logger from 'common/logger';
import PageContext from 'components/pageContext';
import PageContext from 'common/components/pageContext';
import * as React from 'react';
import { createRoot } from 'react-dom/client';
import { HashRouter, Route, Routes } from 'react-router-dom';
Expand Down
2 changes: 1 addition & 1 deletion src/options/pages/add/components/serviceThumbnails.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ServiceTypesContext } from 'components/react-types';
import { ServiceTypesContext } from 'common/components/react-types';
import React, { useContext, useState } from 'react';
import './serviceThumbnails.css';

Expand Down
2 changes: 1 addition & 1 deletion src/options/pages/configuration/components/jsonEditor.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FormButtonField } from 'components/formFields';
import { FormButtonField } from 'common/components/formFields';
import React, { useState } from 'react';
import { Col, Form, Row } from 'react-bootstrap';
import './jsonEditor.css';
Expand Down
10 changes: 7 additions & 3 deletions src/options/pages/configuration/configurationPage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import core from 'common/core';
import { FormBooleanField, FormButtonField, FormInputField } from 'components/formFields';
import { SettingsContext } from 'components/react-types';
import ToastAlert from 'components/toastAlert/toastAlert';
import {
FormBooleanField,
FormButtonField,
FormInputField,
} from 'common/components/formFields';
import { SettingsContext } from 'common/components/react-types';
import ToastAlert from 'common/components/toastAlert';
import React, { useContext, useState } from 'react';
import { Alert, Col, Container, Form, Row } from 'react-bootstrap';
import JsonEditor from './components/jsonEditor';
Expand Down
4 changes: 2 additions & 2 deletions src/options/pages/notificationsPage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import core from 'common/core';
import { FormBooleanField } from 'components/formFields';
import { ViewConfigContext } from 'components/react-types';
import { FormBooleanField } from 'common/components/formFields';
import { ViewConfigContext } from 'common/components/react-types';
import React, { useContext } from 'react';
import { Col, Container, Form } from 'react-bootstrap';

Expand Down
4 changes: 2 additions & 2 deletions src/options/pages/service/components/dynamicForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
CIServiceSettings,
WorkerError,
} from 'common/types';
import { FormInputField } from 'components/formFields';
import { ServiceTypesContext } from 'components/react-types';
import { FormInputField } from 'common/components/formFields';
import { ServiceTypesContext } from 'common/components/react-types';
import React, { useContext, useState } from 'react';
import { Alert, Form } from 'react-bootstrap';
import './dynamicForm.css';
Expand Down
4 changes: 2 additions & 2 deletions src/options/pages/service/servicePage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import core from 'common/core';
import { CIPipelineList, CIServiceSettings } from 'common/types';
import { ServiceContext } from 'components/react-types';
import ToastAlert from 'components/toastAlert/toastAlert';
import { ServiceContext } from 'common/components/react-types';
import ToastAlert from 'common/components/toastAlert';
import React, { useContext, useState } from 'react';
import { Col, Container, Row } from 'react-bootstrap';
import { useNavigate } from 'react-router-dom';
Expand Down
4 changes: 2 additions & 2 deletions src/options/pages/viewPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import {
FormBooleanField,
FormNumberField,
FormSelectField,
} from 'components/formFields';
import { ViewConfigContext } from 'components/react-types';
} from 'common/components/formFields';
import { ViewConfigContext } from 'common/components/react-types';
import DashboardTheme from 'dashboard/components/dashboardTheme';
import React, { useContext } from 'react';
import { Col, Container, Form, Row } from 'react-bootstrap';
Expand Down

0 comments on commit f5c4d57

Please sign in to comment.