front url

app/cms/admin.py

@@ -31,7 +31,7 @@ class PostPhotoInlineAdmin(admin.StackedInline):
 @admin.register(Post)
 class PostAdmin(UtilModel, admin.ModelAdmin):
     list_display = ('title', 'created_at', 'created_by')
-    fields = ("feature_image", "image_tag", "title", "body", "cat",  "tags", "status")
+    fields = ("feature_image", "image_tag", "title", "body", "cat",   "top_store",  "products1",   "products2",  "products3", "tags", "status")
     readonly_fields = ('image_tag',)
 
     inlines = [PostPhotoInlineAdmin,]

app/cms/migrations/0010_post_top_store.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.6 on 2021-08-21 05:55
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fruit', '0031_auto_20210816_1519'),
+        ('cms', '0009_alter_postphoto_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='post',
+            name='top_store',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='fruit.store'),
+        ),
+    ]

app/cms/migrations/0011_post_products.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.6 on 2021-08-21 06:11
+
+from django.db import migrations
+import django.db.models.deletion
+import smart_selects.db_fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fruit', '0031_auto_20210816_1519'),
+        ('cms', '0010_post_top_store'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='post',
+            name='products',
+            field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, chained_field='top_store', chained_model_field='store', null=True, on_delete=django.db.models.deletion.CASCADE, to='fruit.product'),
+        ),
+    ]

app/cms/migrations/0012_auto_20210821_1323.py

@@ -0,0 +1,35 @@
+# Generated by Django 3.2.6 on 2021-08-21 06:23
+
+from django.db import migrations
+import django.db.models.deletion
+import smart_selects.db_fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fruit', '0031_auto_20210816_1519'),
+        ('cms', '0011_post_products'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='post',
+            name='products',
+        ),
+        migrations.AddField(
+            model_name='post',
+            name='products1',
+            field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, chained_field='top_store', chained_model_field='store', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='product1', to='fruit.product'),
+        ),
+        migrations.AddField(
+            model_name='post',
+            name='products2',
+            field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, chained_field='top_store', chained_model_field='store', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='product2', to='fruit.product'),
+        ),
+        migrations.AddField(
+            model_name='post',
+            name='products3',
+            field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, chained_field='top_store', chained_model_field='store', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='product3', to='fruit.product'),
+        ),
+    ]

app/cms/migrations/0013_auto_20210821_1332.py

@@ -0,0 +1,31 @@
+# Generated by Django 3.2.6 on 2021-08-21 06:32
+
+from django.db import migrations
+import django.db.models.deletion
+import smart_selects.db_fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fruit', '0031_auto_20210816_1519'),
+        ('cms', '0012_auto_20210821_1323'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='post',
+            name='products1',
+            field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field='top_store', chained_model_field='store', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='product1', to='fruit.product'),
+        ),
+        migrations.AlterField(
+            model_name='post',
+            name='products2',
+            field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field='top_store', chained_model_field='store', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='product2', to='fruit.product'),
+        ),
+        migrations.AlterField(
+            model_name='post',
+            name='products3',
+            field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field='top_store', chained_model_field='store', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='product3', to='fruit.product'),
+        ),
+    ]

app/cms/migrations/0014_auto_20210821_1342.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.2.6 on 2021-08-21 06:42
+
+from django.db import migrations, models
+import django.db.models.deletion
+import taggit.managers
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('taggit', '0003_taggeditem_add_unique_index'),
+        ('fruit', '0031_auto_20210816_1519'),
+        ('cms', '0013_auto_20210821_1332'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='post',
+            name='tags',
+            field=taggit.managers.TaggableManager(blank=True, help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags'),
+        ),
+        migrations.AlterField(
+            model_name='post',
+            name='top_store',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='fruit.store'),
+        ),
+    ]

