Skip to content

Commit

Permalink
Merge branch 'feature/11837-task-icons' into feature/11772-details-ab…
Browse files Browse the repository at this point in the history
…out-selected-task
  • Loading branch information
wrt95 committed Dec 11, 2023
2 parents 1399a6a + b4f3951 commit 21c9d0d
Show file tree
Hide file tree
Showing 40 changed files with 244 additions and 112 deletions.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion frontend/libs/studio-icons/src/components/Group/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion frontend/libs/studio-icons/src/components/Likert/index.ts

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion frontend/libs/studio-icons/src/components/NavBar/index.ts

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion frontend/libs/studio-icons/src/components/Select/index.ts

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion frontend/libs/studio-icons/src/components/Title/index.ts

This file was deleted.

4 changes: 2 additions & 2 deletions frontend/libs/studio-icons/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Re-export all icons from @navikt/aksel-icons to make them available for consumers of studio/icons
export * from '@navikt/aksel-icons';

export * from './components';
export * from './types/IconProps';
export * from './react/icons';
export * from './react/types';
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import React from 'react';
import { IconProps } from '../../types/IconProps';
import { SvgTemplate } from '../SvgTemplate';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

/**
* @param {IconProps} props the icon props
* @returns {JSX.Element} the icon as a react component
* @example
* import { Accordion } from '@studio/icons';
*/
export const Accordion = (props: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import React from 'react';
import { IconProps } from '../../types/IconProps';
import { SvgTemplate } from '../SvgTemplate';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

/**
* @param {IconProps} props the icon props
* @returns {JSX.Element} the icon as a react component
* @example
* import { Checkbox } from '@studio/icons';
*/
export const Checkbox = (props: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
Expand Down
38 changes: 38 additions & 0 deletions frontend/libs/studio-icons/src/react/icons/ConfirmationTask.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import React from 'react';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

export const ConfirmationTask = (props: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
<rect
x='3.8222'
y='4.5311'
width='18'
height='15.47'
rx='2'
stroke='currentColor'
strokeWidth='1.5'
/>
<path
d='M7.54221 17.6227H18.1022'
stroke='currentColor'
strokeWidth='1.5'
strokeMiterlimit='2.61533'
strokeLinecap='round'
/>
<path
d='M9.00428 15.4174L9.56043 12.9147L14.2877 8.1874C14.8326 7.64252 15.6913 7.64058 16.2343 8.18742C16.7744 8.73148 16.7764 9.63516 16.2343 10.1773L11.507 14.9046L9.00428 15.4174Z'
stroke='currentColor'
strokeWidth='1.5'
strokeLinejoin='round'
/>
<path
d='M13.4535 8.20169L15.4 10.1482'
stroke='currentColor'
strokeWidth='1.5'
strokeMiterlimit='2.61533'
/>
</SvgTemplate>
);
};
48 changes: 48 additions & 0 deletions frontend/libs/studio-icons/src/react/icons/DataTask.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import React from 'react';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

export const DataTask = (props: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
<rect
x='3.4111'
y='4.53186'
width='18'
height='15.4684'
rx='2'
stroke='currentColor'
strokeWidth='1.5'
/>
<rect
x='7.1311'
y='6.96924'
width='10.56'
height='10.5937'
rx='1'
stroke='currentColor'
strokeWidth='1.5'
strokeLinecap='round'
strokeLinejoin='round'
/>
<path
d='M10.0316 12.2661H14.7905'
stroke='currentColor'
strokeWidth='1.5'
strokeLinecap='round'
/>
<path
d='M10.0316 9.50235H14.7906'
stroke='currentColor'
strokeWidth='1.5'
strokeLinecap='round'
/>
<path
d='M10.367 15.0298H13.9362'
stroke='currentColor'
strokeWidth='1.5'
strokeLinecap='round'
/>
</SvgTemplate>
);
};
25 changes: 25 additions & 0 deletions frontend/libs/studio-icons/src/react/icons/FeedbackTask.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import React from 'react';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

export const FeedbackTask = (props: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
<rect
x='3.64441'
y='4.5311'
width='18'
height='15.47'
rx='2'
stroke='currentColor'
strokeWidth='1.5'
/>
<path
d='M16.9245 8.11652H8.36429C7.812 8.11652 7.36429 8.56423 7.36429 9.11651V17.2136C7.36429 17.3711 7.54359 17.4614 7.67009 17.3676L9.80619 15.7851C9.97844 15.6575 10.1871 15.5886 10.4015 15.5886L16.9245 15.5886C17.4768 15.5886 17.9245 15.1409 17.9245 14.5886V9.11652C17.9245 8.56423 17.4768 8.11652 16.9245 8.11652Z'
stroke='currentColor'
strokeWidth='1.5'
strokeLinecap='round'
/>
</SvgTemplate>
);
};
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import React from 'react';
import { IconProps } from '../../types/IconProps';
import { SvgTemplate } from '../SvgTemplate';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

