nguage-py"> 16 
+    operations = [
17 
+        migrations.AlterField(
18 
+            model_name='post',
19 
+            name='tags',
20 
+            field=taggit.managers.TaggableManager(blank=True, help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags'),
21 
+        ),
22 
+        migrations.AlterField(
23 
+            model_name='post',
24 
+            name='top_store',
25 
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='fruit.store'),
26 
+        ),
27 
+    ]

+ 20 - 0
app/cms/migrations/0015_alter_post_cat.py
View File

1 
+# Generated by Django 3.2.6 on 2021-08-21 08:15
2 
+
3 
+from django.db import migrations
4 
+import django.db.models.deletion
5 
+import mptt.fields
6 
+
7 
+
8 
+class Migration(migrations.Migration):
9 
+
10 
+    dependencies = [
11 
+        ('cms', '0014_auto_20210821_1342'),
12 
+    ]
13 
+
14 
+    operations = [
15 
+        migrations.AlterField(
16 
+            model_name='post',
17 
+            name='cat',
18 
+            field=mptt.fields.TreeForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='cms.postcat'),
19 
+        ),
20 
+    ]

+ 34 - 2
app/cms/models.py
View File

22
22
23 
 from django.utils.html import escape, format_html
 23 
 from django.utils.html import escape, format_html
24 
 from taggit.managers import TaggableManager
 24 
 from taggit.managers import TaggableManager
25 
+from fruit.models import Store, Product
25 
 # Create your models here.
 26 
 # Create your models here.
26
27
27
28
52 
     title = models.CharField(max_length=200)
 53 
     title = models.CharField(max_length=200)
53 
     body = QuillField()
 54 
     body = QuillField()
54 
     #body = models.TextField(blank=True, null=True)
 55 
     #body = models.TextField(blank=True, null=True)
55 
-    cat = models.ForeignKey('PostCat', on_delete=models.SET_NULL, null=True)
56 
-    tags = TaggableManager()
56 
+    cat = TreeForeignKey('PostCat', on_delete=models.SET_NULL, null=True)
57 
+    top_store = models.ForeignKey(Store, on_delete=models.SET_NULL, null=True, blank=True)
58 
+    products1 = ChainedForeignKey(
59 
+        Product,
60 
+        chained_field="top_store",
61 
+        chained_model_field="store",
62 
+        show_all=False,
63 
+        auto_choose=True,
64 
+        null=True,
65 
+        blank=True,
66 
+        related_name="product1"
67 
+    )
68 
+    products2 = ChainedForeignKey(
69 
+        Product,
70 
+        chained_field="top_store",
71 
+        chained_model_field="store",
72 
+        show_all=False,
73 
+        auto_choose=True,
74 
+        null=True,
75 
+        blank=True,
76 
+        related_name="product2"
77 
+    )
78 
+    products3 = ChainedForeignKey(
79 
+        Product,
80 
+        chained_field="top_store",
81 
+        chained_model_field="store",
82 
+        show_all=False,
83 
+        auto_choose=True,
84 
+        blank=True,
85 
+        null=True,
86 
+        related_name="product3"
87 
+    )
88 
+    tags = TaggableManager(blank=True)
57 
     status = models.CharField(
 89 
     status = models.CharField(
58 
         max_length=30,
 90 
         max_length=30,
59 
         choices=(("draft", "Draft"), ("publish", "Publish")),
 91 
         choices=(("draft", "Draft"), ("publish", "Publish")),

+ 11 - 4
app/cms/templates/cms/view.html
View File

1 
 {% extends "front/base.html" %}
 1 
 {% extends "front/base.html" %}
2
2
3 
 {% block content %}
 3 
 {% block content %}
4 
-View HTML
5 
-<h1>{{ post.title }}</h1>
6 
-{{ post.body.html | safe }}
7 
-{{ post_id }}
4 
+<div class="row">
5 
+<div class='col-md-8'>
6 
+    View HTML
7 
+    <h1>{{ post.title }}</h1>
8 
+    {{ post.body.html | safe }}
9 
+    {{ post_id }}
10 
+</div>
11 
+<div class='col-md-4'>
12 
+    side menu
13 
+</div>
14 
+</div>
8 
 {% endblock %}
 15 
 {% endblock %}

+ 3 - 0
app/cms/urls.py
View File

7 
     path('post/<post_id>', views.post, name='view_post'),
 7 
     path('post/<post_id>', views.post, name='view_post'),
8 
     path('tags/<tag>', views.post_tags, name='tags'),
 8 
     path('tags/<tag>', views.post_tags, name='tags'),
9 
 ]
 9 
 ]
