pull request

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),
+        ),
+    ]

core/models.py

@@ -8,8 +8,8 @@
 
 CATEGORY_CHOICES = (
     ('S', 'Shirt'),
-    ('SW', 'Sport wear'),
-    ('OW', 'Outwear')
+    ('SW', 'Hoodie'),
+    ('OW', 'Cap')
 )
 
 LABEL_CHOICES = (

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:

templates/home.html

@@ -30,10 +30,10 @@
               <a class="nav-link" href="#">Shirts</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="#">Sport wears</a>
+              <a class="nav-link" href="#">Hoodies</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="#">Outwears</a>
+              <a class="nav-link" href="#">Caps</a>
             </li>
 
           </ul>

templates/navbar.html

@@ -5,7 +5,7 @@
 
       <!-- Brand -->
       <a class="navbar-brand waves-effect" href="/">
-        <strong class="blue-text">DJe-commerce</strong>
+        <strong class="blue-text">Underpaid-N-Overworked</strong>
       </a>
 
       <!-- Collapse -->

templates/product.html

@@ -79,9 +79,10 @@
 
           <h4 class="my-4 h4">Additional information</h4>
 
-          <p>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.</p>
+          <p>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.</p>
 
         </div>
         <!--Grid column-->
@@ -95,23 +96,23 @@ <h4 class="my-4 h4">Additional information</h4>
         <!--Grid column-->
         <div class="col-lg-4 col-md-12 mb-4">
 
-          <img src="https://mdbootstrap.com/img/Photos/Horizontal/E-commerce/Products/11.jpg" class="img-fluid" alt="">
+          <img src="https://unomail.sharepoint.com/:i:/r/sites/UNO-ISQA3900OverworkedUnderpaid/Shared%20Documents/General/Shirt%20Mockups/Back.png?csf=1&web=1&e=GPLp8u" class="img-fluid" alt="">
 
         </div>
         <!--Grid column-->
 
         <!--Grid column-->
         <div class="col-lg-4 col-md-6 mb-4">
 
-          <img src="https://mdbootstrap.com/img/Photos/Horizontal/E-commerce/Products/12.jpg" class="img-fluid" alt="">
+          <img src="https://unomail.sharepoint.com/:i:/r/sites/UNO-ISQA3900OverworkedUnderpaid/Shared%20Documents/General/Shirt%20Mockups/Black_Hoodie.png?csf=1&web=1&e=whQOYD" class="img-fluid" alt="">
 
         </div>
         <!--Grid column-->
 
         <!--Grid column-->
         <div class="col-lg-4 col-md-6 mb-4">
 
-          <img src="https://mdbootstrap.com/img/Photos/Horizontal/E-commerce/Products/13.jpg" class="img-fluid" alt="">
+          <img src="https://unomail.sharepoint.com/:i:/r/sites/UNO-ISQA3900OverworkedUnderpaid/Shared%20Documents/General/Shirt%20Mockups/Red_Tshirt.png?csf=1&web=1&e=1rLwys" class="img-fluid" alt="">
 
         </div>
         <!--Grid column-->

djecommerce/settings/development.py → 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')

djecommerce/settings/production.py → 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']

djecommerce/settings/base.py → 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'

djecommerce/wsgi.py → 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()