House keeping (#345)

* Upgrade to Node v18.13 * Bump sass from 1.57.1 to 1.58.0 in /client Bumps [sass](https://github.com/sass/dart-sass) from 1.57.1 to 1.58.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](sass/dart-sass@1.57.1...1.58.0) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Server package refactor (#310) * Server package refactoring * Fix pep errors * Update pylint ignore file based on current code * Use npm@8 in Github actions * Bump tornado from 6.2 to 6.3 in /server Bumps [tornado](https://github.com/tornadoweb/tornado) from 6.2 to 6.3. - [Release notes](https://github.com/tornadoweb/tornado/releases) - [Changelog](https://github.com/tornadoweb/tornado/blob/master/docs/releases.rst) - [Commits](tornadoweb/tornado@v6.2.0...v6.3.0) --- updated-dependencies: - dependency-name: tornado dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update dependabot.yml * Update dependabot.yml --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dreamteamprod · Apr 20, 2023 · 1aa7978 · 1aa7978
1 parent 903bd03
commit 1aa7978
Show file tree

Hide file tree

Showing 30 changed files with 127 additions and 366 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -18,3 +18,19 @@ updates:
         update-types: ["version-update:semver-major"]
     versioning-strategy: increase
     target-branch: dev
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
+    target-branch: dev
+  - package-ecosystem: "github-actions"
+    directory: "/.github"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
+    target-branch: dev
diff --git a/.github/workflows/nodelint.yml b/.github/workflows/nodelint.yml
@@ -12,6 +12,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 18
+    - run: npm install -g npm@8
     - run: npm ci
     - run: npm run ci-lint
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.15-buster AS node_build
+FROM node:18.13.0-buster AS node_build
 RUN npm install npm@8 -g
 
 COPY /server /server

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ A digital script project for cueing theatrical shows
 
 ### Requirements
 
-* Node v16.15.x (npm 8.11.x)
+* Node v18.13.x (npm 8.11.x)
 * Python 3.10.x
 
 ### Client

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -9,7 +9,7 @@
   },
   "engines": {
     "npm": ">=8.0.0 <9.0.0",
-    "node": ">=16.0.0 <17.0.0"
+    "node": ">=18.13.0"
   },
   "dependencies": {
     "bootstrap": "4.6.2",
@@ -43,7 +43,7 @@
     "eslint-plugin-vue": "9.9.0",
     "eslint-plugin-vuejs-accessibility": "1.2.0",
     "node-sass": "7.0.3",
-    "sass": "1.57.1",
+    "sass": "1.58.0",
     "sass-loader": "13.2.0",
     "webpack": "5.75.0"
   },

diff --git a/server/controllers/api/settings.py b/server/controllers/api/settings.py
@@ -1,13 +1,13 @@
 from tornado import escape
 
-from utils.base_controller import BaseAPIController
-from utils.logger import get_logger
-from utils.route import ApiRoute, ApiVersion
-from utils.settings import Settings
-from utils.web_decorators import no_live_session
+from digi_server.logger import get_logger
+from digi_server.settings import Settings
+from utils.web.base_controller import BaseAPIController
+from utils.web.route import ApiRoute, ApiVersion
+from utils.web.web_decorators import no_live_session
 
 
-@ApiRoute('settings', ApiVersion.v1)
+@ApiRoute('settings', ApiVersion.V1)
 class SettingsController(BaseAPIController):
     async def get(self):
         settings: Settings = self.application.digi_settings
@@ -34,7 +34,7 @@ async def patch(self):
         self.write({'message': 'Settings updated'})
 
 
-@ApiRoute('settings/raw', ApiVersion.v1)
+@ApiRoute('settings/raw', ApiVersion.V1)
 class RawSettingsController(BaseAPIController):
     async def get(self):
         settings: Settings = self.application.digi_settings

diff --git a/server/controllers/api/show/acts.py b/server/controllers/api/show/acts.py
@@ -2,12 +2,12 @@
 
 from models.show import Show, Act, Scene
 from schemas.schemas import ActSchema
-from utils.base_controller import BaseAPIController
-from utils.web_decorators import requires_show, no_live_session
-from utils.route import ApiRoute, ApiVersion
+from utils.web.base_controller import BaseAPIController
+from utils.web.web_decorators import requires_show, no_live_session
+from utils.web.route import ApiRoute, ApiVersion
 
 
-@ApiRoute('show/act', ApiVersion.v1)
+@ApiRoute('show/act', ApiVersion.V1)
 class ActController(BaseAPIController):
 
     @requires_show
@@ -188,7 +188,7 @@ async def delete(self):
                 await self.finish({'message': '404 show not found'})
 
 
-@ApiRoute('show/act/first_scene', ApiVersion.v1)
+@ApiRoute('show/act/first_scene', ApiVersion.V1)
 class FirstSceneController(BaseAPIController):
 
     @requires_show

diff --git a/server/controllers/api/show/cast.py b/server/controllers/api/show/cast.py
@@ -2,12 +2,12 @@
 
 from models.show import Show, Cast
 from schemas.schemas import CastSchema
-from utils.base_controller import BaseAPIController
-from utils.web_decorators import requires_show, no_live_session
-from utils.route import ApiRoute, ApiVersion
+from utils.web.base_controller import BaseAPIController
+from utils.web.web_decorators import requires_show, no_live_session
+from utils.web.route import ApiRoute, ApiVersion
 
 
-@ApiRoute('show/cast', ApiVersion.v1)
+@ApiRoute('show/cast', ApiVersion.V1)
 class CastController(BaseAPIController):
 
     @requires_show

diff --git a/server/controllers/api/show/characters.py b/server/controllers/api/show/characters.py
@@ -2,12 +2,12 @@
 
 from models.show import Show, Cast, Character, CharacterGroup
 from schemas.schemas import CharacterSchema, CharacterGroupSchema
-from utils.base_controller import BaseAPIController
-from utils.web_decorators import requires_show, no_live_session
-from utils.route import ApiRoute, ApiVersion
+from utils.web.base_controller import BaseAPIController
+from utils.web.web_decorators import requires_show, no_live_session
+from utils.web.route import ApiRoute, ApiVersion
 
 
-@ApiRoute('show/character', ApiVersion.v1)
+@ApiRoute('show/character', ApiVersion.V1)
 class CharacterController(BaseAPIController):
 
     @requires_show
@@ -150,7 +150,7 @@ async def delete(self):
                 await self.finish({'message': '404 show not found'})
 
 
-@ApiRoute('show/character/group', ApiVersion.v1)
+@ApiRoute('show/character/group', ApiVersion.V1)
 class CharacterGroupController(BaseAPIController):
 
     @requires_show

diff --git a/server/controllers/api/show/cues.py b/server/controllers/api/show/cues.py
@@ -7,12 +7,12 @@
 from models.script import ScriptRevision, Script
 from models.show import Show
 from schemas.schemas import CueTypeSchema, CueSchema
-from utils.base_controller import BaseAPIController
-from utils.web_decorators import requires_show, no_live_session
-from utils.route import ApiRoute, ApiVersion
+from utils.web.base_controller import BaseAPIController
+from utils.web.web_decorators import requires_show, no_live_session
+from utils.web.route import ApiRoute, ApiVersion
 
 
-@ApiRoute('show/cues/types', ApiVersion.v1)
+@ApiRoute('show/cues/types', ApiVersion.V1)
 class CueTypesController(BaseAPIController):
 
     @requires_show
@@ -155,7 +155,7 @@ async def delete(self):
                 await self.finish({'message': '404 show not found'})
 
 
-@ApiRoute('show/cues', ApiVersion.v1)
+@ApiRoute('show/cues', ApiVersion.V1)
 class CueController(BaseAPIController):
 
     @requires_show

diff --git a/server/controllers/api/show/scenes.py b/server/controllers/api/show/scenes.py
@@ -2,12 +2,12 @@
 
 from models.show import Show, Scene
 from schemas.schemas import SceneSchema
-from utils.base_controller import BaseAPIController
-from utils.web_decorators import requires_show, no_live_session
-from utils.route import ApiRoute, ApiVersion
+from utils.web.base_controller import BaseAPIController
+from utils.web.web_decorators import requires_show, no_live_session
+from utils.web.route import ApiRoute, ApiVersion
 
 
-@ApiRoute('show/scene', ApiVersion.v1)
+@ApiRoute('show/scene', ApiVersion.V1)
 class SceneController(BaseAPIController):
 
     @requires_show

diff --git a/server/controllers/api/show/script.py b/server/controllers/api/show/script.py
@@ -10,12 +10,12 @@
 from models.show import Show
 from models.session import Session
 from schemas.schemas import ScriptRevisionsSchema, ScriptLineSchema
-from utils.base_controller import BaseAPIController
-from utils.web_decorators import requires_show, no_live_session
-from utils.route import ApiRoute, ApiVersion
+from utils.web.base_controller import BaseAPIController
+from utils.web.web_decorators import requires_show, no_live_session
+from utils.web.route import ApiRoute, ApiVersion
 
 
-@ApiRoute('show/script/config', ApiVersion.v1)
+@ApiRoute('show/script/config', ApiVersion.V1)
 class ScriptStatusController(BaseAPIController):
     def get(self):
         with self.make_session() as session:
@@ -34,7 +34,7 @@ def get(self):
             self.finish(data)
 
 
-@ApiRoute('show/script/revisions', ApiVersion.v1)
+@ApiRoute('show/script/revisions', ApiVersion.V1)
 class ScriptRevisionsController(BaseAPIController):
 
     @requires_show
@@ -197,7 +197,7 @@ async def delete(self):
                 await self.finish({'message': '404 show not found'})
 
 
-@ApiRoute('show/script/revisions/current', ApiVersion.v1)
+@ApiRoute('show/script/revisions/current', ApiVersion.V1)
 class ScriptCurrentRevisionController(BaseAPIController):
 
     @requires_show
@@ -267,7 +267,7 @@ async def post(self):
                 await self.finish({'message': '404 show not found'})
 
 
-@ApiRoute('/show/script', ApiVersion.v1)
+@ApiRoute('/show/script', ApiVersion.V1)
 class ScriptController(BaseAPIController):
 
     @requires_show
@@ -668,7 +668,7 @@ async def patch(self):
                 return
 
 
-@ApiRoute('/show/script/max_page', ApiVersion.v1)
+@ApiRoute('/show/script/max_page', ApiVersion.V1)
 class ScriptMaxPageController(BaseAPIController):
 
     @requires_show

diff --git a/server/controllers/api/show/sessions.py b/server/controllers/api/show/sessions.py
@@ -3,12 +3,12 @@
 from models.session import ShowSession
 from models.show import Show
 from schemas.schemas import ShowSessionSchema
-from utils.base_controller import BaseAPIController
-from utils.web_decorators import requires_show
-from utils.route import ApiRoute, ApiVersion
+from utils.web.base_controller import BaseAPIController
+from utils.web.web_decorators import requires_show
+from utils.web.route import ApiRoute, ApiVersion
 
 
-@ApiRoute('show/sessions', ApiVersion.v1)
+@ApiRoute('show/sessions', ApiVersion.V1)
 class SessionsController(BaseAPIController):
 
     @requires_show
@@ -36,7 +36,7 @@ def get(self):
                 self.finish({'message': '404 show not found'})
 
 
-@ApiRoute('show/sessions/start', ApiVersion.v1)
+@ApiRoute('show/sessions/start', ApiVersion.V1)
 class SessionStartController(BaseAPIController):
     @requires_show
     async def post(self):
@@ -71,7 +71,7 @@ async def post(self):
                 await self.finish({'message': '404 show not found'})
 
 
-@ApiRoute('show/sessions/stop', ApiVersion.v1)
+@ApiRoute('show/sessions/stop', ApiVersion.V1)
 class SessionStopController(BaseAPIController):
     @requires_show
     async def post(self):

diff --git a/server/controllers/api/show/shows.py b/server/controllers/api/show/shows.py
@@ -5,13 +5,13 @@
 from models.script import Script, ScriptRevision
 from models.show import Show
 from schemas.schemas import ShowSchema
-from utils.base_controller import BaseAPIController
-from utils.web_decorators import requires_show
-from utils.route import ApiRoute, ApiVersion
-from utils.logger import get_logger
+from utils.web.base_controller import BaseAPIController
+from utils.web.web_decorators import requires_show
+from utils.web.route import ApiRoute, ApiVersion
+from digi_server.logger import get_logger
 
 
-@ApiRoute('show', ApiVersion.v1)
+@ApiRoute('show', ApiVersion.V1)
 class ShowController(BaseAPIController):
     async def post(self):
         """
@@ -191,7 +191,7 @@ async def patch(self):
                 await self.finish({'message': '404 show not found'})
 
 
-@ApiRoute('shows', ApiVersion.v1)
+@ApiRoute('shows', ApiVersion.V1)
 class ShowsController(BaseAPIController):
 
     def get(self):

diff --git a/server/controllers/api/websocket.py b/server/controllers/api/websocket.py
@@ -1,10 +1,10 @@
 from models.session import Session
 from schemas.schemas import SessionSchema
-from utils.base_controller import BaseAPIController
-from utils.route import ApiRoute, ApiVersion
+from utils.web.base_controller import BaseAPIController
+from utils.web.route import ApiRoute, ApiVersion
 
 
-@ApiRoute('ws/sessions', ApiVersion.v1)
+@ApiRoute('ws/sessions', ApiVersion.V1)
 class WebsocketSessionsController(BaseAPIController):
 
     def get(self):

diff --git a/server/controllers/controllers.py b/server/controllers/controllers.py
@@ -4,10 +4,10 @@
 from tornado.escape import url_unescape
 from tornado_prometheus import MetricsHandler
 
-from utils.base_controller import BaseController, BaseAPIController
-from utils.logger import get_logger
-from utils.route import ApiRoute, ApiVersion, Route
+from digi_server.logger import get_logger
 from utils.pkg_utils import find_end_modules
+from utils.web.base_controller import BaseController, BaseAPIController
+from utils.web.route import ApiRoute, ApiVersion, Route
 
 
 IMPORTED_CONTROLLERS = {}
@@ -78,7 +78,7 @@ def get(self):
         })
 
 
-@ApiRoute('debug', ApiVersion.v1)
+@ApiRoute('debug', ApiVersion.V1)
 class ApiDebugController(BaseAPIController):
     def get(self):
         self.set_status(200)