app/cms/migrations/0015_alter_post_cat.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.6 on 2021-08-21 08:15
+
+from django.db import migrations
+import django.db.models.deletion
+import mptt.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0014_auto_20210821_1342'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='post',
+            name='cat',
+            field=mptt.fields.TreeForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='cms.postcat'),
+        ),
+    ]

app/cms/models.py

@@ -22,6 +22,7 @@ from django_quill.fields import QuillField
 
 from django.utils.html import escape, format_html
 from taggit.managers import TaggableManager
+from fruit.models import Store, Product
 # Create your models here.
 
 
@@ -52,8 +53,39 @@ class Post(GenericModel, models.Model):
     title = models.CharField(max_length=200)
     body = QuillField()
     #body = models.TextField(blank=True, null=True)
-    cat = models.ForeignKey('PostCat', on_delete=models.SET_NULL, null=True)
-    tags = TaggableManager()
+    cat = TreeForeignKey('PostCat', on_delete=models.SET_NULL, null=True)
+    top_store = models.ForeignKey(Store, on_delete=models.SET_NULL, null=True, blank=True)
+    products1 = ChainedForeignKey(
+        Product,
+        chained_field="top_store",
+        chained_model_field="store",
+        show_all=False,
+        auto_choose=True,
+        null=True,
+        blank=True,
+        related_name="product1"
+    )
+    products2 = ChainedForeignKey(
+        Product,
+        chained_field="top_store",
+        chained_model_field="store",
+        show_all=False,
+        auto_choose=True,
+        null=True,
+        blank=True,
+        related_name="product2"
+    )
+    products3 = ChainedForeignKey(
+        Product,
+        chained_field="top_store",
+        chained_model_field="store",
+        show_all=False,
+        auto_choose=True,
+        blank=True,
+        null=True,
+        related_name="product3"
+    )
+    tags = TaggableManager(blank=True)
     status = models.CharField(
         max_length=30,
         choices=(("draft", "Draft"), ("publish", "Publish")),

app/cms/templates/cms/view.html

@@ -1,8 +1,15 @@
 {% extends "front/base.html" %}
 
 {% block content %}
-View HTML
-<h1>{{ post.title }}</h1>
-{{ post.body.html | safe }}
-{{ post_id }}
+<div class="row">
+<div class='col-md-8'>
+    View HTML
+    <h1>{{ post.title }}</h1>
+    {{ post.body.html | safe }}
+    {{ post_id }}
+</div>
+<div class='col-md-4'>
+    side menu
+</div>
+</div>
 {% endblock %}

app/cms/urls.py

@@ -7,3 +7,6 @@ urlpatterns = [
     path('post/<post_id>', views.post, name='view_post'),
     path('tags/<tag>', views.post_tags, name='tags'),
 ]
+
+
+app_name = 'cms'

app/front/admin.py

@@ -1,3 +1,8 @@
 from django.contrib import admin
-
+from .models import SearchData
 # Register your models here.
+
+
+@admin.register(SearchData)
+class SearchDataAdmin(admin.ModelAdmin):
+    list_display = ["q", "product_type",  "content_cat",   "created_at", "created_by"]

app/front/forms.py

@@ -0,0 +1,25 @@
+from django.forms.models import inlineformset_factory, modelform_factory, modelformset_factory
+from django import forms
+from .models import SearchData
+from django.forms import ModelForm
+from django_google_maps import widgets as map_widgets
+from django_google_maps import fields as map_fields
+
+import django_filters
+
+
+GeneralWidgets = {
+    'startDate': forms.DateInput(format="%d/%m/%Y",attrs={'type': 'text', 'class': 'datepicker'}),
+    'address': map_widgets.GoogleMapsAddressWidget,
+    'photo': forms.FileInput,
+    'sub_total':  forms.TextInput(attrs={'readonly': 'readonly'}),
+    'vat': forms.TextInput(attrs={'readonly': 'readonly'}),
+    'total': forms.TextInput(attrs={'readonly': 'readonly'}),
+
+}
+
+SearchForm = modelform_factory(
+    SearchData,
+    fields="__all__",
+    widgets = GeneralWidgets,
+    )

app/front/migrations/0001_initial.py

@@ -0,0 +1,36 @@
+# Generated by Django 3.2.6 on 2021-08-21 12:51
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import mptt.fields
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('fruit', '0031_auto_20210816_1519'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cms', '0015_alter_post_cat'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SearchData',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True, null=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('q', models.CharField(max_length=200)),
+                ('content_cat', mptt.fields.TreeForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='cms.postcat')),
+                ('created_by', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='searchdata_created', to=settings.AUTH_USER_MODEL)),
+                ('modified_by', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='searchdata_modified', to=settings.AUTH_USER_MODEL)),
+                ('product_type', mptt.fields.TreeForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='fruit.producttype')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

