golf sample

app/fruit/forms.py

@@ -1,6 +1,6 @@
 from django.forms.models import inlineformset_factory, modelform_factory, modelformset_factory
 from django import forms
-from .models import Store, Product, Photo, ProductSKU, Sale, Inbox, Vendor, VendorOrder, VendorProduct
+from .models import Store, Product, Photo, ProductSKU, Sale, Inbox, Vendor, VendorOrder, VendorProduct, Profile
 from django.forms import ModelForm
 from django_google_maps import widgets as map_widgets
 from django_google_maps import fields as map_fields
@@ -24,6 +24,19 @@ StoreForm = modelform_factory(
     widgets = GeneralWidgets,
     )
 
+
+ProfileForm = modelform_factory(
+    Profile,
+    fields=("bio", "location", "facebook", "line_id", "tel", ),
+    widgets = GeneralWidgets,
+    )
+
+UserForm = modelform_factory(
+    User,
+    fields=("first_name", "last_name"),
+    widgets = GeneralWidgets,
+    )
+
 ProductSKUForm = modelform_factory(
     ProductSKU,
     fields="__all__",
@@ -113,10 +126,11 @@ class VendorOrderFilter(django_filters.FilterSet):
 
 
 class SignUpForm(UserCreationForm):
-    email = forms.EmailField(max_length=254, help_text='Required. Inform a valid email address.')
+    #email = forms.EmailField(max_length=254, help_text='Required. Inform a valid email address.')
+    roles = forms.ChoiceField(choices = (("seller", "Seller"), ("buyer", "Buyer")))
 
     class Meta:
         model = User
-        fields = ('username', 'email', 'password1', 'password2', )
+        fields = ('username', 'email', 'password1', 'password2', 'roles', )
 
 

app/fruit/migrations/0030_profile_roles.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.6 on 2021-08-16 05:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fruit', '0029_auto_20210815_1415'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='roles',
+            field=models.CharField(choices=[('seller', 'Seller'), ('buyer', 'Buyer')], default='seller', max_length=30),
+        ),
+    ]

app/fruit/migrations/0031_auto_20210816_1519.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.6 on 2021-08-16 08:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fruit', '0030_profile_roles'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='facebook',
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='line_id',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='tel',
+            field=models.CharField(max_length=100, null=True),
+        ),
+    ]

app/fruit/models.py

@@ -279,6 +279,15 @@ class Profile(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE)
     bio = models.TextField(max_length=500, blank=True)
     location = models.CharField(max_length=30, blank=True)
+    roles = models.CharField(
+        max_length=30,
+        choices=(("seller", "Seller"), ("buyer", "Buyer"),),
+        default="seller",
+    )
+    tel = models.CharField(max_length=100, null=True, blank=False)
+    line_id = models.CharField(max_length=100, null=True, blank=False)
+    facebook = models.CharField(max_length=200, null=True, blank=False)
+
     birth_date = models.DateField(null=True, blank=True)
 
 @receiver(post_save, sender=User)

app/fruit/templates/fruit/mystore.html

@@ -18,7 +18,8 @@
 <hr> -->
 <div class="d-flex align-items-start">
   <div class="nav flex-column nav-pills me-3 col-md-3 col-lg-2" id="v-pills-tab" role="tablist" aria-orientation="vertical">
-      <a class="nav-link {{ mystore|yesno:"active," }}" id="v-pills-home-tab"  href="{% url "fruit:mystore" %}" type="button" role="tab" aria-controls="v-pills-home" aria-selected="true">Info</a>
+      <a class="nav-link {{ profile|yesno:"active," }}" id="v-pills-profile-tab"  href="{% url "fruit:profile" %}" type="button" role="tab" aria-controls="v-pills-home" aria-selected="true">Profile</a>
+      <a class="nav-link {{ mystore|yesno:"active," }}" id="v-pills-home-tab"  href="{% url "fruit:mystore" %}" type="button" role="tab" aria-controls="v-pills-home" aria-selected="true">Store Info</a>
       <a class="nav-link {{ product|yesno:"active," }}" id="v-pills-profile-tab"  href="{% url "fruit:product_index" %}" type="button" role="tab" aria-controls="v-pills-profile" aria-selected="false">Products</a>
     <a class="nav-link" id="v-pills-messages-tab" href="{% url "fruit:inbox_index" %}" type="button" role="tab" aria-controls="v-pills-messages" aria-selected="false">Inbox</a>
     <a class="nav-link {{ sale_active|yesno:"active," }}" id="v-pills-settings-tab" href="{% url "fruit:sale_index" %}"  type="button" role="tab" aria-controls="v-pills-settings" aria-selected="false">Saled Items</a>