/**
* @param {IconProps} props the icon props
* @returns {JSX.Element} the icon as a react component
* @example
* import { Group } from '@studio/icons';
*/
export const Group = (props: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import React from 'react';
import { IconProps } from '../../types/IconProps';
import { SvgTemplate } from '../SvgTemplate';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

/**
* @param {IconProps} props the icon props
* @returns {JSX.Element} the icon as a react component
* @example
* import { Likert } from '@studio/icons';
*/
export const Likert = (props: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import React from 'react';
import { IconProps } from '../../types/IconProps';
import { SvgTemplate } from '../SvgTemplate';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

/**
* @param {IconProps} props the icon props
* @returns {JSX.Element} the icon as a react component
* @example
* import { LongText } from '@studio/icons';
*/
export const LongText = (props: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import React from 'react';
import { IconProps } from '../../types/IconProps';
import { SvgTemplate } from '../SvgTemplate';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

/**
* @param {IconProps} props the icon props
* @returns {JSX.Element} the icon as a react component
* @example
* import { NavBar } from '@studio/icons';
*/
export const NavBar = (props: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import React from 'react';
import { IconProps } from '../../types/IconProps';
import { SvgTemplate } from '../SvgTemplate';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

/**
* @param {IconProps} props the icon props
* @returns {JSX.Element} the icon as a react component
* @example
* import { Paragraph } from '@studio/icons';
*/
export const Paragraph = (props: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
Expand Down
37 changes: 37 additions & 0 deletions frontend/libs/studio-icons/src/react/icons/PaymentTask.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import React from 'react';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

export const PaymentTask = (props: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
<rect
x='3.23331'
y='4.5311'
width='18'
height='15.47'
rx='2'
stroke='currentColor'
strokeWidth='1.5'
/>
<rect
x='6.95331'
y='8.32443'
width='10.56'
height='7.88333'
rx='1'
stroke='currentColor'
strokeWidth='1.5'
/>
<path
d='M7.35294 10.7776H17.3529'
stroke='currentColor'
strokeWidth='1.5'
strokeMiterlimit='2.61533'
strokeLinecap='round'
/>
<circle cx='9.03253' cy='13.6208' r='0.75' fill='currentColor' />
<circle cx='10.1702' cy='13.6208' r='0.75' fill='currentColor' />
</SvgTemplate>
);
};
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import React from 'react';
import { IconProps } from '../../types/IconProps';
import { SvgTemplate } from '../SvgTemplate';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

/**
* @param {IconProps} props the icon props
* @returns {JSX.Element} the icon as a react component
* @example
* import { RadioButton } from '@studio/icons';
*/
export const RadioButton = (props: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import React from 'react';
import { IconProps } from '../../types/IconProps';
import { SvgTemplate } from '../SvgTemplate';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

/**
* @param {IconProps} props the icon props
* @returns {JSX.Element} the icon as a react component
* @example
* import { Select } from '@studio/icons';
*/
export const Select = (props: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import React from 'react';
import { IconProps } from '../../types/IconProps';
import { SvgTemplate } from '../SvgTemplate';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

/**
* @param {IconProps} props the icon props
* @returns {JSX.Element} the icon as a react component
* @example
* import { ShortText } from '@studio/icons';
*/
export const ShortText = ({ ...props }: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
Expand Down
38 changes: 38 additions & 0 deletions frontend/libs/studio-icons/src/react/icons/SignTask.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import React from 'react';
import { IconProps } from '../types';
import { SvgTemplate } from './SvgTemplate';

export const SignTask = (props: IconProps): JSX.Element => {
return (
<SvgTemplate {...props}>
<rect
x='3.8222'
y='4.5311'
width='18'
height='15.47'
rx='2'
stroke='currentColor'
strokeWidth='1.5'
/>
<path
d='M7.54221 17.6227H18.1022'
stroke='currentColor'
strokeWidth='1.5'
strokeMiterlimit='2.61533'
strokeLinecap='round'
/>
<path
d='M9.00428 15.4174L9.56043 12.9147L14.2877 8.1874C14.8326 7.64252 15.6913 7.64058 16.2343 8.18742C16.7744 8.73148 16.7764 9.63516 16.2343 10.1773L11.507 14.9046L9.00428 15.4174Z'
stroke='currentColor'
strokeWidth='1.5'
strokeLinejoin='round'
/>
<path
d='M13.4535 8.20169L15.4 10.1482'
stroke='currentColor'
strokeWidth='1.5'
strokeMiterlimit='2.61533'
/>
</SvgTemplate>
);
};
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import React from 'react';
import { IconProps } from '../../types/IconProps';

/**
* @param {SvgTemplateProps} props the SvgTemplate props
* @returns {JSX.Element} template for svg icons
*/
import { IconProps } from '../types';

type SvgTemplateProps = IconProps & { children: React.ReactNode };
export const SvgTemplate = ({ title, children, ...rest }: SvgTemplateProps): JSX.Element => {
Expand Down
Loading

0 comments on commit 21c9d0d

Please sign in to comment.