From 50a4b6b4711d0a9b7818687c55a4b1f05ff4be0e Mon Sep 17 00:00:00 2001 From: Snowsune Date: Tue, 23 Sep 2025 11:16:51 -0400 Subject: [PATCH 1/7] Implement new BP app --- .gitmodules | 3 +++ snowsune/settings.py | 1 + snowsune/urls.py | 1 + 3 files changed, 5 insertions(+) create mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1bfa866 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "apps/apps/rp_scheduler"] + path = apps/rp_scheduler + url = git@github_snowsune:snowsune/rp_scheduler.git diff --git a/snowsune/settings.py b/snowsune/settings.py index 0b90bd6..46348e9 100644 --- a/snowsune/settings.py +++ b/snowsune/settings.py @@ -75,6 +75,7 @@ "apps.notifications", # Centralized notification system "apps.thank_yous", # Thank yous management app "apps.quotes", # Quotes scroller app + "apps.rp_scheduler", # RP Scheduler app ] MIDDLEWARE = [ diff --git a/snowsune/urls.py b/snowsune/urls.py index 9a7c3c1..551ad65 100644 --- a/snowsune/urls.py +++ b/snowsune/urls.py @@ -36,6 +36,7 @@ path("characters/", include("apps.characters.urls")), path("quotes/", include("apps.quotes.urls")), path("users/", include("apps.users.urls")), + path("rp/", include("apps.rp_scheduler.urls")), # SEO path( "sitemap.xml", From 48f7701cf9f115e83fba2e1e1aba55986934cf5a Mon Sep 17 00:00:00 2001 From: Snowsune Date: Tue, 23 Sep 2025 11:21:23 -0400 Subject: [PATCH 2/7] Include modules --- .gitmodules | 2 +- apps/rp_scheduler | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 160000 apps/rp_scheduler diff --git a/.gitmodules b/.gitmodules index 1bfa866..53ae2e0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "apps/apps/rp_scheduler"] +[submodule "apps/rp_scheduler"] path = apps/rp_scheduler url = git@github_snowsune:snowsune/rp_scheduler.git diff --git a/apps/rp_scheduler b/apps/rp_scheduler new file mode 160000 index 0000000..8bdb13a --- /dev/null +++ b/apps/rp_scheduler @@ -0,0 +1 @@ +Subproject commit 8bdb13adeec15208536ada2a36ea2877177e2a22 From bfd691fd3302bfc1269bb5a4d411224578eb7623 Mon Sep 17 00:00:00 2001 From: Snowsune Date: Sat, 27 Sep 2025 00:07:05 -0400 Subject: [PATCH 3/7] Add edits in settings --- apps/rp_scheduler | 2 +- snowsune/settings.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/rp_scheduler b/apps/rp_scheduler index 8bdb13a..241d005 160000 --- a/apps/rp_scheduler +++ b/apps/rp_scheduler @@ -1 +1 @@ -Subproject commit 8bdb13adeec15208536ada2a36ea2877177e2a22 +Subproject commit 241d0056abb6d9ceae4efdcf27611607d9d9ff7c diff --git a/snowsune/settings.py b/snowsune/settings.py index 46348e9..15f7e3c 100644 --- a/snowsune/settings.py +++ b/snowsune/settings.py @@ -190,6 +190,7 @@ BASE_DIR / "apps/characters/static", # Characters have their own static files too BASE_DIR / "apps/comics/static", # Comics BASE_DIR / "apps/thank_yous/static", # Thank Yous + BASE_DIR / "apps/rp_scheduler/static", # RP Scheduler Svelte app ] # Media Paths (things like profile pictures and such are uploaded here) From 52040cfada5166b98531e3dba739adda6ce10e37 Mon Sep 17 00:00:00 2001 From: Snowsune Date: Sat, 27 Sep 2025 21:44:59 -0400 Subject: [PATCH 4/7] Move RP_scheudler to MasQue's --- apps/rp_scheduler | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/rp_scheduler b/apps/rp_scheduler index 241d005..327a5ef 160000 --- a/apps/rp_scheduler +++ b/apps/rp_scheduler @@ -1 +1 @@ -Subproject commit 241d0056abb6d9ceae4efdcf27611607d9d9ff7c +Subproject commit 327a5ef0192875907c3da92b3ec27678ad78823e From 76160c17c14259cbe566b6c28f1688bf503b2f01 Mon Sep 17 00:00:00 2001 From: Snowsune Date: Sat, 27 Sep 2025 21:51:15 -0400 Subject: [PATCH 5/7] Fix CI for new NPM deps --- .github/workflows/build_ghcr.yml | 42 +++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_ghcr.yml b/.github/workflows/build_ghcr.yml index cd1052b..1012a99 100644 --- a/.github/workflows/build_ghcr.yml +++ b/.github/workflows/build_ghcr.yml @@ -26,23 +26,41 @@ jobs: - "apps.comics.tests" - "apps.characters.tests" - "snowsune.tests" - - "" # Empty string runs all tests (default Django behavior) + - "" # Empty string runs all tests steps: - name: Checkout repository uses: actions/checkout@v4 + with: + submodules: true - name: Set up Python uses: actions/setup-python@v4 with: python-version: "3.13" - - name: Install dependencies + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + + - name: Install pnpm + uses: pnpm/action-setup@v2 + with: + version: latest + + - name: Install Python dependencies run: | python -m pip install --upgrade pip pip install pipenv pipenv install --dev # Install dev dependencies from Pipfile + - name: Install and build npm apps + run: | + cd apps/rp_scheduler + pnpm install + pnpm build + - name: Run tests for ${{ matrix.test_target || 'all apps' }} run: | if [ -n "${{ matrix.test_target }}" ]; then @@ -55,8 +73,8 @@ jobs: - name: Test Summary run: | - echo "✅ Test matrix completed for ${{ matrix.test_target || 'all apps' }}" - echo "📊 Matrix strategy ensures all apps are tested individually and together" + echo "Test matrix completed for ${{ matrix.test_target || 'all apps' }}" + echo "Matrix strategy ensures all apps are tested individually and together" formatblack: name: Black Formatter @@ -94,6 +112,22 @@ jobs: fetch-depth: 0 submodules: true + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + + - name: Install pnpm + uses: pnpm/action-setup@v2 + with: + version: latest + + - name: Build npm apps + run: | + cd apps/rp_scheduler + pnpm install + pnpm build + - name: Log in to the Container registry uses: docker/login-action@v2 with: From f229889eec96c3221954c6f723c14d36242abae0 Mon Sep 17 00:00:00 2001 From: Snowsune Date: Sat, 27 Sep 2025 21:53:10 -0400 Subject: [PATCH 6/7] Fix submodule URL for GitHub Actions compatibility --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 53ae2e0..3725c58 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "apps/rp_scheduler"] path = apps/rp_scheduler - url = git@github_snowsune:snowsune/rp_scheduler.git + url = https://github.com/snowsune/rp_scheduler.git From d88b083ffb8450517ac60e97f2da8b0fe8d4086c Mon Sep 17 00:00:00 2001 From: Snowsune Date: Sat, 27 Sep 2025 21:54:50 -0400 Subject: [PATCH 7/7] move needle --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 3725c58..c3360fc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "apps/rp_scheduler"] path = apps/rp_scheduler - url = https://github.com/snowsune/rp_scheduler.git + url = https://github.com/MasQueElite/rp_scheduler.git