Merge pull request #25 from alissatroiano/shop-int

Update artwork model and shop views, so users can donate AI artwork to the shop

cart/views.py

@@ -5,7 +5,6 @@
 
 from shop.models import Product
 
-
 # Create your views here.
 
 def view_cart(request):
@@ -18,6 +17,7 @@ def add_to_cart(request, item_id):
     """ A view to add a quantity of a specific store product to the user's shopping cart """
 
     product = get_object_or_404(Product, pk=item_id)
+
     quantity = int(request.POST.get('quantity'))
     redirect_url = request.POST.get('redirect_url')
     dimension = None

checkout/urls.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from django.urls import path
+from django.urls import path, include
 from . import views
 from .webhooks import webhook
 
@@ -8,4 +8,4 @@
     path('checkout_success/<order_number>', views.checkout_success, name='checkout_success'),
     path('wh/', webhook, name='webhook'),
     path('cache_checkout_data/', views.cache_checkout_data, name='cache_checkout_data'),
-]
+]

hugo/admin.py

@@ -14,5 +14,5 @@ class StyleAdmin(admin.ModelAdmin):
 @admin.register(Artwork)
 class ArtworkAdmin(admin.ModelAdmin):
     fields = [  
-        'title', 'user', 'artwork_description', 'image_url', 'image', 'style', 'is_downloadable', 'is_public'
+        'title', 'user', 'artwork_description', 'image_url', 'image', 'style', 'is_downloadable', 'is_public', 'for_sale'
     ]

hugo/forms.py

@@ -41,3 +41,16 @@ def __init__(self, *args, **kwargs):
         for field_name, field in self.fields.items():
             field.widget.attrs['class'] = 'border-1 rounded shadow-sm'
             field.widget.attrs['required'] = False
+
+
+class AddToStoreForm(forms.ModelForm):
+  class Meta:
+        model = Artwork
+        fields = ['price']
+
+        def __init__(self, *args, **kwargs):
+            super().__init__(*args, **kwargs)
+
+            for field_name, field in self.fields.items():
+                field.widget.attrs['class'] = 'border-1 rounded shadow-sm'
+                field.widget.attrs['required'] = False

hugo/migrations/0007_artwork_for_sale.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.2 on 2023-08-22 23:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hugo', '0006_artwork_is_public'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='artwork',
+            name='for_sale',
+            field=models.BooleanField(default=False),
+        ),
+    ]

hugo/migrations/0008_artwork_price.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.2 on 2023-08-23 00:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hugo', '0007_artwork_for_sale'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='artwork',
+            name='price',
+            field=models.DecimalField(decimal_places=2, default=0, max_digits=8),
+        ),
+    ]

hugo/models.py

@@ -1,7 +1,6 @@
 from django.db import models
 from django.contrib.auth.models import User
 
-
 class Style(models.Model):
     name = models.CharField(max_length=254)
     friendly_name = models.CharField(max_length=254, null=True, blank=True)
@@ -27,6 +26,10 @@ class Artwork(models.Model):
     style = models.ForeignKey('Style', null=True, blank=True,on_delete=models.SET_NULL)
     is_public = models.BooleanField(default=False)
     is_downloadable = models.BooleanField(default=False)
