Skip to content

Commit 0f11250

Browse files
author
Mykhailo Istomin
committed
Merge branch 'development' of https://github.com/cmu-delphi/signal_documentation into change-requests-#25-#28-#30-#31
2 parents 8ad9be9 + 187b678 commit 0f11250

139 files changed

Lines changed: 14334 additions & 27 deletions

File tree

Some content is hidden

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

.env.example

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ CSRF_TRUSTED_ORIGINS='http://127.0.0.1:8000,http://localhost:8000'
1212
SECRET_KEY='secret_key'
1313
DEBUG='True'
1414

15+
# Sentry
16+
# Modify the Sentry config here. A DSN string is the minimum. Check the
17+
# application's Sentry init section and the Sentry documentation for the
18+
# defaults and options that may be set. If you don't want to use Sentry you can
19+
# leave this as is.
20+
#SENTRY_DSN=''
21+
1522
# Add the following to your local .env file. They will be used in the CI process
1623
# and you can largely forget about them, but including them in your .env file
1724
# will act like a safe default and help suppress warnings.

Pipfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ django-filter = "*"
99
django-extensions = "*"
1010
pillow = "*"
1111
pre-commit = "*"
12-
sentry-sdk = "*"
12+
'sentry-sdk[django]' = "*"
1313
python-dotenv = "*"
1414
django-health-check = "*"
1515
django-cors-headers = "*"
@@ -27,6 +27,11 @@ django-extensions-models = "*"
2727
mypy = "*"
2828
django-stubs = "*"
2929
tzdata = "*"
30+
pyparsing = "*"
31+
pydot = "*"
32+
django-docs = "*"
33+
sphinxcontrib-django = "*"
34+
sphinx-rtd-theme = "*"
3035

3136
[dev-packages]
3237
flake8 = "*"

Pipfile.lock

Lines changed: 452 additions & 3 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)
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.

0 commit comments

Comments
 (0)