Adjusted application links (#4880)

* Fixed links

* Updated license headers

cvat-ui/src/components/feedback/feedback.tsx

@@ -1,4 +1,5 @@
 // Copyright (C) 2020-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corp
 //
 // SPDX-License-Identifier: MIT
 
@@ -32,7 +33,7 @@ import {
 import consts from 'consts';
 
 function renderContent(): JSX.Element {
-    const { GITHUB_URL, GITHUB_IMAGE_URL, GITTER_PUBLIC_URL } = consts;
+    const { GITHUB_URL, GITHUB_IMAGE_URL, DISCORD_URL } = consts;
 
     return (
         <>
@@ -48,7 +49,7 @@ function renderContent(): JSX.Element {
             <LikeOutlined />
             <Text style={{ marginLeft: '10px' }}>
                 Leave a
-                <a target='_blank' rel='noopener noreferrer' href={GITTER_PUBLIC_URL}>
+                <a target='_blank' rel='noopener noreferrer' href={DISCORD_URL}>
                     {' '}
                     feedback
                 </a>
@@ -58,12 +59,7 @@ function renderContent(): JSX.Element {
                 <FacebookShareButton url={GITHUB_URL} quote='Computer Vision Annotation Tool'>
                     <FacebookIcon size={32} round />
                 </FacebookShareButton>
-                <VKShareButton
+                <VKShareButton url={GITHUB_URL} title='Computer Vision Annotation Tool' image={GITHUB_IMAGE_URL}>
-                    url={GITHUB_URL}
-                    title='Computer Vision Annotation Tool'
-                    image={GITHUB_IMAGE_URL}
-                    description='CVAT'
-                >
                     <VKIcon size={32} round />
                 </VKShareButton>
                 <TwitterShareButton url={GITHUB_URL} title='Computer Vision Annotation Tool' hashtags={['CVAT']}>
@@ -88,9 +84,9 @@ function renderContent(): JSX.Element {
             <hr />
             <Text style={{ marginTop: '50px' }}>
                 Do you need help? Contact us on
-                <a target='_blank' rel='noopener noreferrer' href={GITTER_PUBLIC_URL}>
+                <a target='_blank' rel='noopener noreferrer' href={DISCORD_URL}>
                     {' '}
-                    gitter
+                    Discord
                 </a>
             </Text>
         </>

cvat-ui/src/components/header/header.tsx

@@ -1,4 +1,5 @@
 // Copyright (C) 2020-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corp
 //
 // SPDX-License-Identifier: MIT
 
@@ -163,7 +164,7 @@ function HeaderContainer(props: Props): JSX.Element {
     } = props;
 
     const {
-        CHANGELOG_URL, LICENSE_URL, GITTER_URL, FORUM_URL, GITHUB_URL, GUIDE_URL,
+        CHANGELOG_URL, LICENSE_URL, GITTER_URL, GITHUB_URL, GUIDE_URL, DISCORD_URL,
     } = consts;
 
     const history = useHistory();
@@ -199,7 +200,7 @@ function HeaderContainer(props: Props): JSX.Element {
                         </Col>
                         <Col>
                             <a href={LICENSE_URL} target='_blank' rel='noopener noreferrer'>
-                                License
+                                MIT License
                             </a>
                         </Col>
                         <Col>
@@ -208,8 +209,8 @@ function HeaderContainer(props: Props): JSX.Element {
                             </a>
                         </Col>
                         <Col>
-                            <a href={FORUM_URL} target='_blank' rel='noopener noreferrer'>
+                            <a href={DISCORD_URL} target='_blank' rel='noopener noreferrer'>
-                                Forum on Intel Developer Zone
+                                Find us on Discord
                             </a>
                         </Col>
                     </Row>

cvat-ui/src/components/login-page/intel-footer-drawer.tsx

@@ -1,27 +0,0 @@
-// Copyright (C) 2021-2022 Intel Corporation
-//
-// SPDX-License-Identifier: MIT
-
-import React from 'react';
-import Layout from 'antd/lib/layout';
-
-import { isPublic } from 'utils/enviroment';
-import consts from 'consts';
-
-function FooterDrawer(): JSX.Element | null {
-    const { Footer } = Layout;
-    const { INTEL_TERMS_OF_USE_URL, INTEL_COOKIES_URL, INTEL_PRIVACY_URL } = consts;
-
-    return isPublic() ? (
-        <Footer style={{ textAlign: 'center', borderTop: '1px solid #e8e8e8' }}>
-            © Intel Corporation |
-            <a target='_blank' rel='noopener noreferrer' href={INTEL_TERMS_OF_USE_URL}> Terms of Use </a>
-            |
-            <a target='_blank' rel='noopener noreferrer' data-cookie-notice='true' href={INTEL_COOKIES_URL}> Cookies </a>
-            |
-            <a target='_blank' rel='noopener noreferrer' href={INTEL_PRIVACY_URL}> Privacy </a>
-        </Footer>
-    ) : null;
-}
-
-export default React.memo(FooterDrawer);

cvat-ui/src/components/login-page/login-page.tsx

@@ -1,4 +1,5 @@
 // Copyright (C) 2020-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corp
 //
 // SPDX-License-Identifier: MIT
 
@@ -10,8 +11,6 @@ import Text from 'antd/lib/typography/Text';
 import { Row, Col } from 'antd/lib/grid';
 import Layout from 'antd/lib/layout';
 
-import FooterDrawer from 'components/login-page/intel-footer-drawer';
-
 import LoginForm, { LoginData } from './login-form';
 
 interface LoginPageComponentProps {
@@ -64,7 +63,6 @@ function LoginPageComponent(props: LoginPageComponentProps & RouteComponentProps
                     </Col>
                 </Row>
             </Content>
-            <FooterDrawer />
         </Layout>
     );
 }

cvat-ui/src/components/register-page/register-page.tsx

@@ -1,4 +1,5 @@
 // Copyright (C) 2020-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corp
 //
 // SPDX-License-Identifier: MIT
 
@@ -12,7 +13,6 @@ import { Row, Col } from 'antd/lib/grid';
 import Layout from 'antd/lib/layout';
 
 import { UserAgreement } from 'reducers';
-import FooterDrawer from 'components/login-page/intel-footer-drawer';
 import RegisterForm, { RegisterData, UserConfirmation } from './register-form';
 
 interface RegisterPageComponentProps {
@@ -71,7 +71,6 @@ function RegisterPageComponent(props: RegisterPageComponentProps & RouteComponen
                     </Col>
                 </Row>
             </Content>
-            <FooterDrawer />
         </Layout>
     );
 }

cvat-ui/src/components/reset-password-confirm-page/reset-password-confirm-page.tsx

@@ -1,4 +1,5 @@
 // Copyright (C) 2020-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corp
 //
 // SPDX-License-Identifier: MIT
 
@@ -10,8 +11,6 @@ import Layout from 'antd/lib/layout';
 
 import { CombinedState } from 'reducers';
 import { resetPasswordAsync } from 'actions/auth-actions';
-
-import FooterDrawer from 'components/login-page/intel-footer-drawer';
 import ResetPasswordConfirmForm, { ResetPasswordConfirmData } from './reset-password-confirm-form';
 
 interface StateToProps {
@@ -70,7 +69,6 @@ function ResetPasswordPagePageComponent(props: ResetPasswordConfirmPageComponent
                     </Col>
                 </Row>
             </Content>
-            <FooterDrawer />
         </Layout>
     );
 }

cvat-ui/src/components/reset-password-page/reset-password-page.tsx

@@ -1,4 +1,5 @@
 // Copyright (C) 2020-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corp
 //
 // SPDX-License-Identifier: MIT
 
@@ -12,7 +13,6 @@ import Layout from 'antd/lib/layout';
 
 import { requestPasswordResetAsync } from 'actions/auth-actions';
 import { CombinedState } from 'reducers';
-import FooterDrawer from 'components/login-page/intel-footer-drawer';
 import ResetPasswordForm, { ResetPasswordData } from './reset-password-form';
 
 interface StateToProps {
@@ -73,7 +73,6 @@ function ResetPasswordPagePageComponent(props: ResetPasswordPageComponentProps):
                     </Col>
                 </Row>
             </Content>
-            <FooterDrawer />
         </Layout>
     );
 }

cvat-ui/src/consts.ts

@@ -1,16 +1,16 @@
 // Copyright (C) 2019-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corp
 //
 // SPDX-License-Identifier: MIT
 
 const UNDEFINED_ATTRIBUTE_VALUE = '__undefined__';
 const NO_BREAK_SPACE = '\u00a0';
-const CHANGELOG_URL = 'https://github.com/cvat-ai/cvat/blob/develop/CHANGELOG.md';
+const CHANGELOG_URL = 'https://github.com/opencv/cvat/blob/develop/CHANGELOG.md';
-const LICENSE_URL = 'https://github.com/cvat-ai/cvat/blob/develop/LICENSE';
+const LICENSE_URL = 'https://github.com/opencv/cvat/blob/develop/LICENSE';
 const GITTER_URL = 'https://gitter.im/opencv-cvat';
-const GITTER_PUBLIC_URL = 'https://gitter.im/opencv-cvat/public';
+const DISCORD_URL = 'https://discord.gg/fNR3eXfk6C';
-const FORUM_URL = 'https://software.intel.com/en-us/forums/intel-distribution-of-openvino-toolkit';
+const GITHUB_URL = 'https://github.com/opencv/cvat';
-const GITHUB_URL = 'https://github.com/cvat-ai/cvat';
+const GITHUB_IMAGE_URL = 'https://github.com/opencv/cvat/raw/develop/site/content/en/images/cvat.jpg';
-const GITHUB_IMAGE_URL = 'https://github.com/cvat-ai/cvat/raw/develop/site/content/en/images/cvat.jpg';
 const GUIDE_URL = 'https://opencv.github.io/cvat/docs';
 const SHARE_MOUNT_GUIDE_URL =
     'https://opencv.github.io/cvat/docs/administration/basics/installation/#share-path';
@@ -22,9 +22,6 @@ const LATEST_COMMENTS_SHOWN_QUICK_ISSUE = 3;
 const QUICK_ISSUE_INCORRECT_POSITION_TEXT = 'Wrong position';
 const QUICK_ISSUE_INCORRECT_ATTRIBUTE_TEXT = 'Wrong attribute';
 const DEFAULT_PROJECT_SUBSETS = ['Train', 'Test', 'Validation'];
-const INTEL_TERMS_OF_USE_URL = 'https://www.intel.com/content/www/us/en/legal/terms-of-use.html';
-const INTEL_COOKIES_URL = 'https://www.intel.com/content/www/us/en/privacy/intel-cookie-notice.html';
-const INTEL_PRIVACY_URL = 'https://www.intel.com/content/www/us/en/privacy/intel-privacy-notice.html';
 const OUTSIDE_PIC_URL = 'https://opencv.github.io/cvat/images/image019.jpg';
 const DEFAULT_AWS_S3_REGIONS: string[][] = [
     ['us-east-1', 'US East (N. Virginia)'],
@@ -91,8 +88,7 @@ export default {
     CHANGELOG_URL,
     LICENSE_URL,
     GITTER_URL,
-    GITTER_PUBLIC_URL,
+    DISCORD_URL,
-    FORUM_URL,
     GITHUB_URL,
     GITHUB_IMAGE_URL,
     GUIDE_URL,
@@ -104,9 +100,6 @@ export default {
     QUICK_ISSUE_INCORRECT_POSITION_TEXT,
     QUICK_ISSUE_INCORRECT_ATTRIBUTE_TEXT,
     DEFAULT_PROJECT_SUBSETS,
-    INTEL_TERMS_OF_USE_URL,
-    INTEL_COOKIES_URL,
-    INTEL_PRIVACY_URL,
     DEFAULT_AWS_S3_REGIONS,
     DEFAULT_GOOGLE_CLOUD_STORAGE_LOCATIONS,
     OUTSIDE_PIC_URL,

cvat-ui/src/utils/enviroment.ts

@@ -1,4 +1,5 @@
 // Copyright (C) 2020-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corp
 //
 // SPDX-License-Identifier: MIT
 
@@ -9,10 +10,6 @@ export function isDev(): boolean {
     return process.env.NODE_ENV === 'development';
 }
 
-export function isPublic(): boolean {
-    return process.env.PUBLIC_INSTANCE === 'true';
-}
-
 export function customWaViewHit(pageName?: string, queryString?: string, hashInfo?: string): void {
     const waHitFunctionName = process.env.WA_PAGE_VIEW_HIT;
     if (waHitFunctionName) {
@@ -26,7 +23,7 @@ export function customWaViewHit(pageName?: string, queryString?: string, hashInf
         );
         try {
             waHitFunction(pageName, queryString, hashInfo);
-        } catch (error) {
+        } catch (error: any) {
             // eslint-disable-next-line
             console.error(`Web analitycs hit function has failed. ${error.toString()}`);
         }

serverless/openvino/dextr/nuclio/function.yaml

@@ -7,7 +7,7 @@ metadata:
     spec:
     framework: openvino
     min_pos_points: 4
-    animated_gif: https://raw.githubusercontent.com/cvat-ai/cvat/0fbb19ae3846a017853d52e187f0ce149adced7d/site/content/en/images/dextr_example.gif
+    animated_gif: https://raw.githubusercontent.com/opencv/cvat/0fbb19ae3846a017853d52e187f0ce149adced7d/site/content/en/images/dextr_example.gif
     help_message: The interactor allows to get a mask of an object using its extreme points (more or equal than 4). You can add a point left-clicking the image
 
 spec:

serverless/pytorch/saic-vul/fbrs/nuclio/function.yaml

@@ -8,7 +8,7 @@ metadata:
     framework: pytorch
     min_pos_points: 1
     min_neg_points: 0
-    animated_gif: https://raw.githubusercontent.com/cvat-ai/cvat/0fbb19ae3846a017853d52e187f0ce149adced7d/site/content/en/images/fbrs_example.gif
+    animated_gif: https://raw.githubusercontent.com/opencv/cvat/0fbb19ae3846a017853d52e187f0ce149adced7d/site/content/en/images/fbrs_example.gif
     help_message: The interactor allows to get a mask for an object using positive points, and negative points
 
 spec:

serverless/pytorch/saic-vul/hrnet/nuclio/function-gpu.yaml

@@ -8,7 +8,7 @@ metadata:
     framework: pytorch
     min_pos_points: 1
     min_neg_points: 0
-    animated_gif: https://raw.githubusercontent.com/cvat-ai/cvat/develop/site/content/en/images/hrnet_example.gif
+    animated_gif: https://raw.githubusercontent.com/opencv/cvat/develop/site/content/en/images/hrnet_example.gif
     help_message: The interactor allows to get a mask for an object using positive points, and negative points
 
 spec:

serverless/pytorch/shiyinzhang/iog/nuclio/function.yaml

@@ -9,7 +9,7 @@ metadata:
     min_pos_points: 1
     min_neg_points: 0
     startswith_box: true
-    animated_gif: https://raw.githubusercontent.com/cvat-ai/cvat/0fbb19ae3846a017853d52e187f0ce149adced7d/site/content/en/images/iog_example.gif
+    animated_gif: https://raw.githubusercontent.com/opencv/cvat/0fbb19ae3846a017853d52e187f0ce149adced7d/site/content/en/images/iog_example.gif
     help_message: The interactor allows to get a mask of an object using its wrapping boundig box, positive, and negative points inside it
 
 spec: