Merge pull request #30 from rik/28_flatten_hierarchy

Flatten project hierarchy
djangosocialteam · May 15, 2024 · 8730b07 · 8730b07
2 parents efea447 + 4e15465
commit 8730b07
Show file tree

Hide file tree

Showing 78 changed files with 14 additions and 14 deletions.
diff --git a/Procfile b/Procfile
@@ -1,2 +1,2 @@
-web: gunicorn djangosocial.wsgi:application --bind 0.0.0.0:$PORT --timeout 300 --chdir django
+web: gunicorn wsgi:application --bind 0.0.0.0:$PORT --timeout 300 --chdir django
 release: python django/manage.py migrate
diff --git a/django/djangosocial/__init__.py → django/__init__.py b/django/djangosocial/__init__.py → django/__init__.py
diff --git a/django/djangosocial/home/__init__.py → django/home/__init__.py b/django/djangosocial/home/__init__.py → django/home/__init__.py
diff --git a/...ngosocial/home/migrations/0001_initial.py → django/home/migrations/0001_initial.py b/...ngosocial/home/migrations/0001_initial.py → django/home/migrations/0001_initial.py
diff --git a/...l/home/migrations/0002_create_homepage.py → ...o/home/migrations/0002_create_homepage.py b/...l/home/migrations/0002_create_homepage.py → ...o/home/migrations/0002_create_homepage.py
diff --git a/...ial/home/migrations/0003_homepage_body.py → django/home/migrations/0003_homepage_body.py b/...ial/home/migrations/0003_homepage_body.py → django/home/migrations/0003_homepage_body.py
diff --git a/...me/migrations/0004_alter_homepage_body.py → ...me/migrations/0004_alter_homepage_body.py b/...me/migrations/0004_alter_homepage_body.py → ...me/migrations/0004_alter_homepage_body.py
diff --git a/...osocial/home/migrations/0005_aboutpage.py → django/home/migrations/0005_aboutpage.py b/...osocial/home/migrations/0005_aboutpage.py → django/home/migrations/0005_aboutpage.py
diff --git a/...ome/migrations/0006_footer_navbar_link.py → ...ome/migrations/0006_footer_navbar_link.py b/...ome/migrations/0006_footer_navbar_link.py → ...ome/migrations/0006_footer_navbar_link.py
diff --git a/...7_alter_link_footer_alter_link_nav_bar.py → ...7_alter_link_footer_alter_link_nav_bar.py b/...7_alter_link_footer_alter_link_nav_bar.py → ...7_alter_link_footer_alter_link_nav_bar.py
diff --git a/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py b/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py
diff --git a/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py b/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py
diff --git a/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py b/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py
diff --git a/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py b/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py
diff --git a/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py b/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py
diff --git a/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py b/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py
diff --git a/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py b/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py
diff --git a/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py b/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py
diff --git a/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py b/...ter_aboutpage_body_alter_homepage_body.py → ...ter_aboutpage_body_alter_homepage_body.py
diff --git a/...ocial/home/migrations/0017_footer_text.py → django/home/migrations/0017_footer_text.py b/...ocial/home/migrations/0017_footer_text.py → django/home/migrations/0017_footer_text.py
diff --git a/...me/migrations/0018_alter_homepage_body.py → ...me/migrations/0018_alter_homepage_body.py b/...me/migrations/0018_alter_homepage_body.py → ...me/migrations/0018_alter_homepage_body.py
diff --git a/...me/migrations/0019_alter_homepage_body.py → ...me/migrations/0019_alter_homepage_body.py b/...me/migrations/0019_alter_homepage_body.py → ...me/migrations/0019_alter_homepage_body.py
diff --git a/.../djangosocial/home/migrations/__init__.py → django/home/migrations/__init__.py b/.../djangosocial/home/migrations/__init__.py → django/home/migrations/__init__.py
diff --git a/django/djangosocial/home/models.py → django/home/models.py b/django/djangosocial/home/models.py → django/home/models.py
@@ -10,7 +10,7 @@
 from wagtail.models import Page
 from wagtail.snippets.models import register_snippet
 
