nl-11 ol-11"> 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 15
 {% endblock %}

+ 3 - 0
app/cms/urls.py

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

二進制
app/front/__pycache__/admin.cpython-39.pyc


二進制
app/front/__pycache__/models.cpython-39.pyc


二進制
app/front/__pycache__/urls.cpython-39.pyc


二進制
app/front/__pycache__/views.cpython-39.pyc


+ 6 - 1
app/front/admin.py

@@ -1,3 +1,8 @@
1 1
 from django.contrib import admin
2
-
2
+from .models import SearchData
3 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

@@ -0,0 +1,25 @@
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

@@ -0,0 +1,36 @@
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

@@ -0,0 +1,32 @@
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

@@ -1,3 +1,28 @@
1 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 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

@@ -146,3 +146,9 @@ h1, h2, h3, h4, h5, h6 {
146 146
 .multiField {
147 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

@@ -7,7 +7,7 @@
7 7
 			<a class="blog-header-logo text-dark" href="{% url "front:index" %}">SimpleMarket</a>
8 8
 		</div>
9 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 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 12
 			</a>
13 13
             {% if user.is_authenticated %}
@@ -26,9 +26,11 @@
26 26
 		<a class="p-2 text-muted" href="#">Home</a>
27 27
 		<a class="p-2 text-muted" href="#">News</a>
28 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 30
 		<a class="p-2 text-muted" href="#">Articles</a>
31 31
 		<a class="p-2 text-muted" href="#">Forum</a>
32 32
 	</nav>
33 33
 </div>
34 34
 
35
+<hr>
36
+

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

@@ -0,0 +1,34 @@
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

@@ -0,0 +1,21 @@
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

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

+ 35 - 1
app/front/views.py

@@ -1,6 +1,11 @@
1 1
 from django.shortcuts import render, redirect
2 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 9
 # Create your views here.
5 10
 
6 11
 def index(request):
@@ -39,6 +44,35 @@ def agri_market(request):
39 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 77
 def mystore(requeset):
44 78
     pass

tum/kaceeapp7 - Gogs: Simplico Git Service

Няма описание

gradlew 7.9KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235
  1. #!/bin/sh
  2. #
  3. # Copyright © 2015-2021 the original authors.
  4. #
  5. # Licensed under the Apache License, Version 2.0 (the "License");
  6. # you may not use this file except in compliance with the License.
  7. # You may obtain a copy of the License at
  8. #
  9. # https://www.apache.org/licenses/LICENSE-2.0
  10. #
  11. # Unless required by applicable law or agreed to in writing, software
  12. # distributed under the License is distributed on an "AS IS" BASIS,
  13. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  14. # See the License for the specific language governing permissions and
  15. # limitations under the License.
  16. #
  17. ##############################################################################
  18. #
  19. # Gradle start up script for POSIX generated by Gradle.
  20. #
  21. # Important for running:
  22. #
  23. # (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
  24. # noncompliant, but you have some other compliant shell such as ksh or
  25. # bash, then to run this script, type that shell name before the whole
  26. # command line, like:
  27. #
  28. # ksh Gradle
  29. #
  30. # Busybox and similar reduced shells will NOT work, because this script
  31. # requires all of these POSIX shell features:
  32. # * functions;
  33. # * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
  34. # «${var#prefix}», «${var%suffix}», and «$( cmd )»;
  35. # * compound commands having a testable exit status, especially «case»;
  36. # * various built-in commands including «command», «set», and «ulimit».
  37. #
  38. # Important for patching:
  39. #
  40. # (2) This script targets any POSIX shell, so it avoids extensions provided
  41. # by Bash, Ksh, etc; in particular arrays are avoided.
  42. #
  43. # The "traditional" practice of packing multiple parameters into a
  44. # space-separated string is a well documented source of bugs and security
  45. # problems, so this is (mostly) avoided, by progressively accumulating
  46. # options in "$@", and eventually passing that to Java.
  47. #
  48. # Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
  49. # and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
  50. # see the in-line comments for details.
  51. #
  52. # There are tweaks for specific operating systems such as AIX, CygWin,
  53. # Darwin, MinGW, and NonStop.
  54. #
  55. # (3) This script is generated from the Groovy template
  56. # https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
  57. # within the Gradle project.
  58. #
  59. # You can find Gradle at https://github.com/gradle/gradle/.
  60. #
  61. ##############################################################################
  62. # Attempt to set APP_HOME
  63. # Resolve links: $0 may be a link
  64. app_path=$0
  65. # Need this for daisy-chained symlinks.
  66. while
  67. APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
  68. [ -h "$app_path" ]
  69. do
  70. ls=$( ls -ld "$app_path" )
  71. link=${ls#*' -> '}
  72. case $link in #(
  73. /*) app_path=$link ;; #(
  74. *) app_path=$APP_HOME$link ;;
  75. esac
  76. done
  77. APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
  78. APP_NAME="Gradle"
  79. APP_BASE_NAME=${0##*/}
  80. # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
  81. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
  82. # Use the maximum available, or set MAX_FD != -1 to use that value.
  83. MAX_FD=maximum
  84. warn () {
  85. echo "$*"
  86. } >&2
  87. die () {
  88. echo
  89. echo "$*"
  90. echo
  91. exit 1
  92. } >&2
  93. # OS specific support (must be 'true' or 'false').
  94. cygwin=false
  95. msys=false
  96. darwin=false
  97. nonstop=false
  98. case "$( uname )" in #(
  99. CYGWIN* ) cygwin=true ;; #(
  100. Darwin* ) darwin=true ;; #(
  101. MSYS* | MINGW* ) msys=true ;; #(
  102. NONSTOP* ) nonstop=true ;;
  103. esac
  104. CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
  105. # Determine the Java command to use to start the JVM.
  106. if [ -n "$JAVA_HOME" ] ; then
  107. if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
  108. # IBM's JDK on AIX uses strange locations for the executables
  109. JAVACMD=$JAVA_HOME/jre/sh/java
  110. else
  111. JAVACMD=$JAVA_HOME/bin/java
  112. fi
  113. if [ ! -x "$JAVACMD" ] ; then
  114. die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
  115. Please set the JAVA_HOME variable in your environment to match the
  116. location of your Java installation."
  117. fi
  118. else
  119. JAVACMD=java
  120. which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
  121. Please set the JAVA_HOME variable in your environment to match the
  122. location of your Java installation."
  123. fi
  124. # Increase the maximum file descriptors if we can.
  125. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
  126. case $MAX_FD in #(
  127. max*)
  128. MAX_FD=$( ulimit -H -n ) ||
  129. warn "Could not query maximum file descriptor limit"
  130. esac
  131. case $MAX_FD in #(
  132. '' | soft) :;; #(
  133. *)
  134. ulimit -n "$MAX_FD" ||
  135. warn "Could not set maximum file descriptor limit to $MAX_FD"
  136. esac
  137. fi
  138. # Collect all arguments for the java command, stacking in reverse order:
  139. # * args from the command line
  140. # * the main class name
  141. # * -classpath
  142. # * -D...appname settings
  143. # * --module-path (only if needed)
  144. # * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
  145. # For Cygwin or MSYS, switch paths to Windows format before running java
  146. if "$cygwin" || "$msys" ; then
  147. APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
  148. CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
  149. JAVACMD=$( cygpath --unix "$JAVACMD" )
  150. # Now convert the arguments - kludge to limit ourselves to /bin/sh
  151. for arg do
  152. if
  153. case $arg in #(
  154. -*) false ;; # don't mess with options #(
  155. /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
  156. [ -e "$t" ] ;; #(
  157. *) false ;;
  158. esac
  159. then
  160. arg=$( cygpath --path --ignore --mixed "$arg" )
  161. fi
  162. # Roll the args list around exactly as many times as the number of
  163. # args, so each arg winds up back in the position where it started, but
  164. # possibly modified.
  165. #
  166. # NB: a `for` loop captures its iteration list before it begins, so
  167. # changing the positional parameters here affects neither the number of
  168. # iterations, nor the values presented in `arg`.
  169. shift # remove old arg
  170. set -- "$@" "$arg" # push replacement arg
  171. done
  172. fi
  173. # Collect all arguments for the java command;
  174. # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
  175. # shell script including quotes and variable substitutions, so put them in
  176. # double quotes to make sure that they get re-expanded; and
  177. # * put everything else in single quotes, so that it's not re-expanded.
  178. set -- \
  179. "-Dorg.gradle.appname=$APP_BASE_NAME" \
  180. -classpath "$CLASSPATH" \
  181. org.gradle.wrapper.GradleWrapperMain \
  182. "$@"
  183. # Use "xargs" to parse quoted args.
  184. #
  185. # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
  186. #
  187. # In Bash we could simply go:
  188. #
  189. # readarray ARGS < <( xargs -n1 <<<"$var" ) &&
  190. # set -- "${ARGS[@]}" "$@"
  191. #
  192. # but POSIX shell has neither arrays nor command substitution, so instead we
  193. # post-process each arg (as a line of input to sed) to backslash-escape any
  194. # character that might be a shell metacharacter, then use eval to reverse
  195. # that process (while maintaining the separation between arguments), and wrap
  196. # the whole thing up as a single "set" statement.
  197. #
  198. # This will of course break if any of these variables contains a newline or
  199. # an unmatched quote.
  200. #
  201. eval "set -- $(
  202. printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
  203. xargs -n1 |
  204. sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
  205. tr '\n' ' '
  206. )" '"$@"'
  207. exec "$JAVACMD" "$@"