From 5f149f76b406795f901644b92872c113eb0df3b8 Mon Sep 17 00:00:00 2001
From: Walter <walter@walter.lol>
Date: Fri, 7 Feb 2025 04:03:23 +0100
Subject: [PATCH] Register form working now, but we need it inherited

---
 app/{api => bloonsa_api}/__init__.py          |   0
 app/{api => bloonsa_api}/admin.py             |   0
 app/{api => bloonsa_api}/apps.py              |   4 +-
 .../migrations/__init__.py                    |   0
 app/{api => bloonsa_api}/models.py            |   0
 .../templates/api/html/empty.html             |   0
 app/{api => bloonsa_api}/tests.py             |   0
 app/{api => bloonsa_api}/urls.py              |   4 +-
 app/{api => bloonsa_api}/views.py             |   2 +-
 app/{game => bloonsa_game}/__init__.py        |   0
 app/{game => bloonsa_game}/admin.py           |   0
 app/{game => bloonsa_game}/apps.py            |   4 +-
 .../migrations/__init__.py                    |   0
 app/{game => bloonsa_game}/models.py          |   0
 .../static/bloonsa_game}/css/append.css       |   0
 .../static/bloonsa_game}/css/main.css         |   0
 .../bloonsa_game}/img/ads/banner160x600.png   | Bin
 .../bloonsa_game}/img/ads/banner720x90.png    | Bin
 .../bloonsa_game}/img/ads/banner90x720.png    | Bin
 .../static/bloonsa_game}/img/alpha.png        | Bin
 .../static/bloonsa_game}/img/bg1.gif          | Bin
 .../static/bloonsa_game}/img/bg2.gif          | Bin
 .../img/driller-bunny-300x250.jpg             | Bin
 .../static/bloonsa_game}/img/header2.gif      | Bin
 .../static/bloonsa_game}/img/nav_build.gif    | Bin
 .../static/bloonsa_game}/img/nav_buy.gif      | Bin
 .../static/bloonsa_game}/img/nav_home.gif     | Bin
 .../static/bloonsa_game}/img/nav_levels.gif   | Bin
 .../static/bloonsa_game}/img/nav_nk.gif       | Bin
 .../static/bloonsa_game}/img/nav_play.gif     | Bin
 .../static/bloonsa_game}/img/nav_users.gif    | Bin
 .../static/bloonsa_game}/img/top_build.gif    | Bin
 .../static/bloonsa_game}/img/top_playnow.gif  | Bin
 .../bloonsa_game}/misc/bloons_unlimited.swf   | Bin
 .../misc/bloons_unlimited_backup.swf          | Bin
 .../misc/bloons_unlimited_edit1.swf           | Bin
 .../misc/bloons_unlimited_edit2.swf           | Bin
 .../misc/ruffle/140c188b03464bea8b00.wasm     | Bin
 .../misc/ruffle/6c4a1ae30d22cb8267bf.wasm     | Bin
 .../bloonsa_game}/misc/ruffle/LICENSE_APACHE  |   0
 .../bloonsa_game}/misc/ruffle/LICENSE_MIT     |   0
 .../bloonsa_game}/misc/ruffle/README.md       |   0
 .../core.ruffle.26f84453b49365bca172.js       |   0
 .../core.ruffle.26f84453b49365bca172.js.map   |   0
 .../core.ruffle.58955c5ccebbe17126d7.js       |   0
 .../core.ruffle.58955c5ccebbe17126d7.js.map   |   0
 .../bloonsa_game}/misc/ruffle/package.json    |   0
 .../bloonsa_game}/misc/ruffle/ruffle.js       |   0
 .../bloonsa_game}/misc/ruffle/ruffle.js.map   |   0
 .../static/bloonsa_game}/misc/swflash.cab     | Bin
 .../templates/bloonsa_game}/base.html         |  36 +++++++++---------
 .../templates/bloonsa_game}/error.html        |   0
 .../templates/bloonsa_game}/game.html         |  13 +++++--
 .../templates/bloonsa_game}/index.html        |   8 ++--
 .../templates/bloonsa_game}/level.html        |   0
 .../templates/bloonsa_game}/terms.html        |   2 +-
 app/{game => bloonsa_game}/tests.py           |   0
 app/{game => bloonsa_game}/urls.py            |   4 +-
 app/{game => bloonsa_game}/views.py           |  18 +++++----
 app/settings/settings.py                      |  11 ++++--
 app/settings/urls.py                          |   5 ++-
 app/users/apps.py                             |   4 +-
 app/users/forms.py                            |  33 ++++++++++++++++
 app/users/models.py                           |  12 +++---
 app/users/templates/user/login.html           |   1 -
 app/users/templates/user/register.html        |   1 -
 app/users/templates/users/login.html          |   1 +
 app/users/templates/users/register.html       |  14 +++++++
 app/users/urls.py                             |  10 +++++
 app/users/validators.py                       |  14 ++++++-
 app/users/views.py                            |  27 ++++++++++++-
 readme.md                                     |   2 +
 72 files changed, 168 insertions(+), 62 deletions(-)
 rename app/{api => bloonsa_api}/__init__.py (100%)
 rename app/{api => bloonsa_api}/admin.py (100%)
 rename app/{api => bloonsa_api}/apps.py (60%)
 rename app/{api => bloonsa_api}/migrations/__init__.py (100%)
 rename app/{api => bloonsa_api}/models.py (100%)
 rename app/{api => bloonsa_api}/templates/api/html/empty.html (100%)
 rename app/{api => bloonsa_api}/tests.py (100%)
 rename app/{api => bloonsa_api}/urls.py (77%)
 rename app/{api => bloonsa_api}/views.py (97%)
 rename app/{game => bloonsa_game}/__init__.py (100%)
 rename app/{game => bloonsa_game}/admin.py (100%)
 rename app/{game => bloonsa_game}/apps.py (59%)
 rename app/{game => bloonsa_game}/migrations/__init__.py (100%)
 rename app/{game => bloonsa_game}/models.py (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/css/append.css (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/css/main.css (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/ads/banner160x600.png (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/ads/banner720x90.png (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/ads/banner90x720.png (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/alpha.png (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/bg1.gif (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/bg2.gif (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/driller-bunny-300x250.jpg (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/header2.gif (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/nav_build.gif (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/nav_buy.gif (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/nav_home.gif (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/nav_levels.gif (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/nav_nk.gif (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/nav_play.gif (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/nav_users.gif (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/top_build.gif (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/img/top_playnow.gif (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/bloons_unlimited.swf (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/bloons_unlimited_backup.swf (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/bloons_unlimited_edit1.swf (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/bloons_unlimited_edit2.swf (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/ruffle/140c188b03464bea8b00.wasm (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/ruffle/6c4a1ae30d22cb8267bf.wasm (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/ruffle/LICENSE_APACHE (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/ruffle/LICENSE_MIT (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/ruffle/README.md (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/ruffle/core.ruffle.26f84453b49365bca172.js (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/ruffle/core.ruffle.26f84453b49365bca172.js.map (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/ruffle/core.ruffle.58955c5ccebbe17126d7.js (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/ruffle/core.ruffle.58955c5ccebbe17126d7.js.map (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/ruffle/package.json (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/ruffle/ruffle.js (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/ruffle/ruffle.js.map (100%)
 rename app/{game/static/game => bloonsa_game/static/bloonsa_game}/misc/swflash.cab (100%)
 rename app/{game/templates/game => bloonsa_game/templates/bloonsa_game}/base.html (68%)
 rename app/{game/templates/game => bloonsa_game/templates/bloonsa_game}/error.html (100%)
 rename app/{game/templates/game => bloonsa_game/templates/bloonsa_game}/game.html (50%)
 rename app/{game/templates/game => bloonsa_game/templates/bloonsa_game}/index.html (97%)
 rename app/{game/templates/game => bloonsa_game/templates/bloonsa_game}/level.html (100%)
 rename app/{game/templates/game => bloonsa_game/templates/bloonsa_game}/terms.html (99%)
 rename app/{game => bloonsa_game}/tests.py (100%)
 rename app/{game => bloonsa_game}/urls.py (81%)
 rename app/{game => bloonsa_game}/views.py (54%)
 create mode 100644 app/users/forms.py
 delete mode 100644 app/users/templates/user/login.html
 delete mode 100644 app/users/templates/user/register.html
 create mode 100644 app/users/templates/users/login.html
 create mode 100644 app/users/templates/users/register.html
 create mode 100644 app/users/urls.py
 create mode 100644 readme.md

diff --git a/app/api/__init__.py b/app/bloonsa_api/__init__.py
similarity index 100%
rename from app/api/__init__.py
rename to app/bloonsa_api/__init__.py
diff --git a/app/api/admin.py b/app/bloonsa_api/admin.py
similarity index 100%
rename from app/api/admin.py
rename to app/bloonsa_api/admin.py
diff --git a/app/api/apps.py b/app/bloonsa_api/apps.py
similarity index 60%
rename from app/api/apps.py
rename to app/bloonsa_api/apps.py
index 66656fd..57e5b25 100644
--- a/app/api/apps.py
+++ b/app/bloonsa_api/apps.py
@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class ApiConfig(AppConfig):
+class Bloonsa_ApiConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'api'
+    name = 'bloonsa_api'
diff --git a/app/api/migrations/__init__.py b/app/bloonsa_api/migrations/__init__.py
similarity index 100%
rename from app/api/migrations/__init__.py
rename to app/bloonsa_api/migrations/__init__.py
diff --git a/app/api/models.py b/app/bloonsa_api/models.py
similarity index 100%
rename from app/api/models.py
rename to app/bloonsa_api/models.py
diff --git a/app/api/templates/api/html/empty.html b/app/bloonsa_api/templates/api/html/empty.html
similarity index 100%
rename from app/api/templates/api/html/empty.html
rename to app/bloonsa_api/templates/api/html/empty.html
diff --git a/app/api/tests.py b/app/bloonsa_api/tests.py
similarity index 100%
rename from app/api/tests.py
rename to app/bloonsa_api/tests.py
diff --git a/app/api/urls.py b/app/bloonsa_api/urls.py
similarity index 77%
rename from app/api/urls.py
rename to app/bloonsa_api/urls.py
index 8db59d0..5033254 100644
--- a/app/api/urls.py
+++ b/app/bloonsa_api/urls.py
@@ -1,6 +1,8 @@
 from django.urls import path, include
 
-from api.views import LoadLevel, RandomLevel, CompleteLevel, RateLevel
+from bloonsa_api.views import LoadLevel, RandomLevel, CompleteLevel, RateLevel
+
+app_name = "bloonsa_api"
 
 urlpatterns = [
     path("load_level", LoadLevel.as_view(), name="api-load_level"),
diff --git a/app/api/views.py b/app/bloonsa_api/views.py
similarity index 97%
rename from app/api/views.py
rename to app/bloonsa_api/views.py
index 4cdd430..1e2a469 100644
--- a/app/api/views.py
+++ b/app/bloonsa_api/views.py
@@ -9,7 +9,7 @@ import time
 
 # Create your views here.
 
-from game.models import Level
+from bloonsa_game.models import Level
 
 
 class CSRFexemptTemplateView(TemplateView):
diff --git a/app/game/__init__.py b/app/bloonsa_game/__init__.py
similarity index 100%
rename from app/game/__init__.py
rename to app/bloonsa_game/__init__.py
diff --git a/app/game/admin.py b/app/bloonsa_game/admin.py
similarity index 100%
rename from app/game/admin.py
rename to app/bloonsa_game/admin.py
diff --git a/app/game/apps.py b/app/bloonsa_game/apps.py
similarity index 59%
rename from app/game/apps.py
rename to app/bloonsa_game/apps.py
index 8ad49cb..073117b 100644
--- a/app/game/apps.py
+++ b/app/bloonsa_game/apps.py
@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class GameConfig(AppConfig):
+class Bloonsa_GameConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'game'
+    name = 'bloonsa_game'
diff --git a/app/game/migrations/__init__.py b/app/bloonsa_game/migrations/__init__.py
similarity index 100%
rename from app/game/migrations/__init__.py
rename to app/bloonsa_game/migrations/__init__.py
diff --git a/app/game/models.py b/app/bloonsa_game/models.py
similarity index 100%
rename from app/game/models.py
rename to app/bloonsa_game/models.py
diff --git a/app/game/static/game/css/append.css b/app/bloonsa_game/static/bloonsa_game/css/append.css
similarity index 100%
rename from app/game/static/game/css/append.css
rename to app/bloonsa_game/static/bloonsa_game/css/append.css
diff --git a/app/game/static/game/css/main.css b/app/bloonsa_game/static/bloonsa_game/css/main.css
similarity index 100%
rename from app/game/static/game/css/main.css
rename to app/bloonsa_game/static/bloonsa_game/css/main.css
diff --git a/app/game/static/game/img/ads/banner160x600.png b/app/bloonsa_game/static/bloonsa_game/img/ads/banner160x600.png
similarity index 100%
rename from app/game/static/game/img/ads/banner160x600.png
rename to app/bloonsa_game/static/bloonsa_game/img/ads/banner160x600.png
diff --git a/app/game/static/game/img/ads/banner720x90.png b/app/bloonsa_game/static/bloonsa_game/img/ads/banner720x90.png
similarity index 100%
rename from app/game/static/game/img/ads/banner720x90.png
rename to app/bloonsa_game/static/bloonsa_game/img/ads/banner720x90.png
diff --git a/app/game/static/game/img/ads/banner90x720.png b/app/bloonsa_game/static/bloonsa_game/img/ads/banner90x720.png
similarity index 100%
rename from app/game/static/game/img/ads/banner90x720.png
rename to app/bloonsa_game/static/bloonsa_game/img/ads/banner90x720.png
diff --git a/app/game/static/game/img/alpha.png b/app/bloonsa_game/static/bloonsa_game/img/alpha.png
similarity index 100%
rename from app/game/static/game/img/alpha.png
rename to app/bloonsa_game/static/bloonsa_game/img/alpha.png
diff --git a/app/game/static/game/img/bg1.gif b/app/bloonsa_game/static/bloonsa_game/img/bg1.gif
similarity index 100%
rename from app/game/static/game/img/bg1.gif
rename to app/bloonsa_game/static/bloonsa_game/img/bg1.gif
diff --git a/app/game/static/game/img/bg2.gif b/app/bloonsa_game/static/bloonsa_game/img/bg2.gif
similarity index 100%
rename from app/game/static/game/img/bg2.gif
rename to app/bloonsa_game/static/bloonsa_game/img/bg2.gif
diff --git a/app/game/static/game/img/driller-bunny-300x250.jpg b/app/bloonsa_game/static/bloonsa_game/img/driller-bunny-300x250.jpg
similarity index 100%
rename from app/game/static/game/img/driller-bunny-300x250.jpg
rename to app/bloonsa_game/static/bloonsa_game/img/driller-bunny-300x250.jpg
diff --git a/app/game/static/game/img/header2.gif b/app/bloonsa_game/static/bloonsa_game/img/header2.gif
similarity index 100%
rename from app/game/static/game/img/header2.gif
rename to app/bloonsa_game/static/bloonsa_game/img/header2.gif
diff --git a/app/game/static/game/img/nav_build.gif b/app/bloonsa_game/static/bloonsa_game/img/nav_build.gif
similarity index 100%
rename from app/game/static/game/img/nav_build.gif
rename to app/bloonsa_game/static/bloonsa_game/img/nav_build.gif
diff --git a/app/game/static/game/img/nav_buy.gif b/app/bloonsa_game/static/bloonsa_game/img/nav_buy.gif
similarity index 100%
rename from app/game/static/game/img/nav_buy.gif
rename to app/bloonsa_game/static/bloonsa_game/img/nav_buy.gif
diff --git a/app/game/static/game/img/nav_home.gif b/app/bloonsa_game/static/bloonsa_game/img/nav_home.gif
similarity index 100%
rename from app/game/static/game/img/nav_home.gif
rename to app/bloonsa_game/static/bloonsa_game/img/nav_home.gif
diff --git a/app/game/static/game/img/nav_levels.gif b/app/bloonsa_game/static/bloonsa_game/img/nav_levels.gif
similarity index 100%
rename from app/game/static/game/img/nav_levels.gif
rename to app/bloonsa_game/static/bloonsa_game/img/nav_levels.gif
diff --git a/app/game/static/game/img/nav_nk.gif b/app/bloonsa_game/static/bloonsa_game/img/nav_nk.gif
similarity index 100%
rename from app/game/static/game/img/nav_nk.gif
rename to app/bloonsa_game/static/bloonsa_game/img/nav_nk.gif
diff --git a/app/game/static/game/img/nav_play.gif b/app/bloonsa_game/static/bloonsa_game/img/nav_play.gif
similarity index 100%
rename from app/game/static/game/img/nav_play.gif
rename to app/bloonsa_game/static/bloonsa_game/img/nav_play.gif
diff --git a/app/game/static/game/img/nav_users.gif b/app/bloonsa_game/static/bloonsa_game/img/nav_users.gif
similarity index 100%
rename from app/game/static/game/img/nav_users.gif
rename to app/bloonsa_game/static/bloonsa_game/img/nav_users.gif
diff --git a/app/game/static/game/img/top_build.gif b/app/bloonsa_game/static/bloonsa_game/img/top_build.gif
similarity index 100%
rename from app/game/static/game/img/top_build.gif
rename to app/bloonsa_game/static/bloonsa_game/img/top_build.gif
diff --git a/app/game/static/game/img/top_playnow.gif b/app/bloonsa_game/static/bloonsa_game/img/top_playnow.gif
similarity index 100%
rename from app/game/static/game/img/top_playnow.gif
rename to app/bloonsa_game/static/bloonsa_game/img/top_playnow.gif
diff --git a/app/game/static/game/misc/bloons_unlimited.swf b/app/bloonsa_game/static/bloonsa_game/misc/bloons_unlimited.swf
similarity index 100%
rename from app/game/static/game/misc/bloons_unlimited.swf
rename to app/bloonsa_game/static/bloonsa_game/misc/bloons_unlimited.swf
diff --git a/app/game/static/game/misc/bloons_unlimited_backup.swf b/app/bloonsa_game/static/bloonsa_game/misc/bloons_unlimited_backup.swf
similarity index 100%
rename from app/game/static/game/misc/bloons_unlimited_backup.swf
rename to app/bloonsa_game/static/bloonsa_game/misc/bloons_unlimited_backup.swf
diff --git a/app/game/static/game/misc/bloons_unlimited_edit1.swf b/app/bloonsa_game/static/bloonsa_game/misc/bloons_unlimited_edit1.swf
similarity index 100%
rename from app/game/static/game/misc/bloons_unlimited_edit1.swf
rename to app/bloonsa_game/static/bloonsa_game/misc/bloons_unlimited_edit1.swf
diff --git a/app/game/static/game/misc/bloons_unlimited_edit2.swf b/app/bloonsa_game/static/bloonsa_game/misc/bloons_unlimited_edit2.swf
similarity index 100%
rename from app/game/static/game/misc/bloons_unlimited_edit2.swf
rename to app/bloonsa_game/static/bloonsa_game/misc/bloons_unlimited_edit2.swf
diff --git a/app/game/static/game/misc/ruffle/140c188b03464bea8b00.wasm b/app/bloonsa_game/static/bloonsa_game/misc/ruffle/140c188b03464bea8b00.wasm
similarity index 100%
rename from app/game/static/game/misc/ruffle/140c188b03464bea8b00.wasm
rename to app/bloonsa_game/static/bloonsa_game/misc/ruffle/140c188b03464bea8b00.wasm
diff --git a/app/game/static/game/misc/ruffle/6c4a1ae30d22cb8267bf.wasm b/app/bloonsa_game/static/bloonsa_game/misc/ruffle/6c4a1ae30d22cb8267bf.wasm
similarity index 100%
rename from app/game/static/game/misc/ruffle/6c4a1ae30d22cb8267bf.wasm
rename to app/bloonsa_game/static/bloonsa_game/misc/ruffle/6c4a1ae30d22cb8267bf.wasm
diff --git a/app/game/static/game/misc/ruffle/LICENSE_APACHE b/app/bloonsa_game/static/bloonsa_game/misc/ruffle/LICENSE_APACHE
similarity index 100%
rename from app/game/static/game/misc/ruffle/LICENSE_APACHE
rename to app/bloonsa_game/static/bloonsa_game/misc/ruffle/LICENSE_APACHE
diff --git a/app/game/static/game/misc/ruffle/LICENSE_MIT b/app/bloonsa_game/static/bloonsa_game/misc/ruffle/LICENSE_MIT
similarity index 100%
rename from app/game/static/game/misc/ruffle/LICENSE_MIT
rename to app/bloonsa_game/static/bloonsa_game/misc/ruffle/LICENSE_MIT
diff --git a/app/game/static/game/misc/ruffle/README.md b/app/bloonsa_game/static/bloonsa_game/misc/ruffle/README.md
similarity index 100%
rename from app/game/static/game/misc/ruffle/README.md
rename to app/bloonsa_game/static/bloonsa_game/misc/ruffle/README.md
diff --git a/app/game/static/game/misc/ruffle/core.ruffle.26f84453b49365bca172.js b/app/bloonsa_game/static/bloonsa_game/misc/ruffle/core.ruffle.26f84453b49365bca172.js
similarity index 100%
rename from app/game/static/game/misc/ruffle/core.ruffle.26f84453b49365bca172.js
rename to app/bloonsa_game/static/bloonsa_game/misc/ruffle/core.ruffle.26f84453b49365bca172.js
diff --git a/app/game/static/game/misc/ruffle/core.ruffle.26f84453b49365bca172.js.map b/app/bloonsa_game/static/bloonsa_game/misc/ruffle/core.ruffle.26f84453b49365bca172.js.map
similarity index 100%
rename from app/game/static/game/misc/ruffle/core.ruffle.26f84453b49365bca172.js.map
rename to app/bloonsa_game/static/bloonsa_game/misc/ruffle/core.ruffle.26f84453b49365bca172.js.map
diff --git a/app/game/static/game/misc/ruffle/core.ruffle.58955c5ccebbe17126d7.js b/app/bloonsa_game/static/bloonsa_game/misc/ruffle/core.ruffle.58955c5ccebbe17126d7.js
similarity index 100%
rename from app/game/static/game/misc/ruffle/core.ruffle.58955c5ccebbe17126d7.js
rename to app/bloonsa_game/static/bloonsa_game/misc/ruffle/core.ruffle.58955c5ccebbe17126d7.js
diff --git a/app/game/static/game/misc/ruffle/core.ruffle.58955c5ccebbe17126d7.js.map b/app/bloonsa_game/static/bloonsa_game/misc/ruffle/core.ruffle.58955c5ccebbe17126d7.js.map
similarity index 100%
rename from app/game/static/game/misc/ruffle/core.ruffle.58955c5ccebbe17126d7.js.map
rename to app/bloonsa_game/static/bloonsa_game/misc/ruffle/core.ruffle.58955c5ccebbe17126d7.js.map
diff --git a/app/game/static/game/misc/ruffle/package.json b/app/bloonsa_game/static/bloonsa_game/misc/ruffle/package.json
similarity index 100%
rename from app/game/static/game/misc/ruffle/package.json
rename to app/bloonsa_game/static/bloonsa_game/misc/ruffle/package.json
diff --git a/app/game/static/game/misc/ruffle/ruffle.js b/app/bloonsa_game/static/bloonsa_game/misc/ruffle/ruffle.js
similarity index 100%
rename from app/game/static/game/misc/ruffle/ruffle.js
rename to app/bloonsa_game/static/bloonsa_game/misc/ruffle/ruffle.js
diff --git a/app/game/static/game/misc/ruffle/ruffle.js.map b/app/bloonsa_game/static/bloonsa_game/misc/ruffle/ruffle.js.map
similarity index 100%
rename from app/game/static/game/misc/ruffle/ruffle.js.map
rename to app/bloonsa_game/static/bloonsa_game/misc/ruffle/ruffle.js.map
diff --git a/app/game/static/game/misc/swflash.cab b/app/bloonsa_game/static/bloonsa_game/misc/swflash.cab
similarity index 100%
rename from app/game/static/game/misc/swflash.cab
rename to app/bloonsa_game/static/bloonsa_game/misc/swflash.cab
diff --git a/app/game/templates/game/base.html b/app/bloonsa_game/templates/bloonsa_game/base.html
similarity index 68%
rename from app/game/templates/game/base.html
rename to app/bloonsa_game/templates/bloonsa_game/base.html
index 390ddd9..a0cab36 100644
--- a/app/game/templates/game/base.html
+++ b/app/bloonsa_game/templates/bloonsa_game/base.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta name="title" content="Bloonsworld!"/>
+        <meta name="title" content="{% block title %}{% endblock title %}"/>
         <meta name="robots" content="index, follow"/>
         <meta name="description" content="Finally, the creators of Bloons bring you Bloonsworld!"/>
         <meta name="keywords" content="flash, games, awesome"/>
@@ -12,31 +12,31 @@
         <!--[if IE6]>
         <style>
         #wrapper {
-          background: url({% static 'game/img/alpha.png' %});
+          background: url({% static 'bloonsa_game/img/alpha.png' %});
             filter:alpha(opacity=75);
         }
         </style>
         <![endif]-->
-        <link rel="shortcut icon" href="{% static 'game/img/favicon.ico' %}"/>
+        <link rel="shortcut icon" href="{% static 'bloonsa_game/img/favicon.ico' %}"/>
 
-        <link rel="stylesheet" type="text/css" media="screen" href="{% static 'game/css/main.css' %}"/>
-        <link rel="stylesheet" type="text/css" media="screen" href="{% static 'game/css/append.css' %}"/>
+        <link rel="stylesheet" type="text/css" media="screen" href="{% static 'bloonsa_game/css/main.css' %}"/>
+        <link rel="stylesheet" type="text/css" media="screen" href="{% static 'bloonsa_game/css/append.css' %}"/>
         <script>window.RufflePlayer=window.RufflePlayer||{};window.RufflePlayer.config={"autoplay":"on","unmuteOverlay":"hidden"};</script>
-        <script src="{% static 'game/misc/ruffle/ruffle.js' %}"></script>
+        <script src="{% static 'bloonsa_game/misc/ruffle/ruffle.js' %}"></script>
     </head>
 
 <body id="body">
   <div id="wrapper">
     <div id="inner_wrapper">
       <div id="alpha"></div>
-      <a href="{% url 'index' %}" id="header"></a>
+      <a href="{% url 'bloonsa_game:index' %}" id="header"></a>
       <div id="horizontal_header">
         <div class="ad ad_720x90">
         <div id="adslot1"></div>
       </div>
 
       <div id="login_box">
-    <form method="post" action="{% url 'login' %}">  <table>
+    <form method="post" action="{% url 'bloonsa_game:login' %}">  <table>
   <tr>
     <td><label for="login_username">Name: </label></td>
     <td><input type="text" name="login_username" id="login_username" value=""/></td>
@@ -53,7 +53,7 @@
   </tr>
 
   </table></form>
-  <h3><a href="/register">Register for free</a>&nbsp;&nbsp;<a href="/forgot_password">Forgot Password?</a></h3>
+  <h3><a href="/users/register">Register for free</a>&nbsp;&nbsp;<a href="/users/forgot_password">Forgot Password?</a></h3>
 </div>    </div>
 
     <div class="skyscraper">
@@ -67,20 +67,20 @@
     <div class="wide centered">
         Copyright Kaiparasoft 2007, all rights reserved<br/>
         <a href="http://www.ninjakiwi.com">Ninjakiwi</a>
-        - <a href="{% url 'terms' %}">Terms of Use</a>
-        - <a href="{% url 'contact' %}">Contact Us</a>      </div>
+        - <a href="{% url 'bloonsa_game:terms' %}">Terms of Use</a>
+        - <a href="{% url 'bloonsa_game:contact' %}">Contact Us</a>      </div>
     </div>
 
     <div class="skyscraper rhs">
       <ul id="menu" class="light">
 
-<li><a href="/"><img src="{% static 'game/img/nav_home.gif' %}" alt="Nav_home"/></a></li>
-<li><a href="/game"><img src="{% static 'game/img/nav_play.gif' %}" alt="Nav_play"/></a></li>
-<li><a href="/level_editor"><img src="{% static 'game/img/nav_build.gif' %}" alt="Nav_build"/></a></li>
-<li><a href="/level/list"><img src="{% static 'game/img/nav_levels.gif' %}" alt="Nav_levels"/></a></li>
-<li><a href="/user/list"><img src="{% static 'game/img/nav_users.gif' %}" alt="Nav_users"/></a></li>
-<li><a href="http://www.ninjakiwi.com/"><img src="{% static 'game/img/nav_nk.gif' %}" alt="Nav_nk"/></a></li>
-<li><a href="http://ninjakiwi.com/Games/Tower-Defense/Bloons-Tower-Defense-5-Deluxe.html?predorder"><img src="{% static 'game/img/nav_buy.gif' %}" alt="Nav_buy"/></a></li>
+<li><a href="/"><img src="{% static 'bloonsa_game/img/nav_home.gif' %}" alt="Nav_home"/></a></li>
+<li><a href="/game"><img src="{% static 'bloonsa_game/img/nav_play.gif' %}" alt="Nav_play"/></a></li>
+<li><a href="/level_editor"><img src="{% static 'bloonsa_game/img/nav_build.gif' %}" alt="Nav_build"/></a></li>
+<li><a href="/level/list"><img src="{% static 'bloonsa_game/img/nav_levels.gif' %}" alt="Nav_levels"/></a></li>
+<li><a href="/user/list"><img src="{% static 'bloonsa_game/img/nav_users.gif' %}" alt="Nav_users"/></a></li>
+<li><a href="http://www.ninjakiwi.com/"><img src="{% static 'bloonsa_game/img/nav_nk.gif' %}" alt="Nav_nk"/></a></li>
+<li><a href="http://ninjakiwi.com/Games/Tower-Defense/Bloons-Tower-Defense-5-Deluxe.html?predorder"><img src="{% static 'bloonsa_game/img/nav_buy.gif' %}" alt="Nav_buy"/></a></li>
 </ul>
       <div id="searchbox">
         <form method="post" action="/level/list">
diff --git a/app/game/templates/game/error.html b/app/bloonsa_game/templates/bloonsa_game/error.html
similarity index 100%
rename from app/game/templates/game/error.html
rename to app/bloonsa_game/templates/bloonsa_game/error.html
diff --git a/app/game/templates/game/game.html b/app/bloonsa_game/templates/bloonsa_game/game.html
similarity index 50%
rename from app/game/templates/game/game.html
rename to app/bloonsa_game/templates/bloonsa_game/game.html
index e3595d3..c1d2e6e 100644
--- a/app/game/templates/game/game.html
+++ b/app/bloonsa_game/templates/bloonsa_game/game.html
@@ -1,12 +1,17 @@
-{% extends 'game/base.html' %}
+{% extends 'bloonsa_game/base.html' %}
 {% load static %}
+
+{% block title %}
+    {{ levelTitle }} by {{ levelAuthor }}
+{% endblock title %}
+
 {% block content %}
 <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-        codebase="{% static 'game/misc/swflash.cab' %}#version=7,0,19,0"
+        codebase="{% static 'bloonsa_game/misc/swflash.cab' %}#version=7,0,19,0"
         width="640" height="480" title="">
-<param name="movie" value="{% static 'game/misc/bloons_unlimited.swf' %}">
+<param name="movie" value="{% static 'bloonsa_game/misc/bloons_unlimited.swf' %}">
 <param name="quality" value="high">
-<embed src="{% static 'game/misc/bloons_unlimited.swf' %}"
+<embed src="{% static 'bloonsa_game/misc/bloons_unlimited.swf' %}"
        quality="high" pluginspage="http://www.macromedia.com/go/getflashplayer"
        type="application/x-shockwave-flash"
        width="640" height="480">
diff --git a/app/game/templates/game/index.html b/app/bloonsa_game/templates/bloonsa_game/index.html
similarity index 97%
rename from app/game/templates/game/index.html
rename to app/bloonsa_game/templates/bloonsa_game/index.html
index 6134bc7..797157c 100644
--- a/app/game/templates/game/index.html
+++ b/app/bloonsa_game/templates/bloonsa_game/index.html
@@ -1,4 +1,4 @@
-{% extends 'game/base.html' %}
+{% extends 'bloonsa_game/base.html' %}
 {% load static %}
 
 {% block content %}
@@ -11,18 +11,18 @@
     If you like Bloons, you will LOVE THIS GAME.<br>
     Get Driller Bunny now for iPhone or iPod Touch.<br>
     <a href="http://newgam.es/drillbunny">
-        <img src="{% static 'game/img/driller-bunny-300x250.jpg' %}"
+        <img src="{% static 'bloonsa_game/img/driller-bunny-300x250.jpg' %}"
              alt="Driller Bunny"/></a><br>
   </div>
 <div class=" wide light">
   <h2 class="centered">Welcome to Bloonsworld!</h2>
   <p class="centered"></p>
   <a class="homepage_button" href="{% url 'game' %}">
-      <img src="{% static 'game/img/top_playnow.gif' %}"
+      <img src="{% static 'bloonsa_game/img/top_playnow.gif' %}"
            alt="Top_playnow"/></a>
     <a class="homepage_button"
        href="/web/20140115060749/http://bloonsworld.com/level_editor">
-        <img src="{% static 'game/img/top_build.gif' %}"
+        <img src="{% static 'bloonsa_game/img/top_build.gif' %}"
              alt="Top_build"/></a>
 </div>
 <div class="left">
diff --git a/app/game/templates/game/level.html b/app/bloonsa_game/templates/bloonsa_game/level.html
similarity index 100%
rename from app/game/templates/game/level.html
rename to app/bloonsa_game/templates/bloonsa_game/level.html
diff --git a/app/game/templates/game/terms.html b/app/bloonsa_game/templates/bloonsa_game/terms.html
similarity index 99%
rename from app/game/templates/game/terms.html
rename to app/bloonsa_game/templates/bloonsa_game/terms.html
index 0869f8b..031751f 100644
--- a/app/game/templates/game/terms.html
+++ b/app/bloonsa_game/templates/bloonsa_game/terms.html
@@ -1,4 +1,4 @@
-{% extends 'game/base.html' %}
+{% extends 'bloonsa_game/base.html' %}
 {% block content %}
 <div id="content">
     <div class="wide">
diff --git a/app/game/tests.py b/app/bloonsa_game/tests.py
similarity index 100%
rename from app/game/tests.py
rename to app/bloonsa_game/tests.py
diff --git a/app/game/urls.py b/app/bloonsa_game/urls.py
similarity index 81%
rename from app/game/urls.py
rename to app/bloonsa_game/urls.py
index c765e8b..21d9291 100644
--- a/app/game/urls.py
+++ b/app/bloonsa_game/urls.py
@@ -1,6 +1,8 @@
 from django.urls import path, include
 
-from game.views import IndexView, TermsView, GameView, WIPView
+from bloonsa_game.views import IndexView, TermsView, GameView, WIPView
+
+app_name = "bloonsa_game"
 
 urlpatterns = [
     path("", IndexView.as_view(), name="index"),
diff --git a/app/game/views.py b/app/bloonsa_game/views.py
similarity index 54%
rename from app/game/views.py
rename to app/bloonsa_game/views.py
index bac98f6..ee7c1c9 100644
--- a/app/game/views.py
+++ b/app/bloonsa_game/views.py
@@ -2,18 +2,18 @@ from django.shortcuts import render
 from django.views.generic import TemplateView
 # Create your views here.
 
-from game.models import Level
+from bloonsa_game.models import Level
 
 
 class IndexView(TemplateView):
 
     def get(self, request, *args, **kwargs):
-        return render(request, "game/index.html", context={})
+        return render(request, "bloonsa_game/index.html", context={})
 
 class TermsView(TemplateView):
 
     def get(self, request, *args, **kwargs):
-        return render(request, "game/terms.html", context={})
+        return render(request, "bloonsa_game/terms.html", context={})
 
 class GameView(TemplateView):
 
@@ -21,16 +21,18 @@ class GameView(TemplateView):
         if type(kwargs.get("pk")) is int:
             level = Level.objects.get(id=kwargs["pk"])
             if level:
-                return render(request, "game/level.html", context={
-                    "flashVars": level.getFlashVars(seperator="&amp;")
+                return render(request, "bloonsa_game/level.html", context={
+                    "flashVars": level.getFlashVars(seperator="&amp;"),
+                    "levelTitle": level.title,
+                    "levelAuthor": level.author,
                 })
 
-        return render(request, "game/game.html", context={})
+        return render(request, "bloonsa_game/game.html", context={})
 
 class WIPView(TemplateView):
 
     def get(self, request, *args, **kwargs):
-        return render(request, "game/error.html", context={})
+        return render(request, "bloonsa_game/error.html", context={})
 
     def post(self, request, *args, **kwargs):
-        return render(request, "game/error.html", context={})
\ No newline at end of file
+        return render(request, "bloonsa_game/error.html", context={})
\ No newline at end of file
diff --git a/app/settings/settings.py b/app/settings/settings.py
index 002ee27..3ec4c07 100644
--- a/app/settings/settings.py
+++ b/app/settings/settings.py
@@ -38,9 +38,14 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
 
-    # Walter
-    "game",
-    "api",
+    # Global
+    "users",
+
+    # Bloons archive
+    "bloonsa_game",
+    "bloonsa_api",
+
+    # Bloons builder
 ]
 
 MIDDLEWARE = [
diff --git a/app/settings/urls.py b/app/settings/urls.py
index 3f4b324..1f8c801 100644
--- a/app/settings/urls.py
+++ b/app/settings/urls.py
@@ -18,6 +18,7 @@ from django.urls import path, include
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path("web_service/", include("api.urls")),
-    path("", include("game.urls")),
+    path("web_service/", include("bloonsa_api.urls", namespace="bloonsa_api")),
+    path("a/", include("bloonsa_game.urls", namespace="bloonsa_game")),
+    path("users/", include("users.urls", namespace="users"))
 ]
diff --git a/app/users/apps.py b/app/users/apps.py
index 86c66f5..72b1401 100644
--- a/app/users/apps.py
+++ b/app/users/apps.py
@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class PlayersConfig(AppConfig):
+class UsersConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'players'
+    name = 'users'
diff --git a/app/users/forms.py b/app/users/forms.py
new file mode 100644
index 0000000..7ffb81a
--- /dev/null
+++ b/app/users/forms.py
@@ -0,0 +1,33 @@
+from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
+from django import forms
+from django.contrib.auth.models import User
+
+from users.validators import usernameValidator
+
+class UserRegisterForm(UserCreationForm):
+    field_order = ("username", "password1", "password2")
+
+    username = forms.CharField(min_length=3,
+                               max_length=16,
+                               label="Username",
+                               required=True,
+                               validators=[usernameValidator],
+                               help_text="3-16 chars, alphanumeric and _- pls")
+
+    class Meta:
+        model = User
+        fields = [
+            "username",
+            "password1",
+            "password2",
+        ]
+
+class UserLoginForm(AuthenticationForm):
+    def __init__(self, *args, **kwargs):
+        super(UserLoginForm, self).__init__(*args, **kwargs)
+
+    username = forms.CharField(min_length=3,
+                               max_length=16,
+                               label="Username",
+                               required=True,
+                               validators=[usernameValidator])
\ No newline at end of file
diff --git a/app/users/models.py b/app/users/models.py
index a9986bc..64683d1 100644
--- a/app/users/models.py
+++ b/app/users/models.py
@@ -2,17 +2,15 @@ from django.db import models
 from django.utils import timezone
 from django.contrib.auth.models import User
 
-from game.models import Level
+from bloonsa_game.models import Level
 
-class CustomUser(User):
-    ...
 
 class Player(models.Model):
-    user = models.ForeignKey(CustomUser, on_delete=models.CASCADE, null=True, blank=True)
+    user = models.ForeignKey(User, on_delete=models.CASCADE, null=True, blank=True)
     # Savedata
-    levelsPlayed = models.ManyToManyField(Level, blank=True)
-    levelsBeaten = models.ManyToManyField(Level, blank=True)
-    levelsRated = ...
+    levelsPlayed = models.ManyToManyField(Level, blank=True, related_name="levelsPlayed")
+    levelsBeaten = models.ManyToManyField(Level, blank=True, related_name="levelsBeaten")
+    # levelsRated = ...
     # Logging
     creationIP = models.GenericIPAddressField()
     latestIP = models.GenericIPAddressField()
diff --git a/app/users/templates/user/login.html b/app/users/templates/user/login.html
deleted file mode 100644
index 82c7b2c..0000000
--- a/app/users/templates/user/login.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "game/base.html" %}
\ No newline at end of file
diff --git a/app/users/templates/user/register.html b/app/users/templates/user/register.html
deleted file mode 100644
index 82c7b2c..0000000
--- a/app/users/templates/user/register.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "game/base.html" %}
\ No newline at end of file
diff --git a/app/users/templates/users/login.html b/app/users/templates/users/login.html
new file mode 100644
index 0000000..a26618c
--- /dev/null
+++ b/app/users/templates/users/login.html
@@ -0,0 +1 @@
+{% extends "bloonsa_game/base.html" %}
\ No newline at end of file
diff --git a/app/users/templates/users/register.html b/app/users/templates/users/register.html
new file mode 100644
index 0000000..34c21d7
--- /dev/null
+++ b/app/users/templates/users/register.html
@@ -0,0 +1,14 @@
+{% extends "bloonsa_game/base.html" %}
+
+{% block title %}
+    Register
+{% endblock title %}
+
+{% block content %}
+    <h1>Register!</h1>
+    <form class="form-with-validation" action="/users/register" method="post">
+        {% csrf_token %}
+        {{ form }}
+        <button class="form-submit">Create</button>
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/app/users/urls.py b/app/users/urls.py
new file mode 100644
index 0000000..dec87c4
--- /dev/null
+++ b/app/users/urls.py
@@ -0,0 +1,10 @@
+from django.urls import path, include
+
+from users.views import LoginView, RegisterView
+
+app_name = "users"
+
+urlpatterns = [
+    path("login", LoginView.as_view(), name="login"),
+    path("register", RegisterView.as_view(), name="register"),
+]
diff --git a/app/users/validators.py b/app/users/validators.py
index 8b5ab27..5ccff3b 100644
--- a/app/users/validators.py
+++ b/app/users/validators.py
@@ -1,7 +1,17 @@
+import string
+
+from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 
-from users.models import User, Player
+from users.models import Player
 
 def usernameValidator(username):
     if User.objects.filter(username__iexact=username).first() is not None:
-        raise ValidationError("Sorry, deze gebruikersnaam is al in gebruik")
\ No newline at end of file
+        raise ValidationError("Sorry, this username is already in use")
+
+    if 3 < len(username) < 17:
+        raise ValidationError("Username must be between 3-16 characters long")
+
+    charset = set(string.ascii_letters + string.digits + "_-")
+    if not all(x in charset for x in username):
+        raise ValidationError("Username may only contain normal letters, numbers and _-")
\ No newline at end of file
diff --git a/app/users/views.py b/app/users/views.py
index ed84443..d5ddfdc 100644
--- a/app/users/views.py
+++ b/app/users/views.py
@@ -1,10 +1,33 @@
-from django.shortcuts import render
 from django.contrib.auth.forms import UserCreationForm
+from django.shortcuts import render, redirect
+from django.views.generic import TemplateView
+
+from users.forms import UserRegisterForm
 
 
+class LoginView(TemplateView):
+
+    def get(self, request, *args, **kwargs):
+        ...
+
+    def post(self, request, *args, **kwargs):
+        ...
 
 
-class
+class RegisterView(TemplateView):
+
+    def get(self, request, *args, **kwargs):
+        form = UserCreationForm()
+        return render(request=request, template_name="users/register.html", context={"form": form})
+
+    def post(self, request, *args, **kwargs):
+        form = UserCreationForm(request.POST)
+        if not form.is_valid():
+            print("form invalid", form.error_messages, request.POST)
+            return render(request=request, template_name="users/register.html", context={"form": form})
+        # form.save()
+        return redirect("bloonsa_game:game")
+
 
 
 
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..96786a9
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,2 @@
+# Bloonsworld archive
+yes finally.
\ No newline at end of file