Skip to content
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

feat: gitlab support #174

Merged
merged 1 commit into from
May 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions components/cloudProviderCard/cloudProviderCard.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const CardContainer = styled(Card)`
max-width: 540px;
min-width: 365px;
padding: 24px;
height: 84px;
`;

export const DetailsContainer = styled.div`
Expand Down
2 changes: 1 addition & 1 deletion components/gitProviderButton/gitProviderButton.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const Button = styled.button<{ active?: boolean }>`
justify-content: center;
align-items: center;
width: 260px;
height: 88px;
height: 84px;
border: 2px solid #e2e8f0;
border-radius: 8px;
background-color: white;
Expand Down
6 changes: 3 additions & 3 deletions components/menu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,18 @@ const Menu: FunctionComponent<MenuProps> = ({ label, options, onClickMenu }) =>
sx={{ '& .MuiMenu-paper': { backgroundColor: 'white' } }}
anchorOrigin={{
vertical: 'bottom',
horizontal: 'left',
horizontal: 'right',
}}
transformOrigin={{
vertical: 'top',
horizontal: 'left',
horizontal: 'right',
}}
>
{options &&
options.map(({ label, icon, color }) => {
return (
<MenuItem key={label} onClick={() => handleClickMenu(label)}>
<ListItemIcon>{icon}</ListItemIcon>
{icon && <ListItemIcon>{icon}</ListItemIcon>}
<ListItemText>
<Typography variant="body2" color={color || VOLCANIC_SAND}>
{label}
Expand Down
5 changes: 4 additions & 1 deletion components/progress/progress.styled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ export const Label = muiStyled(StepLabel)(() => ({
[`& .${stepLabelClasses.disabled}`]: {
color: theme.colors.saltboxBlue,
},
[`& .${stepLabelClasses.alternativeLabel}`]: {
marginTop: '4px !important',
},
}));

export const ColorlibConnector = muiStyled(StepConnector)(({ theme: muiTheme }) => ({
Expand Down Expand Up @@ -86,6 +89,6 @@ export const Container = styled.div`
background-color: ${({ theme }) => theme.colors.childOfLight};
display: flex;
justify-content: center;
padding: 25px 0;
padding: 21px 0;
width: 100%;
`;
7 changes: 4 additions & 3 deletions components/table/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import MoreHorizIcon from '@mui/icons-material/MoreHoriz';

import Typography from '../typography';
import Menu from '../menu';
import { CHILD_OF_LIGHT, SALTBOX_BLUE } from '../../constants/colors';

export interface Row {
[key: string]: unknown | ReactNode;
Expand Down Expand Up @@ -42,13 +43,13 @@ const Table: FunctionComponent<TableProps> = ({
<TableHead>
<TableRow>
{cols.map((col) => (
<TableCell key={col} sx={{ backgroundColor: '#F1F5F9' }}>
<Typography variant="labelMedium" color="#64748B">
<TableCell key={col} sx={{ backgroundColor: CHILD_OF_LIGHT }}>
<Typography variant="labelMedium" color={SALTBOX_BLUE}>
{col?.toUpperCase()}
</Typography>
</TableCell>
))}
{hasActionMenu && <TableCell sx={{ backgroundColor: '#F1F5F9' }}></TableCell>}
{hasActionMenu && <TableCell sx={{ backgroundColor: CHILD_OF_LIGHT }}></TableCell>}
</TableRow>
</TableHead>
<TableBody>
Expand Down
9 changes: 1 addition & 8 deletions constants/cluster.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
export const CLUSTER_MANAGEMENT_COLUMNS = [
'Cluster Name',
'Status',
'Created by',
'Git Provider',
'Cloud',
'Creation Date',
];
export const CLUSTER_MANAGEMENT_COLUMNS = ['Cluster Name', 'Status', 'Created On', 'Created by'];
4 changes: 2 additions & 2 deletions containers/clusterForms/aws/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import ClusterRunningMessage from '../../../components/clusterReady';
import TerminalLogs from '../../terminalLogs';
import { FormStep } from '../../../constants/installation';
import { InstallValues } from '../../../types/redux';
import AuthForm from '../shared/authForm';

import AwsReadinessForm from './readinessForm';
import AwsSetupForm from './setupForm';

const AWS_FORM_FLOW = {
[FormStep.AUTHENTICATION]: AwsReadinessForm,
[FormStep.AUTHENTICATION]: AuthForm,
[FormStep.SETUP]: AwsSetupForm,
[FormStep.PROVISIONING]: TerminalLogs,
[FormStep.READY]: ClusterRunningMessage,
Expand Down
88 changes: 0 additions & 88 deletions containers/clusterForms/aws/readinessForm/index.tsx

This file was deleted.

4 changes: 2 additions & 2 deletions containers/clusterForms/civo/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import ClusterRunningMessage from '../../../components/clusterReady';
import TerminalLogs from '../../terminalLogs';
import { FormStep } from '../../../constants/installation';
import { InstallValues } from '../../../types/redux';
import AuthForm from '../shared/authForm';

import AwsReadinessForm from './readinessForm';
import AwsSetupForm from './setupForm';

const CIVO_FORM_FLOW = {
[FormStep.AUTHENTICATION]: AwsReadinessForm,
[FormStep.AUTHENTICATION]: AuthForm,
[FormStep.SETUP]: AwsSetupForm,
[FormStep.PROVISIONING]: TerminalLogs,
[FormStep.READY]: ClusterRunningMessage,
Expand Down
91 changes: 0 additions & 91 deletions containers/clusterForms/civo/readinessForm/index.tsx

This file was deleted.

4 changes: 2 additions & 2 deletions containers/clusterForms/digitalocean/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import ClusterRunningMessage from '../../../components/clusterReady';
import TerminalLogs from '../../terminalLogs';
import { FormStep } from '../../../constants/installation';
import { InstallValues } from '../../../types/redux';
import AuthForm from '../shared/authForm';

import DigitalOceanReadinessForm from './readinessForm';
import DigitalOceanSetupForm from './setupForm';

const DIGITAL_OCEAN_FORM_FLOW = {
[FormStep.AUTHENTICATION]: DigitalOceanReadinessForm,
[FormStep.AUTHENTICATION]: AuthForm,
[FormStep.SETUP]: DigitalOceanSetupForm,
[FormStep.PROVISIONING]: TerminalLogs,
[FormStep.READY]: ClusterRunningMessage,
Expand Down
Loading