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

Website with documentation #3039

Merged
merged 58 commits into from
May 20, 2021
Merged

Website with documentation #3039

merged 58 commits into from
May 20, 2021

Conversation

TOsmanov
Copy link
Contributor

@TOsmanov TOsmanov commented Mar 31, 2021

Motivation and context

This PR contains a website created using an extended version of Hugo 0.81 (hugo documentation) and a docsy theme (docsy documentation) .

  • The site contains a homepage, a about page and documentation. The main documentation page has original design.
  • User Guide is divided into several pages for easy reading without having to scroll a long page (issue UX: User guide for hosted cvat.org needs better navigation #1630).
  • Added .gitmodule file to sync docsy theme
  • Temporary website files added to the .gitignore file
  • Fotter is the final

Current issues:

  • "Main page" - hide also not finalized
  • "About page" - not finalized
  • "The team" block on the page "about us" is not finished, the main idea of this block is a map of the world with icons of the main developers on the GitHub with the floating card of each developer when hovering on the icon.
  • File "site/assets/icons/logo.svg" is a copy of "cvat-ui/src/assets/cvat-logo.svg" with color changed.
  • Links lead to the "develop" branch (not variable)
  • Images on the GitHub and on the site have different paths, because of this, viewing the user guide with images is possible only on the website
  • The link to user guide in the README.md file is now absolute (domain name: cvat.org)
  • The link to the user guide from cvat (Help) should be changed to "domain_name/docs/for-users/user-guide/"

Readme files not added to the website:
cvat\cvat\apps\dataset_repo\README.md
cvat\components\serverless\README.md
cvat\cvat-canvas\README.md
cvat\cvat-canvas3d\README.md
cvat\cvat-core\README.md
cvat\cvat-data\README.md
cvat\cvat-ui\README.md
cvat\docs\rest_api_desing.md
cvat\kubernetes-templates\README.md
cvat\ssh\README.md

Change table:

Original file Current file Move Divide Rename Compare Delete original file
cvat/tree/develop/cvat/apps/documentation/instalation.md cvat/site/content/en/docs/for-users/instalation.md X X X
cvat/tree/develop/cvat/apps/documentation/user_guide.md cvat/site/content/en/docs/for-users/user-guide/ X X X X
cvat/tree/develop/cvat/apps/documentation/installation_automatic_annotation.md cvat/site/content/en/docs/for-users/installation_automatic_annotation.md X X X
cvat/tree/develop/cvat/apps/documentation/faq.md cvat/site/content/en/docs/for-users/faq.md X X X
cvat/tree/develop/components/analytics/README.md cvat/site/content/en/docs/for-developers/analytics.md X X X X
cvat/tree/develop/cvat/apps/dataset_manager/formats/README.md cvat/site/content/en/docs/for-developers/formats/ X X X X X
cvat/tree/develop/utils/cli/README.md cvat/site/content/en/docs/for-developers/cli.md X X X X
cvat/tree/develop/cvat/apps/documentation/xml_format.md cvat/site/content/en/docs/for-developers/xml_format.md X X X
cvat/tree/develop/cvat/apps/documentation/AWS-Deployment-Guide.md cvat/site/content/en/docs/for-developers/AWS-Deployment-Guide.md X X X
cvat/tree/develop/utils/dataset_manifest/README.md cvat/site/content/en/docs/for-developers/dataset_manifest.md X X X X
cvat/tree/develop/cvat/apps/documentation/data_on_fly.md cvat/site/content/en/docs/for-developers/data_on_fly.md X X X
cvat/tree/develop/cvat/apps/documentation/mounting_cloud_storages.md cvat/site/content/en/docs/for-developers/mounting_cloud_storages.md X X X
cvat/blob/develop/cvat/apps/documentation/backup_guide.md cvat/site/content/en/docs/for-developers/backup_guide.md X X X

The documentation has the following structure:

Documentation
├───for-developers
│       analytics.md
│       AWS-Deployment-Guide.md
│       backup_guide.md
│       cli.md
│       dataset_manifest.md
│       data_on_fly.md
│       mounting_cloud_storages.md
│       xml_format.md
│       _index.md
│
└───for-users
    │   faq.md
    │   installation.md
    │   installation_automatic_annotation.md
    │   _index.md
    │
    ├───formats
    │   │   _index.md
    │   │
    │   └───format-specifications
    │           format-camvid.md
    │           format-coco.md
    │           format-cvat.md
    │           format-datumaro.md
    │           format-icdar.md
    │           format-imagenet.md
    │           format-labelme.md
    │           format-market1501.md
    │           format-mot.md
    │           format-mots.md
    │           format-tfrecord.md
    │           format-vggface2.md
    │           format-voc.md
    │           format-widerface.md
    │           format-yolo.md
    │           _index.md
    │
    └───user-guide
        │   controls-sidebar.md
        │   creating_an_annotation_task.md
        │   downloading-annotations.md
        │   getting_started.md
        │   interface.md
        │   models.md
        │   objects-sidebar.md
        │   projects.md
        │   search.md
        │   settings.md
        │   task-synchronization.md
        │   top-panel.md
        │   types-of-shapes.md
        │   vocabulary.md
        │   workspace.md
        │   _index.md
        │
        ├───advanced
        │   │   ai-tools.md
        │   │   analytics.md
        │   │   annotation-with-polylines.md
        │   │   annotation-with-rectangle-by-4-points.md
        │   │   annotation-with-tags.md
        │   │   attribute-annotation-mode-advanced.md
        │   │   automatic-annotation.md
        │   │   filter.md
        │   │   opencv-tools.md
        │   │   review.md
        │   │   shape-grouping.md
        │   │   shape-mode-advanced.md
        │   │   shortcuts.md
        │   │   track-mode-advanced.md
        │   │   _index.md
        │   │
        │   ├───annotation-with-cuboids
        │   │       creating-the-cuboid.md
        │   │       editing-the-cuboid.md
        │   │       _index.md
        │   │
        │   ├───annotation-with-points
        │   │       liner-interpolation-with-one-point.md
        │   │       points-in-shape-mode.md
        │   │       _index.md
        │   │
        │   └───annotation-with-polygons
        │           automatic-borders.md
        │           creating-mask.md
        │           edit-polygon.md
        │           manual-drawing.md
        │           track-mode-with-polygons.md
        │           _index.md
        │
        └───basics
                attribute-annotation-mode-basics.md
                basic-navigation.md
                shape-mode-basics.md
                track-mode-basics.md
                _index.md

How has this been tested?

Checklist

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.
  • I have updated the license header for each file (see an example below)
# Copyright (C) 2021 Intel Corporation
#
# SPDX-License-Identifier: MIT

@TOsmanov TOsmanov marked this pull request as ready for review March 31, 2021 06:10
@TOsmanov TOsmanov mentioned this pull request Mar 31, 2021
8 tasks
@coveralls
Copy link

coveralls commented Apr 13, 2021

Coverage Status

Coverage decreased (-0.04%) to 73.998% when pulling 9a3d902 on TOsmanov:website into 177120b on openvinotoolkit:develop.

@TOsmanov TOsmanov requested a review from zhiltsov-max as a code owner April 13, 2021 12:32
@TOsmanov
Copy link
Contributor Author

TOsmanov commented May 19, 2021

@TOsmanov , @azhavoro , I try to follow installation instructions here: https://github.com/openvinotoolkit/cvat/blob/7152e18fadb39e9b8173ad5fd73a6a5a5542bab1/site/README.md#start-site-localy. I see 404 error when I try to open http://localhost:1313/
@nmanovic

This is probably due to recent changes in the config.toml file. You need specify baseURL="/" in config.toml before generation.

@azhavoro
Copy link
Contributor

@TOsmanov , @azhavoro , I try to follow installation instructions here: https://github.com/openvinotoolkit/cvat/blob/7152e18fadb39e9b8173ad5fd73a6a5a5542bab1/site/README.md#start-site-localy. I see 404 error when I try to open http://localhost:1313/
@nmanovic

This is probably due to recent changes in the config.toml file. You need specify baseURL="/" in config.toml before generation.

@nmanovic does it solve the issue? If so, lets keep "/" as baseURL in the config and pass option for Hugo during build.

@nmanovic
Copy link
Contributor

@TOsmanov , why do we need so many favicons?

image

@nmanovic
Copy link
Contributor

@TOsmanov , should the actual icon be so small?

image

@TOsmanov
Copy link
Contributor Author

@TOsmanov , why do we need so many favicons?

image

@nmanovic

To generate favicons I used the site https://cthedot.de/icongen/ as described in the docsy manual. This number of files is needed to be displayed correctly on different devices and browsers.

Comment on lines +1 to +22
+++
title = "CVAT"
linkTitle = "CVAT"
+++

{{< blocks/section height="full" color="docs" >}}

<section id="temporary-page" class="mx-auto text-center py-5">
<div class="py-4">
<i class="fas fa-tools fa-7x"></i>
</div>
<div class="py-4">
<h1 class="text-center">This page is in development.</h1>
</div>
<div class="py-4">
<h3 class="text-center">
Visit our <a href="https://github.com/openvinotoolkit/cvat">GitHub</a> repository.
</h3>
</div>
</section>

{{< /blocks/section >}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest redirecting from this page to About page. I think it is a good candidate to be default page.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And add link to GitHub repository from the header

@nmanovic
Copy link
Contributor

@TOsmanov , @azhavoro , let's commit as is and fix other problems after that. Really huge PR and it blocks documentation development.

@nmanovic nmanovic merged commit 9615436 into cvat-ai:develop May 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants