From e6b56e3b40c440c1d0ec064baf76114351678de9 Mon Sep 17 00:00:00 2001 From: Duy Dang Date: Sat, 15 Jun 2024 01:24:00 +0800 Subject: [PATCH] update warehouse page --- frontend/index.html | 2 +- frontend/public/favicon.png | Bin 0 -> 5043 bytes frontend/src/assets/css/fu-theme.scss | 4 ++ frontend/src/assets/{ => images}/logo.svg | 0 frontend/src/assets/{ => images}/solid.svg | 0 frontend/src/components/Header.jsx | 2 +- frontend/src/components/Navbar/Navbar.jsx | 13 +++-- frontend/src/index.scss | 1 + frontend/src/lang/vi.json | 2 +- frontend/src/pages/Login/Login.jsx | 2 +- frontend/src/pages/Profile/Profile.jsx | 2 +- frontend/src/pages/WareHouse.jsx | 12 ----- frontend/src/pages/WareHouse/WareHouse.jsx | 54 ++++++++++++++++++++ frontend/src/pages/WareHouse/index.js | 1 + frontend/src/pages/WareHouse/warehouse.scss | 3 ++ frontend/src/routes/routes.js | 2 +- frontend/tailwind.config.js | 9 ++-- 17 files changed, 84 insertions(+), 25 deletions(-) create mode 100644 frontend/public/favicon.png create mode 100644 frontend/src/assets/css/fu-theme.scss rename frontend/src/assets/{ => images}/logo.svg (100%) rename frontend/src/assets/{ => images}/solid.svg (100%) delete mode 100644 frontend/src/pages/WareHouse.jsx create mode 100644 frontend/src/pages/WareHouse/WareHouse.jsx create mode 100644 frontend/src/pages/WareHouse/index.js create mode 100644 frontend/src/pages/WareHouse/warehouse.scss diff --git a/frontend/index.html b/frontend/index.html index 9beb395..af929d7 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -2,7 +2,7 @@ - + ;M1&8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H16F^Bs zK~#90?VWpg71g)tbaW^d;G zhwQnm_1l}@tXVT_t?v_6-Ko=kYBm*64Pb&ke z02A1cun%QFLJ5}c!7z%zETWp7dS`ZtD__hdB#{jye|V?|$-y*4F9scik_vK~vz78C z=ysG3z}SS8Z_+F`d9 z*+twNsP>k09l~hPOF@#{*3<%3AnUo6FD%H=@N zZA}pp1_}@sQ+?8Mz4OjWw*|G8xH6E;%R3j5@xU!WSGV=pOex6I1Z1J6PyNJgF|8#o z3?z>|{C&i{6X7P1fZKW;#sXf&G9T5fd)BxurX@UWAbB)z6ai*}{LpPJF7YN7Gc{}a z8*U3}3QrnH9-Ea$!1yi7D7UqEgaSnF(~N2FxGkh1o-&X;k>8UF>p_J701>zKcnejK zWdxY6>C-=TTTLCFFpw--l!Uo|3dnTeB)9c=oHCSI1Ut{s^z>@C#kg)DSvY$z7K?x( zt_q1iwxc>;C(L-)O%bjcNOE(N>CrA1)yXHola)iL3GzFND{?g_r^*clt{6z>=l2I) zjNj_m#dgFTqZ#*Xk9EaHtSglH`C~!f#y5|h3`7I#W&Z42VqI~}S|FJ_H$>9WStt`@ zQsIfqA1SVw9IIPeObk>rts<}lNOQb09}wPxieJWJ8j0ful6m>(Bi2hGy&SE`ry)fI zteu>A7}hf1Jf5Wr%eqmsvRB$wplt?{`LjlX@iNfPmI8eoLd#LPS|?0@ z(~i)0ImyjUj;4_4TA&`GIrzg9@r!aX-9ryYQ$)ml zpxROO$D^s-$0LZ0(~N0G*KwSveF{yRJZvSCW{s&5tb+L&67xU zz%c$CNq?yAeIV<={fG=}^LajAX9zt)_qFw;Hr>KxVg4{IYkeZlVNMPN7~5}P%x7pu zL$zh{+$TG%qhY%iXQ+u4xJ0w2ZfWfqtu~P4<_1X#Z3MY6VtpQFZ2y7AE8z@*e+ant%dv+F}^$n#HzZ8r~q zkV^Q#U9CR6H7$@Vm~#eNwVm%mz9ketIjfJX`1cz;A0no-qFgfyS6MF=eQY^g)e!=r z3p9Q5mn|LGx~opB@<>qg0Nj;2)bqElHJ=yhuq981V_+VDlL=Qm(3%5VY=LBc{zYIF zChA)CfnB=E<{NGeibua*ML5g@TQ-`H{QVuvitQRc3-l7roUysNgIaF3Mej#F`s>=j z1Eo4<%?fktz7jW<4;u*g16MbHP&3H9hb~X#5GyI|J8)y)0iNqTt16Fe z-(saLT^x4FJhejP3VCeyWz8MZdQ+pbH3agEVx*ZpSFT?^v zgsnH;7VOuli|f7Tx4+)2w-&50Kl$d6ms*_$s7W9&u(9Z|jT@vUlx{+r2jH4s=NN9A zCu~_fuz907YWXu^Z<_}|0+{9O^=TLk{rFaS{wMU!9Q^2)?89?RL2*tHdhpV9KXM=%2;4&{Y}T*!emiyH_UdQ z62G}8n&s?{9p$5&(t|-GwjTQ1XS?-|!d2nDWk+IKul;B>mY%Iy+576Y9Q#X}q3cOd z^8idr9d5+ZJmukPrfe)Qf3|W-0+nFsc7EBuRXdJ#+45(?31}Wr z87cE}Pp-|^Pxvm@W=xV0P7Yq|svHNIJZQM>txvUO^1$Ye=9Md+3x9s(NFw)lnm~l4U>elj!bH;& z@$GZJPMzhdv-;R-pdAPI>6kSu%=b%+6Yv*n18Q9itf(=NGT2=;&MQnrr?~v6jxStgzOv_&1pAeuKy?s6 zQ0C6+PSA)t)S1`F8aTx0kQDuEt(S^EwlWG=o23;;ZBUg!i1d`lW_1k`WPsaR>?RZl zkp8_3qiTK1!`0mT&U*8Iw{1Srp0HYv5jZahM#AN>xTW6(MvwL#BJTWbt{unPnTSIX zcA{3VAkf=w9d;tXU4tSEln}Noe!ulSE9c$yX0_!vJS`)Af}m$5(h$Z~XZMu>ow~O9 z3t6hn`^Wp%mXfdZ+TQ2Ibi&ZrmvK0LCfX|qlH#@wJGpz%@Q4B>7$Qtc9coNU z9cs6vW_j(i-Fo}FSHm%_)Gky~fIIfI&vrcHYabd8n#_N$X!XpZ)ls@!L^u77fMy5}tqv69+m!-?^=<{bG;a zwsxiYMOk9c7YYJZfcGxnR&s6c^Nc>Hbn?tSxY7*s+s&@TG;{%}41&b9f$kn`|BS;( z`RL$29kb?T^Y5iDhNX)wl|i7g#lt+x@RZXftw&GSTb~nmvYA!}K@Y|2aK_XjX|A_E z#pOpey>OMe@J>!-u`;8 zjxAVW{>$@W>0&}j5actrRkW4#?+rFOCdYOJ#-D7~2r7Gmi0meg-d7|U2ALNOiD~Pz z=kOsNw|1rZrW5Iv;u_r@1hXif0)b z#HiYV>3rNAyNGnYb6Y7bKT75stIg%HNv{;2RFv;DG(D#jp~b{vUf@S(_Ljk2Qyg!7 z3clE*!vC!GFN^2FK=Hxoy88lKLNy zy*&gfUj#f6DPm~%)8x|ABMX#JT2Zc}SHBRxwcr)sJhr0MR93!Jf6Fljs(myoh^eL~ zh;+5Z>z^0tuq981UykR*ZeB&?Z+dsmF*8_?f4L$oMsamm7Sz0&peDZ5cw;jF0R35YOZ zV9WEJm+jtZ4SoK}uy39ip}e4(Gyc`suI5H4=K$9>v)^`Z=-c1u)$!COAKkyHs$}wp zHRjVh|KX2g#S+y&G_|YAt6e8d-w4F?&Ge*ZW*ol#^Y&8+5U!RWN#owFBThnak%r~ejV}RpZ#$x z_gJNw+3TA-pykJ9k^69X<>7g!c9Nf-)%UxBT~+??qpeojvc=&oB`0`dH}|j*&1vbN z77e5s)80XyeJ^xZy~J=O6-RaSYcGZ~3s;+E)hAM{9j~EJX~vBATRN(B^F-Sj|4pS{ z3!L2Iv2CPFyY}3C-uDcs3HzU3xGKE2>_|(e`8bJimmeM zUT~pdh%jYifqBi!CBAvQfTa)U>k{ZZ6L`1H=lOUX-9mB2gKa&lO}DUbPg?Zw zIhfYFIPg^F;|gV1R+?sI?`-Rd5ltJ_^r@c!lOj3S$Abu&k(dXf2u-G$)1L+wM0&oD zXPB!Q)BhUj$Q$R$0pkoSHl-rGPXgwn5L{*SatSLe& zMrcM(aWsWQZ6E-dpWh$!4WM(>h50y-upiU9EYf~YeQb%jqnXoofOP}t2^#Z1t~iRt z^>&yCY>e+)J8xt(XxwK1IRU5weqB4;)D~=w`lXpOUI*hp@yPOMpJNDPaI!>y3v9k%^O8Pmf^pxcAKN9-l!91yw>ue zZO1VK0m!`BBQRKk(#5e#e41k)%4j?LJPmQwKu|YsX1)XxcS-Hy8r9v1@$;G|Wan@^ z?}VmL{RFAJ9MrL^z~?wNVCo2`%>yw?)1w(V#S~Zm7ZLg_0H^)SXAct zE$p}o7v$fJ>Z3r1m{y$l96>cpC(L*@mX*fbKmf8JuQ$k3C>O`P@zra8@+QH0U?$B5?RzjTa-Frs+`yNq8HAu!ZcA#sOp#V|5- z{IvJnRN;EAOU<0JmEwv^QSJf!MPV%=97c6I#g!MiZ65GI3sfKZ{X?e{3fv1i&W-43 z-bS@%iFqJfCrtgyZ8ddx%0P9<{JfzE_oH%!+giMVu12`8HEY#ljVBFMhb)+N32Mv) zM!K!VCDvkDGc_yQv(tt>ZJ;`2LEaE7CL!`GY+4oTVJzTPklC6!ZIjz#S|TnCRENyZ z>x;;Elv{8yj+lBU_>wwWHmw74QS>tFWNFm5lD$18P%smlr#Jz#)Bab}N zfez*1?g~1;{o;w?beOX80}5%HHQ}o$is)25JnMliP*l [ text: language?.ui.dashboard, }, { - path: '/location', + path: '/warehouse', show: true, - icon: IconLocation, + icon: IconBuildingWarehouse, text: language?.ui.location, }, ] @@ -36,7 +41,7 @@ function NavbarItem(props) { } > - + {merged.text} diff --git a/frontend/src/index.scss b/frontend/src/index.scss index 4cc5076..47368ba 100644 --- a/frontend/src/index.scss +++ b/frontend/src/index.scss @@ -1,6 +1,7 @@ @tailwind base; @tailwind components; @tailwind utilities; +@import './assets/css/fu-theme.scss'; :root { font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif; diff --git a/frontend/src/lang/vi.json b/frontend/src/lang/vi.json index cb47892..d366019 100644 --- a/frontend/src/lang/vi.json +++ b/frontend/src/lang/vi.json @@ -9,7 +9,7 @@ "changeInfo": "Thông tin tài khoản", "save": "Lưu", "clear": "Xóa", - "houses": "Kho", + "location": "Nhà kho", "displayName": "Display Name", "newPassword": "New Password", "confirmNewPassword": "Confirm New Password" diff --git a/frontend/src/pages/Login/Login.jsx b/frontend/src/pages/Login/Login.jsx index 1fa57c8..dad6588 100644 --- a/frontend/src/pages/Login/Login.jsx +++ b/frontend/src/pages/Login/Login.jsx @@ -8,7 +8,7 @@ import { onMount } from 'solid-js' import * as yup from 'yup' import './login.scss' -import Logo from '@assets/logo.svg' +import Logo from '@assets/images/logo.svg' import TextInput from '@components/common/TextInput' import useAuth from '@hooks/useAuth' import useToast from '@hooks/useToast' diff --git a/frontend/src/pages/Profile/Profile.jsx b/frontend/src/pages/Profile/Profile.jsx index 6a8236d..5120555 100644 --- a/frontend/src/pages/Profile/Profile.jsx +++ b/frontend/src/pages/Profile/Profile.jsx @@ -71,7 +71,7 @@ export default function Profile() { return (
- + {language.ui.profile} diff --git a/frontend/src/pages/WareHouse.jsx b/frontend/src/pages/WareHouse.jsx deleted file mode 100644 index 5caccd1..0000000 --- a/frontend/src/pages/WareHouse.jsx +++ /dev/null @@ -1,12 +0,0 @@ -import { useNavigate } from '@solidjs/router' -import { onMount } from 'solid-js' - -export default function WareHouse() { - const navigate = useNavigate() - - onMount(() => { - navigate('/me', { replace: true }) - }) - - return <> -} diff --git a/frontend/src/pages/WareHouse/WareHouse.jsx b/frontend/src/pages/WareHouse/WareHouse.jsx new file mode 100644 index 0000000..63d0d6e --- /dev/null +++ b/frontend/src/pages/WareHouse/WareHouse.jsx @@ -0,0 +1,54 @@ +import { IconPackage } from '@tabler/icons-solidjs' +import { For } from 'solid-js' +import { Dynamic } from 'solid-js/web' +import './warehouse.scss' + +function PackageItem(props) { + const { item } = { ...props } + const isEmpty = item % 2 === 0 + return ( + + + + ) +} + +export default function WareHouse() { + return ( +
+
+
+
+

Section Overview

+
+ +
+
+
+
+
Khu bếp
+
+ {(item) => } +
+
+
+
+
+
+ ) +} diff --git a/frontend/src/pages/WareHouse/index.js b/frontend/src/pages/WareHouse/index.js new file mode 100644 index 0000000..ed3f652 --- /dev/null +++ b/frontend/src/pages/WareHouse/index.js @@ -0,0 +1 @@ +export { default } from './WareHouse' diff --git a/frontend/src/pages/WareHouse/warehouse.scss b/frontend/src/pages/WareHouse/warehouse.scss new file mode 100644 index 0000000..ff64f4b --- /dev/null +++ b/frontend/src/pages/WareHouse/warehouse.scss @@ -0,0 +1,3 @@ +.warehouse { + +} diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js index 6e91dfd..2c6082d 100644 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -20,7 +20,7 @@ export const ROUTES = [ show: true, }, { - path: '/ware-house', + path: '/warehouse', components: lazy(() => import('@pages/WareHouse')), filter: {}, show: true, diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index cf8adf0..eeba1e9 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -13,6 +13,7 @@ export default { primary: '#03c9d7', green: '#05b187', orange: '#fb9678', + warning: '#fbc66c', yellow: '#fec90f', }, }, @@ -24,10 +25,12 @@ export default { { light: { ...themes['light'], - primary: '#03c9d7', - 'primary-content': '#ffff', + // primary: '#03c9d7', + // 'primary-content': '#ffffff', secondary: '#fb9678', - 'secondary-content': '#ffff', + 'secondary-content': '#ffffff', + neutral: '#03c9d7', + 'neutral-content': '#ffffff', }, }, ],