From f07e58c6c3864805bb1e6b1faded1d522999c6be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 09:32:12 +0000 Subject: [PATCH 1/7] Bump bcrypt from 4.1.3 to 4.2.0 in /server Bumps [bcrypt](https://github.com/pyca/bcrypt) from 4.1.3 to 4.2.0. - [Changelog](https://github.com/pyca/bcrypt/blob/main/release.py) - [Commits](https://github.com/pyca/bcrypt/compare/4.1.3...4.2.0) --- updated-dependencies: - dependency-name: bcrypt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- server/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/requirements.txt b/server/requirements.txt index 3e8b964c..3af1b20a 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -5,6 +5,6 @@ python-dateutil==2.9.0.post0 pylint-ignore==2022.1025 marshmallow-sqlalchemy==0.30.0 tornado-prometheus==0.1.2 -bcrypt==4.1.3 +bcrypt==4.2.0 anytree==2.12.1 alembic==1.13.2 From d66a1315c297c56730ed50e2ded1196f43c227b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 09:36:30 +0000 Subject: [PATCH 2/7] Bump alembic from 1.13.2 to 1.13.3 in /server Bumps [alembic](https://github.com/sqlalchemy/alembic) from 1.13.2 to 1.13.3. - [Release notes](https://github.com/sqlalchemy/alembic/releases) - [Changelog](https://github.com/sqlalchemy/alembic/blob/main/CHANGES) - [Commits](https://github.com/sqlalchemy/alembic/commits) --- updated-dependencies: - dependency-name: alembic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- server/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/requirements.txt b/server/requirements.txt index 3af1b20a..ffd0192c 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -7,4 +7,4 @@ marshmallow-sqlalchemy==0.30.0 tornado-prometheus==0.1.2 bcrypt==4.2.0 anytree==2.12.1 -alembic==1.13.2 +alembic==1.13.3 From 123390f07ecb9aefe7ff3b5c61272b4caa823ad2 Mon Sep 17 00:00:00 2001 From: Jack Pollock Date: Sat, 23 Nov 2024 13:05:28 +0000 Subject: [PATCH 3/7] Add ID returns to API and update Docker Compose to build (#568) * Updated API to return ID values of created objects * Updated docker compose to build if no image found * Update shows API return --------- Co-authored-by: Tim Bradgate --- docker-compose.yaml | 3 +++ server/controllers/api/show/acts.py | 2 +- server/controllers/api/show/cast.py | 5 +++-- server/controllers/api/show/characters.py | 7 ++++--- server/controllers/api/show/cues.py | 7 ++++--- server/controllers/api/show/microphones.py | 7 ++++--- server/controllers/api/show/scenes.py | 2 +- server/controllers/api/show/script.py | 2 +- 8 files changed, 21 insertions(+), 14 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 881d23ed..23e4ebee 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,6 +3,9 @@ version: '3.9' services: server: image: digiscript:latest + build: + context: . + dockerfile: Dockerfile restart: always container_name: DS-Server environment: diff --git a/server/controllers/api/show/acts.py b/server/controllers/api/show/acts.py index c139d655..cb226175 100644 --- a/server/controllers/api/show/acts.py +++ b/server/controllers/api/show/acts.py @@ -67,7 +67,7 @@ async def post(self): session.commit() self.set_status(200) - await self.finish({'message': 'Successfully added act'}) + await self.finish({'id': new_act.id, 'message': 'Successfully added act'}) await self.application.ws_send_to_all('NOOP', 'GET_ACT_LIST', {}) else: diff --git a/server/controllers/api/show/cast.py b/server/controllers/api/show/cast.py index 583b733d..20b98458 100644 --- a/server/controllers/api/show/cast.py +++ b/server/controllers/api/show/cast.py @@ -51,11 +51,12 @@ async def post(self): await self.finish({'message': 'Last name missing'}) return - session.add(Cast(show_id=show.id, first_name=first_name, last_name=last_name)) + new_cast = Cast(show_id=show.id, first_name=first_name, last_name=last_name) + session.add(new_cast) session.commit() self.set_status(200) - await self.finish({'message': 'Successfully added cast member'}) + await self.finish({'id': new_cast.id, 'message': 'Successfully added cast member'}) await self.application.ws_send_to_all('GET_CAST_LIST', 'GET_CAST_LIST', {}) else: diff --git a/server/controllers/api/show/characters.py b/server/controllers/api/show/characters.py index 1b7eede2..ad5391fc 100644 --- a/server/controllers/api/show/characters.py +++ b/server/controllers/api/show/characters.py @@ -57,12 +57,13 @@ async def post(self): await self.finish({'message': '404 cast member found'}) return - session.add(Character(show_id=show.id, name=name, description=description, - played_by=played_by)) + new_character = Character(show_id=show.id, name=name, description=description, + played_by=played_by) + session.add(new_character) session.commit() self.set_status(200) - await self.finish({'message': 'Successfully added cast member'}) + await self.finish({'id': new_character.id, 'message': 'Successfully added cast member'}) await self.application.ws_send_to_all('NOOP', 'GET_CHARACTER_LIST', {}) else: diff --git a/server/controllers/api/show/cues.py b/server/controllers/api/show/cues.py index 245f2abc..532d2a25 100644 --- a/server/controllers/api/show/cues.py +++ b/server/controllers/api/show/cues.py @@ -58,15 +58,16 @@ async def post(self): await self.finish({'message': 'Colour missing'}) return - session.add(CueType( + new_cuetype = CueType( show_id=show_id, prefix=prefix, description=description, - colour=colour)) + colour=colour) + session.add(new_cuetype) session.commit() self.set_status(200) - await self.finish({'message': 'Successfully added cue type'}) + await self.finish({'id': new_cuetype.id, 'message': 'Successfully added cue type'}) await self.application.ws_send_to_all('NOOP', 'GET_CUE_TYPES', {}) else: diff --git a/server/controllers/api/show/microphones.py b/server/controllers/api/show/microphones.py index 1f62c22b..83f20225 100644 --- a/server/controllers/api/show/microphones.py +++ b/server/controllers/api/show/microphones.py @@ -60,14 +60,15 @@ async def post(self): description: str = data.get('description', None) - session.add(Microphone( + new_microphone = Microphone( show_id=show_id, name=name, - description=description)) + description=description) + session.add(new_microphone) session.commit() self.set_status(200) - await self.finish({'message': 'Successfully added microphone'}) + await self.finish({'id': new_microphone.id, 'message': 'Successfully added microphone'}) await self.application.ws_send_to_all('NOOP', 'GET_MICROPHONE_LIST', {}) else: diff --git a/server/controllers/api/show/scenes.py b/server/controllers/api/show/scenes.py index 3e467183..633f6bdb 100644 --- a/server/controllers/api/show/scenes.py +++ b/server/controllers/api/show/scenes.py @@ -84,7 +84,7 @@ async def post(self): session.commit() self.set_status(200) - await self.finish({'message': 'Successfully added scene'}) + await self.finish({'id': new_scene.id, 'message': 'Successfully added scene'}) await self.application.ws_send_to_all('NOOP', 'GET_SCENE_LIST', {}) diff --git a/server/controllers/api/show/script.py b/server/controllers/api/show/script.py index f06c2d26..1aeed387 100644 --- a/server/controllers/api/show/script.py +++ b/server/controllers/api/show/script.py @@ -134,7 +134,7 @@ async def post(self): session.commit() self.set_status(200) - await self.finish({'message': 'Successfully added script revision'}) + await self.finish({'id': new_rev.id, 'message': 'Successfully added script revision'}) await self.application.ws_send_to_all('NOOP', 'GET_SCRIPT_REVISIONS', {}) else: self.set_status(404) From 3202d5688d6cbd37ca93621a773ba113182ad1c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 09:48:12 +0000 Subject: [PATCH 4/7] Bump tornado from 6.4.1 to 6.4.2 in /server Bumps [tornado](https://github.com/tornadoweb/tornado) from 6.4.1 to 6.4.2. - [Changelog](https://github.com/tornadoweb/tornado/blob/v6.4.2/docs/releases.rst) - [Commits](https://github.com/tornadoweb/tornado/compare/v6.4.1...v6.4.2) --- updated-dependencies: - dependency-name: tornado dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- server/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/requirements.txt b/server/requirements.txt index ffd0192c..8f038a6d 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -1,4 +1,4 @@ -tornado==6.4.1 +tornado==6.4.2 tornado-sqlalchemy==0.7.0 datetime==4.9 python-dateutil==2.9.0.post0 From 235453654410ff14278e792e4a87d944a044295c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:41:44 +0000 Subject: [PATCH 5/7] Bump bcrypt from 4.2.0 to 4.2.1 in /server Bumps [bcrypt](https://github.com/pyca/bcrypt) from 4.2.0 to 4.2.1. - [Changelog](https://github.com/pyca/bcrypt/blob/main/release.py) - [Commits](https://github.com/pyca/bcrypt/compare/4.2.0...4.2.1) --- updated-dependencies: - dependency-name: bcrypt dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- server/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/requirements.txt b/server/requirements.txt index 8f038a6d..aaa1ab10 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -5,6 +5,6 @@ python-dateutil==2.9.0.post0 pylint-ignore==2022.1025 marshmallow-sqlalchemy==0.30.0 tornado-prometheus==0.1.2 -bcrypt==4.2.0 +bcrypt==4.2.1 anytree==2.12.1 alembic==1.13.3 From 90a18934f2fc6bf5514e407ab814cb62da08a68e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 13:12:24 +0000 Subject: [PATCH 6/7] Bump alembic from 1.13.3 to 1.14.0 in /server (#564) Bumps [alembic](https://github.com/sqlalchemy/alembic) from 1.13.3 to 1.14.0. - [Release notes](https://github.com/sqlalchemy/alembic/releases) - [Changelog](https://github.com/sqlalchemy/alembic/blob/main/CHANGES) - [Commits](https://github.com/sqlalchemy/alembic/commits) --- updated-dependencies: - dependency-name: alembic dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- server/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/requirements.txt b/server/requirements.txt index aaa1ab10..2bc48c66 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -7,4 +7,4 @@ marshmallow-sqlalchemy==0.30.0 tornado-prometheus==0.1.2 bcrypt==4.2.1 anytree==2.12.1 -alembic==1.13.3 +alembic==1.14.0 From ce8451f6d48328009893d6e3282f08b29a379829 Mon Sep 17 00:00:00 2001 From: Tim Bradgate Date: Sat, 23 Nov 2024 13:19:36 +0000 Subject: [PATCH 7/7] [Release] 0.8.1 --- .gitignore | 6 ++++-- client/package-lock.json | 4 ++-- client/package.json | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f4f2e8ad..08d3ce38 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ - # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +**/.DS_Store + +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # User-specific stuff @@ -12,7 +14,7 @@ .idea/**/aws.xml # Generated files -.idea/**/contentModel.xml +.idea/**/contentModel.xmlg # Sensitive or high-churn files .idea/**/dataSources/ diff --git a/client/package-lock.json b/client/package-lock.json index 3c987733..9fc04261 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "client", - "version": "0.8.0", + "version": "0.8.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "client", - "version": "0.8.0", + "version": "0.8.1", "dependencies": { "bootstrap": "4.6.2", "bootstrap-vue": "2.23.1", diff --git a/client/package.json b/client/package.json index 0ea2dd57..7ab74c4f 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "client", - "version": "0.8.0", + "version": "0.8.1", "private": true, "scripts": { "build": "vite build",