Skip to content

Commit 3f518c3

Browse files
committed
Merge branch 'development' of https://github.com/cmu-delphi/signal_documentation into API-endpoints-#41
2 parents 5b9aeaf + 187b678 commit 3f518c3

File tree

138 files changed

+14084
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+14084
-189
lines changed

Pipfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ pyparsing = "*"
3232
pydot = "*"
3333
markdown = "*"
3434
drf-spectacular = "*"
35+
pyparsing = "*"
36+
pydot = "*"
37+
django-docs = "*"
38+
sphinxcontrib-django = "*"
39+
sphinx-rtd-theme = "*"
3540

3641
[dev-packages]
3742
flake8 = "*"

Pipfile.lock

Lines changed: 218 additions & 163 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ Changes of this sort should be carefully evaluated as they may require interacti
101101
## [Django admin](https://docs.djangoproject.com/en/4.1/ref/contrib/admin/) web interface (user should be `is_staff` or `is_superuser`)
102102
`http://localhost:8000/admin`
103103

104+
## Read the docs (Sphynx)
105+
`http://localhost:8000/<MAIN_PAGE>/docs/index.html`
106+
107+
104108

105109
## Import data from admin interface
106110

@@ -133,20 +137,20 @@ To import data from a CSV file must meet the requirements:
133137
* Colums should be saparateb by `","`
134138

135139
Othervice you will receive Errors during import process:
136-
![Import errors](./docs/image-3.png)
140+
![Import errors](./src/docs/source/_static/import_errors.png)
137141

138142

139143
1. Import `SourceSubdivision` instances with `SourceSubdivisionResource` - [http://localhost:8000/admin/datasources/sourcesubdivision/import/](http://localhost:8000/admin/datasources/sourcesubdivision/import/)
140-
![Import `SourceSubdivision` instances](./docs/image.png)
141-
![Confirm importing `SourceSubdivision` instances](./docs/image-1.png)
144+
![Import `SourceSubdivision` instances](./src/docs/source/_static/import_source_subdivision.png)
145+
![Confirm importing `SourceSubdivision` instances](./src/docs/source/_static/import_confirm_source_subdivision.png)
142146

143147
2. Import `Signal` instances with `SignalResource` - [http://localhost:8000/admin/signals/signal/import/](http://localhost:8000/admin/signals/signal/import/)
144-
![Import `Signal` instances](./docs/image-2.png)
145-
![Confirm importing `Signal` instances](./docs/image-4.png)
148+
![Import `Signal` instances](./src/docs/source/_static/import_signals.png)
149+
![Confirm importing `Signal` instances](./src/docs/source/_static/import_confirm_signals.png)
146150

147151
3. Import `Signal.base` fields with `SignalBaseResource` - [http://localhost:8000/admin/signals/signal/import/](http://localhost:8000/admin/signals/signal/import/)
148-
![Import `Signal.base` field](./docs/image-5.png)
149-
![Confirm importing `Signal.base` fields](./docs/image-6.png)
152+
![Import `Signal.base` field](./src/docs/source/_static/import_signals_base.png)
153+
![Confirm importing `Signal.base` fields](./src/docs/source/_static/import_confirm_signals_base.png)
150154

151155
## Deployment
152156

git

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.git

src/docs/Makefile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Minimal makefile for Sphinx documentation
2+
#
3+
4+
# You can set these variables from the command line, and also
5+
# from the environment for the first two.
6+
SPHINXOPTS ?=
7+
SPHINXBUILD ?= sphinx-build
8+
SOURCEDIR = source
9+
BUILDDIR = build
10+
11+
# Put it first so that "make" without argument is like "make help".
12+
help:
13+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
14+
15+
.PHONY: help Makefile
16+
17+
# Catch-all target: route all unknown targets to Sphinx using the new
18+
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
19+
%: Makefile
20+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

src/docs/build/doctrees/base.doctree

104 KB
Binary file not shown.
17.8 KB
Binary file not shown.
16.1 KB
Binary file not shown.
29.2 KB
Binary file not shown.
149 KB
Binary file not shown.

0 commit comments

Comments
 (0)