10 
+
11 
+
12 
+app_name = 'cms'

BIN
app/front/__pycache__/admin.cpython-39.pyc
View File


BIN
app/front/__pycache__/models.cpython-39.pyc
View File


BIN
app/front/__pycache__/urls.cpython-39.pyc
View File


BIN
app/front/__pycache__/views.cpython-39.pyc
View File


+ 6 - 1
app/front/admin.py
View File

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

+ 25 - 0
app/front/forms.py
View File

1 
+from django.forms.models import inlineformset_factory, modelform_factory, modelformset_factory
2 
+from django import forms
3 
+from .models import SearchData
4 
+from django.forms import ModelForm
5 
+from django_google_maps import widgets as map_widgets
6 
+from django_google_maps import fields as map_fields
7 
+
8 
+import django_filters
9 
+
10 
+
11 
+GeneralWidgets = {
12 
+    'startDate': forms.DateInput(format="%d/%m/%Y",attrs={'type': 'text', 'class': 'datepicker'}),
13 
+    'address': map_widgets.GoogleMapsAddressWidget,
14 
+    'photo': forms.FileInput,
15 
+    'sub_total':  forms.TextInput(attrs={'readonly': 'readonly'}),
16 
+    'vat': forms.TextInput(attrs={'readonly': 'readonly'}),
17 
+    'total': forms.TextInput(attrs={'readonly': 'readonly'}),
18 
+
19 
+}
20 
+
21 
+SearchForm = modelform_factory(
22 
+    SearchData,
23 
+    fields="__all__",
24 
+    widgets = GeneralWidgets,
25 
+    )

+ 36 - 0
app/front/migrations/0001_initial.py
View File

1 
+# Generated by Django 3.2.6 on 2021-08-21 12:51
2 
+
3 
+from django.conf import settings
4 
+from django.db import migrations, models
5 
+import django.db.models.deletion
6 
+import mptt.fields
7 
+
8 
+
9 
+class Migration(migrations.Migration):
10 
+
11 
+    initial = True
12 
+
13 
+    dependencies = [
14 
+        ('fruit', '0031_auto_20210816_1519'),
15 
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
16 
+        ('cms', '0015_alter_post_cat'),
17 
+    ]
18 
+
19 
+    operations = [
20 
+        migrations.CreateModel(
21 
+            name='SearchData',
22 
+            fields=[
23 
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
24 
+                ('created_at', models.DateTimeField(auto_now_add=True, null=True)),
25 
+                ('updated_at', models.DateTimeField(auto_now=True)),
26 
+                ('q', models.CharField(max_length=200)),
27 
+                ('content_cat', mptt.fields.TreeForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='cms.postcat')),
28 
+                ('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)),
29 
+                ('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)),
30 
+                ('product_type', mptt.fields.TreeForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='fruit.producttype')),
31 
+            ],
32 
+            options={
33 
+                'abstract': False,
34 
+            },
35 
+        ),
36 
+    ]

+ 32 - 0
app/front/migrations/0002_auto_20210821_2217.py
View File

1 
+# Generated by Django 3.2.6 on 2021-08-21 15:17
2 
+
3 
+from django.db import migrations, models
4 
+import django.db.models.deletion
5 
+import mptt.fields
6 
+
7 
+
8 
+class Migration(migrations.Migration):
9 
+
10 
+    dependencies = [
11 
+        ('fruit', '0031_auto_20210816_1519'),
12 
+        ('cms', '0015_alter_post_cat'),
13 
+        ('front', '0001_initial'),
14 
+    ]
15 
+
16 
+    operations = [
17 
+        migrations.AlterField(
18 
+            model_name='searchdata',
19 
+            name='content_cat',
20 
+            field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cms.postcat'),
21 
+        ),
22 
+        migrations.AlterField(
23 
+            model_name='searchdata',
24 
+            name='product_type',
25 
+            field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='fruit.producttype'),
26 
+        ),
27 
+        migrations.AlterField(
28 
+            model_name='searchdata',
29 
+            name='q',
30 
+            field=models.CharField(blank=True, default='', max_length=200),
31 
+        ),
32 
+    ]

+ 26 - 1
app/front/models.py
View File

1 
 from django.db import models
 1 
 from django.db import models
