Skip to content

Commit bf5c747

Browse files
authored
Merge pull request #87 from zenml-io/feat/ahsan-v2
Feat/ahsan v2
2 parents 30da3cd + ed0b25a commit bf5c747

File tree

34 files changed

+530
-416
lines changed

34 files changed

+530
-416
lines changed

src/redux/reducers/projectsReducer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const projectsReducer = (
5151
const projects: Projects[] = camelCaseArray(
5252
action.payload.items as ProjectsPayload,
5353
);
54-
54+
5555
const myProjectIds: TId[] = projects.map(
5656
(project: Projects) => project.id,
5757
);
@@ -83,7 +83,7 @@ const projectsReducer = (
8383

8484
case projectActionTypes.getMyProjectStats.success: {
8585
// const { projectStats } = action.payload as any;
86-
const projectStats = action.payload;
86+
const projectStats = action.payload.items;
8787

8888
return { ...newState(state, projectStats) };
8989
}

src/ui/assets/cookie.svg

Lines changed: 9 additions & 0 deletions
Loading

src/ui/assets/logo_small.svg

Lines changed: 3 additions & 0 deletions
Loading

src/ui/components/buttons/index.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
}
2626

2727
&:hover {
28-
background: #E8A562;
28+
background: #A8A8A8;
2929
}
3030
}
3131

src/ui/components/forms/index.tsx

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,43 @@ export const CopyField = (
166166
);
167167
};
168168

169+
export const SearchInputField = (
170+
props: {
171+
label?: string;
172+
labelColor?: any;
173+
placeholder: any;
174+
onChange?: any;
175+
value: string;
176+
} & any,
177+
): JSX.Element => {
178+
return (
179+
<FlexBox.Column fullWidth style={{ height: '100px' }}>
180+
<FlexBox alignItems="center" fullWidth style={{ position: 'relative' }}>
181+
182+
<LinkBox style={{ position: 'absolute', left: '7px', top: '30px' }} onClick={() => {}}>
183+
<icons.search color={iconColors.grey} />
184+
</LinkBox>
185+
186+
<InputWithLabel
187+
name={props.name}
188+
label={props.label}
189+
labelColor={props.labelColor}
190+
InputComponent={
191+
<TextInput
192+
{...props}
193+
style={{ paddingLeft: '40px' }}
194+
value={props.value}
195+
onChangeText={props.onChange}
196+
placeholder={props.placeholder}
197+
/>
198+
}
199+
/>
200+
201+
</FlexBox>
202+
</FlexBox.Column>
203+
);
204+
};
205+
169206
export const FormPasswordField = (
170207
props: {
171208
label: string;
Lines changed: 4 additions & 0 deletions
Loading

src/ui/components/icons/index.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import { ReactComponent as Inprogress } from './assets/InProgress.svg';
4343
import { ReactComponent as Cached } from './assets/Cached.svg';
4444
import { ReactComponent as RightArrow } from './assets/RightArrow.svg';
4545
import { ReactComponent as Edit } from './assets/Edit.svg';
46+
import { ReactComponent as Search } from './assets/Search.svg';
4647

4748
//icons for stackComponents
4849
import { ReactComponent as PuzzlePiece } from './assets/PuzzlePiece.svg';
@@ -167,6 +168,7 @@ const icons = {
167168
funnelFill: createIcon({ Component: FunnelFill }),
168169
delete: createIcon({ Component: Delete }),
169170
edit: createIcon({ Component: Edit }),
171+
search: createIcon({ Component: Search }),
170172

171173
//icons for stackComponents
172174
artifact_store: createIcon({ Component: Folders, useStroke: true }),

src/ui/components/logos/index.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ import { Image } from '..';
44

55
import logo from '../../assets/logo.svg';
66
import logoWhite from '../../assets/logo_white.svg';
7+
import logoSmallWhite from '../../assets/logo_small.svg';
78

89
export const ZenMLLogo: React.FC = () => (
910
<Image style={{ width: 113, height: 32 }} src={logo} />
1011
);
1112

1213
export const ZenMLLogoWhite: React.FC = () => (
1314
<Image style={{ width: 150, height: 35 }} src={logoWhite} />
15+
);
16+
17+
export const ZenMLLogoSmall: React.FC = () => (
18+
<Image style={{ width: 36, height: 36 }} src={logoSmallWhite} />
1419
);

src/ui/components/typographies/index.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
.baseParagraph {
3333
font-family: $fontFamilyNormal;
34-
color: $textColor;
34+
color: #828282;
3535
word-wrap: break-word;
3636
margin: 0;
3737
}

src/ui/layouts/common/Pagination/index.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,16 @@ export const Pagination: React.FC<Props> = forwardRef((props, ref) => {
227227
}}
228228
icon={icons.paginationLast}
229229
/>
230+
230231
</FlexBox>
232+
233+
234+
235+
236+
237+
238+
239+
231240
</FlexBox.Column>
232241
);
233242
});

0 commit comments

Comments
 (0)