%Dpe-i)1
zf3Z^uC2eo5ic(o95=aoZpteY;vgjTtqNIl+I8ab~fVKkVQUPi&NFaKFiJgKeAV#~R
zeeZoUZ|2+gzLj-yKcOw)*{3E%sQ%_(2#t&l$=cza^(e-Wrw_BmWx6GSzS~I(GULg;5|~p2x^~p
zbOEwG)t=l011AvSPX`v)EUAvpEXp+w+wq05%0sVmFW3eVgQ@`*^1t)Q(h`|}9
zh_=3>Tt2PFDeUxNPQHtxra*yDiWuzVaj{dHFT}Z)bbfEE*(ER!7UYOOWsPyY)ghyNn_rap)JNlE>kF5s)-yO
zOAHC4)v38-MPFr(3)qF()bVsyUk%#Egd&?LMCgLs>0n%r=#;5!3XBE9h6oc8QihkO
z>15s*2$iGrGtA6%J|6dkT>6l=XgB8FF<)_6Z!1L0QT>>ulBlqHOK8r&q<8DxQ-NvQ
zRLL?kRUHja6++Hj)yeb8T%^Legj{LT5lC|rK|5~_PZXo}U~WDU3EIPqt6DrIxb>c(
z*UF91nKZxX8({-hCKbp=)5cWQX)7~AFv)lqLhj=cCN%EaJI`_phKN7S^5wYcDYJ~Z
zg?o$1LL2J$-WmjmT2vADp@^ux0ta-&IQT!>@cR7^_NfUS)YoLUIT9X$HfV%;#Qg*1
z^HKr;QrDPwH)d^P*3_NfeR5I@!7U8xlwZs5wrx?uIG9*8gP2P#7EM?c4x1B
zm;u)bRhMjyI|^3C^B%C&HKf80Vv0lZOXLG`N867mV+OAi)5HyY1)Rej*w5HOpAC>^9)Y_Lth*6q||-
zq`C#ga-U9$0nK2G@HqIadP|1X4H?qzM)3jt-*jjT(bT1FjJAns6{amr({5s3)F4d%
w-oKP;3&6)@v1V9w-vigXQI+1r;3m9@s#JvieFO*oyRLC@^LNmvdUr+j2gJkJ=Kufz
delta 549
zcmXv~PiWI%6#rh5=1Y?%ueE`R!@jG<#6tZbrKBKQ+O;%l78J2;Icj-}Bl9lIu4
zdc~o`alUOrXO&S~kO5N!Q=Bo3PAdCQ0bC{AC<~QWkgZ-)gEAORVl;WplEIp{yMc3B
zgqzB%>d0D;W0q)P!lCu`#%l&ke0iSUu1d26cNp*d@8t#E4ou6YZ$z5aer>3*=5-Ci
zU2s1qfU>u+D9qJ+1aILm>;nOo*>Bn-O8nF%XQ#HP`gugITn>h*8y|$KH!}nm!iGr(
z2u>L}{Yl`P`qfp^5D^IR_NKuS;edO590u0&>Nt#0>FUJ@^?po&Al*0$vb*&xMBMX9
v=yc%-G(csrEcV@(YS1TITGFL;h~JA^nwM{6IAV(hMnrbC@z2qxe&VQiOqOgi=Jnq$rpa%VbPvi4sT=j}lCg
zh!RR+i4q245g-;#k&F^ck%|&ekq&0ilu0yTWMJTO$x6&i&sQi;-T3k(GxIIZlFh4F
zq8Qmg?yK^ctiUR=S&l7;Nk;vfSKAjbiSiwh=dM@yx$q;RKlX7Ob4rSPP1
z^fITjMDeGv1T$#zZk%wMNur9qI5n{-IYa*zcUoprYEe*XacNG8roiM_=32)hkWsg|
zON(*}5=%-_i}H$BG872{#lXZbOJ}Q?(Bjmh;+W82*Ps}m#L~Q!qRRYIpg<0UJ=uUo
XT}%k5frX!kQGk(yk%JjT1MwdKe@!y@
delta 185
zcmeyz@tQ+Bk(ZZ?0SJB;_9f0?W?*;>;vfSyAjbiSixVblM{}h!NAabw1T$!IZ(MMi
ziAj@xax-&n*e&kTqMU-nl9JS-yyBG%MFK$eVB%{4kmYO@6Iz^FR2)-Tnpd2f@12;J
z9^;>v>QafGvXSt_CSw4#p&%9j
diff --git a/LaundrYours/laundryours/urls.py b/LaundrYours/laundryours/urls.py
index a4e0036..9e8d189 100644
--- a/LaundrYours/laundryours/urls.py
+++ b/LaundrYours/laundryours/urls.py
@@ -22,4 +22,5 @@
path('admin/', admin.site.urls),
path('', search.views.home, name="home"),
path('accounts/', include('accounts.urls')),
+ path('search/', search.views.fiberResult, name="fiberResult"),
]
diff --git a/LaundrYours/search/__pycache__/__init__.cpython-39.pyc b/LaundrYours/search/__pycache__/__init__.cpython-39.pyc
index b94496ec57a7a35d9332fc8bbd3baf94aeab57c3..b2c51e4e24dc124bb11733054921e39cf16fdbb0 100644
GIT binary patch
delta 57
zcmZ3>IGK?vk(ZZ?0SKlqnaE|M{L8}GDkiizwWv5IG}tvL#wW2fFQuq5zZ58t17S~W
G)&ciZaVm
lV_t8V^0s-Z!rPfsUa#B|lara3Y7*mg`kg4ShyiKRgLF^Gc}F+Pcg`kf{MbvL?ews{Cd?{IpdFlCj$@zIDMVU!OAOlu16fpxSF!9v~$a1!d2`x@7Dvqfv
z%_~mL_Xg^S@y|6t3U6mldA)K=OipHAs!5DbVrgDVQDlB8P)~7c
fVo`EN4A@4!g34PQHo5sJr8%i~j6jn=12F>tqscoL
diff --git a/LaundrYours/search/__pycache__/apps.cpython-39.pyc b/LaundrYours/search/__pycache__/apps.cpython-39.pyc
index 6b58f18a9d3c679d3f5fb4f3840ee22e5f6f39a3..bce0639e5111c5c564b260fa28540f39a12a246b 100644
GIT binary patch
delta 59
zcmX@ayn>l4k(ZZ?0SKlq*~rDmsQk;s*(xTqIJKxaCN$VJD8?tTG%uy7GQSikkON^)
I4rR;*00xi~kpKVy
delta 85
zcmZ3%e2AGVk(ZZ?0SGDzH*)bY+J5y0vYoABLW@(2ieoBE^NLgRy%Y1&WBl_{U5YZx
nQe$3knDVxHs>0iuQ(mv!5|fjemueE@lUSOUQWQDanlTpuo9!R8
diff --git a/LaundrYours/search/__pycache__/models.cpython-39.pyc b/LaundrYours/search/__pycache__/models.cpython-39.pyc
index b73b949561b3948f9a7269b6fd5bc1efe14f6a6d..c903e1b182657a36f82af8bf7c171233c79ec8e0 100644
GIT binary patch
literal 735
zcmZ8fy^a$x5VrRx`;$%J8R)hN9R)(@q=-XE5DD(CSw*s(jFW6|b`N_O-JR&T_IL{l
z-h^jxOO=kAiW%oX(Tz1@fAiU%oo_8iqnx4r{{BtA4;cGJ;MgJrC+PMG24KK7+wqEX
z_L@Ne;Vpwu@on%mtU`#+SQ+neA1k>V>{?LTE(so6jNk;_HW(DEIIt>E;Wh$J7v2R`
zjA#H6q8L$vD22g2m;FZxq<3MJKfuEWxPT1uTUL!=h#yzD__SUqvwwuO9V-Ku@8p%x
zs#$j%mw;NyUUxT1y_0KYpCX_2m%5c8y4ECkX8#kzc^R4k&OYPfg_h07CC9`+qc!;y
z-O|o4Y|F4bpP?>MBX^2stMuvzGb7~xJexkBUsz@A{Nn7@hxuFCH(;*Y9uxX#ZIv|3
z&HSM35sSk{y!!Da{
zq&cmX1~Vj_zab%f!o^+`mz}Gt&S$E0sg-Q%W{thb&&nk$CA;3JDp|_DtJ}tq%)Y^+
zFs59HfnJs+l=873k2#LObF(sX8Ej>g`kf{MbvL>nOe7{oyaOhAqU5Elyoi4=wu#vF!R#wbQch7_h?22JLdKv4!w
z##?N;`6;P6#eSMhw>VR>67$mY^-_|GK$=%F6tMs)F!9wF$a1!d2`x@7Dvqfv%_~mL
z_XaAC@y|6t3U6mldA)K=OipHAs!5DbVrgDVQDlB8P)~7cVo`EN
a48%6Qg34PQHb8c1PO2Rv(CE)V%m4ru>^fTj
diff --git a/LaundrYours/search/__pycache__/views.cpython-39.pyc b/LaundrYours/search/__pycache__/views.cpython-39.pyc
index 4519d8aabf019f965ca4c01e5cec901698c7f676..5f83d66c3181d068bb0f621cb88c4b789be68f47 100644
GIT binary patch
literal 628
zcmY*W&1&2*5Y|}!*-bY6d5ap#-U_9Z5(sH7We-VnF$;@hDOnrYZbx#<2Jb1owvSMf
zOChhMYfpKFo;ssY*a}9P8D{4D=2LlauqWso{`yh=1R;KNuzMm34$16Gx|C30L<6D_W%>%P_VwQCJB9h#A${yb>w?geI)`Sa@N&GOu8w9E6e#uhHY2#xaoG>WQ6@XK^|6|6ixF9flO^y={+(vg|3!`Y{ZLB~=
zchNQ)BYZJJlZ+(Gci4hUX#59ebja^
zE^JvOmn>19Aw&DDzi4#jte2%RUY;C(^zuqOpI+9+X+-9jOHAo0W}$QS*nuo%5a{um
z@U;Ce%K(N%-90mr9pue7m&S&%C11op
WU_hF@rP{&hcl^DU>CIp!C-N^bn~x&^
delta 250
zcmeyua+!%Qk(ZZ?0SM+5_9fObOyrZ%mH_fn7*ZH>7;+h-7#SH-m{OQq7^0X`Sb`Ze
zSzm$_uVlQ%R+O5TGO^sdo)yUd>H{R4tztrpQ;UjYDogWK4wt1?;+nG~duiO%olbM%l662FtnwL@(nO_RjQ=FPul$;S$mYG^!tXEKZizOpJ
zHlJ6@7nLNJmY5V5F$1N*@JJOV@3M_
diff --git a/LaundrYours/search/admin.py b/LaundrYours/search/admin.py
index 8c38f3f..314c276 100644
--- a/LaundrYours/search/admin.py
+++ b/LaundrYours/search/admin.py
@@ -1,3 +1,4 @@
from django.contrib import admin
-
+from .models import Fiber
# Register your models here.
+admin.site.register(Fiber)
\ No newline at end of file
diff --git a/LaundrYours/search/migrations/0001_initial.py b/LaundrYours/search/migrations/0001_initial.py
new file mode 100644
index 0000000..cb11302
--- /dev/null
+++ b/LaundrYours/search/migrations/0001_initial.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.2.9 on 2021-11-12 18:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Fiber',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(default='', max_length=15)),
+ ('image', models.ImageField(default='', upload_to='images/')),
+ ('cleaning', models.TextField(default='', max_length=200)),
+ ('save', models.TextField(blank=True, default='', max_length=200)),
+ ('feature', models.TextField(blank=True, default='', max_length=200)),
+ ('caution', models.TextField(blank=True, default='', max_length=200)),
+ ],
+ ),
+ ]
diff --git a/LaundrYours/search/migrations/__pycache__/0001_initial.cpython-39.pyc b/LaundrYours/search/migrations/__pycache__/0001_initial.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b6772a70a3f6afb8f54193d5c330f2385dcd99e8
GIT binary patch
literal 875
zcmZWo!EVz)5M8e~ahy19D1{SOka8*IS|L;@w5mjVpzXzqWNk7N*QsNNUAt;}g=_eP
z-a&i_->_Fs{RB7wv)iCnu&W*Kn;DPi&5UKY+h(+`zJ8Kle8#?8aCZp;+jR6362QRA
z+0=`@DUZ3w_84&RKQi#qoA@96*avaM`i*PyWqoei(=1i8%F05U=ClON^~jp;t`!2?
zbo3PoWU&V<=HSJC%3^_yNz;A;gGmcK+5#HTT!=A;fOH|WAcXdU6Ydah6ON$k@CxA$
z;nk(R=dkBA_ZB|AvG$+l{=b?ufb|7Wy*PpgMC_pn5B@SbHjUkEh|2H`b`9Tu-4`a3
zbyX%Kg|b30otes}Qq7YyoSRUi%4D8hqKVE?4NHwlA*X1Blk9qx=u^o8z_G0JifSh>
zk{pY)IyDW7lj3FI9{OpYE9-5-dX|?GlBzVVQI4|6iuC%MwFoWGvG1G4Fqg%d^Hx1;
z2*#9KtJu_9||jx)?bANISZmAK53#I%!yx>n~%_b5r;*D|-+5(=^+tB8+@
z0B2YL7NZQc;x<%g#}(kf_FK_RF%!MY(w9`4UHc6a?wm?>b8YWiVoUWgUQ|nUIm6}L
zd}it~g>d5M-pi_@%
literal 0
HcmV?d00001
diff --git a/LaundrYours/search/migrations/__pycache__/__init__.cpython-39.pyc b/LaundrYours/search/migrations/__pycache__/__init__.cpython-39.pyc
index 8e020c4125bf92db9c8dc3fb8d20e5eefed447d3..6cec69375ed82fe6cb0e9e2c63d597d977dcd73c 100644
GIT binary patch
delta 57
zcmdnNIFFGlk(ZZ?0SKlqnaE|M{L9(dDkiizwWv5IG}tvL#wW2fFQuq5zZ58t17S~W
GHU$9gEfa_U
delta 83
zcmbQoxPy@^k(ZZ?0SGDzCvw@?evJY$ovmU*i&Kk=V=7DYic|Bw6Z6tz{PR*>iZaVm
lV_t8V^0s-Z!rPfsUa#B|lara3Y7*m홈
{% if user.is_authenticated %}
{{user.username}}님 환영합니다.
-
+
{% else %}
login
signup
-{% endif %}
\ No newline at end of file
+{% endif %}
+
+
\ No newline at end of file
diff --git a/LaundrYours/search/templates/result.html b/LaundrYours/search/templates/result.html
new file mode 100644
index 0000000..da8a589
--- /dev/null
+++ b/LaundrYours/search/templates/result.html
@@ -0,0 +1,3 @@
+검색 결과
+소재: {{fiber.name}}
+세탁 방법: {{fiber.cleaning}}
\ No newline at end of file
diff --git a/LaundrYours/search/views.py b/LaundrYours/search/views.py
index 35fb3dc..d2ae95f 100644
--- a/LaundrYours/search/views.py
+++ b/LaundrYours/search/views.py
@@ -1,5 +1,13 @@
from django.shortcuts import render
+from .models import Fiber
# Create your views here.
def home(request):
- return render(request, 'home.html')
\ No newline at end of file
+ return render(request, 'home.html')
+
+def fiberResult(request):
+ fiber_object = Fiber.objects.all()
+ query = request.GET.get('query','')
+ if query :
+ fiber_object = fiber_object.filter(name__icontains= query)
+ return render(request, 'result.html', {'fiber':fiber_object})
\ No newline at end of file
From d5f6f6b8d814b42489a388e0b67d91b1c7bb6f0b Mon Sep 17 00:00:00 2001
From: bestlalala <82032452+bestlalala@users.noreply.github.com>
Date: Sat, 13 Nov 2021 03:55:55 +0900
Subject: [PATCH 3/5] search please.,,
---
.../__pycache__/urls.cpython-39.pyc | Bin 1150 -> 1132 bytes
LaundrYours/laundryours/urls.py | 6 +++---
.../search/__pycache__/views.cpython-39.pyc | Bin 628 -> 628 bytes
LaundrYours/search/templates/home.html | 5 +++--
LaundrYours/search/views.py | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/LaundrYours/laundryours/__pycache__/urls.cpython-39.pyc b/LaundrYours/laundryours/__pycache__/urls.cpython-39.pyc
index ebcb4678413cf0fca0bfba3ea98b5fd9e22bddfb..b78c874dffe835cd69af7b38f0e5542000e9fa2e 100644
GIT binary patch
delta 165
zcmeyz@rHvpk(ZZ?0SK73_a&a4$Scd3F;QF3o;8OfgdvqBg)NmSi!+O>nF+{dPvuVG
zNa5^d2C}(QSyQ;18NuQ_sXQsXAn|mTDBcv7UL36PvPig2J$&mSyQ;08NqVgU^%`N9*|r*OB8q}g)kvE+Q07{Dnj{pDw
delta 22
ccmeyu@`Z&rk(ZZ?0SFwH^(D^R$eYdt07jt(9RL6T
diff --git a/LaundrYours/search/templates/home.html b/LaundrYours/search/templates/home.html
index 88d2fb5..d2b94fa 100644
--- a/LaundrYours/search/templates/home.html
+++ b/LaundrYours/search/templates/home.html
@@ -7,9 +7,10 @@ 홈
signup
{% endif %}
-
\ No newline at end of file
diff --git a/LaundrYours/search/views.py b/LaundrYours/search/views.py
index d2ae95f..e9aec75 100644
--- a/LaundrYours/search/views.py
+++ b/LaundrYours/search/views.py
@@ -10,4 +10,4 @@ def fiberResult(request):
query = request.GET.get('query','')
if query :
fiber_object = fiber_object.filter(name__icontains= query)
- return render(request, 'result.html', {'fiber':fiber_object})
\ No newline at end of file
+ return render(request, 'result.html', {'fiber':fiber_object})
From dff3318d3625b89dd56e1a3a3cb456eb6fc26014 Mon Sep 17 00:00:00 2001
From: bestlalala <82032452+bestlalala@users.noreply.github.com>
Date: Sat, 13 Nov 2021 04:18:47 +0900
Subject: [PATCH 4/5] model success
---
LaundrYours/db.sqlite3 | Bin 139264 -> 143360 bytes
LaundrYours/images/cotton.jpg | Bin 0 -> 184276 bytes
.../__pycache__/urls.cpython-39.pyc | Bin 1132 -> 1123 bytes
LaundrYours/laundryours/urls.py | 2 +-
.../search/__pycache__/models.cpython-39.pyc | Bin 735 -> 737 bytes
.../search/__pycache__/views.cpython-39.pyc | Bin 628 -> 645 bytes
.../migrations/0002_auto_20211113_0412.py | 23 ++++++++++++++++++
.../0002_auto_20211113_0412.cpython-39.pyc | Bin 0 -> 672 bytes
LaundrYours/search/models.py | 4 +--
LaundrYours/search/views.py | 8 +++---
10 files changed, 30 insertions(+), 7 deletions(-)
create mode 100644 LaundrYours/images/cotton.jpg
create mode 100644 LaundrYours/search/migrations/0002_auto_20211113_0412.py
create mode 100644 LaundrYours/search/migrations/__pycache__/0002_auto_20211113_0412.cpython-39.pyc
diff --git a/LaundrYours/db.sqlite3 b/LaundrYours/db.sqlite3
index f70066560c4a058cdcf41d3dc475890efa656ead..4819e05f7d5713a03853351b889556efbc595746 100644
GIT binary patch
delta 950
zcmaJ;O-vI(6yDhd+iqMRHCj>p8QKs)g>JV%X*GswI2ap=iU&hX-O{BLp;cOc5<{RZ
zF$gAtC6*`bvA2qZr`Os!+S;xE(Bk}1ux+y
z48c5j;7PI+*MMOc$5kP3haB()-LkjKA8>aDeO%mQw(DUBSEk!Y>~8aWllU7r_%{}OfdsX5Q1W+
zgw9_Jy_Yy0;{;O+LTJkxYaF%qYOAeIvesJExl{#tHJTk+Ypp6kgHt}y%7)6G3J;?5CoIIOZF)tb89dh4hE__uKCE_VbY(@
z#v+;ID*mIT7chC8rj3xnX`ETUPbQxUd=;kMVRdLAJD64{R&xf8RbR}ilVeyN8&(HL
zu^JzzE;5nIMpEkYd39)lhPQ3RXGg}>g+($oj!AT$Jf6#>2gppHz-N+EWNdaLGyeOj
p-Wwy2Qlx(zXBJcB>4LzM>5ho1HGq7pkzX2I&O{D+;
delta 319
zcmZp8z|nAkV}i7xJ_7@T5)i|H>qH%6M*WQmOZb^ZxmHeQ7tr3Us8G(ed8Je&tH>+{
zcK##={+Ik$_;>S{@ptpD;ZNEuSm47yIZ5AAkbyynGqJQJBfhjawFqdQ@Z>f68Z5%h
z%(|0r=&Lh|HW_R)U{p6?e#^kHT`Pf6gPGA{dvG%2baqCz?XR;K?=VgG^JZK%-OYos
zMx#l0}Dk3BVgCj%`2vHGHQ8A(1HTY+dDiZaMI
z()r&E0P(+9p}}Z?1>o-=&}it|BP8ME<0%T3jb9yd_(2EEuACOG5sP^hYL~o8!8DB4
zGe6j7TC(0vpdViwu^*Mw4LY#K0(?-zwtJhnE>evmf`cA@V?-JcdWiB-58JJ+m0^^y
zPv7w_V2TuItN|+$0-tgx%}L_wE4Z)nubSk2B%xhFpiBh5rx7G##55&3ktDkJ>c0)%
zNW_B9l;hU_KsqD(yYmg3zHK?C49lrnec09TYe*v_ui@l@1^0E#CNMF@BGxy=%gGTL
z#FI5);`zCHvU*1BoQD%nI)_em4GC#WX=h68Z36rQ>@2`rkhY!LWw!d)J=LLLu7rJZ
zKf@mMp*;xpaI9we2T|=**9v8(D^a|-Jx$Zz-hJ5kJiqE`n9IUNYDwqhgQQp+=6cYrm%uKsBvq;ZeG`Y
z?B$X+Y@H2dkbtBS2gX-#klYdJhCQ}2S#q54#K)l;GUaJO;dI3CE1K?wLK&SCwh0I?=U$;fAE{N*hyM4~P-y^HUVQmA%Z)Qx;@HE>FXF)Exhr}-PIurV48JmAJyXqsauuSMt*84GPA4HNV
zy+8BZgtQ5ho4v7gE-g}1Bf3;a-&-LK5)DduZgPc1U`;)WdH|8spNZAoKy~h
z(YLI>c?4WKVBKG`#h`K@NW_xXEp8UM)nbz=&MT}%Q0kcujdIb;1=R%C!D=k+IxcVa
z3r>Oa&ZCN_%Dmb+B@)?CP2*AaeR#(p#~brPJ9-yXp0+N*<;~5CIuHGxYd=SjAG_ie
z?{&P-G1NsF2$5`C=ZXh&uMrB_%i8Ia%a6(kpck@Z-Vb=DsM)87IIz%wN=}fGS|wrt
z?{3p!mo5|arC<-aUgr3S4iN-9=@=5B|BdoATZf)Ztgj3FJ#Zj9G$Tw_$(zYqtqOP~
z>8U!0#g%;}XQj6evBl_dM={!#;F9!qA