chore: moved all django elements up one level

merged .gitignores
wlmac · Dec 1, 2023 · c74561c · c74561c
1 parent 388b179
commit c74561c
Show file tree

Hide file tree

Showing 82 changed files with 56 additions and 22 deletions.
diff --git a/wlmac-scavenger/.envrc → .envrc b/wlmac-scavenger/.envrc → .envrc
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@ __pycache__
 *.pyc
 .mypy_cache
 .direnv
+/db.sqlite3
+/venv
diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/wlmac-scavenger/Makefile → Makefile b/wlmac-scavenger/Makefile → Makefile
diff --git a/wlmac-scavenger/core/__init__.py → core/__init__.py b/wlmac-scavenger/core/__init__.py → core/__init__.py
diff --git a/wlmac-scavenger/core/admin.py → core/admin.py b/wlmac-scavenger/core/admin.py → core/admin.py
diff --git a/wlmac-scavenger/core/context_processors.py → core/context_processors.py b/wlmac-scavenger/core/context_processors.py → core/context_processors.py
diff --git a/wlmac-scavenger/core/fixtures/qrcodes.json → core/fixtures/qrcodes.json b/wlmac-scavenger/core/fixtures/qrcodes.json → core/fixtures/qrcodes.json
diff --git a/wlmac-scavenger/core/forms.py → core/forms.py b/wlmac-scavenger/core/forms.py → core/forms.py
diff --git a/...r/core/locale/en_CA/LC_MESSAGES/django.mo → core/locale/en_CA/LC_MESSAGES/django.mo b/...r/core/locale/en_CA/LC_MESSAGES/django.mo → core/locale/en_CA/LC_MESSAGES/django.mo
diff --git a/...r/core/locale/en_CA/LC_MESSAGES/django.po → core/locale/en_CA/LC_MESSAGES/django.po b/...r/core/locale/en_CA/LC_MESSAGES/django.po → core/locale/en_CA/LC_MESSAGES/django.po
diff --git a/...r/core/locale/ja_JP/LC_MESSAGES/django.mo → core/locale/ja_JP/LC_MESSAGES/django.mo b/...r/core/locale/ja_JP/LC_MESSAGES/django.mo → core/locale/ja_JP/LC_MESSAGES/django.mo
diff --git a/...r/core/locale/ja_JP/LC_MESSAGES/django.po → core/locale/ja_JP/LC_MESSAGES/django.po b/...r/core/locale/ja_JP/LC_MESSAGES/django.po → core/locale/ja_JP/LC_MESSAGES/django.po
diff --git a/...scavenger/core/migrations/0001_initial.py → core/migrations/0001_initial.py b/...scavenger/core/migrations/0001_initial.py → core/migrations/0001_initial.py
diff --git a/...ore/migrations/0002_alter_qrcode_notes.py → core/migrations/0002_alter_qrcode_notes.py b/...ore/migrations/0002_alter_qrcode_notes.py → core/migrations/0002_alter_qrcode_notes.py
diff --git a/...ons/0003_remove_team_members_user_team.py → ...ons/0003_remove_team_members_user_team.py b/...ons/0003_remove_team_members_user_team.py → ...ons/0003_remove_team_members_user_team.py
diff --git a/...ns/0004_qrcode_short_alter_invite_code.py → ...ns/0004_qrcode_short_alter_invite_code.py b/...ns/0004_qrcode_short_alter_invite_code.py → ...ns/0004_qrcode_short_alter_invite_code.py
diff --git a/...enger/core/migrations/0005_user_chosen.py → core/migrations/0005_user_chosen.py b/...enger/core/migrations/0005_user_chosen.py → core/migrations/0005_user_chosen.py
diff --git a/...core/migrations/0006_alter_user_chosen.py → core/migrations/0006_alter_user_chosen.py b/...core/migrations/0006_alter_user_chosen.py → core/migrations/0006_alter_user_chosen.py
diff --git a/...ons/0007_qrcode_code_alter_invite_code.py → ...ons/0007_qrcode_code_alter_invite_code.py b/...ons/0007_qrcode_code_alter_invite_code.py → ...ons/0007_qrcode_code_alter_invite_code.py
diff --git a/..._code_alter_qrcode_key_alter_team_name.py → ..._code_alter_qrcode_key_alter_team_name.py b/..._code_alter_qrcode_key_alter_team_name.py → ..._code_alter_qrcode_key_alter_team_name.py
diff --git a/...avenger/core/migrations/0009_team_solo.py → core/migrations/0009_team_solo.py b/...avenger/core/migrations/0009_team_solo.py → core/migrations/0009_team_solo.py
diff --git a/...r/core/migrations/0010_alter_hint_hint.py → core/migrations/0010_alter_hint_hint.py b/...r/core/migrations/0010_alter_hint_hint.py → core/migrations/0010_alter_hint_hint.py
diff --git a/...ore/migrations/0011_alter_hint_options.py → core/migrations/0011_alter_hint_options.py b/...ore/migrations/0011_alter_hint_options.py → core/migrations/0011_alter_hint_options.py
diff --git a/...ore/migrations/0012_remove_user_chosen.py → core/migrations/0012_remove_user_chosen.py b/...ore/migrations/0012_remove_user_chosen.py → core/migrations/0012_remove_user_chosen.py
diff --git a/...013_logicpuzzlehint_alter_qrcode_notes.py → ...013_logicpuzzlehint_alter_qrcode_notes.py b/...013_logicpuzzlehint_alter_qrcode_notes.py → ...013_logicpuzzlehint_alter_qrcode_notes.py
diff --git a/...emove_team_completed_qr_codes_and_more.py → ...emove_team_completed_qr_codes_and_more.py b/...emove_team_completed_qr_codes_and_more.py → ...emove_team_completed_qr_codes_and_more.py
diff --git a/...re/migrations/0014_merge_20221212_1857.py → core/migrations/0014_merge_20221212_1857.py b/...re/migrations/0014_merge_20221212_1857.py → core/migrations/0014_merge_20221212_1857.py
diff --git a/...5_alter_hint_options_alter_invite_team.py → ...5_alter_hint_options_alter_invite_team.py b/...5_alter_hint_options_alter_invite_team.py → ...5_alter_hint_options_alter_invite_team.py
diff --git a/...igrations/0016_alter_team_current_qr_i.py → ...igrations/0016_alter_team_current_qr_i.py b/...igrations/0016_alter_team_current_qr_i.py → ...igrations/0016_alter_team_current_qr_i.py
diff --git a/...r/core/migrations/0017_alter_user_team.py → core/migrations/0017_alter_user_team.py b/...r/core/migrations/0017_alter_user_team.py → core/migrations/0017_alter_user_team.py
diff --git a/.../core/migrations/0018_qrcode_image_url.py → core/migrations/0018_qrcode_image_url.py b/.../core/migrations/0018_qrcode_image_url.py → core/migrations/0018_qrcode_image_url.py
diff --git a/wlmac-scavenger/core/migrations/__init__.py → core/migrations/__init__.py b/wlmac-scavenger/core/migrations/__init__.py → core/migrations/__init__.py
diff --git a/wlmac-scavenger/core/models.py → core/models.py b/wlmac-scavenger/core/models.py → core/models.py
diff --git a/...er/core/static/core/animal_buta_shock.png → core/static/core/animal_buta_shock.png b/...er/core/static/core/animal_buta_shock.png → core/static/core/animal_buta_shock.png
diff --git a/wlmac-scavenger/core/static/core/banner.svg → core/static/core/banner.svg b/wlmac-scavenger/core/static/core/banner.svg → core/static/core/banner.svg
diff --git a/wlmac-scavenger/core/static/core/base.css → core/static/core/base.css b/wlmac-scavenger/core/static/core/base.css → core/static/core/base.css
diff --git a/.../static/core/computer_mob_programming.png → .../static/core/computer_mob_programming.png b/.../static/core/computer_mob_programming.png → .../static/core/computer_mob_programming.png
diff --git a/...c-scavenger/core/static/core/countdown.js → core/static/core/countdown.js b/...c-scavenger/core/static/core/countdown.js → core/static/core/countdown.js
diff --git a/wlmac-scavenger/core/static/core/index.css → core/static/core/index.css b/wlmac-scavenger/core/static/core/index.css → core/static/core/index.css
diff --git a/...cavenger/core/static/core/logic_hints.css → core/static/core/logic_hints.css b/...cavenger/core/static/core/logic_hints.css → core/static/core/logic_hints.css
diff --git a/...e/static/core/metropolis_festive_icon.ico → core/static/core/metropolis_festive_icon.ico b/...e/static/core/metropolis_festive_icon.ico → core/static/core/metropolis_festive_icon.ico
diff --git a/...ger/core/static/core/ojigi_animal_inu.png → core/static/core/ojigi_animal_inu.png b/...ger/core/static/core/ojigi_animal_inu.png → core/static/core/ojigi_animal_inu.png
diff --git a/...c-scavenger/core/static/core/overcast.svg → core/static/core/overcast.svg b/...c-scavenger/core/static/core/overcast.svg → core/static/core/overcast.svg
diff --git a/wlmac-scavenger/core/static/core/qr.css → core/static/core/qr.css b/wlmac-scavenger/core/static/core/qr.css → core/static/core/qr.css
diff --git a/wlmac-scavenger/core/static/core/qr.js → core/static/core/qr.js b/wlmac-scavenger/core/static/core/qr.js → core/static/core/qr.js
diff --git a/...-scavenger/core/static/core/qrcode.min.js → core/static/core/qrcode.min.js b/...-scavenger/core/static/core/qrcode.min.js → core/static/core/qrcode.min.js
diff --git a/...c-scavenger/core/templates/core/base.html → core/templates/core/base.html b/...c-scavenger/core/templates/core/base.html → core/templates/core/base.html
diff --git a/...cavenger/core/templates/core/credits.html → core/templates/core/credits.html b/...cavenger/core/templates/core/credits.html → core/templates/core/credits.html
diff --git a/...c-scavenger/core/templates/core/gate.html → core/templates/core/gate.html b/...c-scavenger/core/templates/core/gate.html → core/templates/core/gate.html
diff --git a/...-scavenger/core/templates/core/index.html → core/templates/core/index.html b/...-scavenger/core/templates/core/index.html → core/templates/core/index.html
diff --git a/...nger/core/templates/core/logic_hints.html → core/templates/core/logic_hints.html b/...nger/core/templates/core/logic_hints.html → core/templates/core/logic_hints.html
diff --git a/...scavenger/core/templates/core/logout.html → core/templates/core/logout.html b/...scavenger/core/templates/core/logout.html → core/templates/core/logout.html
diff --git a/wlmac-scavenger/core/templates/core/qr.html → core/templates/core/qr.html b/wlmac-scavenger/core/templates/core/qr.html → core/templates/core/qr.html
diff --git a/...nger/core/templates/core/team_invite.html → core/templates/core/team_invite.html b/...nger/core/templates/core/team_invite.html → core/templates/core/team_invite.html
diff --git a/...venger/core/templates/core/team_join.html → core/templates/core/team_join.html b/...venger/core/templates/core/team_join.html → core/templates/core/team_join.html
diff --git a/...avenger/core/templates/core/team_new.html → core/templates/core/team_new.html b/...avenger/core/templates/core/team_new.html → core/templates/core/team_new.html
diff --git a/...c-scavenger/core/templatetags/__init__.py → core/templatetags/__init__.py b/...c-scavenger/core/templatetags/__init__.py → core/templatetags/__init__.py
diff --git a/wlmac-scavenger/core/templatetags/base.py → core/templatetags/base.py b/wlmac-scavenger/core/templatetags/base.py → core/templatetags/base.py
diff --git a/wlmac-scavenger/core/templatetags/md.py → core/templatetags/md.py b/wlmac-scavenger/core/templatetags/md.py → core/templatetags/md.py
diff --git a/wlmac-scavenger/core/templatetags/qr.py → core/templatetags/qr.py b/wlmac-scavenger/core/templatetags/qr.py → core/templatetags/qr.py
diff --git a/wlmac-scavenger/core/urls.py → core/urls.py b/wlmac-scavenger/core/urls.py → core/urls.py
diff --git a/wlmac-scavenger/wlmac-scavenger/__init__.py → core/views/__init__.py b/wlmac-scavenger/wlmac-scavenger/__init__.py → core/views/__init__.py
diff --git a/wlmac-scavenger/core/views/auth.py → core/views/auth.py b/wlmac-scavenger/core/views/auth.py → core/views/auth.py
diff --git a/wlmac-scavenger/core/views/index.py → core/views/index.py b/wlmac-scavenger/core/views/index.py → core/views/index.py
diff --git a/wlmac-scavenger/core/views/puzzle.py → core/views/puzzle.py b/wlmac-scavenger/core/views/puzzle.py → core/views/puzzle.py
diff --git a/wlmac-scavenger/core/views/qr.py → core/views/qr.py b/wlmac-scavenger/core/views/qr.py → core/views/qr.py
diff --git a/wlmac-scavenger/core/views/team.py → core/views/team.py b/wlmac-scavenger/core/views/team.py → core/views/team.py
diff --git a/wlmac-scavenger/flake.lock → flake.lock b/wlmac-scavenger/flake.lock → flake.lock
diff --git a/wlmac-scavenger/flake.nix → flake.nix b/wlmac-scavenger/flake.nix → flake.nix
diff --git a/wlmac-scavenger/manage.py → manage.py b/wlmac-scavenger/manage.py → manage.py
diff --git a/wlmac-scavenger/poetry.lock → poetry.lock b/wlmac-scavenger/poetry.lock → poetry.lock
diff --git a/wlmac-scavenger/pyproject.toml → pyproject.toml b/wlmac-scavenger/pyproject.toml → pyproject.toml
diff --git a/wlmac-scavenger/requirements.txt → requirements.txt b/wlmac-scavenger/requirements.txt → requirements.txt
diff --git a/wlmac-scavenger/.gitignore b/wlmac-scavenger/.gitignore
@@ -1,2 +1 @@
-/db.sqlite3
-/venv
+/local_settings.py
diff --git a/wlmac-scavenger/__init__.py b/wlmac-scavenger/__init__.py
diff --git a/wlmac-scavenger/wlmac-scavenger/asgi.py → wlmac-scavenger/asgi.py b/wlmac-scavenger/wlmac-scavenger/asgi.py → wlmac-scavenger/asgi.py
diff --git a/wlmac-scavenger/wlmac-scavenger/settings.py → wlmac-scavenger/settings.py b/wlmac-scavenger/wlmac-scavenger/settings.py → wlmac-scavenger/settings.py
diff --git a/wlmac-scavenger/wlmac-scavenger/urls.py → wlmac-scavenger/urls.py b/wlmac-scavenger/wlmac-scavenger/urls.py → wlmac-scavenger/urls.py
diff --git a/wlmac-scavenger/wlmac-scavenger/.gitignore b/wlmac-scavenger/wlmac-scavenger/.gitignore
diff --git a/wlmac-scavenger/wlmac-scavenger/wsgi.py → wlmac-scavenger/wsgi.py b/wlmac-scavenger/wlmac-scavenger/wsgi.py → wlmac-scavenger/wsgi.py