Skip to content

Commit

Permalink
Merge pull request #420 from NASA-AMMOS/docs/aerie-2186--update-docs-toc
Browse files Browse the repository at this point in the history
[Aerie 2186]  Update Website Layout
  • Loading branch information
Mythicaeda authored Nov 4, 2022
2 parents 355f98d + ac12ef5 commit 41c6657
Show file tree
Hide file tree
Showing 201 changed files with 3,618 additions and 90 deletions.
5 changes: 2 additions & 3 deletions docs/buildExternalDocs.bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
# Build the EDSL documentation and insert it into the current build directory
../gradlew publishDocs -p ../

ls -1 ../merlin-server/constraints-dsl-compiler/build/
pwd
ls -1 ./source

mkdir -p ./source/constraints-edsl-api
cp -a ../merlin-server/constraints-dsl-compiler/build/docs/. ./source/constraints-edsl-api
Expand All @@ -20,6 +17,8 @@ rm -rf ./source/scheduling-edsl-api/*/Constraint_eDSL.*
# Remove the extra navigation bar from the generated Constraints EDSL files
tail -n +3 "./source/constraints-edsl-api/README.md" > "./source/constraints-edsl-api/README.tmp" && mv "./source/constraints-edsl-api/README.tmp" "./source/constraints-edsl-api/README.md"
sed -i -e 's/README/index/g' ./source/constraints-edsl-api/README.md
# Remove the word 'Documentation' in the title
sed -i -e 's/Documentation//' ./source/constraints-edsl-api/README.md

for file in ./source/constraints-edsl-api/classes/*.md
do
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 17 additions & 0 deletions docs/old_site/contribute/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
==========
Contribute
==========

.. toctree::
:hidden:

Contribute to the Source Code <https://github.com/NASA-AMMOS/aerie/blob/develop/CONTRIBUTING.md>
Contribute to the documentation <contribute-docs>
Source Code <https://github.com/NASA-AMMOS/aerie>

We are always looking for those who want to help and appreciate any contribution we can get.

There are two ways to contribute to Aerie :

* `Contribute to the Source Code <https://github.com/NASA-AMMOS/aerie/blob/develop/CONTRIBUTING.md>`_ - over on our GitHub.
* :doc:`Contribute to the documentation <contribute-docs>` - by writing new or changing existing Documentation.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
122 changes: 122 additions & 0 deletions docs/old_site/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
:orphan:
:full-width:
.. .:. landing:
:hide-sidebar:
:hide-secondary-sidebar:
:hide-version-warning:
:hide-pre-content:
:hide-post-content:


.. title:: Aerie Documentation

.. hero-box::
:title: Welcome to the Aerie Documentation

.. raw:: html

<div class="landing__content">

.. raw:: html

<div class="topics-grid grid-container full">

<div class="grid-x grid-margin-x">

.. topic-box::
:title: Mission Modeling
:link: mission-modeling
:icon: scylla-icon scylla-icon--networking
:class: large-6
:anchor: Learn more

Develop a mission model to support simulation and mission planning.

.. topic-box::
:title: Creating & Simulating Activity Plans
:link: activity-plans
:icon: scylla-icon scylla-icon--benchmarks
:class: large-6
:anchor: Learn more

Create activity plans, configure simulations, and populate a plan with automated scheduling.

.. topic-box::
:title: Command Expansion
:link: command-expansion
:icon: scylla-icon scylla-icon--apps
:class: large-6
:anchor: Learn more

Author command expansion logic and link activities to their command expansions.

.. topic-box::
:title: User Interface
:link: user-interface
:icon: scylla-icon scylla-icon--architecture
:class: large-6
:anchor: Learn more

The client application and API guide.

.. topic-box::
:title: Constraints EDSL APIs
:link: constraints-edsl-api
:icon: scylla-icon scylla-icon--about-team
:class: large-6
:anchor: Learn more

Constraints EDSL APIs for defining constraints on activity plans.

.. topic-box::
:title: Scheduling EDSL APIs
:link: scheduling-edsl-api
:icon: scylla-icon scylla-icon--about-team
:class: large-6
:anchor: Learn more

Scheduling EDSL APIs for defining scheduling rules.

.. topic-box::
:title: Deployment
:link: deployment
:icon: scylla-icon scylla-icon--cloud
:class: large-6
:anchor: Learn more

Deploy Aerie for individual users, small and large missions.

.. topic-box::
:title: Contribute
:link: contribute
:icon: scylla-icon scylla-icon--about-team
:class: large-6
:anchor: Learn more

Get setup for development as a contributor to the Aerie project.

.. raw:: html

</div></div>

.. raw:: html

</div>

.. toctree::
:hidden:
:includehidden:

activity-plans/index
aerie-glossary
command-expansion/index
constraints/index
contribute/index
deployment/index
graphql-api/index
mission-modeling/index
upgrade-guides/index
user-interface/index
constraints-edsl-api/index
scheduling-edsl-api/index
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
18 changes: 9 additions & 9 deletions docs/poetry.lock

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

2 changes: 1 addition & 1 deletion docs/source/aerie-glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

**Cell**: allows a mission model to express **time-dependent state** in a way that can be tracked and managed by the host system.

**Constraint**: an expression built up with the [Aerie constraints eDSL](./constraints/overview.md), which evaluates to a set of windows during which the condition(s) defined by the expression is true or false.
**Constraint**: an expression built up with the [Aerie constraints eDSL](./user-guide/ui-api-guide/constraints/index.rst), which evaluates to a set of windows during which the condition(s) defined by the expression is true or false.

**Decomposition**:
A method for modeling the behavior of an activity (root activity) by composing a set of activities. Each composed activity describes some smaller aspect of behavior. The root activity orchestrates the execution of each child activity by interleaving function calls to `spawn()`, `delay()`, and `call()`. The goal of decomposition is to allow mission modelers to modularize their activity modeling code and to provide greater visibility into the simulated behavior of an activity. For example, consider an activity which models taking an observation with a particular spacecraft instrument. The process of taking an observation may include the distinct phases of instrument startup, take observation, and instrument shutdown. The mission modeler can decide to modularize their modeling and use decomposition to model each of the three phases separately and then compose them with a root activity called "observation" which orchestrates the execution of each of the three activities.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

# List of substitutions
rst_prolog = """
.. |rst| replace:: restructuredText
.. |rst| replace:: reStructuredText
"""
# -- Options for not found extension ---------------------------------------

Expand Down
5 changes: 5 additions & 0 deletions docs/source/contact.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
:orphan:

==========
Contact Us
==========
66 changes: 66 additions & 0 deletions docs/source/contribute/documentation/docs-pr.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
========================
Issues and Pull Requests
========================

Any documentation contribution, no matter how small, is made as a pull request (PR) on `our GitHub <https://github.com/NASA-AMMOS/aerie>`_.
You can use a client, the Web UI, or the command line to manage your PRs.

Issue assignment
================

The Aerie repository has `an issues page on GitHub <https://github.com/NASA-AMMOS/aerie/issues>`_.
Doc issues are labeled with a ``documentation`` label.
Please do not work on issues that are not assigned to you.
This avoids working on something someone else is working on.
Also, if there is an issue with any guide and the issue does not exist, please create an issue so it can be tracked.

Guidelines for branch names
===========================

If you are providing documentation alongside new code, prefix the name of your branch with ``feature/AERIE-[Issue Number]--``.

If you are only providing documentation, prefix the name of your branch with ``docs/AERIE-[Issue Number]--``.


Previewing local changes
========================

Before submitting docs changes, we ask that you build them first locally. To do so, you will need:

* `Python 3.7 <https://www.python.org/downloads/>`_ or later.
* `Poetry 1.12 <https://python-poetry.org/docs/master/>`_ or later.

To preview your changes while you are working, run ``make preview`` from the command line in the ``docs`` directory.
If you have previously run ``make preview``, it is recommended to run ``make clean`` first. Navigate to http://127.0.0.1:5500/.
The site will automatically update as you work. Fix all warnings raised during the build.

When you are finished making changes, run ``make clean`` and then ``make dirhtml-ext`` to ensure that the site will deploy.
Once the site builds successfully without warnings, you may proceed to the next step.

To check for broken links, run ``make clean && make dirhtml-ext`` then ``make linkcheck``.
Once ``make linkcheck`` builds with the only broken links being those that reference ``localhost`` sites, you may proceed to open a PR.


Submit a pull request (PR)
==========================

We expect that you are aware of how to submit a PR to GitHub. If you are not, please look at this `tutorial <https://docs.github.com/en/get-started/quickstart/hello-world>`_.
When creating a PR, fill out the provided template.

For Documentation PRs, the following guidelines apply:

* Test the instructions against the product. For all tests you must use a clean, new install unless otherwise specified in the issue.
* Make sure the PR renders with no errors and that make preview does not return any errors.
* Cite the issue you are fixing in the PR comments and use screenshots to show changes in formatting.
* In the subject line of the PR prepend the subject with ``[Aerie Issue Number]``.
* Apply the ``documentation`` label to your PR.

If you have any questions about the process, ask the maintainer of the project you're working on.

Best practices for content submission
=====================================

* Always open an issue describing what you want to work on if one doesn't already exist.
* Use GitHub search to see if there is someone else working on the issue already. Look at the open PRs.
* Test the new / changed content using the make preview script. Confirm there are no compilation errors before submitting.
* Give some text to your commit message. Explain why you did what you did. If you changed something in formatting, provide a before and after screenshot.
61 changes: 61 additions & 0 deletions docs/source/contribute/documentation/examples/admonitions.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
Admonitions
===========

At Scylla, we limit the admonitions. Although |rst| will allow for more, use the following:

* Note_
* Caution_
* Warning_
* Tip_

Note
----

Use a note to point out something to the reader. This action does not have any risk.

.. code-block:: rst
.. note:: text follows here
Renders as:

.. note:: text follows here

Caution
-------

Use caution if there is any potential risk to data loss or lower performance.

.. code-block:: rst
.. caution:: look out
Renders as

.. caution:: look out

Warning
-------

Use warning if there is any potential risk to total data loss or physical danger.

.. code-block:: rst
.. warning:: take care
Renders as:

.. warning:: take care

Tip
---

This is a time-saving or performance enhancing option.

.. code-block:: rst
.. tip:: here's a tip
Renders as:

.. tip:: here's a tip
Loading

0 comments on commit 41c6657

Please sign in to comment.