dev->main: Merge dynamic form changes back to main #54

twinkarma · 2025-01-14T10:49:21Z

I've changed quite a few things namely:

Removed the question and answer models
Added Survey and SurveyResponse models
Merged invitation app into the survey app

see #31 for full details

It's a can of worms for a Django app

https://www.digitalocean.com/community/tutorials/how-to-set-up-django-with-postgres-nginx-and-gunicorn-on-ubuntu

https://docs.djangoproject.com/en/5.1/howto/static-files/#deployment

https://docs.djangoproject.com/en/5.1/ref/settings/#databases

https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_set_header

It's obtained in settings.py by default

fix: Remove redundant login_url from views

Require Psycopg 3

feat: Add drag drop field re-ordering

fix: Change default question settings and minor ui fixes

UI/icons consistent

UI/navbar

- Add evidence gathering and improvement plan views with endpoints - Add quill text editor in the evidence gathering view, show example of what the page might look like - Add an example improvement plan table to the improvement plan view

…plan feat: add placeholder for evidence and improvement pages

Add nginx systemd logs command

twinkarma and others added 30 commits December 3, 2024 15:08

feat: add dynamic form generation

fff075d

Add deployment script

d0fb23f

Fix syntax error

aa78a03

Add shell and systemd linting

0d7fd29

Add gunicorn systemd service

4476fd6

Don't use pyproject.toml

d75a0f4

It's a can of worms for a Django app

Install Gunicorn socket

a84d3f9

-

df44486

Fix SORT module name

249c5d8

Configure NGINX proxy pass

3ac712f

-

e2ca956

Fix nginx linter path

d363d54

Fix indent

83cb30f

Reload services on deploy

4398da4

Revert Gunicorn socket path

6251386

Add ALLOWED_HOSTS env var

b2dc7cb

Add deployment auto check workflow

2e45292

Install Django package

7dbc1f7

Install dotenv

3cac085

Serve static files

9f87479

https://www.digitalocean.com/community/tutorials/how-to-set-up-django-with-postgres-nginx-and-gunicorn-on-ubuntu

Remove spoof check

bcbfeeb

Collect static files

3479a76

https://docs.djangoproject.com/en/5.1/howto/static-files/#deployment

Collect static files on service start

bc9ecc8

Install static files in deployment script

b4b7099

Start working on PostgreSQL installation

a557a3e

Configure database using env vars

813669b

https://docs.djangoproject.com/en/5.1/ref/settings/#databases

Forward HTTP host to proxy

68b147f

https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_set_header

Update deployment docs

e74e8d9

Create UTF-8 en_GB database localisation

4a4b8b2

Ensure gunicorn is started

19af2be

rosannamilner added 7 commits February 11, 2025 10:12

added header.html and moved navitems to base_*.html

7af8446

added fix

f2fd1c3

Merge remote-tracking branch 'origin/dev' into ui/icons-consistent

343582a

added delete icons and icons to base_*.html

a956913

added logout as button back in

4a537d0

add logout button

55cab53

added icons to search bar

73b747b

twinkarma marked this pull request as ready for review February 11, 2025 16:58

twinkarma and others added 22 commits February 11, 2025 17:06

fix: Remove redundant login_url from views

0ec4efd

It's obtained in settings.py by default

Merge pull request #123 from RSE-Sheffield/fix/login-url-redundancy

675b1e6

fix: Remove redundant login_url from views

Merge branch 'dev' into chore/psycopg3

92794ba

Update requirements.txt

c3cde29

Merge pull request #67 from RSE-Sheffield/chore/psycopg3

bb97a86

Require Psycopg 3

Update base_anonymous.html

d1d9dd0

Update base_anonymous.html

1bd349e

Update base_anonymous.html

66936fd

fix: Change default question settings and minor ui fixes

163f731

added more url paths to hover

3862aae

feat: Add drag drop field re-ordering

e636442

Merge pull request #119 from RSE-Sheffield/feat/survey-item-drag-reorder

9d6e696

feat: Add drag drop field re-ordering

added icons for survey

42c81bf

Merge pull request #128 from RSE-Sheffield/fix/default-survey-questions

9f73a8e

fix: Change default question settings and minor ui fixes

Merge branch 'dev' into ui/icons-consistent

6a4635e

Merge pull request #99 from RSE-Sheffield/ui/icons-consistent

8e9a571

UI/icons consistent

Merge branch 'dev' into ui/navbar

7395dde

Merge pull request #115 from RSE-Sheffield/ui/navbar

43891ea

UI/navbar

feat: Export survey responses to csv

31d396a

Merge pull request #132 from RSE-Sheffield/feat/evidence-improvement-…

73d8d25

…plan feat: add placeholder for evidence and improvement pages

Merge pull request #116 from RSE-Sheffield/docs/nginx-journalctl

f595f36

Add nginx systemd logs command

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dev->main: Merge dynamic form changes back to main #54

dev->main: Merge dynamic form changes back to main #54

twinkarma commented Jan 14, 2025

dev->main: Merge dynamic form changes back to main #54

Are you sure you want to change the base?

dev->main: Merge dynamic form changes back to main #54

Conversation

twinkarma commented Jan 14, 2025