diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..13566b81 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/UNOv2.iml b/.idea/UNOv2.iml new file mode 100644 index 00000000..6971eb05 --- /dev/null +++ b/.idea/UNOv2.iml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 00000000..3c62c665 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,17 @@ + + + + + sqlite.xerial + true + org.sqlite.JDBC + jdbc:sqlite:C:\Users\big_p\Desktop\unoshop\unoshop\db.sqlite3 + $ProjectFileDir$ + + + file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.43.0/org/xerial/sqlite-jdbc/3.43.0.0/sqlite-jdbc-3.43.0.0.jar + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 00000000..105ce2da --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..e9f71195 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..16929234 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/core/migrations/0005_auto_20231022_1706.py b/core/migrations/0005_auto_20231022_1706.py new file mode 100644 index 00000000..b677b8cc --- /dev/null +++ b/core/migrations/0005_auto_20231022_1706.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2 on 2023-10-22 22:06 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0004_auto_20190630_1408'), + ] + + operations = [ + migrations.AlterField( + model_name='item', + name='category', + field=models.CharField(choices=[('S', 'Shirt'), ('SW', 'Hoodie'), ('OW', 'Cap')], max_length=2), + ), + ] diff --git a/core/models.py b/core/models.py index 881088f6..d0948061 100644 --- a/core/models.py +++ b/core/models.py @@ -8,8 +8,8 @@ CATEGORY_CHOICES = ( ('S', 'Shirt'), - ('SW', 'Sport wear'), - ('OW', 'Outwear') + ('SW', 'Hoodie'), + ('OW', 'Cap') ) LABEL_CHOICES = ( diff --git a/db.sqlite3 b/db.sqlite3 index 1491c076..2914fd4c 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/manage.py b/manage.py index cc7ec082..df63853f 100755 --- a/manage.py +++ b/manage.py @@ -3,7 +3,7 @@ import sys if __name__ == '__main__': - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'djecommerce.settings.development') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'unoshop.settings.development') try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/requirements.txt b/requirements.txt index e7e0d239..62326ea2 100644 Binary files a/requirements.txt and b/requirements.txt differ diff --git a/templates/home.html b/templates/home.html index 9e56f4e4..b88059cf 100755 --- a/templates/home.html +++ b/templates/home.html @@ -30,10 +30,10 @@ Shirts
  • - Sport wears + Hoodies
  • - Outwears + Caps
    • diff --git a/templates/navbar.html b/templates/navbar.html index c40ce502..b279c194 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -5,7 +5,7 @@ - DJe-commerce + Underpaid-N-Overworked diff --git a/templates/product.html b/templates/product.html index 689ec000..f3ad3577 100755 --- a/templates/product.html +++ b/templates/product.html @@ -79,9 +79,10 @@

    Additional information

    -

    Lorem ipsum dolor sit amet consectetur adipisicing elit. Natus suscipit modi sapiente illo soluta odit - voluptates, - quibusdam officia. Neque quibusdam quas a quis porro? Molestias illo neque eum in laborum.

    +

    Looking for a unique touch for your "Underpaid-N-Overworked" T-shirt or Hoodie? + We offer customization services for bulk orders or special events. + Contact our customer service team to inquire about personalized designs, + logos, or prints for your business, organization, or special occasion.

    @@ -95,7 +96,7 @@

    Additional information

    - +
    @@ -103,7 +104,7 @@

    Additional information

    - +
    @@ -111,7 +112,7 @@

    Additional information

    - +
    diff --git a/djecommerce/__init__.py b/unoshop/__init__.py similarity index 100% rename from djecommerce/__init__.py rename to unoshop/__init__.py diff --git a/djecommerce/settings/__init__.py b/unoshop/settings/__init__.py similarity index 100% rename from djecommerce/settings/__init__.py rename to unoshop/settings/__init__.py diff --git a/djecommerce/settings/development.py b/unoshop/settings/development.py similarity index 85% rename from djecommerce/settings/development.py rename to unoshop/settings/development.py index f85f845c..1d1edbb9 100644 --- a/djecommerce/settings/development.py +++ b/unoshop/settings/development.py @@ -1,7 +1,8 @@ -from .base import * +from .settings import * +import os DEBUG = True -ALLOWED_HOSTS = ['127.0.0.1'] +ALLOWED_HOSTS = ['127.0.0.1', '.pythonanywhere.com'] INSTALLED_APPS += [ 'debug_toolbar' @@ -45,3 +46,9 @@ def show_toolbar(request): STRIPE_PUBLIC_KEY = config('STRIPE_TEST_PUBLIC_KEY') STRIPE_SECRET_KEY = config('STRIPE_TEST_SECRET_KEY') + + + +MEDIA_URL = 'media/' +STATIC_ROOT = os.path.join(BASE_DIR, 'static') +MEDIA_ROOT = os.path.join(BASE_DIR, 'media') diff --git a/djecommerce/settings/production.py b/unoshop/settings/production.py similarity index 97% rename from djecommerce/settings/production.py rename to unoshop/settings/production.py index 7e485c25..0135d9ff 100644 --- a/djecommerce/settings/production.py +++ b/unoshop/settings/production.py @@ -1,4 +1,4 @@ -from .base import * +from .settings import * DEBUG = config('DEBUG', cast=bool) ALLOWED_HOSTS = ['ip-address', 'www.your-website.com'] diff --git a/djecommerce/settings/base.py b/unoshop/settings/settings.py similarity index 96% rename from djecommerce/settings/base.py rename to unoshop/settings/settings.py index 52e68c07..42ebf6f3 100644 --- a/djecommerce/settings/base.py +++ b/unoshop/settings/settings.py @@ -34,7 +34,7 @@ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] -ROOT_URLCONF = 'djecommerce.urls' +ROOT_URLCONF = 'unoshop.urls' TEMPLATES = [ { @@ -52,7 +52,7 @@ }, ] -WSGI_APPLICATION = 'djecommerce.wsgi.application' +WSGI_APPLICATION = 'unoshop.wsgi.application' LANGUAGE_CODE = 'en-us' TIME_ZONE = 'UTC' diff --git a/djecommerce/urls.py b/unoshop/urls.py similarity index 100% rename from djecommerce/urls.py rename to unoshop/urls.py diff --git a/djecommerce/wsgi.py b/unoshop/wsgi.py similarity index 58% rename from djecommerce/wsgi.py rename to unoshop/wsgi.py index b2e66244..f8192e86 100644 --- a/djecommerce/wsgi.py +++ b/unoshop/wsgi.py @@ -2,6 +2,6 @@ from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'djecommerce.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'unoshop.settings') application = get_wsgi_application()