2 
-
2 
+from smart_selects.db_fields import (
3 
+    ChainedForeignKey,
4 
+    ChainedManyToManyField,
5 
+    GroupedForeignKey,
6 
+)
7 
+from django.contrib.auth.models import User
3 
 # Create your models here.
 8 
 # Create your models here.
9 
+from mptt.models import MPTTModel, TreeForeignKey
10 
+from cms.models import PostCat, Post
11 
+from fruit.models import  Product, ProductType
12 
+
13 
+class GenericModel(models.Model):
14 
+    created_at = models.DateTimeField(auto_now_add=True, null=True)
15 
+    updated_at = models.DateTimeField(auto_now=True)
16 
+
17 
+    created_by = models.ForeignKey(User, null=True, editable=False, related_name='%(class)s_created', on_delete=models.SET_NULL)
18 
+    modified_by = models.ForeignKey(User, null=True, editable=False, related_name='%(class)s_modified', on_delete=models.SET_NULL)
19 
+
20 
+    class Meta:
21 
+        abstract = True
22 
+
23 
+
24 
+
25 
+class SearchData(GenericModel, models.Model):
26 
+    q = models.CharField(max_length=200, blank=True, default="")
27 
+    product_type = TreeForeignKey(ProductType, on_delete=models.SET_NULL, null=True, blank=True)
28 
+    content_cat = TreeForeignKey(PostCat, on_delete=models.SET_NULL, null=True, blank=True)

+ 6 - 0
app/front/static/front/css/blog.css
View File

146 
 .multiField {
 146 
 .multiField {
147 
     border:1px solid #ccc;
 147 
     border:1px solid #ccc;
148 
 }
 148 
 }
149 
+.top-image {
150 
+    height: 200px;
151 
+    object-fit: contain;
152 
+    width: 100%;
153 
+    background-color: #888;
154 
+}

+ 4 - 2
app/front/templates/front/_menu.html
View File

7 
 			<a class="blog-header-logo text-dark" href="{% url "front:index" %}">SimpleMarket</a>
 7 
 			<a class="blog-header-logo text-dark" href="{% url "front:index" %}">SimpleMarket</a>
8 
 		</div>
 8 
 		</div>
9 
 		<div class="col-4 d-flex justify-content-end align-items-center">
 9 
 		<div class="col-4 d-flex justify-content-end align-items-center">
10 
-			<a class="text-muted" href="#">
10 
+            <a class="text-muted" href="{% url "front:search" %}">
11 
 				<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>
 11 
 				<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>
12 
 			</a>
 12 
 			</a>
13 
             {% if user.is_authenticated %}
 13 
             {% if user.is_authenticated %}
26 
 		<a class="p-2 text-muted" href="#">Home</a>
 26 
 		<a class="p-2 text-muted" href="#">Home</a>
27 
 		<a class="p-2 text-muted" href="#">News</a>
 27 
 		<a class="p-2 text-muted" href="#">News</a>
28 
         <a class="p-2 text-muted" href="#">Market</a>
 28 
         <a class="p-2 text-muted" href="#">Market</a>
29 
-		<a class="p-2 text-muted" href="#">Store</a>
29 
+        <a class="p-2 text-muted" href="{% url "front:stores" %}">Store</a>
30 
 		<a class="p-2 text-muted" href="#">Articles</a>
 30 
 		<a class="p-2 text-muted" href="#">Articles</a>
31 
 		<a class="p-2 text-muted" href="#">Forum</a>
 31 
 		<a class="p-2 text-muted" href="#">Forum</a>
32 
 	</nav>
 32 
 	</nav>
33 
 </div>
 33 
 </div>
34
34
35 
+<hr>
36 
+

+ 34 - 0
app/front/templates/front/search.html
View File

1 
+{% extends "front/base.html" %}
2 
+
3 
+{% load static %}
4 
+{% load crispy_forms_tags %}
5 
+
6 
+{% block header %}
7 
+{{ form.media  }}
8 
+{% endblock %}
9 
+
10 
+{% block top_slide %}
11 
+{% endblock %}
12 
+{% block content %}
13 
+<h1>Search</h1>
14 
+<div class='row'>
15 
+    <div class="col-md-9">
16 
+        <form>
17 
+            {% csrf_token %}
18 
+            <div class='row'>
19 
+                <div class="col-md-4">{{ form.q| as_crispy_field }}</div>
20 
+                <div class="col-md-4">{{ form.product_type | as_crispy_field }}</div>
21 
+                <div class="col-md-4">{{ form.content_cat | as_crispy_field }}</div>
22 
+            </div>
23 
+            <br>
24 
+            <input type='submit' class='btn btn-primary' value="Search" />
25 
+        </form>
26 
+        {{ results }}
27 
+    </div>
28 
+    <div class="col-md-3">
29 
+        Recom
30 
+    </div>
31 
+</div>
32 
+{% endblock %}
33 
+
34 
+

