Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix!: Remove Kurono references, URLs and functionality #2334

Merged
merged 7 commits into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
775 changes: 228 additions & 547 deletions Pipfile.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion cfl_common/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
include common/fixtures/*.json
graft common/templates
graft common/static
2 changes: 0 additions & 2 deletions cfl_common/common/csp_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
"https://www.google-analytics.com/",
"https://pyodide-cdn2.iodide.io/v0.15.0/full/",
"https://crowdin.com/",
f"wss://{MODULE_NAME}-aimmo.codeforlife.education/",
f"https://{MODULE_NAME}-aimmo.codeforlife.education/",
)
CSP_FONT_SRC = ("'self'", "https://fonts.gstatic.com/", "https://fonts.googleapis.com/", "https://use.typekit.net/")
CSP_SCRIPT_SRC = (
Expand Down
6 changes: 1 addition & 5 deletions cfl_common/common/migrations/0005_add_worksheets.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
from common.helpers.data_migration_loader import load_data_from_file
from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
("common", "0004_add_aimmocharacters"),
("aimmo", "0020_add_info_to_worksheet"),
]
dependencies = [("common", "0004_add_aimmocharacters")]

operations = [migrations.RunPython(migrations.RunPython.noop, reverse_code=migrations.RunPython.noop)]
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
from common.helpers.data_migration_loader import load_data_from_file
from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
("common", "0006_update_aimmo_character_image_path"),
("aimmo", "0021_add_pdf_names_to_worksheet"),
]
dependencies = [("common", "0006_update_aimmo_character_image_path")]

operations = [migrations.RunPython(migrations.RunPython.noop, reverse_code=migrations.RunPython.noop)]
20 changes: 20 additions & 0 deletions cfl_common/common/migrations/0054_delete_aimmo_models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 3.2.25 on 2024-07-31 00:13

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('common', '0053_clean_class_data'),
]

operations = [
migrations.DeleteModel(
name='AimmoCharacter',
),
migrations.RemoveField(
model_name='userprofile',
name='aimmo_badges',
),
]
25 changes: 0 additions & 25 deletions cfl_common/common/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ class UserProfile(models.Model):
developer = models.BooleanField(default=False)
is_verified = models.BooleanField(default=False)

# Holds the user's earned kurono badges. This information has to be on the
# UserProfile as the Avatar objects are deleted every time the Game gets
# deleted.
# This is a string showing which badges in which worksheets have been
# earned. The format is "X:Y" where X is the worksheet ID and Y is the
# badge ID. This repeats for all badges and each pair is comma-separated.
aimmo_badges = models.CharField(max_length=200, null=True, blank=True)

# TODO: Make not nullable once data has been transferred
first_name = models.CharField(max_length=200, null=True, blank=True)
_first_name = models.BinaryField(null=True, blank=True)
Expand Down Expand Up @@ -387,23 +379,6 @@ def stripStudentName(name):
return re.sub("[ \t]+", " ", name.strip())


class AimmoCharacterManager(models.Manager):
def sorted(self):
return self.get_queryset().order_by("sort_order")


class AimmoCharacter(models.Model):
name = models.CharField(max_length=255)
description = models.TextField()
image_path = models.CharField(max_length=255)
sort_order = models.IntegerField()
alt = models.CharField(max_length=255, null=True)
objects = AimmoCharacterManager()

def __str__(self) -> str:
return self.name


# -----------------------------------------------------------------------
# Below are models used for data tracking and maintenance
# -----------------------------------------------------------------------
Expand Down
29 changes: 0 additions & 29 deletions cfl_common/common/tests/test_migration_aimmo_characters.py

This file was deleted.

1 change: 0 additions & 1 deletion example_project/portal_test_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
SILENCED_SYSTEM_CHECKS = ["captcha.recaptcha_test_key_error"]

INSTALLED_APPS = [
"aimmo",
"game",
"pipeline",
"portal",
Expand Down
1 change: 0 additions & 1 deletion example_project/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
SILENCED_SYSTEM_CHECKS = ["captcha.recaptcha_test_key_error"]

INSTALLED_APPS = [
"aimmo",
"game",
"pipeline",
"portal",
Expand Down
2 changes: 0 additions & 2 deletions example_project/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from aimmo import urls as aimmo_urls
from django.conf.urls import include, url
from django.contrib import admin
from django.urls import path
Expand All @@ -12,5 +11,4 @@
url(r"^", include(portal_urls)),
path("administration/", admin.site.urls),
url(r"^rapidrouter/", include(game_urls)),
url(r"^kurono/", include(aimmo_urls)),
]
29 changes: 0 additions & 29 deletions portal/forms/add_game.py

This file was deleted.

Binary file removed portal/static/portal/img/kurono_hero.jpg
Binary file not shown.
Binary file removed portal/static/portal/img/kurono_landing_hero.png
Binary file not shown.
1 change: 0 additions & 1 deletion portal/static/portal/img/kurono_logo.svg

This file was deleted.

1 change: 0 additions & 1 deletion portal/static/portal/img/kurono_logo_grey_background.svg

This file was deleted.

1 change: 0 additions & 1 deletion portal/static/portal/img/kurono_logo_mark.svg

This file was deleted.

Binary file removed portal/static/portal/img/kurono_resources_hero.jpg
Binary file not shown.
Binary file removed portal/static/portal/img/kurono_story.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed portal/static/portal/img/thumbnail_play_kurono.png
Binary file not shown.
106 changes: 0 additions & 106 deletions portal/static/portal/js/aimmoGame.js

This file was deleted.

Loading
Loading