Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dreamteamprod/DigiScript
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.6.0
Choose a base ref
...
head repository: dreamteamprod/DigiScript
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
Showing with 24,440 additions and 7,190 deletions.
  1. +2 −2 .github/workflows/nodelint.yml
  2. +1 −1 .github/workflows/python-test.yml
  3. +4 −2 .gitignore
  4. +3 −0 .idea/misc.xml
  5. +3 −3 Dockerfile
  6. +1 −1 README.md
  7. +1 −0 client/.gitignore
  8. +22,891 −6,959 client/package-lock.json
  9. +17 −17 client/package.json
  10. +110 −10 client/src/App.vue
  11. +56 −1 client/src/store/modules/scriptConfig.js
  12. +18 −3 client/src/store/modules/show.js
  13. +6 −0 client/src/store/modules/websocket.js
  14. +52 −18 client/src/views/show/ShowLiveView.vue
  15. +62 −51 client/src/views/show/config/ConfigCharacters.vue
  16. +19 −1 client/src/vue_components/config/ConfigSettings.vue
  17. +176 −0 client/src/vue_components/show/config/characters/CharacterLineStats.vue
  18. +92 −28 client/src/vue_components/show/config/cues/CueEditor.vue
  19. +20 −6 client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue
  20. +8 −0 client/src/vue_components/show/config/mics/MicList.vue
  21. +71 −5 client/src/vue_components/show/config/script/ScriptEditor.vue
  22. +1 −0 client/src/vue_components/show/config/script/ScriptLinePart.vue
  23. +23 −4 client/src/vue_components/show/config/script/ScriptLineViewer.vue
  24. +6 −3 client/src/vue_components/show/live/ScriptLineViewer.vue
  25. +5 −1 docker-compose.yaml
  26. +1 −2 server/.gitignore
  27. +1 −0 server/.pylintrc
  28. +119 −0 server/alembic.ini
  29. +1 −0 server/alembic_config/README
  30. 0 server/alembic_config/__init__.py
  31. +106 −0 server/alembic_config/env.py
  32. +26 −0 server/alembic_config/script.py.mako
  33. +26 −0 server/alembic_config/versions/d4f66f58158b_initial_alembic_revision.py
  34. +1 −1 server/controllers/api/show/acts.py
  35. +3 −2 server/controllers/api/show/cast.py
  36. +47 −3 server/controllers/api/show/characters.py
  37. +4 −3 server/controllers/api/show/cues.py
  38. +4 −3 server/controllers/api/show/microphones.py
  39. +1 −1 server/controllers/api/show/scenes.py
  40. +85 −2 server/controllers/api/show/script.py
  41. +1 −1 server/controllers/controllers.py
  42. +24 −2 server/controllers/ws_controller.py
  43. +75 −3 server/digi_server/app_server.py
  44. +32 −15 server/digi_server/settings.py
  45. +3 −1 server/main.py
  46. +16 −0 server/models/models.py
  47. +195 −28 server/pylint-ignore.md
  48. +6 −5 server/requirements.txt
  49. +2 −1 server/test/test_utils.py
  50. +1 −0 server/test_requirements.txt
  51. +2 −0 server/utils/exceptions.py
  52. +10 −1 server/utils/web/route.py
4 changes: 2 additions & 2 deletions .github/workflows/nodelint.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- run: npm install -g npm@8
node-version: 22
- run: npm install -g npm@10
- run: npm ci
- run: npm run ci-lint
2 changes: 1 addition & 1 deletion .github/workflows/python-test.yml
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pytest
pip install -r requirements.txt
pip install -r test_requirements.txt
- name: Run tests
run: |
python -m pytest --junitxml=junit/test-results.xml
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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/
3 changes: 3 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM node:18.13.0-buster AS node_build
RUN npm install npm@8 -g
FROM node:22-bookworm AS node_build
RUN npm install npm@10 -g

COPY /client /client
WORKDIR /client
RUN npm ci
COPY /server /server
RUN npm run build

FROM python:3.10-buster
FROM python:3.10-bookworm

COPY /server/requirements.txt ./requirements.txt
RUN pip install -r requirements.txt
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ A digital script project for cueing theatrical shows

### Requirements

* Node v18.13.x (npm 8.11.x)
* Node v22.x (npm 10.x)
* Python 3.10.x

### Client
1 change: 1 addition & 0 deletions client/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.DS_Store
node_modules
/dist
.nvmrc


# local env files
Loading