Skip to content

Commit a7daa42

Browse files
4lmpaulapreuss
authored andcommitted
Run pre-commit on all files
1 parent cd624d6 commit a7daa42

133 files changed

Lines changed: 249 additions & 270 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.

.envs/db.mysql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ MYSQL_DATABASE=dummy_db
22
MYSQL_USER=dummy_user
33
MYSQL_PASSWORD=dummy_pw
44
MYSQL_ROOT_PASSWORD=dummy_root_pw
5-
MYSQL_TCP_PORT=3306
5+
MYSQL_TCP_PORT=3306

.envs/db.postgres

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
POSTGRES_HOST=postgres
22
POSTGRES_DB=dummy_db
33
POSTGRES_USER=dummy_user
4-
POSTGRES_PASSWORD=dummy_pw
4+
POSTGRES_PASSWORD=dummy_pw

.envs/epa.mysql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ SQL_USER=dummy_user
1313
SQL_PASSWORD=dummy_pw
1414
SQL_HOST=db
1515
SQL_PORT=3306
16-
DATABASE=mysql
16+
DATABASE=mysql

.envs/epa.postgres

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ SQL_USER=dummy_user
1414
SQL_PASSWORD=dummy_pw
1515
SQL_HOST=db_pg
1616
SQL_PORT=5432
17-
DATABASE=postgres
17+
DATABASE=postgres

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,25 @@ DEBUG=(True|False)
4444
## Deploy using Docker Compose
4545
The following commands should get everything up and running, using the web based version of the MVS API.
4646

47-
You need to be able to run docker-compose inside your terminal. If you can't you should install [Docker desktop](https://www.docker.com/products/docker-desktop/) first.
47+
You need to be able to run docker-compose inside your terminal. If you can't you should install [Docker desktop](https://www.docker.com/products/docker-desktop/) first.
4848

4949

5050
* Clone the repository locally `git clone --single-branch --branch main https://github.com/open-plan-tool/gui.git open_plan_gui`
5151
* Move inside the created folder (`cd open_plan_gui`)
5252
* Edit the `.envs/epa.postgres` and `.envs/db.postgres` environment files
5353
* Change the value assigned to `EPA_SECRET_KEY` with a [randomly generated one](https://randomkeygen.com/)
5454
* Make sure to replace dummy names with you preferred names
55-
* The value assigned to the variables `POSTGRES_DB`, `POSTGRES_USER`, `POSTGRES_PASSWORD` in `.envs/db.postgres` should match the ones of
55+
* The value assigned to the variables `POSTGRES_DB`, `POSTGRES_USER`, `POSTGRES_PASSWORD` in `.envs/db.postgres` should match the ones of
5656
the variables `SQL_DATABASE`, `SQL_USER`, `SQL_PASSWORD` in `.envs/epa.postgres`, respectively
5757

58-
* Define an environment variable `MVS_HOST_API` in `.envs/epa.postgres` and set the url of the simulation server
58+
* Define an environment variable `MVS_HOST_API` in `.envs/epa.postgres` and set the url of the simulation server
5959
you wish to use for your models (for example `MVS_API_HOST="<url to your favorite simulation server>"`), you can deploy your own [simulation server](https://github.com/open-plan-tool/simulation-server) locally if you need
6060

6161
* Assign the domain of your website (without `http://` or `https://`) to `TRUSTED_HOST` , see https://docs.djangoproject.com/en/4.2/ref/settings/#csrf-trusted-origins for more information
6262

6363
Next you can either provide the following commands inside a terminal (with ubuntu you might have to prepend `sudo`)
6464
* `docker-compose --file=docker-compose-postgres.yml up -d --build` (you can replace `postgres` by `mysql` if you want to use mysql)
65-
* `docker-compose --file=docker-compose-postgres.yml exec -u root app_pg sh initial_setup.sh` (this will also load a default testUser account with sample scenario).
65+
* `docker-compose --file=docker-compose-postgres.yml exec -u root app_pg sh initial_setup.sh` (this will also load a default testUser account with sample scenario).
6666

6767
Or you can run a python script with the following command
6868
* `python deploy.py -db postgres`
@@ -72,7 +72,7 @@ Finally
7272
* You can then login with `testUser` and `ASas12,.` or create your own account
7373

7474
### Proxy settings (optional)
75-
If you use a proxy you will need to set `USE_PROXY=True` and edit `PROXY_ADDRESS=http://proxy_address:port` with your proxy settings in `.envs/epa.postgres`.
75+
If you use a proxy you will need to set `USE_PROXY=True` and edit `PROXY_ADDRESS=http://proxy_address:port` with your proxy settings in `.envs/epa.postgres`.
7676

7777
>**_NOTE:_** If you wish to use mysql instead of postgres, simply replace `postgres` by `mysql` and `app_pg` by `app` in the above commands or filenames
7878
<hr>
@@ -89,7 +89,7 @@ If you use a proxy you will need to set `USE_PROXY=True` and edit `PROXY_ADDRESS
8989
9090
## Tear down (uninstall) docker containers
9191
To remove the application (including relevant images, volumes etc.), one can use the following commands in terminal:
92-
92+
9393
`docker-compose down --file=docker-compose-postgres.yml -v`
9494

9595
you can add `--rmi local` if you wish to also remove the images (this will take you a long time to rebuild the docker containers from scratch if you want to redeploy the app later then)

app/.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ webpack.config.js
2626
# !users/**
2727
# !epa.env
2828
# !manage.py
29-
# !setup.sh
29+
# !setup.sh

app/dev_setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ export EXCHANGE_ACCOUNT="dummy@rl-institut.de"
1010
export EXCHANGE_PW="dummy"
1111
export EXCHANGE_EMAIL="dummy@rl-institut.de"
1212
export EXCHANGE_SERVER="dummy"
13-
export RECIPIENTS="dummy@b.de,dummy@a.com"
13+
export RECIPIENTS="dummy@b.de,dummy@a.com"

app/djangoq_setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/local/bin/python
22
python manage.py collectstatic && \
3-
python manage.py qcluster
3+
python manage.py qcluster

app/fixtures/test_users.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@
3535
"user_permissions": []
3636
}
3737
}
38-
]
38+
]

app/fixtures/two_scenarios_fixture.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)