diff --git a/.github/workflows/publish-python-package.yml b/.github/workflows/publish-python-package.yml index bf6b3d6bb..3adb46b08 100644 --- a/.github/workflows/publish-python-package.yml +++ b/.github/workflows/publish-python-package.yml @@ -26,8 +26,7 @@ jobs: run: | pip install pipenv pipenv install --dev --system - pip install -U git+https://github.com/ocadotechnology/codeforlife-portal@python312 - pip install -U "git+https://github.com/ocadotechnology/codeforlife-portal@python312#egg=cfl-common&subdirectory=cfl_common" + pip install -U git+https://github.com/ocadotechnology/codeforlife-portal.git#egg=codeforlife-portal #TODO: Remove as part of #688 sudo apt-get install gettext # TODO: Restore action once we figure out how to use bot token properly (if still needed) # - name: Prepare files for Crowdin diff --git a/CHANGELOG.md b/CHANGELOG.md index b7867d2c6..294f2d5ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ +## v6.3.8 (2024-09-03) + +### Fix + +* Adjust Python den banner size ([#1715](https://github.com/ocadotechnology/rapid-router/issues/1715)) ([`77ee1ab`](https://github.com/ocadotechnology/rapid-router/commit/77ee1abf48734229ed2a8ea193be4f1ae443a7f4)) + +## v6.3.7 (2024-09-03) + +### Fix + +* Install portal master when publishing ([`e5c0682`](https://github.com/ocadotechnology/rapid-router/commit/e5c068261a5c3f47906d296e3a767dd5307d4976)) +* Django js reverse upgrade ([#1714](https://github.com/ocadotechnology/rapid-router/issues/1714)) ([`e6a9fe8`](https://github.com/ocadotechnology/rapid-router/commit/e6a9fe8c84d8ea8ebd317ba7a840ddf4c67ba061)) + ## v6.3.6 (2024-09-02) ### Fix diff --git a/Pipfile.lock b/Pipfile.lock index fff78289a..22f2b23c9 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -197,13 +197,6 @@ "markers": "python_version >= '3.8'", "version": "==4.1.1" }, - "django-js-reverse": { - "hashes": [ - "sha256:2a392d169f44e30b883c30dfcfd917a14167ce8fe196c99d2385b31c90d77aa0", - "sha256:8134c2ab6307c945edfa90671ca65e85d6c1754d48566bdd6464be259cc80c30" - ], - "version": "==0.9.1" - }, "django-otp": { "hashes": [ "sha256:931a4f46f0ec10cab4d25ac8b7dfd6344538320b0489716cabb0da3108dabd75", @@ -227,6 +220,14 @@ ], "version": "==2.0.8" }, + "django-reverse-js": { + "hashes": [ + "sha256:7d626f4d660604e4c2623a494a08ddb70587375110cf4e7bb6f56eeb4471630f", + "sha256:89c15e3f1bd656a6f7c7f3641144c0a79d42ec692182c8edd6a91061674f6b62" + ], + "markers": "python_version >= '3.10'", + "version": "==0.1.7" + }, "django-two-factor-auth": { "hashes": [ "sha256:3fac266d12472ac66475dd737bb18f2992484313bf56acf5a2eea5e824291ee6", diff --git a/example_project/rapid_router_test_settings.py b/example_project/rapid_router_test_settings.py index 7baee6a39..a7f1459a0 100644 --- a/example_project/rapid_router_test_settings.py +++ b/example_project/rapid_router_test_settings.py @@ -83,7 +83,7 @@ "django.contrib.sessions", "django.contrib.messages", "django.contrib.staticfiles", - "django_js_reverse", + "django_reverse_js", "django_otp", "django_otp.plugins.otp_static", "django_otp.plugins.otp_totp", diff --git a/example_project/settings.py b/example_project/settings.py index b3c2da01b..26671baa2 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -70,7 +70,7 @@ "django.contrib.sessions", "django.contrib.messages", "django.contrib.staticfiles", - "django_js_reverse", + "django_reverse_js", "django_otp", "django_otp.plugins.otp_static", "django_otp.plugins.otp_totp", diff --git a/game/__init__.py b/game/__init__.py index ef5d4d41b..241240d9e 100644 --- a/game/__init__.py +++ b/game/__init__.py @@ -1 +1 @@ -__version__ = "6.3.6" +__version__ = "6.3.8" diff --git a/game/static/game/image/Python_Den_hero_student.png b/game/static/game/image/Python_Den_hero_student.png new file mode 100644 index 000000000..f19040b3e Binary files /dev/null and b/game/static/game/image/Python_Den_hero_student.png differ diff --git a/game/static/game/image/Python_Den_student_hero_image.png b/game/static/game/image/Python_Den_student_hero_image.png deleted file mode 100644 index 6c0b30fbe..000000000 Binary files a/game/static/game/image/Python_Den_student_hero_image.png and /dev/null differ diff --git a/game/static/game/image/Python_Den_hero_image.svg b/game/static/game/image/Python_levels_page.svg similarity index 51% rename from game/static/game/image/Python_Den_hero_image.svg rename to game/static/game/image/Python_levels_page.svg index 12561a559..a3b5e0139 100644 --- a/game/static/game/image/Python_Den_hero_image.svg +++ b/game/static/game/image/Python_levels_page.svg @@ -1,1992 +1,1954 @@ - - - - - - - + + + + + + + + + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + + + - - - - - + - - - + - - - + - - - + - - - + - - - + + + + + - - + + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + + + - - - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - + - - - + - - - + - + - - - + - - - + - - - + - - + + + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - + + - + diff --git a/game/templates/game/base.html b/game/templates/game/base.html index 7cf6f0a2f..7bc2748fb 100644 --- a/game/templates/game/base.html +++ b/game/templates/game/base.html @@ -8,9 +8,9 @@ - + - + {% endblock %} diff --git a/game/templates/game/python_den_level_selection.html b/game/templates/game/python_den_level_selection.html index 054da9e1b..34177d667 100644 --- a/game/templates/game/python_den_level_selection.html +++ b/game/templates/game/python_den_level_selection.html @@ -32,10 +32,10 @@ {% block header %} + {% if user|is_logged_in_as_student or user|is_independent_student %} + {% else %} - + {% endif %} {% endblock header %} diff --git a/game/urls.py b/game/urls.py index 29655611d..e1bd9daf9 100644 --- a/game/urls.py +++ b/game/urls.py @@ -1,6 +1,7 @@ from django.conf.urls import url, include +from django.urls import path from django.views.i18n import JavaScriptCatalog -from django_js_reverse.views import urls_js +from django_reverse_js.views import urls_js from game.views.api import ( level_list, @@ -266,7 +267,7 @@ ] ), ), - url(r"^js-reverse/$", urls_js, name="js-reverse"), + path("reverse.js", urls_js, name="js-reverse"), url( r"^js-i18n/$", JavaScriptCatalog.as_view(packages=["game"]), diff --git a/setup.py b/setup.py index f39653995..5fb4f4c41 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ install_requires=[ "django==3.2.25", "django-csp==3.7", - "django-js-reverse==0.9.1", + "django-reverse-js==0.1.7", "django-pipeline==2.0.8", "djangorestframework==3.13.1", "more-itertools==8.7.0",