From 34d0d49d938d784a5c009a4e14732ba0f9023214 Mon Sep 17 00:00:00 2001 From: Kacper Prywata Date: Thu, 13 Jun 2024 13:27:07 +0100 Subject: [PATCH 1/3] Updated the readme --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 4cccefc..675440f 100644 --- a/README.md +++ b/README.md @@ -47,10 +47,10 @@ below command to the .zshrc (if using a z shell) or .inputrc or .profile or .bas eval "$(pyenv init -)" ``` -- **`pyenv --version`** # check whether pyenv is installed -- **`brew install pyenv`** # install pyenv with brew -- **`pyenv install 3.X.Y`** # the app needs python 3.9 -- **`pyenv local 3.x.y`** # whenever you come to this directory this python will be used +- **`pyenv --version`** # check whether pyenv is installed +- **`brew install pyenv`** # install pyenv with brew +- **`pyenv install 3.X.Y`** # the app needs python 3.9 +- **`pyenv local 3.x.y`** # whenever you come to this directory this python will be used pyenv local will create a **.python-version** file so that whenever you return to the directory your python env is set. Note that this has been put into `.gitignore` @@ -60,8 +60,8 @@ Note that this has been put into `.gitignore` As this project maintains a pip file you can ascertain validity by running **`pipenv check`** - whenever Python is upgraded the Pipfile change is all that is required. To ensure you are in sync use -- **`pipenv check`** # check whether the environments match -- **`pipenv --rm`** # if the check fails remove the current environment +- **`pipenv check`** # check whether the environments match +- **`pipenv --rm`** # if the check fails remove the current environment ## Setup Based on python 3.X.Y @@ -123,14 +123,14 @@ Development using this repo can be done by doing the following: ### pgAdmin 4 1. Start all the services `make up` -2. Navigate to `localhost:80` in your browser +2. Navigate to `localhost:81` in your browser 3. Login with `ons@ons.gov` / `secret` 4. Object -> Create -> Server... 5. Give it a suitable name then in the connection tab: - 1. `postgres` for the host name - 1. `5432` for the port - 1. `postgres` for the maintenance database - 1. `postgres` for the username + 1. `postgres` for the host name + 1. `5432` for the port + 1. `postgres` for the maintenance database + 1. `appuser` for the username 6. Click save to close the dialog and connect to the postgres docker container ## Troubleshooting From 2f594c609a33430ae4e99bcc95346a334ddcbb07 Mon Sep 17 00:00:00 2001 From: Kacper Prywata Date: Mon, 17 Jun 2024 17:19:51 +0100 Subject: [PATCH 2/3] Fixed --- README.md | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 675440f..9e02905 100644 --- a/README.md +++ b/README.md @@ -125,13 +125,19 @@ Development using this repo can be done by doing the following: 1. Start all the services `make up` 2. Navigate to `localhost:81` in your browser 3. Login with `ons@ons.gov` / `secret` -4. Object -> Create -> Server... -5. Give it a suitable name then in the connection tab: - 1. `postgres` for the host name - 1. `5432` for the port - 1. `postgres` for the maintenance database - 1. `appuser` for the username -6. Click save to close the dialog and connect to the postgres docker container +4. Object -> Register -> Server... +5. Give it a suitable name in the `General` tab +6. Then in the `Connection` tab set: + + | | | + | --------------------- | ---------- | + | Host name/ address: | `postgres | + | Port: | `5432` | + | Maintenance database: | `postgres` | + | Username: | `appuser` | + | Password: | `postgres` | + +7. Click save to close the dialog and connect to the postgres docker container ## Troubleshooting From 1240869261eb005524f64817bba72f8d9370b1f4 Mon Sep 17 00:00:00 2001 From: kacperpONS <113175775+kacperpONS@users.noreply.github.com> Date: Tue, 18 Jun 2024 09:07:44 +0100 Subject: [PATCH 3/3] Fixed 2.0 Co-authored-by: Daniel Banks_ONS --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9e02905..0485116 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ Development using this repo can be done by doing the following: | | | | --------------------- | ---------- | - | Host name/ address: | `postgres | + | Host name/ address: | `postgres` | | Port: | `5432` | | Maintenance database: | `postgres` | | Username: | `appuser` |