diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml new file mode 100644 index 00000000..6b3fc7da --- /dev/null +++ b/.github/workflows/github_pages.yml @@ -0,0 +1,38 @@ +name: Github pages + +on: + push: + branches: + - develop + +jobs: + deploy: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + fetch-depth: 0 + + - name: Setup Hugo + uses: peaceiris/actions-hugo@v2 + with: + hugo-version: '0.83.1' + extended: true + + - name: Setup Node + uses: actions/setup-node@v2 + with: + node-version: '14.x' + + - name: Build docs + working-directory: ./site + run: | + npm ci + hugo --baseURL "/cvat/" --minify + - name: Deploy + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./site/public + force_orphan: true diff --git a/.gitignore b/.gitignore index ab8d42c8..9ff25c63 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,9 @@ yarn-error.log* /helm-chart/values.*.yaml /helm-chart/*.values.yaml /helm-chart/charts/* + +#Ignore website temp files +/site/public/ +/site/resources/ +/site/node_modules/ +/site/tech-doc-hugo \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..ae36fe05 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "site/themes/docsy"] + path = site/themes/docsy + url = https://github.com/google/docsy diff --git a/README.md b/README.md index c90303f5..9abcdf41 100644 --- a/README.md +++ b/README.md @@ -17,14 +17,14 @@ annotation team. Try it online [cvat.org](https://cvat.org). ## Documentation -- [Installation guide](cvat/apps/documentation/installation.md) -- [User's guide](cvat/apps/documentation/user_guide.md) +- [Installation guide](site/content/en/docs/for-users/installation.md) +- [User's guide](https://openvinotoolkit.github.io/cvat/docs/for-users/user-guide/) - [Django REST API documentation](#rest-api) - [Datumaro dataset framework](https://github.com/openvinotoolkit/datumaro/blob/develop/README.md) -- [Command line interface](utils/cli/) -- [XML annotation format](cvat/apps/documentation/xml_format.md) -- [AWS Deployment Guide](cvat/apps/documentation/AWS-Deployment-Guide.md) -- [Frequently asked questions](cvat/apps/documentation/faq.md) +- [Command line interface](site/content/en/docs/for-developers/cli.md) +- [XML annotation format](site/content/en/docs/for-developers/xml_format.md) +- [AWS Deployment Guide](site/content/en/docs/for-developers/AWS-Deployment-Guide.md) +- [Frequently asked questions](site/content/en/docs/for-users/faq.md) - [Questions](#questions) ## Screencasts @@ -97,7 +97,7 @@ are visible to users. Disabled features: -- [Analytics: management and monitoring of data annotation team](/components/analytics/README.md) +- [Analytics: management and monitoring of data annotation team](site/content/en/docs/for-developers/analytics.md) Limitations: diff --git a/cvat-ui/src/components/header/header.tsx b/cvat-ui/src/components/header/header.tsx index 8b5ac047..70cd25f8 100644 --- a/cvat-ui/src/components/header/header.tsx +++ b/cvat-ui/src/components/header/header.tsx @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT @@ -232,7 +232,11 @@ function HeaderContainer(props: Props): JSX.Element { About {renderChangePasswordItem && ( - switchChangePasswordDialog(true)} disabled={changePasswordFetching}> + switchChangePasswordDialog(true)} + disabled={changePasswordFetching} + > {changePasswordFetching ? : } Change password @@ -320,12 +324,12 @@ function HeaderContainer(props: Props): JSX.Element {