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

React, Antd, Redux: Left sidebar and top for annotation page #963

Merged
merged 13 commits into from
Dec 16, 2019
1 change: 0 additions & 1 deletion cvat-ui/dist/assets/cvat-logo.svg

This file was deleted.

1 change: 0 additions & 1 deletion cvat-ui/dist/assets/icon-redo.svg

This file was deleted.

1 change: 0 additions & 1 deletion cvat-ui/dist/assets/icon-undo.svg

This file was deleted.

1 change: 1 addition & 0 deletions cvat-ui/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare module '*.svg';
205 changes: 205 additions & 0 deletions cvat-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cvat-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"eslint-plugin-react": "^7.17.0",
"eslint-plugin-react-hooks": "^1.7.0",
"html-webpack-plugin": "^3.2.0",
"react-svg-loader": "^3.0.3",
"style-loader": "^1.0.0",
"typescript": "^3.7.3",
"webpack": "^4.41.2",
Expand Down
1 change: 1 addition & 0 deletions cvat-ui/src/assets/cvat-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
1 change: 1 addition & 0 deletions cvat-ui/src/assets/redo-icon.svg
File renamed without changes
1 change: 1 addition & 0 deletions cvat-ui/src/assets/undo-icon.svg
17 changes: 17 additions & 0 deletions cvat-ui/src/components/annotation-page/annotation-page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';

import {
Layout,
} from 'antd';

import AnnotationTopBarComponent from './top-bar/top-bar';
import StandardWorkspaceComponent from './standard-workspace/standard-workspace';

export default function AnnotationPageComponent(): JSX.Element {
return (
<Layout className='cvat-annotation-page'>
<AnnotationTopBarComponent />
<StandardWorkspaceComponent />
</Layout>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react';

import {
Layout,
} from 'antd';

export default function CanvasWrapperComponent(): JSX.Element {
return (
<Layout.Content
className='cvat-annotation-page-canvas-container'
>
main content
</Layout.Content>
);
}
Loading