From 55d5431859e139fbf121b60bbd6ae0d555978089 Mon Sep 17 00:00:00 2001 From: Pablo Moreno Date: Wed, 19 Feb 2025 15:36:41 +0100 Subject: [PATCH] chore: cleanup --- .dockerignore | 1 + config/settings/base.py | 1 - requirements.txt | 2 +- scripts/build_static.sh | 2 +- theme/apps.py | 5 ----- theme/management/commands/__init__.py | 0 {theme => web/management}/__init__.py | 0 {theme/management => web/management/commands}/__init__.py | 0 {theme => web}/management/commands/build_tailwind_theme.py | 0 {theme => web}/static/css/.gitignore | 0 {theme => web}/static/css/components.css | 2 +- {theme => web}/static/css/main.css | 0 {theme => web}/static/theme/js/theme.js | 0 web/templates/components/product_card.html | 2 +- {theme => web}/templates/components/theme-switch.html | 0 {theme => web}/templates/theme/base.html | 0 {theme => web}/templates/theme/main.css.template | 0 {theme => web}/templates/theme/seo.html | 0 18 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 theme/apps.py delete mode 100644 theme/management/commands/__init__.py rename {theme => web/management}/__init__.py (100%) rename {theme/management => web/management/commands}/__init__.py (100%) rename {theme => web}/management/commands/build_tailwind_theme.py (100%) rename {theme => web}/static/css/.gitignore (100%) rename {theme => web}/static/css/components.css (98%) rename {theme => web}/static/css/main.css (100%) rename {theme => web}/static/theme/js/theme.js (100%) rename {theme => web}/templates/components/theme-switch.html (100%) rename {theme => web}/templates/theme/base.html (100%) rename {theme => web}/templates/theme/main.css.template (100%) rename {theme => web}/templates/theme/seo.html (100%) diff --git a/.dockerignore b/.dockerignore index 9f3eaa8..a7865c9 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,3 +8,4 @@ docker-compose.dev.yml docker-compose.yml **/*.db junit.xml +.env diff --git a/config/settings/base.py b/config/settings/base.py index 2e594a8..f18e398 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -38,7 +38,6 @@ THIRD_PARTY_APPS = [ PROJECT_APPS = [ "shop", - "theme", "users", "web", ] diff --git a/requirements.txt b/requirements.txt index 7d1cadc..4428ac7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,7 @@ drf-spectacular==0.26.1 gonk==0.6.1 ipython==8.16.1 Pillow==11.0.0 -psycopg2-binary==2.9.9 +psycopg2-binary==2.9.10 pyDes==2.0.1 redis==4.5.4 requests==2.32.3 diff --git a/scripts/build_static.sh b/scripts/build_static.sh index 93bbfd5..5735087 100644 --- a/scripts/build_static.sh +++ b/scripts/build_static.sh @@ -1,3 +1,3 @@ -tailwindcss -i theme/static/css/main.css -o theme/static/css/styles.css --minify +tailwindcss -i web/static/css/main.css -o web/static/css/styles.css --minify python manage.py collectstatic --noinput diff --git a/theme/apps.py b/theme/apps.py deleted file mode 100644 index dd24136..0000000 --- a/theme/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class ThemeConfig(AppConfig): - name = "theme" diff --git a/theme/management/commands/__init__.py b/theme/management/commands/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/theme/__init__.py b/web/management/__init__.py similarity index 100% rename from theme/__init__.py rename to web/management/__init__.py diff --git a/theme/management/__init__.py b/web/management/commands/__init__.py similarity index 100% rename from theme/management/__init__.py rename to web/management/commands/__init__.py diff --git a/theme/management/commands/build_tailwind_theme.py b/web/management/commands/build_tailwind_theme.py similarity index 100% rename from theme/management/commands/build_tailwind_theme.py rename to web/management/commands/build_tailwind_theme.py diff --git a/theme/static/css/.gitignore b/web/static/css/.gitignore similarity index 100% rename from theme/static/css/.gitignore rename to web/static/css/.gitignore diff --git a/theme/static/css/components.css b/web/static/css/components.css similarity index 98% rename from theme/static/css/components.css rename to web/static/css/components.css index 69c0ad9..e7110ba 100644 --- a/theme/static/css/components.css +++ b/web/static/css/components.css @@ -67,7 +67,7 @@ } .icon-button { - @apply flex text-gray-500 dark:text-gray-100 hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none rounded-lg text-sm p-4 cursor-pointer; + @apply flex text-gray-900 dark:text-gray-100 hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none rounded-lg text-sm p-4 cursor-pointer; } .link-button { diff --git a/theme/static/css/main.css b/web/static/css/main.css similarity index 100% rename from theme/static/css/main.css rename to web/static/css/main.css diff --git a/theme/static/theme/js/theme.js b/web/static/theme/js/theme.js similarity index 100% rename from theme/static/theme/js/theme.js rename to web/static/theme/js/theme.js diff --git a/web/templates/components/product_card.html b/web/templates/components/product_card.html index c73f2a1..19a5f54 100644 --- a/web/templates/components/product_card.html +++ b/web/templates/components/product_card.html @@ -2,7 +2,7 @@
-
+
{{ product.name }} diff --git a/theme/templates/components/theme-switch.html b/web/templates/components/theme-switch.html similarity index 100% rename from theme/templates/components/theme-switch.html rename to web/templates/components/theme-switch.html diff --git a/theme/templates/theme/base.html b/web/templates/theme/base.html similarity index 100% rename from theme/templates/theme/base.html rename to web/templates/theme/base.html diff --git a/theme/templates/theme/main.css.template b/web/templates/theme/main.css.template similarity index 100% rename from theme/templates/theme/main.css.template rename to web/templates/theme/main.css.template diff --git a/theme/templates/theme/seo.html b/web/templates/theme/seo.html similarity index 100% rename from theme/templates/theme/seo.html rename to web/templates/theme/seo.html