+    for_sale = models.BooleanField(default=False)
+    price = models.DecimalField(
+        decimal_places=2, max_digits=8, null=False, default=0)
+
 
     def get_style(s):
         """

hugo/templates/artwork_detail.html

@@ -21,9 +21,7 @@
             <div class="col-12 col-sm-5">
                 <h1 class="display-font display-4 mb-2 text-start">{{ artwork.title }}</h1>
                 <h2 class="text-start body-font">By: 
-                    <a class="link-font">
-                    {{ artwork.user }}
-                </a></h2>        
+                    <a href="{% url 'artist_artworks' artwork.user.username %}">{{ artwork.user }}</a></h2>        
                 <div class="mt-3">
                 <i class="fas fa-quote-left fa-3x my-3 icon-main" id="quote1"></i>
                 <p class="text-start my-3 body-font"> "{{ artwork.artwork_description }}"</p>

hugo/templates/hugo.html

@@ -106,7 +106,7 @@ <h3 class="display-font">
                 {{ artwork.title }}</h3>
                   <div class="intro">
                     <p>by 
-                    <a href="#" class="artist-link"> {{ artwork.user }}</a> 
+                        <a href="{% url 'artist_artworks' artwork.user.username %}">{{ artwork.user }}</a></p>
                 </p>
                 {% if artwork.is_downloadable %}
                 <small>Downloadable</small>
@@ -121,6 +121,11 @@ <h3 class="display-font">
                     <a class="btn display-font" href="{% url 'artwork_detail' artwork.id %}">
                         VIEW ARTWORK <i class="fas fa-chevron-right"></i></a>
                   </div>
+                  <div class="view-artist">
+                    <a class="btn display-font" href="{% url 'artist_artworks' artwork.user %}">
+                        <i class="fas fa-chevron-left"></i>
+                        VIEW ARTIST </a>
+                  </div>
                   {% if artwork.style %}
                   <div class="mt-lg-4">
                     <a class="tag-font" href="{% url 'hugo' %}?style={{ artwork.style.name }}">

hugo/views.py

@@ -20,6 +20,7 @@
 email = os.environ["MINDSDB_EMAIL"]
 password = os.environ["MINDSDB_PASSWORD"]
 
+from cart.views import add_to_cart
 
 def hugo(request):
     artworks = Artwork.objects.all()
@@ -119,3 +120,11 @@ def add_hugo(request):
     context = {'form': form}
 
     return render(request, template, context)
+
+def add_artwork_to_cart(request, artwork_id):
+    artwork = get_object_or_404(Artwork, id=artwork_id)
+
+    # Call the add_to_cart view to add the artwork to the cart
+    add_to_cart(request, artwork.id, quantity=1)
+
+    return redirect('cart:view_cart') 

profiles/templates/add_to_store.html

@@ -0,0 +1,30 @@
+
+{% extends 'base.html' %}
+{% load static %}
+
+{% block extra_css %}
+<link rel="stylesheet" href="{% static 'profiles/css/profile.css' %}">
+{% endblock %}
+
+{% block page_header %}
+<div class="container header-container">
+    <div class="row">
+        <div class="col"></div>
+    </div>
+</div>
+{% endblock %}
+
+{% block content %}
+<div class="container pt-5">
+    <div class="row d-flex p-5">
+        <div class="col-10 offset-2">
+<form method="post" enctype="multipart/form-data">
+    {% csrf_token %}
+    {{ form.as_p }}
+    <button type="submit">Add Artwork to Store</button>
+</form>
+</div>
+</div>
+</div>
+
+{% endblock %}

profiles/templates/profiles/add_to_store.html

@@ -0,0 +1,40 @@
+{% extends 'base.html' %}
+{% load static %}
+
+{% block extra_css %}
+<link rel="stylesheet" href="{% static 'profiles/css/profile.css' %}">
+{% endblock %}
+
+{% block page_header %}
+<div class="container header-container">
+    <div class="row">
+        <div class="col"></div>
+    </div>
+</div>
+{% endblock %}
+
+{% block content %}
+<div class="container pt-5">
+    <div class="row d-flex p-5">
+        <div class="col-12">
+            <div class="text-center">
+            <i class="fas fa-solid fa-hand-holding-heart fa-3x mb-3"></i>
+            </div>
+            <h1 class="text-center">Donate Artwork</h1>
+            <hr class="my-3 my-md-4">
+            <p class="body-font text-center px-3 px-md-5">Set a price for your creation and add it to our shop! Proceeds from donated artwork will go to "bla bla"</p>
+        </div>
+        </div>
+        <div class="col-10 offset-1 justify-content-center">
+            <div class="card h-100 p-3 p-md-4 p-lg-5 m-lg-3">
+                <form method="post" enctype="multipart/form-data">
+                    {% csrf_token %}
+                    {{ form.price|as_crispy_field }}
+                    <button type="submit">Add Artwork to Store</button>
+                </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    {% endblock %}

profiles/templates/profiles/artwork.html

@@ -14,4 +14,26 @@
 {% endblock %}
 
 {% block content %}
+<div class="container mt-5">
+    <div class="row">
+        <div class="col-12">
+            <h1>{{ artist.username }}'s Collection</h1>
+            </div>
+            </div>
+  <div class="row d-flex p-3">
+    {% for artwork in artworks %}
+      <div class="col-xs-8 col-sm-4">
+        <div class="card m-2">
+          <img src="{{ artwork.image.url }}" class="card-img-top img-fluid" alt="{{ artwork.title }}">
+          <div class="card-body">
+            <h5 class="card-title">{{ artwork.title }}</h5>
+            <p class="card-text">{{ artwork.artwork_description }}</p>
+            <a href="{% url 'artwork_detail' artwork.id %}" class="btn btn-primary">View Artwork</a>
+          </div>
+        </div>
+      </div>
+    {% endfor %}
+  </div>
+        </div>
+
 {% endblock %}

profiles/templates/profiles/profile.html

@@ -61,13 +61,16 @@ <h3 class="display-font fw-normal mb-0">
                             <img class="img-fluid" src="{{ artwork.image.url }}" alt="Card image cap">
                         </a>
                         {% endif %}
-                        <div class="card-footer bg-light d-flex justify-content-around">
-                            <div class="col text-start">
+                        <div class="card-footer bg-light d-flex justify-content-center">
+                            <div class="col-4 text-start">
                             <a href="{% url 'edit_artwork' artwork.id %}" class="text-small text-success">Edit</a>
                             </div>
-                            <div class="col text-end">
+                            <div class="col-4 text-center">
                                 <a href="{% url 'delete_artwork' artwork.id %}" class="text-small text-danger">Delete</a>
                         </div>
+                        <div class="col-4 text-end">
+                            <a href="{% url 'add_artwork_to_store' artwork.id %}" class="text-small text-info">DONATE</a>
+                    </div>
                         </div>
                     </div>
                 </div>

profiles/urls.py

@@ -6,4 +6,7 @@
     path('order_history/<order_number>', views.order_history, name='order_history'),
     path('edit_artwork/<int:artwork_id>/', views.edit_artwork, name='edit_artwork'),
     path('delete_artwork/<int:artwork_id>/', views.delete_artwork, name='delete_artwork'),
+    path('add_artwork_to_store/<int:artwork_id>/', views.add_artwork_to_store, name='add_artwork_to_store'),
+    path('artist/<str:username>/', views.artist_artworks, name='artist_artworks'),
+
 ]

profiles/views.py

@@ -12,7 +12,7 @@
 import pandas as pd
 from pandas import DataFrame
 from hugo.models import Artwork
-from hugo.forms import EditArtworkForm
+from hugo.forms import EditArtworkForm, AddToStoreForm
 
 
 def profile(request):
@@ -98,4 +98,33 @@ def delete_artwork(request, artwork_id):
     context = {
         'artwork': artwork,
     }
-    return render(request, template, context)
+    return render(request, template, context)
+
+
+def add_artwork_to_store(request, artwork_id):
+    artwork = get_object_or_404(Artwork, id=artwork_id, user=request.user)
+
+    if request.method == 'POST':     
+        form = AddToStoreForm(request.POST, request.FILES, instance=artwork)
+        if form.is_valid():
+            artwork = form.save(commit=False)
+            artwork.user = request.user 
+            artwork.for_sale = True
+            artwork.save()
+            return redirect('shop')
+    else:
+        form = AddToStoreForm()
+
+    context = {'form': form}
+    return render(request, 'profiles/add_to_store.html', context)
+
+
+def artist_artworks(request, username):
+    artist = get_object_or_404(User, username=username)
+    artworks = Artwork.objects.filter(user=artist)
+
+    context = {
+        'artist': artist,
+        'artworks': artworks,
+    }
+    return render(request, 'profiles/artwork.html', context)

shop/admin.py

@@ -64,6 +64,7 @@ class ProductAdmin(admin.ModelAdmin):
         'label',
         'predicted_titles',
         'artwork_description',
+        'style',
     ]
     autocomplete_fields = ['category']
    # Add display_final_price to readonly_fields because it is a function not a db field

shop/forms.py

@@ -1,20 +1,6 @@
 from django import forms
 from .models import Product, Category
-
-class ArtworkDescriptionForm(forms.ModelForm):
-    class Meta:
-        model = Product
-        fields = ['artwork_description']
-        labels = {
-            'artwork_description': 'Artwork Description'
-        }
-        widgets = {
-            'artwork_description': forms.Textarea(attrs={
-                'rows': 3,
-                'placeholder': 'Describe your artwork',
-                'class': 'border-1 rounded shadow-sm'
-            })
-        }
+from hugo.models import Artwork, Style
 
 class ProductForm(forms.ModelForm):
 
@@ -43,7 +29,8 @@ def __init__(self, *args, **kwargs):
             else:
                 field.widget.attrs['required'] = True
 
-class ArtworkForm(forms.Form):
-    description = forms.CharField(label='Describe your artwork', widget=forms.Textarea)
-    artwork_description = forms.CharField(label='Artwork Description', widget=forms.Textarea)
-    predicted_titles = forms.JSONField(label='Predicted Titles', widget=forms.HiddenInput, required=False)
+class EditProductForm(forms.ModelForm):
+
+    class Meta:
+        model = Product
+        fields = 'title', 'price'