app/front/migrations/0002_auto_20210821_2217.py

@@ -0,0 +1,32 @@
+# Generated by Django 3.2.6 on 2021-08-21 15:17
+
+from django.db import migrations, models
+import django.db.models.deletion
+import mptt.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fruit', '0031_auto_20210816_1519'),
+        ('cms', '0015_alter_post_cat'),
+        ('front', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='searchdata',
+            name='content_cat',
+            field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cms.postcat'),
+        ),
+        migrations.AlterField(
+            model_name='searchdata',
+            name='product_type',
+            field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='fruit.producttype'),
+        ),
+        migrations.AlterField(
+            model_name='searchdata',
+            name='q',
+            field=models.CharField(blank=True, default='', max_length=200),
+        ),
+    ]

app/front/models.py

@@ -1,3 +1,28 @@
 from django.db import models
-
+from smart_selects.db_fields import (
+    ChainedForeignKey,
+    ChainedManyToManyField,
+    GroupedForeignKey,
+)
+from django.contrib.auth.models import User
 # Create your models here.
+from mptt.models import MPTTModel, TreeForeignKey
+from cms.models import PostCat, Post
+from fruit.models import  Product, ProductType
+
+class GenericModel(models.Model):
+    created_at = models.DateTimeField(auto_now_add=True, null=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    created_by = models.ForeignKey(User, null=True, editable=False, related_name='%(class)s_created', on_delete=models.SET_NULL)
+    modified_by = models.ForeignKey(User, null=True, editable=False, related_name='%(class)s_modified', on_delete=models.SET_NULL)
+
+    class Meta:
+        abstract = True
+
+
+
+class SearchData(GenericModel, models.Model):
+    q = models.CharField(max_length=200, blank=True, default="")
+    product_type = TreeForeignKey(ProductType, on_delete=models.SET_NULL, null=True, blank=True)
+    content_cat = TreeForeignKey(PostCat, on_delete=models.SET_NULL, null=True, blank=True)

app/front/static/front/css/blog.css

@@ -146,3 +146,9 @@ h1, h2, h3, h4, h5, h6 {
 .multiField {
     border:1px solid #ccc;
 }
+.top-image {
+    height: 200px;
+    object-fit: contain;
+    width: 100%;
+    background-color: #888;
+}

app/front/templates/front/_menu.html

@@ -7,7 +7,7 @@
 			<a class="blog-header-logo text-dark" href="{% url "front:index" %}">SimpleMarket</a>
 		</div>
 		<div class="col-4 d-flex justify-content-end align-items-center">
-			<a class="text-muted" href="#">
+            <a class="text-muted" href="{% url "front:search" %}">
 				<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="mx-3"><circle cx="10.5" cy="10.5" r="7.5"></circle><line x1="21" y1="21" x2="15.8" y2="15.8"></line></svg>
 			</a>
             {% if user.is_authenticated %}
@@ -26,9 +26,11 @@
 		<a class="p-2 text-muted" href="#">Home</a>
 		<a class="p-2 text-muted" href="#">News</a>
         <a class="p-2 text-muted" href="#">Market</a>
-		<a class="p-2 text-muted" href="#">Store</a>
+        <a class="p-2 text-muted" href="{% url "front:stores" %}">Store</a>
 		<a class="p-2 text-muted" href="#">Articles</a>
 		<a class="p-2 text-muted" href="#">Forum</a>
 	</nav>
 </div>
 
+<hr>
+

app/front/templates/front/search.html

@@ -0,0 +1,34 @@
+{% extends "front/base.html" %}
+
+{% load static %}
+{% load crispy_forms_tags %}
+
+{% block header %}            
+{{ form.media  }}
+{% endblock %}
+
+{% block top_slide %}
+{% endblock %}
+{% block content %}
+<h1>Search</h1>
+<div class='row'>
+    <div class="col-md-9">
+        <form>
+            {% csrf_token %}
+            <div class='row'>
+                <div class="col-md-4">{{ form.q| as_crispy_field }}</div>
+                <div class="col-md-4">{{ form.product_type | as_crispy_field }}</div>
+                <div class="col-md-4">{{ form.content_cat | as_crispy_field }}</div>
+            </div>
+            <br>
+            <input type='submit' class='btn btn-primary' value="Search" />
+        </form>
+        {{ results }}
+    </div>
+    <div class="col-md-3">
+        Recom
+    </div>
+</div>
+{% endblock %}
+
+

app/front/templates/front/stores.html

@@ -0,0 +1,21 @@
+{% extends "front/base.html" %}
+
+{% load static %}
+{% block top_slide %}
+{% endblock %}
+{% block content %}
+<h1>Top Stores</h1>
+<div class='row'>
+
+{% for s in top_stores %}
+<div class="col-md-3">
+    <img src="{{ s.feature_image.url }}" class="img-fluid top-image" />
+    <a href="{% url  "cms:view_post" post_id=s.id %}">{{ s.title }}</a>
+</div>
+{% endfor %}
+</div>
+{% for s in top_stores %}
+{% endfor %}
+{% endblock %}
+
+

app/front/urls.py

@@ -5,6 +5,8 @@ from . import views
 
 urlpatterns = [
     path('', views.index, name='index'),
+    path('stores', views.stores, name='stores'),
+    path('search', views.search, name='search'),
     path('tracking', views.tracking, name='tracking'),
     path('tracking', views.tracking, name='tracking'),
     path('success', views.success, name='success'),

app/front/views.py

@@ -1,6 +1,11 @@
 from django.shortcuts import render, redirect
 from backend.models import Patient
-
+from cms.models import Post
+from fruit.models import Product
+from .forms import SearchForm
+from itertools import chain, tee
+from operator import attrgetter
+from django.db.models import Q
 # Create your views here.
 
 def index(request):
@@ -39,6 +44,35 @@ def agri_market(request):
     pass
 
 
+def stores(request):
+    top_stores = Post.objects.filter(cat__name="Top Stores", status="publish").order_by("-created_at")
+    return render(request, "front/stores.html", {'top_stores': top_stores})
+
+def search(request):
+    form = SearchForm(request.GET)
+
+    results = None
+    if form.is_valid():
+        o = form.save(commit = False)
+        o.created_by = request.user
+        o.save()
+
+        q = Q()
+        q2 = Q()
+        if o.content_cat != None:
+            q = q & Q(cat = o.content_cat)
+
+        if o.product_type != None:
+            q2 = q2 & Q(product_type = o.product_type)
+
+        q = q & ( Q(title__contains = o.q ) | Q(body__contains = o.q))
+        q2 = q2 & ( Q(name__contains = o.q ) | Q(description__contains = o.q))
+
+        r1 = Post.objects.filter(q)
+        r2 = Product.objects.filter(q2)
+        results = list(sorted(chain(r1, r2), key = lambda obj: obj.created_at, reverse = True))
+
+    return render(request, "front/search.html", {'form': form, 'results': results})
 
 def mystore(requeset):
     pass