-from djangosocial.streams.blocks import (
+from streams.blocks import (
     ContentListBlock,
     ContentWithImagesBlock,
     GalleryBlock,

diff --git a/...ocial/home/templates/home/about_page.html → django/home/templates/home/about_page.html b/...ocial/home/templates/home/about_page.html → django/home/templates/home/about_page.html
diff --git a/...social/home/templates/home/home_page.html → django/home/templates/home/home_page.html b/...social/home/templates/home/home_page.html → django/home/templates/home/home_page.html
diff --git a/...ocial/home/templates/includes/footer.html → django/home/templates/includes/footer.html b/...ocial/home/templates/includes/footer.html → django/home/templates/includes/footer.html
diff --git a/...ocial/home/templates/includes/header.html → django/home/templates/includes/header.html b/...ocial/home/templates/includes/header.html → django/home/templates/includes/header.html
diff --git a/...ngosocial/home/templates/tags/footer.html → django/home/templates/tags/footer.html b/...ngosocial/home/templates/tags/footer.html → django/home/templates/tags/footer.html
diff --git a/...osocial/home/templates/tags/top_menu.html → django/home/templates/tags/top_menu.html b/...osocial/home/templates/tags/top_menu.html → django/home/templates/tags/top_menu.html
diff --git a/...jangosocial/home/templatetags/__init__.py → django/home/templatetags/__init__.py b/...jangosocial/home/templatetags/__init__.py → django/home/templatetags/__init__.py
diff --git a/...ngosocial/home/templatetags/navigation.py → django/home/templatetags/navigation.py b/...ngosocial/home/templatetags/navigation.py → django/home/templatetags/navigation.py
diff --git a/django/manage.py b/django/manage.py
@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "djangosocial.settings.dev")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.dev")
 
     from django.core.management import execute_from_command_line
 

diff --git a/django/pyproject.toml b/django/pyproject.toml
@@ -7,7 +7,7 @@ extend-exclude = "(migrations)"
 force-exclude = "(migrations)"
 
 [tool.django-stubs]
-django_settings_module = "djangosocial.settings.dev"
+django_settings_module = "settings.dev"
 
 [tool.mypy]
 exclude = [

diff --git a/django/djangosocial/search/__init__.py → django/search/__init__.py b/django/djangosocial/search/__init__.py → django/search/__init__.py
diff --git a/...ocial/search/templates/search/search.html → django/search/templates/search/search.html b/...ocial/search/templates/search/search.html → django/search/templates/search/search.html
diff --git a/django/djangosocial/search/views.py → django/search/views.py b/django/djangosocial/search/views.py → django/search/views.py
diff --git a/django/djangosocial/settings/__init__.py → django/settings/__init__.py b/django/djangosocial/settings/__init__.py → django/settings/__init__.py
diff --git a/django/djangosocial/settings/base.py → django/settings/base.py b/django/djangosocial/settings/base.py → django/settings/base.py
@@ -48,10 +48,10 @@
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
-    "djangosocial.home",
-    "djangosocial.search",
-    "djangosocial.streams",
-    "djangosocial.users",
+    "home",
+    "search",
+    "streams",
+    "users",
 ]
 
 MIDDLEWARE = [
@@ -65,7 +65,7 @@
     "wagtail.contrib.redirects.middleware.RedirectMiddleware",
 ]
 
-ROOT_URLCONF = "djangosocial.urls"
+ROOT_URLCONF = "urls"
 
 TEMPLATES = [
     {
@@ -85,7 +85,7 @@
     },
 ]
 
-WSGI_APPLICATION = "djangosocial.wsgi.application"
+WSGI_APPLICATION = "wsgi.application"
 
 LOGGING = {
     "version": 1,

diff --git a/django/djangosocial/settings/dev.py → django/settings/dev.py b/django/djangosocial/settings/dev.py → django/settings/dev.py
diff --git a/django/djangosocial/settings/production.py → django/settings/production.py b/django/djangosocial/settings/production.py → django/settings/production.py
diff --git a/.../djangosocial/static/css/djangosocial.css → django/static/css/djangosocial.css b/.../djangosocial/static/css/djangosocial.css → django/static/css/djangosocial.css
diff --git a/django/djangosocial/static/css/theme.css → django/static/css/theme.css b/django/djangosocial/static/css/theme.css → django/static/css/theme.css
diff --git a/...go/djangosocial/static/js/djangosocial.js → django/static/js/djangosocial.js b/...go/djangosocial/static/js/djangosocial.js → django/static/js/djangosocial.js
diff --git a/django/djangosocial/streams/__init__.py → django/streams/__init__.py b/django/djangosocial/streams/__init__.py → django/streams/__init__.py
diff --git a/django/djangosocial/streams/apps.py → django/streams/apps.py b/django/djangosocial/streams/apps.py → django/streams/apps.py
@@ -7,4 +7,4 @@ class StreamsConfig(AppConfig):
     """Defaault streams app config."""
 
     default_auto_field = "django.db.models.BigAutoField"
-    name = "djangosocial.streams"
+    name = "streams"
diff --git a/django/djangosocial/streams/blocks.py → django/streams/blocks.py b/django/djangosocial/streams/blocks.py → django/streams/blocks.py
diff --git a/...tes/blocks/content_with_images_block.html → ...tes/blocks/content_with_images_block.html b/...tes/blocks/content_with_images_block.html → ...tes/blocks/content_with_images_block.html
diff --git a/...s/templates/blocks/content_with_list.html → ...s/templates/blocks/content_with_list.html b/...s/templates/blocks/content_with_list.html → ...s/templates/blocks/content_with_list.html
diff --git a/...reams/templates/blocks/gallery_block.html → ...reams/templates/blocks/gallery_block.html b/...reams/templates/blocks/gallery_block.html → ...reams/templates/blocks/gallery_block.html
diff --git a/.../streams/templates/blocks/hero_block.html → .../streams/templates/blocks/hero_block.html b/.../streams/templates/blocks/hero_block.html → .../streams/templates/blocks/hero_block.html
diff --git a/...ms/templates/blocks/hero_image_block.html → ...ms/templates/blocks/hero_image_block.html b/...ms/templates/blocks/hero_image_block.html → ...ms/templates/blocks/hero_image_block.html
diff --git a/...ams/templates/blocks/logocloud_block.html → ...ams/templates/blocks/logocloud_block.html b/...ams/templates/blocks/logocloud_block.html → ...ams/templates/blocks/logocloud_block.html
diff --git a/...streams/templates/blocks/stats_block.html → ...streams/templates/blocks/stats_block.html b/...streams/templates/blocks/stats_block.html → ...streams/templates/blocks/stats_block.html
diff --git a/...eams/templates/blocks/timeline_block.html → ...eams/templates/blocks/timeline_block.html b/...eams/templates/blocks/timeline_block.html → ...eams/templates/blocks/timeline_block.html
diff --git a/...mplates/blocks/timeline_moment_block.html → ...mplates/blocks/timeline_moment_block.html b/...mplates/blocks/timeline_moment_block.html → ...mplates/blocks/timeline_moment_block.html
diff --git a/django/djangosocial/templates/404.html → django/templates/404.html b/django/djangosocial/templates/404.html → django/templates/404.html
diff --git a/django/djangosocial/templates/500.html → django/templates/500.html b/django/djangosocial/templates/500.html → django/templates/500.html
diff --git a/django/djangosocial/templates/base.html → django/templates/base.html b/django/djangosocial/templates/base.html → django/templates/base.html
diff --git a/...al/templates/registration/logged_out.html → ...go/templates/registration/logged_out.html b/...al/templates/registration/logged_out.html → ...go/templates/registration/logged_out.html
diff --git a/...osocial/templates/registration/login.html → django/templates/registration/login.html b/...osocial/templates/registration/login.html → django/templates/registration/login.html
diff --git a/...es/registration/password_change_done.html → ...es/registration/password_change_done.html b/...es/registration/password_change_done.html → ...es/registration/password_change_done.html
diff --git a/...es/registration/password_change_form.html → ...es/registration/password_change_form.html b/...es/registration/password_change_form.html → ...es/registration/password_change_form.html
diff --git a/...registration/password_reset_complete.html → ...registration/password_reset_complete.html b/...registration/password_reset_complete.html → ...registration/password_reset_complete.html
diff --git a/.../registration/password_reset_confirm.html → .../registration/password_reset_confirm.html b/.../registration/password_reset_confirm.html → .../registration/password_reset_confirm.html
diff --git a/...tes/registration/password_reset_done.html → ...tes/registration/password_reset_done.html b/...tes/registration/password_reset_done.html → ...tes/registration/password_reset_done.html
diff --git a/...tes/registration/password_reset_form.html → ...tes/registration/password_reset_form.html b/...tes/registration/password_reset_form.html → ...tes/registration/password_reset_form.html
diff --git a/...tes/tailwindui_components/about_page.html → ...tes/tailwindui_components/about_page.html b/...tes/tailwindui_components/about_page.html → ...tes/tailwindui_components/about_page.html
diff --git a/...plates/tailwindui_components/contact.html → ...plates/tailwindui_components/contact.html b/...plates/tailwindui_components/contact.html → ...plates/tailwindui_components/contact.html
diff --git a/...mplates/tailwindui_components/footer.html → ...mplates/tailwindui_components/footer.html b/...mplates/tailwindui_components/footer.html → ...mplates/tailwindui_components/footer.html
diff --git a/...templates/tailwindui_components/hero.html → ...templates/tailwindui_components/hero.html b/...templates/tailwindui_components/hero.html → ...templates/tailwindui_components/hero.html
diff --git a/django/djangosocial/urls.py → django/urls.py b/django/djangosocial/urls.py → django/urls.py
@@ -7,7 +7,7 @@
 from wagtail.admin import urls as wagtailadmin_urls
 from wagtail.documents import urls as wagtaildocs_urls
 
-from djangosocial.search import views as search_views
+from search import views as search_views
 
 urlpatterns = [
     path("django-admin/", admin.site.urls),

diff --git a/django/djangosocial/users/__init__.py → django/users/__init__.py b/django/djangosocial/users/__init__.py → django/users/__init__.py
diff --git a/django/djangosocial/users/apps.py → django/users/apps.py b/django/djangosocial/users/apps.py → django/users/apps.py
@@ -7,4 +7,4 @@ class UsersConfig(AppConfig):
     """Users app configuration."""
 
     default_auto_field = "django.db.models.BigAutoField"
-    name = "djangosocial.users"
+    name = "users"
diff --git a/...gosocial/users/migrations/0001_initial.py → django/users/migrations/0001_initial.py b/...gosocial/users/migrations/0001_initial.py → django/users/migrations/0001_initial.py
diff --git a/...djangosocial/users/migrations/__init__.py → django/users/migrations/__init__.py b/...djangosocial/users/migrations/__init__.py → django/users/migrations/__init__.py
diff --git a/django/djangosocial/users/models.py → django/users/models.py b/django/djangosocial/users/models.py → django/users/models.py
diff --git a/django/djangosocial/wsgi.py → django/wsgi.py b/django/djangosocial/wsgi.py → django/wsgi.py
@@ -10,6 +10,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "djangosocial.settings.dev")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.dev")
 
 application = get_wsgi_application()