+ 21 - 0
app/front/templates/front/stores.html
View File

1 
+{% extends "front/base.html" %}
2 
+
3 
+{% load static %}
4 
+{% block top_slide %}
5 
+{% endblock %}
6 
+{% block content %}
7 
+<h1>Top Stores</h1>
8 
+<div class='row'>
9 
+
10 
+{% for s in top_stores %}
11 
+<div class="col-md-3">
12 
+    <img src="{{ s.feature_image.url }}" class="img-fluid top-image" />
13 
+    <a href="{% url  "cms:view_post" post_id=s.id %}">{{ s.title }}</a>
14 
+</div>
15 
+{% endfor %}
16 
+</div>
17 
+{% for s in top_stores %}
18 
+{% endfor %}
19 
+{% endblock %}
20 
+
21 
+

+ 2 - 0
app/front/urls.py
View File

5
5
6 
 urlpatterns = [
 6 
 urlpatterns = [
7 
     path('', views.index, name='index'),
 7 
     path('', views.index, name='index'),
8 
+    path('stores', views.stores, name='stores'),
9 
+    path('search', views.search, name='search'),
8 
     path('tracking', views.tracking, name='tracking'),
 10 
     path('tracking', views.tracking, name='tracking'),
9 
     path('tracking', views.tracking, name='tracking'),
 11 
     path('tracking', views.tracking, name='tracking'),
10 
     path('success', views.success, name='success'),
 12 
     path('success', views.success, name='success'),

+ 35 - 1
app/front/views.py
View File

1 
 from django.shortcuts import render, redirect
 1 
 from django.shortcuts import render, redirect
2 
 from backend.models import Patient
 2 
 from backend.models import Patient
3 
-
3 
+from cms.models import Post
4 
+from fruit.models import Product
5 
+from .forms import SearchForm
6 
+from itertools import chain, tee
7 
+from operator import attrgetter
8 
+from django.db.models import Q
4 
 # Create your views here.
 9 
 # Create your views here.
5
10
6 
 def index(request):
 11 
 def index(request):
39 
     pass
 44 
     pass
40
45
41
46
47 
+def stores(request):
48 
+    top_stores = Post.objects.filter(cat__name="Top Stores", status="publish").order_by("-created_at")
49 
+    return render(request, "front/stores.html", {'top_stores': top_stores})
50 
+
51 
+def search(request):
52 
+    form = SearchForm(request.GET)
53 
+
54 
+    results = None
55 
+    if form.is_valid():
56 
+        o = form.save(commit = False)
57 
+        o.created_by = request.user
58 
+        o.save()
59 
+
60 
+        q = Q()
61 
+        q2 = Q()
62 
+        if o.content_cat != None:
63 
+            q = q & Q(cat = o.content_cat)
64 
+
65 
+        if o.product_type != None:
66 
+            q2 = q2 & Q(product_type = o.product_type)
67 
+
68 
+        q = q & ( Q(title__contains = o.q ) | Q(body__contains = o.q))
69 
+        q2 = q2 & ( Q(name__contains = o.q ) | Q(description__contains = o.q))
70 
+
71 
+        r1 = Post.objects.filter(q)
72 
+        r2 = Product.objects.filter(q2)
73 
+        results = list(sorted(chain(r1, r2), key = lambda obj: obj.created_at, reverse = True))
74 
+
75 
+    return render(request, "front/search.html", {'form': form, 'results': results})
42
76
43 
 def mystore(requeset):
 77 
 def mystore(requeset):
44 
     pass
 78 
     pass

tum/whitesportapp - Gogs: Simplico Git Service
ホーム エクスプローラ ヘルプ
サインイン
tum
/
whitesportapp
Watch 1
Star 0
Fork 0
コード 課題 0 プルリクエスト 0 コミット 4 リリース 0 Wiki

説明なし

ブランチ: master
ブランチ タグ
whitesportapp
/
resources
/
ios
/
icon
/
icon-98@2x.png

icon-98@2x.png 6.6KB
パーマリンク 履歴 Raw