app/fruit/templates/fruit/profile.html

@@ -0,0 +1,30 @@
+{% extends "fruit/mystore.html" %}
+{% load static %}
+{% load crispy_forms_tags %}
+
+{% block header %}
+{{ form1.media }}
+{{ form2.media }}
+{% endblock %}
+
+{% block store_main %}
+<form  method="post">
+    {% csrf_token %}
+    <dl>
+        <dt>Email:</dt>
+        <dd>
+            {{ user.email }}</dd>
+        <dt>User name:</dt>
+        <dd>
+            {{ user.username }}</dd>
+        <dt>Role</td>
+        <dd>
+            {{ user.profile.get_roles_display }}</dd>
+    </dl>
+    {{ form1 | crispy }}
+    {{ form2 | crispy }}
+    <br>
+    <input type='submit' class='btn btn-primary' name='updateProfile' value="Update" />
+
+</form>
+{% endblock %}

app/fruit/urls.py

@@ -6,6 +6,7 @@ from . import views
 urlpatterns = [
     path('', views.index, name='index'),
     path('mystore', views.mystore, name='mystore'),
+    path('profile', views.profile, name='profile'),
     path('products/create', views.create_product, name='product_create'),
     path('products/<pk>/sku/create', views.create_sku, name='create_sku'),
     path('sku/<pk>', views.edit_sku, name='edit_sku'),

app/fruit/views.py

@@ -2,13 +2,13 @@
 from django.shortcuts import render, redirect
 # Create your views here.
 from django.contrib.auth import login, authenticate
-from django.contrib.auth.forms import UserCreationForm
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 from django.urls import reverse
 from django.contrib.auth.decorators import login_required
 
 from fruit.models import Store, Product, Photo, ProductSKU, Sale, Inbox, Vendor, VendorProduct
 
-from .forms import StoreForm, ProductForm, InboxForm, SaleForm,  PhotoFormSet,VendorFilter,  InlinePhotoFormset, ProductSKUForm, ProductFilter, SaleFilter, InboxFilter, VendorForm, VendorOrderForm, VendorOrderFilter, VendorOrder, InlineVendorProductFormset, VendorProductForm, SignUpForm
+from .forms import StoreForm, ProductForm, InboxForm, SaleForm,  PhotoFormSet,VendorFilter,  InlinePhotoFormset, ProductSKUForm, ProductFilter, SaleFilter, InboxFilter, VendorForm, VendorOrderForm, VendorOrderFilter, VendorOrder, InlineVendorProductFormset, VendorProductForm, SignUpForm, ProfileForm, UserForm
 from django.contrib import messages
 from django.core.paginator import Paginator
 
@@ -486,6 +486,8 @@ def signup(request):
             user = form.save(commit=False)
             user.is_active = False
             user.save()
+            user.profile.roles = form.cleaned_data['roles']
+            user.profile.save()
             current_site = "https://localhost:8000"
             subject = 'Activate Your MySite Account'
             message = render_to_string('fruit/account_activation_email.html', {
@@ -519,3 +521,32 @@ def activate(request, uidb64, token):
 
 def account_activation_sent(request):
     return render(request, "fruit/account_activation_sent.html")
+
+
+@login_required
+def profile(request):
+    form1 = UserForm(instance = request.user)
+    user = request.user
+    form2 = ProfileForm(instance = request.user.profile)
+    if request.method == "POST":
+        form1 = UserForm(request.POST, instance=request.user)
+        form2 = ProfileForm(request.POST, instance=request.user.profile)
+        if form1.is_valid() and form2.is_valid():
+            form1.save()
+            form2.save()
+            '''
+            print(instances)
+            for s in instances:
+                s.product = instance1
+                s.save()
+            '''
+            messages.success(request, "Profile Save")
+            return redirect("fruit:profile")
+        else:
+            print("Invalid ")
+            if form1.errors:
+                messages.error(request, form1.errors)
+            if form2.errors:
+                messages.error(request, form2.errors)
+
+    return render(request, 'fruit/profile.html', {'form1': form1, 'form2': form2, 'user': user, 'profile': True} )

app/shaqfindbed/settings.py

@@ -77,7 +77,7 @@ MIDDLEWARE = [
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST = 'smtp.gmail.com'
 EMAIL_HOST_USER = 'tech@simplico.net'
-EMAIL_HOST_PASSWORD = 'SteveJobs1984'
+EMAIL_HOST_PASSWORD = 'Tum 1984 2527'
 EMAIL_PORT = 587
 EMAIL_USE_TLS = True
 DEFAULT_FROM_EMAIL = EMAIL_HOST_USER