From 8612aabe5d4df47ebf6032e0090a05ba7a7ff5df Mon Sep 17 00:00:00 2001 From: "@elizaoliveira88" Date: Mon, 24 May 2021 17:23:10 -0300 Subject: [PATCH 01/20] organizacaoDePastas --- src/App.css | 38 ----- src/App.js | 19 ++- src/App.test.js | 9 -- src/components/AppContainer.js | 11 -- .../Cadastro/CadastrarPrestadorServicos.js | 12 ++ .../Cadastro/CasdastrarPrestadorStyled.js | 0 .../Marketplace/Carrinho/Carrinho.js | 0 .../Marketplace/Carrinho/CarrinhoStyled.js | 0 .../EscolherPrestador/EscolherPrestador.js | 0 .../EscolherPrestadorStyled.js | 0 src/global.js | 22 +++ src/icon/carrinho.png | Bin 0 -> 18458 bytes src/icon/favoritos.png | Bin 0 -> 19275 bytes src/icon/labeninjas2.png | Bin 0 -> 23409 bytes src/icon/lupa.png | Bin 0 -> 4535 bytes src/index.css | 13 -- src/index.js | 7 +- src/logo.svg | 7 - src/serviceWorker.js | 141 ------------------ src/setupTests.js | 5 - 20 files changed, 47 insertions(+), 237 deletions(-) delete mode 100644 src/App.css delete mode 100644 src/App.test.js delete mode 100644 src/components/AppContainer.js create mode 100644 src/components/Marketplace/Cadastro/CadastrarPrestadorServicos.js create mode 100644 src/components/Marketplace/Cadastro/CasdastrarPrestadorStyled.js create mode 100644 src/components/Marketplace/Carrinho/Carrinho.js create mode 100644 src/components/Marketplace/Carrinho/CarrinhoStyled.js create mode 100644 src/components/Marketplace/EscolherPrestador/EscolherPrestador.js create mode 100644 src/components/Marketplace/EscolherPrestador/EscolherPrestadorStyled.js create mode 100644 src/global.js create mode 100644 src/icon/carrinho.png create mode 100644 src/icon/favoritos.png create mode 100644 src/icon/labeninjas2.png create mode 100644 src/icon/lupa.png delete mode 100644 src/index.css delete mode 100644 src/logo.svg delete mode 100644 src/serviceWorker.js delete mode 100644 src/setupTests.js diff --git a/src/App.css b/src/App.css deleted file mode 100644 index 74b5e05..0000000 --- a/src/App.css +++ /dev/null @@ -1,38 +0,0 @@ -.App { - text-align: center; -} - -.App-logo { - height: 40vmin; - pointer-events: none; -} - -@media (prefers-reduced-motion: no-preference) { - .App-logo { - animation: App-logo-spin infinite 20s linear; - } -} - -.App-header { - background-color: #282c34; - min-height: 100vh; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - font-size: calc(10px + 2vmin); - color: white; -} - -.App-link { - color: #61dafb; -} - -@keyframes App-logo-spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} diff --git a/src/App.js b/src/App.js index d4acf4b..53bf4af 100644 --- a/src/App.js +++ b/src/App.js @@ -1,10 +1,15 @@ import React from 'react' -import { AppContainer } from './components/AppContainer' +import GlobalStyle from './global' -function App() { - return ( - - ) +export default class App extends React.Component { + render() { + return ( + <> + +
+

Prontos(as) para começar!

+
+ + ) + } } - -export default App diff --git a/src/App.test.js b/src/App.test.js deleted file mode 100644 index 4db7ebc..0000000 --- a/src/App.test.js +++ /dev/null @@ -1,9 +0,0 @@ -import React from 'react'; -import { render } from '@testing-library/react'; -import App from './App'; - -test('renders learn react link', () => { - const { getByText } = render(); - const linkElement = getByText(/learn react/i); - expect(linkElement).toBeInTheDocument(); -}); diff --git a/src/components/AppContainer.js b/src/components/AppContainer.js deleted file mode 100644 index 06b7967..0000000 --- a/src/components/AppContainer.js +++ /dev/null @@ -1,11 +0,0 @@ -import React, { Component } from 'react' - -export class AppContainer extends Component { - render() { - return ( -
-

Pronto para começar!

-
- ) - } -} diff --git a/src/components/Marketplace/Cadastro/CadastrarPrestadorServicos.js b/src/components/Marketplace/Cadastro/CadastrarPrestadorServicos.js new file mode 100644 index 0000000..a761f90 --- /dev/null +++ b/src/components/Marketplace/Cadastro/CadastrarPrestadorServicos.js @@ -0,0 +1,12 @@ +import React, { Component } from 'react' + + +export class CadastrarPrestadorServicos extends Component { + render() { + return ( + <> + + + ) + } +} diff --git a/src/components/Marketplace/Cadastro/CasdastrarPrestadorStyled.js b/src/components/Marketplace/Cadastro/CasdastrarPrestadorStyled.js new file mode 100644 index 0000000..e69de29 diff --git a/src/components/Marketplace/Carrinho/Carrinho.js b/src/components/Marketplace/Carrinho/Carrinho.js new file mode 100644 index 0000000..e69de29 diff --git a/src/components/Marketplace/Carrinho/CarrinhoStyled.js b/src/components/Marketplace/Carrinho/CarrinhoStyled.js new file mode 100644 index 0000000..e69de29 diff --git a/src/components/Marketplace/EscolherPrestador/EscolherPrestador.js b/src/components/Marketplace/EscolherPrestador/EscolherPrestador.js new file mode 100644 index 0000000..e69de29 diff --git a/src/components/Marketplace/EscolherPrestador/EscolherPrestadorStyled.js b/src/components/Marketplace/EscolherPrestador/EscolherPrestadorStyled.js new file mode 100644 index 0000000..e69de29 diff --git a/src/global.js b/src/global.js new file mode 100644 index 0000000..05cfba6 --- /dev/null +++ b/src/global.js @@ -0,0 +1,22 @@ +import {createGlobalStyle} from 'styled-components'; + +export default createGlobalStyle` + +*{ + padding: 0; + margin: 0; + list-style: none; + box-sizing: border-box; +} + +html { + max-width: 100vw; + min-height: 100vh; +} +body, #root { + width: 100%; + height: 100%; + -webkit-font-smoothing: antialiased !important; +} + +` \ No newline at end of file diff --git a/src/icon/carrinho.png b/src/icon/carrinho.png new file mode 100644 index 0000000000000000000000000000000000000000..c0596f43d5f38ef1be0de098712edccdfb29f2c4 GIT binary patch literal 18458 zcmeHOYgkifwqAR)fe47vDxhs)6I%xrNJ2zN3=p|gQBkT?v06v*ZR-lkQD9?$VuukmiH#oDPYtvaHPm!qgqTLnck>)YY7L2TOd%+L5dm@jL+ z>s{-6*ZRKfKl@LaV@GuN>*ogm-P1>=jt8J|NrT7-KYq4<`v5<>Sw>E_0t6hK_3h6_9m?#jIaRUgQs!W0mc_m- zB4Wo4?a}w6(!^WNgn#kf`x{3Ydrg~m=8e+LQ+$Jq_dC9L*^=2zJ2kUz)QZDPN<{Dd z-?>9qiVl2SGy5ama-DeQ8I$UpUlu4I9uAlQUw7O7t?7RP;nE9lHy*e)n691sk8Q)c zKR&wP-9g>QaJNj$7qf#j&g75!9S)I|yz$BKbJT|_RvGLGhG=`C1@#6{ zC)q7J{Y-<6%`xN~O$m}ayZ1|2V{U?EQf!7S!;)f{VH`QH$S`5v*ew0LnR;ceBq`BP zZC4>dp~0qO?S%yZ4kR4P+SFiM^YkwC>D^IGysxLBHY(}$*CA_*E z^K4s!L_!j^{cG7*p`|U6$=aeFswlPVEK+&2OxjgYuD&hCGP|gNFD+LuH53>M4JMlv zXMKe;-a?l-Xru>zi4y(-UKRH(Bh8Vhy# z2C2oAua>qO1<1CkQl*#+%tct1AyJ{0c4h7|3a{f#*KOR=g7G7g*$6y|@u+w^ivT8| z;RjZgZnD~RCcPm&H4zQbMq{ojCU1z+5I;00O0JBLi_#4pqKMMza^s?6a^ldVh?D2U z=J379$Pk7}COAO|-=(t2{+?!vaKj>Pa6fJ&z)mtvxxoGU}FTH3+d zURGOVOPKNh+dvn;ApGe$if0&1zjiKNR6OeGBvx~ttyouN7@m(a@msD87i-6`&h%<2 z`4K5Fc5H;p+Oa>a6Z>R8)#Pqe;VfWXI=%;Twe$&FduA6toAk6`Hjh`v#K~ncDgKdL ziVqdKJBLpG^-!U^b7*_yD<-2YF{UM3C$k`mT;Q(TWdc5H7!rrZ#wudf($4125t&B2 zp&&cei09WzrZQHJsraDIo-QLNKQ&U|X^C_-OYmI4_tIs>rw)AJk+wbYbZm3mQTPup z+PCx{CKl3pk_gpsyY|TCRw5z5BbQJOw`-4FZY2@|JaP%uaJ%-%T{A|b#dmrxD2YmZ!R zB@zNWatYONyY|TCRw5z5BbQJOw`-4FZY2@|JaP%uaJ%-%T{A|b#dmrxD2YmZ!RB@zNW zatYONyY|TCRw5z5BbQJOw`-4FZY2@|JaP%uaJ%-%hLW4k9FtIu9zAZ00+LX{8U-?rDnuxMGyM5us+<#sa1OipRKf3d%=uZB4Cl80uTXc zaD}guijf;v3}(fTr@J)hT>7 z!IDA(f#I++3cqPUM4>4eYiu>u{u#uS1l?%Z&C9U=YR9r2wZvOiO^X zKsoYjhQMJCw;u|d5Y0mAA`vo|(>*b>m_c%i6{Vse8Zir!Np}v)%eY~PPEB#VP7`!(G(n3k zm5A<1(7ou}JuoGq58T+Bz8%Pi-uJ;`D8!ITxHI9k`+xxn*(WKMN7wmN_ZhYwg>)Qf zr!zbI3sGC%hWl8ifU9S%sfA1PB7M%E1AbFHfFa5DI_I%a;{0jHh>6&M0IJ6pR4IfC zokW2~#;CWUkXpu`orYLUsR^gmAJe=kv(>a{Nfw!*HcGxS&2KO{rZlamx}oZ>tpeF9 zpfK2o0f~?4P83xAjdv)^SEe^aP%?l7`D8GtSiow4?7hogE7Re-&op@b0l@EJjUgnS zLNb{}f~4A71{`0$R+k*`9)Re!E;y&2LGc{5n497bVBBD5^vcn4jt7G`Xmrk9y}cs% zB$*fj0UI#M{f7%Ftq8rg`@2F)T;7-Y5;nDZL%a#E%n!IPt7j|AUgl#rlRbsJL_yW< z`%c=CiQel;me1Lgfh0j0zSxZkK4_(o@f2D@v47T;zXW{9M~~rm^DYhA^LL!y+{NA$ zoPPf1rht!l?^xcuw$)4Z;guMK2jbxwL*Go^yMZQ3XuQF(>w?oCQqYUZv2$5-KJ{0; z&wEFr_g)x!OL(u(E9kxV$!G<39Ah*2$~ItSv-dlLp$xrP_@@9L*JTCgXY<}F^xjH( z91K1adG8kDov4Xnk zF_pApbH&hq@nV1N4O*!m1nk0GsT8LR25#L>y>wRrKe<&E;27H*Lgr9Vvjm4;3h*!! z=NyB=0?#jrevWT>Jq=YoyuoK0z?_XZ?*8BiJ@=XaYbriNeHv(cV1|8|K|^sDF~jo_ zAZx}TuO+uN!Ie+ioeU)6#aZ+EusQ2bj6l});243`?;Z!W{l&oT{R7m8i@@>EXP{Bc zfc8%J^YeYUXA^z$d*Ck^S4lal(GvnKo30y1aXo0qKD4pW@&%_GZv&TJ+Ea%6Yll0Q zP&HN>7KCsKNUtjg$J-bXkMzfG)tJkuFp+kDH>h6(_tt>JSAx}KU^P7{?)(6#Uy9Y3 zp566*0F&6;G3^b2$OQ8c{rjJ1U!I$C$%W0{NT4BbF}b@LXxu=x&7g+d7#OtpSWDx{ z$m5o^S1wD5{ea8doy&Jk#HifP~F>6k3L! z{Is-i3Txm^W8h43lA^F=$ubMi@CCuo~)0H+lvFv&WEwInBj1fte*xru|`aiax9`GFbhLc;S$D+D8`G_ z$I1GT$Cz-IsFF+qpp*pg!eUyA=66a2&@g;}2t~W-%OI#SiA5%R^P+i7c3o|QF9ZC4 z_GTQN4*yXsI4+a(1fdHxC`)~#SLi|_4Y_{Qk2#zl?pPT4LMVa>4PK+fLsSCju^-@s z|M4WWQ8H^&_Q6^_`c*@q`G>=Sp$jNjdhEjbe?;c^cthz*Q^Qhu#lz6iJu&COy#?JS z@5^gAd%r(2XYX1S8RlOT`S{Yxvq8_pe>o^g(CyZ;!!sE%O)U&&wjNk>seBTW!;> ze%y}kwau&4UO=c`i`5#W$CWGW|7 zTHG`-mR#L)aw8Uy{X+F+AwO~!f(YYc(O&CNKoR0VJ zu}&ecpy5Q^4$Im_ebv>6BK@yCSK$Ppx4xvfcoRq)0cK`4!5W%Sikgs(Je>dEz!N%)jqdE)J; zHNC^~RT!auvEbtBq?7n~G`i-$V&}g*0*k3K%zP}XL?YdZ@0xX?NOUlWP>Xn?yZNE0 zNVh3FuAWl+fuq-sg0J4g%DA+G)2kB{_&9aq%%<4+dE`_(4Ia^%X(Z`~gUPd}U-_^;E2Jc~thvwVz{+;Zv$a)b@ekNZv7Z;1cd3ng&kU zRw{8kkEpd#6O+ShtFgo11P$64Vo9RGuG0-0JfMu*jTd+7n~u5u04qltknaUs0CQ30=C(5z|H%P<5WJ#B32wq)&_{|20t*ysQN literal 0 HcmV?d00001 diff --git a/src/icon/favoritos.png b/src/icon/favoritos.png new file mode 100644 index 0000000000000000000000000000000000000000..274a40c9b1dc5b06de12042717c3064721a6f174 GIT binary patch literal 19275 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 Z7B-Aw9@_M7{92?6QPZNsOQ#A}{vY9^n=b$W literal 0 HcmV?d00001 diff --git a/src/icon/labeninjas2.png b/src/icon/labeninjas2.png new file mode 100644 index 0000000000000000000000000000000000000000..d9c5f91fe0c0e67c7077491cdff7fd61a7ad2a61 GIT binary patch literal 23409 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 OL@J7E3gvP}f&T-u<6rLp literal 0 HcmV?d00001 diff --git a/src/icon/lupa.png b/src/icon/lupa.png new file mode 100644 index 0000000000000000000000000000000000000000..616c54a267833446d2867eeafde9e45ecba80026 GIT binary patch literal 4535 zcmV;o5lHTdP)wkq@<+q@bICbp@4vZ{QUfiii-I7`1JJj>+9>-*x1a>%-`SNv$M06m6gQA z#9?7!<>lo}OiVK~GrqpQkB^U2Q&ZB?(z?336%`d^WMs<9$_on%LPA0+Dk?iWJ8o`n zdwY9NPfsBsA#-zcG&D3?T3RbBD;padBO@aN8(tg$01)d*L_t(|ob6rddh#j|uDdo- zqt#lss?|?x_5QE#ba93m7-AA2+NbCJnOb0Ac3^mT@PWrhFKKqR|K9hD)vB^uoHpy@ zZcv}kqPCazZ;H4#IIJsHERLrcJ^8;$9oaS z(LZfuoq{8)O>|ao`WapcKh^P~D_H4bP9VM~uxABbV zZ>X@?J+p7bvthHfJx-_N@xSSDxqC@^{VVeIdLr$2{Ea&^W^|5+DL-t#R;Rix|HkV5 zkaSc2u|_S&()akU;+6D1wMyV)cVLM(5ZlDANT{!LELo*aNZ&7(-?V2taqSFD>ozBd zO2V8mcs(!9@(h3NalY9O^YS3lT=rtKTi20NSz`ppc6zwtDv5BpJ6 z`$QDQv!vM)GsY)Ls)y?D)!^iPYDneDJPCiUnxh_9Uu8`{N)8+2*XzFd!=Czc3898s zB0=!GdRpmp7^eHp{iY$aLWYK{Vw#WO1xoJ6=E5|!u|5s6c;lmiwg)gamrM`i?0_K- zJl|H$&r96MmEX|R2WLVLx*=L7L`wEl7FH5s%_L_n_wR5NQs#KCu#&g3h(H) z**xjZG!zdP?cf@w(1RiDREV5{)h>0{_2h+8bAh%Q6_4sdMkHuq4TeXv*ZQDyxRNb? zq}dC-Ez~yqVia6KgdOWC8M1AM zVs3wCQM5JX;yi1X0sVgO$_9O3ZSsgGV`NMdnh(rF;lqO>@yP#xtTZl6iUl}#T$L#G zV-Pr#Pc39LmdG-CqN`==&k++#e`>BZ7HyOKN)ZYlRmkMuX4VQybiSq4q?f%LcB zWTXIC=7R?{D4d$ua|?0q6blAa&XS89YHyEQQmDZA9uTh7f~lW~g|lx-R=zYa!1j3) zAc-E6ix8Tv*jMH2v&n3*T(>17o(-5Z;6i{W2fR5pvAl#BF|lYOqCuXc`>1RYevN1XN*}emU(7_A}hFdo?{d_ZufzG7q0CCfLS=NpiO2Lj>w>o8Ahj_Iccb7JsAwt zGc3u6nvR7UB-VG5KmgLhO#^h}$^VA9lkaY!Pe%19v4ft{MHuulZHCiZSWh!-F0C;= zgC2KN`dC>Bx%onPghLrTa{^!eG73wefqKuO zRfo=@yC8y-LY2oOIEKWhz$Ns*5e=r7nJdU)Iwvz?usoC-fJJCx5v0(Yuc!ci@tS@F z1>`LBKnycHph=0thF(U16ZRO}P-WMZ$S#7aG*zHUiK+%q(Q9e}@Gi_AW~5vj-e>K@$eo~HRdpi0E{iw)3C0DJ%DdRT^oQ&Wf@Xn zCAULTz#cT)1iLh3UE#EIsI%COi)ZylJAhP}o9rKiR=_$bp@1n4bAaH19Ehar1?Ix7 zTmj4zRnyS2Ql+9k@`|HCAGh(oPV^gau3A?}DTKSZ3mT8EmmjBQA*hhCL7^X+Ps2c%LokwVvT@PU zY|ngcPzXDs;f_Uu%uzR6uv!Ihq40x#yHL1NVMM<-`$Er8j$Hy!NM#NvblbwaPZ$$Ru; z561#ETcNkmkY?47*JgTXW!QHUFw;~rzzc9Yr3kj1S~}p45-(W8ZL&R0bOA59`56)? zK*}OiKraAt!fbQKPdZVO=C0ITSU{I7>vZ|Hatpg5E~49X5o~2RwVVqu(Tr^_-yFkk z*iB{$l8aDO%BxoaTZmM-!O+%jP1mGmmO_7F0UH<8KmmJ6_XBdEeOWJ-Z3dnxt&{_t zZ`)8uQF6wMU@6QVq-8?oe+_^K%8rA86X1ICt0m3UK?=NvD0f$ z64?O(GfHhcWH49O|H=qxi0ux5ARcZ1dHM1?@I0Cq1rM^ z90M1zJp%~veH=~%FO;zZ@JI=|24|DSfeWllUE5puS;=|Dv% z_wGm2fy^zKV#fQ0VM}o1#UQqXV8T2d6O6=z@hBfbBMhvd#4nJ;rnj$D5u{_+>?AKwhv?VdI?{mt+MewK zp%38iAf)BO9~M6flsUzdvsxeuQlr;CaDc_Ws|yxhFC8QB9vtUJB;03l46F>n?Yp{> z9zqn=6&xOh9^}t%z-i<5{SmKI2B^TLs%Uc_MJe=KhX+@S2b_vey;tB;^~(;*GD0NkxyHb{$ogRRTsA*_*Y1C^y6;ek~OH-g=_|6fbBx+MyQw1J9 zUXLdQQngeN-ct3Sa7TXB_6byR2Y;o0Nr_vH5H-;OP7z?IS}>uCV_537<_39-K#$GP zM25)np__lw?o^P%lq(`6k|wJ{VSj&0nlSC1wV;t#B=!L`SZS|w?ybd`7bY?^ zmMRV#_WZ!XK7-i;6rEo!2g8wOL27Ydd^T^Ns-i56`n47BlSDG@l40t}^%76(r)_J{ ztk;{>&TcuiJbv+VMLmfm{ygd9(-$YqB4#WnMc!HcLWUaBL>6IsYZvY3lSI;uY}>`x z9xwXww@#Lesv z&1^02Lwq|?da%Y;kv*&Blf*Wyjc5(lM%9nXbu8_#UH*7-dX9^5kY2_&kh)1rugCLk zicFrTgOpgd4@{tw_+)RlO&lByK!{YEst3&rK_81#R{J!vIigB%Rn;d&z%km&Ux;Yb_PrdfPfsHgGge#rEhXf#Na8fq0EhWaD$ z+d?VnsIJFdhi{ugNW3s=1IB;U!th`u^7moBuo&bt9_@*tUY=o|bVmJjwjrcBYI%lG zjQXkm%=hx1U%FY%M?5#R%Ze-lU&Zgsh_;MuI1(R*g8O-1*1Ol7m(goSf4Te%9hUW= zve@|PCpJ6ntFU2tj|e}WI@S88OZtgP zQg03p4z4XaM-p>a-P>Rp-8BpPo#Wx;dn>TznCP``2+D6B00ARg{yJt^T>&2Z$O zroXPMWCIK(lHYu5*<`;y1d<;ORp$4X3wVeVBPeoaRL{-B&Av zQ7PhX?{!ii3|=}f)n+n$o%Qn_@U4-&WX4M@Ws~TJoGki-5*gJQk3|UlO(aql&2?w= z*DxyCt;>0l?6<6fS*+?uk2$1cp-5eU|{~>g~YoSMJkJV zNmTdz%dAMA9}cUCdz?OtG6cXi5=Yicif!1A-v7o_y>zW5Ui6h98+en0ckTR+wx;CyS|AtSniosZl3av+h2Vm;%D6mCAZB z`!*Eq{(MW%)4$z)A~6k~^gAA9Y#fQQ#xZVIzpm4>%6A5jg0NjiaYxwPMfQCgLw zyFQ4K9ac`A{#H9^AR3$``rIDZy)#6KcBOUG`F+vEHPl|4+qcuIve+Cu$;fo${sYua V&1~n9jOqXY002ovPDHLkV1hohy3POq literal 0 HcmV?d00001 diff --git a/src/index.css b/src/index.css deleted file mode 100644 index ec2585e..0000000 --- a/src/index.css +++ /dev/null @@ -1,13 +0,0 @@ -body { - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -code { - font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', - monospace; -} diff --git a/src/index.js b/src/index.js index f5185c1..f36c1ba 100644 --- a/src/index.js +++ b/src/index.js @@ -1,8 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import './index.css'; import App from './App'; -import * as serviceWorker from './serviceWorker'; + ReactDOM.render( @@ -11,7 +10,3 @@ ReactDOM.render( document.getElementById('root') ); -// If you want your app to work offline and load faster, you can change -// unregister() to register() below. Note this comes with some pitfalls. -// Learn more about service workers: https://bit.ly/CRA-PWA -serviceWorker.unregister(); diff --git a/src/logo.svg b/src/logo.svg deleted file mode 100644 index 6b60c10..0000000 --- a/src/logo.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/serviceWorker.js b/src/serviceWorker.js deleted file mode 100644 index b04b771..0000000 --- a/src/serviceWorker.js +++ /dev/null @@ -1,141 +0,0 @@ -// This optional code is used to register a service worker. -// register() is not called by default. - -// This lets the app load faster on subsequent visits in production, and gives -// it offline capabilities. However, it also means that developers (and users) -// will only see deployed updates on subsequent visits to a page, after all the -// existing tabs open on the page have been closed, since previously cached -// resources are updated in the background. - -// To learn more about the benefits of this model and instructions on how to -// opt-in, read https://bit.ly/CRA-PWA - -const isLocalhost = Boolean( - window.location.hostname === 'localhost' || - // [::1] is the IPv6 localhost address. - window.location.hostname === '[::1]' || - // 127.0.0.0/8 are considered localhost for IPv4. - window.location.hostname.match( - /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ - ) -); - -export function register(config) { - if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { - // The URL constructor is available in all browsers that support SW. - const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href); - if (publicUrl.origin !== window.location.origin) { - // Our service worker won't work if PUBLIC_URL is on a different origin - // from what our page is served on. This might happen if a CDN is used to - // serve assets; see https://github.com/facebook/create-react-app/issues/2374 - return; - } - - window.addEventListener('load', () => { - const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; - - if (isLocalhost) { - // This is running on localhost. Let's check if a service worker still exists or not. - checkValidServiceWorker(swUrl, config); - - // Add some additional logging to localhost, pointing developers to the - // service worker/PWA documentation. - navigator.serviceWorker.ready.then(() => { - console.log( - 'This web app is being served cache-first by a service ' + - 'worker. To learn more, visit https://bit.ly/CRA-PWA' - ); - }); - } else { - // Is not localhost. Just register service worker - registerValidSW(swUrl, config); - } - }); - } -} - -function registerValidSW(swUrl, config) { - navigator.serviceWorker - .register(swUrl) - .then(registration => { - registration.onupdatefound = () => { - const installingWorker = registration.installing; - if (installingWorker == null) { - return; - } - installingWorker.onstatechange = () => { - if (installingWorker.state === 'installed') { - if (navigator.serviceWorker.controller) { - // At this point, the updated precached content has been fetched, - // but the previous service worker will still serve the older - // content until all client tabs are closed. - console.log( - 'New content is available and will be used when all ' + - 'tabs for this page are closed. See https://bit.ly/CRA-PWA.' - ); - - // Execute callback - if (config && config.onUpdate) { - config.onUpdate(registration); - } - } else { - // At this point, everything has been precached. - // It's the perfect time to display a - // "Content is cached for offline use." message. - console.log('Content is cached for offline use.'); - - // Execute callback - if (config && config.onSuccess) { - config.onSuccess(registration); - } - } - } - }; - }; - }) - .catch(error => { - console.error('Error during service worker registration:', error); - }); -} - -function checkValidServiceWorker(swUrl, config) { - // Check if the service worker can be found. If it can't reload the page. - fetch(swUrl, { - headers: { 'Service-Worker': 'script' }, - }) - .then(response => { - // Ensure service worker exists, and that we really are getting a JS file. - const contentType = response.headers.get('content-type'); - if ( - response.status === 404 || - (contentType != null && contentType.indexOf('javascript') === -1) - ) { - // No service worker found. Probably a different app. Reload the page. - navigator.serviceWorker.ready.then(registration => { - registration.unregister().then(() => { - window.location.reload(); - }); - }); - } else { - // Service worker found. Proceed as normal. - registerValidSW(swUrl, config); - } - }) - .catch(() => { - console.log( - 'No internet connection found. App is running in offline mode.' - ); - }); -} - -export function unregister() { - if ('serviceWorker' in navigator) { - navigator.serviceWorker.ready - .then(registration => { - registration.unregister(); - }) - .catch(error => { - console.error(error.message); - }); - } -} diff --git a/src/setupTests.js b/src/setupTests.js deleted file mode 100644 index 74b1a27..0000000 --- a/src/setupTests.js +++ /dev/null @@ -1,5 +0,0 @@ -// jest-dom adds custom jest matchers for asserting on DOM nodes. -// allows you to do things like: -// expect(element).toHaveTextContent(/react/i) -// learn more: https://github.com/testing-library/jest-dom -import '@testing-library/jest-dom/extend-expect'; From 1888e1350b5c455d28cfce79fbe44ba5c7cb7c02 Mon Sep 17 00:00:00 2001 From: Venus Date: Wed, 26 May 2021 16:56:16 -0300 Subject: [PATCH 02/20] estruturacao do Header --- package-lock.json | 383 +++++++++++++++++- package.json | 4 +- public/imagens/labelogo.png | Bin 0 -> 14638 bytes .../imagens/labeninjas.png | Bin src/App.js | 43 +- src/Header.js | 44 ++ src/icon/carrinho.png | Bin 18458 -> 0 bytes src/icon/favoritos.png | Bin 19275 -> 0 bytes src/icon/lupa.png | Bin 4535 -> 0 bytes src/index.js | 2 + 10 files changed, 455 insertions(+), 21 deletions(-) create mode 100644 public/imagens/labelogo.png rename src/icon/labeninjas2.png => public/imagens/labeninjas.png (100%) create mode 100644 src/Header.js delete mode 100644 src/icon/carrinho.png delete mode 100644 src/icon/favoritos.png delete mode 100644 src/icon/lupa.png diff --git a/package-lock.json b/package-lock.json index 5176811..8b92ee6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1201,6 +1201,11 @@ "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-10.1.0.tgz", "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==" }, + "@emotion/hash": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", + "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" + }, "@emotion/is-prop-valid": { "version": "0.8.8", "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz", @@ -1430,6 +1435,103 @@ "@types/yargs": "^13.0.0" } }, + "@material-ui/core": { + "version": "4.11.4", + "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.11.4.tgz", + "integrity": "sha512-oqb+lJ2Dl9HXI9orc6/aN8ZIAMkeThufA5iZELf2LQeBn2NtjVilF5D2w7e9RpntAzDb4jK5DsVhkfOvFY/8fg==", + "requires": { + "@babel/runtime": "^7.4.4", + "@material-ui/styles": "^4.11.4", + "@material-ui/system": "^4.11.3", + "@material-ui/types": "5.1.0", + "@material-ui/utils": "^4.11.2", + "@types/react-transition-group": "^4.2.0", + "clsx": "^1.0.4", + "hoist-non-react-statics": "^3.3.2", + "popper.js": "1.16.1-lts", + "prop-types": "^15.7.2", + "react-is": "^16.8.0 || ^17.0.0", + "react-transition-group": "^4.4.0" + } + }, + "@material-ui/icons": { + "version": "4.11.2", + "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.2.tgz", + "integrity": "sha512-fQNsKX2TxBmqIGJCSi3tGTO/gZ+eJgWmMJkgDiOfyNaunNaxcklJQFaFogYcFl0qFuaEz1qaXYXboa/bUXVSOQ==", + "requires": { + "@babel/runtime": "^7.4.4" + } + }, + "@material-ui/styles": { + "version": "4.11.4", + "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.4.tgz", + "integrity": "sha512-KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew==", + "requires": { + "@babel/runtime": "^7.4.4", + "@emotion/hash": "^0.8.0", + "@material-ui/types": "5.1.0", + "@material-ui/utils": "^4.11.2", + "clsx": "^1.0.4", + "csstype": "^2.5.2", + "hoist-non-react-statics": "^3.3.2", + "jss": "^10.5.1", + "jss-plugin-camel-case": "^10.5.1", + "jss-plugin-default-unit": "^10.5.1", + "jss-plugin-global": "^10.5.1", + "jss-plugin-nested": "^10.5.1", + "jss-plugin-props-sort": "^10.5.1", + "jss-plugin-rule-value-function": "^10.5.1", + "jss-plugin-vendor-prefixer": "^10.5.1", + "prop-types": "^15.7.2" + }, + "dependencies": { + "jss": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss/-/jss-10.6.0.tgz", + "integrity": "sha512-n7SHdCozmxnzYGXBHe0NsO0eUf9TvsHVq2MXvi4JmTn3x5raynodDVE/9VQmBdWFyyj9HpHZ2B4xNZ7MMy7lkw==", + "requires": { + "@babel/runtime": "^7.3.1", + "csstype": "^3.0.2", + "indefinite-observable": "^2.0.1", + "is-in-browser": "^1.1.3", + "tiny-warning": "^1.0.2" + }, + "dependencies": { + "csstype": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz", + "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==" + } + } + } + } + }, + "@material-ui/system": { + "version": "4.11.3", + "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.11.3.tgz", + "integrity": "sha512-SY7otguNGol41Mu2Sg6KbBP1ZRFIbFLHGK81y4KYbsV2yIcaEPOmsCK6zwWlp+2yTV3J/VwT6oSBARtGIVdXPw==", + "requires": { + "@babel/runtime": "^7.4.4", + "@material-ui/utils": "^4.11.2", + "csstype": "^2.5.2", + "prop-types": "^15.7.2" + } + }, + "@material-ui/types": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz", + "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==" + }, + "@material-ui/utils": { + "version": "4.11.2", + "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.2.tgz", + "integrity": "sha512-Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA==", + "requires": { + "@babel/runtime": "^7.4.4", + "prop-types": "^15.7.2", + "react-is": "^16.8.0 || ^17.0.0" + } + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -1816,6 +1918,14 @@ "@types/react": "*" } }, + "@types/react-transition-group": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.1.tgz", + "integrity": "sha512-vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ==", + "requires": { + "@types/react": "*" + } + }, "@types/stack-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", @@ -2753,9 +2863,9 @@ "integrity": "sha512-1aGDUfL1qOOIoqk9QKGIo2lANk+C7ko/fqH0uIyC71x3PEGz0uVP8ISgfEsFuG+FKmjHTvFK/nNM8dowpmUxLA==" }, "babel-plugin-styled-components": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz", - "integrity": "sha512-YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz", + "integrity": "sha512-FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA==", "requires": { "@babel/helper-annotate-as-pure": "^7.0.0", "@babel/helper-module-imports": "^7.0.0", @@ -3677,6 +3787,11 @@ "shallow-clone": "^0.1.2" } }, + "clsx": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz", + "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==" + }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -4303,6 +4418,11 @@ "cssom": "0.3.x" } }, + "csstype": { + "version": "2.6.17", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.17.tgz", + "integrity": "sha512-u1wmTI1jJGzCJzWndZo8mk4wnPTZd1eOIYTYvuEyOQGfmDl3TrabCCfKnOC86FZwW/9djqTl933UF/cS425i9A==" + }, "cyclist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", @@ -4619,6 +4739,22 @@ "utila": "~0.4" } }, + "dom-helpers": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", + "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", + "requires": { + "@babel/runtime": "^7.8.7", + "csstype": "^3.0.2" + }, + "dependencies": { + "csstype": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz", + "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==" + } + } + }, "dom-serializer": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", @@ -6686,6 +6822,14 @@ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, + "indefinite-observable": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-2.0.1.tgz", + "integrity": "sha512-G8vgmork+6H9S8lUAg1gtXEj2JxIQTo0g2PbFiYOdjkziSI0F7UYBiVwhZRuixhBCNGczAls34+5HJPyZysvxQ==", + "requires": { + "symbol-observable": "1.2.0" + } + }, "indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", @@ -7946,6 +8090,215 @@ } } }, + "jss-plugin-camel-case": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.6.0.tgz", + "integrity": "sha512-JdLpA3aI/npwj3nDMKk308pvnhoSzkW3PXlbgHAzfx0yHWnPPVUjPhXFtLJzgKZge8lsfkUxvYSQ3X2OYIFU6A==", + "requires": { + "@babel/runtime": "^7.3.1", + "hyphenate-style-name": "^1.0.3", + "jss": "10.6.0" + }, + "dependencies": { + "csstype": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz", + "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==" + }, + "jss": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss/-/jss-10.6.0.tgz", + "integrity": "sha512-n7SHdCozmxnzYGXBHe0NsO0eUf9TvsHVq2MXvi4JmTn3x5raynodDVE/9VQmBdWFyyj9HpHZ2B4xNZ7MMy7lkw==", + "requires": { + "@babel/runtime": "^7.3.1", + "csstype": "^3.0.2", + "indefinite-observable": "^2.0.1", + "is-in-browser": "^1.1.3", + "tiny-warning": "^1.0.2" + } + } + } + }, + "jss-plugin-default-unit": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.6.0.tgz", + "integrity": "sha512-7y4cAScMHAxvslBK2JRK37ES9UT0YfTIXWgzUWD5euvR+JR3q+o8sQKzBw7GmkQRfZijrRJKNTiSt1PBsLI9/w==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.6.0" + }, + "dependencies": { + "csstype": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz", + "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==" + }, + "jss": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss/-/jss-10.6.0.tgz", + "integrity": "sha512-n7SHdCozmxnzYGXBHe0NsO0eUf9TvsHVq2MXvi4JmTn3x5raynodDVE/9VQmBdWFyyj9HpHZ2B4xNZ7MMy7lkw==", + "requires": { + "@babel/runtime": "^7.3.1", + "csstype": "^3.0.2", + "indefinite-observable": "^2.0.1", + "is-in-browser": "^1.1.3", + "tiny-warning": "^1.0.2" + } + } + } + }, + "jss-plugin-global": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.6.0.tgz", + "integrity": "sha512-I3w7ji/UXPi3VuWrTCbHG9rVCgB4yoBQLehGDTmsnDfXQb3r1l3WIdcO8JFp9m0YMmyy2CU7UOV6oPI7/Tmu+w==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.6.0" + }, + "dependencies": { + "csstype": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz", + "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==" + }, + "jss": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss/-/jss-10.6.0.tgz", + "integrity": "sha512-n7SHdCozmxnzYGXBHe0NsO0eUf9TvsHVq2MXvi4JmTn3x5raynodDVE/9VQmBdWFyyj9HpHZ2B4xNZ7MMy7lkw==", + "requires": { + "@babel/runtime": "^7.3.1", + "csstype": "^3.0.2", + "indefinite-observable": "^2.0.1", + "is-in-browser": "^1.1.3", + "tiny-warning": "^1.0.2" + } + } + } + }, + "jss-plugin-nested": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.6.0.tgz", + "integrity": "sha512-fOFQWgd98H89E6aJSNkEh2fAXquC9aZcAVjSw4q4RoQ9gU++emg18encR4AT4OOIFl4lQwt5nEyBBRn9V1Rk8g==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.6.0", + "tiny-warning": "^1.0.2" + }, + "dependencies": { + "csstype": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz", + "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==" + }, + "jss": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss/-/jss-10.6.0.tgz", + "integrity": "sha512-n7SHdCozmxnzYGXBHe0NsO0eUf9TvsHVq2MXvi4JmTn3x5raynodDVE/9VQmBdWFyyj9HpHZ2B4xNZ7MMy7lkw==", + "requires": { + "@babel/runtime": "^7.3.1", + "csstype": "^3.0.2", + "indefinite-observable": "^2.0.1", + "is-in-browser": "^1.1.3", + "tiny-warning": "^1.0.2" + } + } + } + }, + "jss-plugin-props-sort": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.6.0.tgz", + "integrity": "sha512-oMCe7hgho2FllNc60d9VAfdtMrZPo9n1Iu6RNa+3p9n0Bkvnv/XX5San8fTPujrTBScPqv9mOE0nWVvIaohNuw==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.6.0" + }, + "dependencies": { + "csstype": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz", + "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==" + }, + "jss": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss/-/jss-10.6.0.tgz", + "integrity": "sha512-n7SHdCozmxnzYGXBHe0NsO0eUf9TvsHVq2MXvi4JmTn3x5raynodDVE/9VQmBdWFyyj9HpHZ2B4xNZ7MMy7lkw==", + "requires": { + "@babel/runtime": "^7.3.1", + "csstype": "^3.0.2", + "indefinite-observable": "^2.0.1", + "is-in-browser": "^1.1.3", + "tiny-warning": "^1.0.2" + } + } + } + }, + "jss-plugin-rule-value-function": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.6.0.tgz", + "integrity": "sha512-TKFqhRTDHN1QrPTMYRlIQUOC2FFQb271+AbnetURKlGvRl/eWLswcgHQajwuxI464uZk91sPiTtdGi7r7XaWfA==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.6.0", + "tiny-warning": "^1.0.2" + }, + "dependencies": { + "csstype": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz", + "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==" + }, + "jss": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss/-/jss-10.6.0.tgz", + "integrity": "sha512-n7SHdCozmxnzYGXBHe0NsO0eUf9TvsHVq2MXvi4JmTn3x5raynodDVE/9VQmBdWFyyj9HpHZ2B4xNZ7MMy7lkw==", + "requires": { + "@babel/runtime": "^7.3.1", + "csstype": "^3.0.2", + "indefinite-observable": "^2.0.1", + "is-in-browser": "^1.1.3", + "tiny-warning": "^1.0.2" + } + } + } + }, + "jss-plugin-vendor-prefixer": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.6.0.tgz", + "integrity": "sha512-doJ7MouBXT1lypLLctCwb4nJ6lDYqrTfVS3LtXgox42Xz0gXusXIIDboeh6UwnSmox90QpVnub7au8ybrb0krQ==", + "requires": { + "@babel/runtime": "^7.3.1", + "css-vendor": "^2.0.8", + "jss": "10.6.0" + }, + "dependencies": { + "css-vendor": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz", + "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==", + "requires": { + "@babel/runtime": "^7.8.3", + "is-in-browser": "^1.0.2" + } + }, + "csstype": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz", + "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==" + }, + "jss": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss/-/jss-10.6.0.tgz", + "integrity": "sha512-n7SHdCozmxnzYGXBHe0NsO0eUf9TvsHVq2MXvi4JmTn3x5raynodDVE/9VQmBdWFyyj9HpHZ2B4xNZ7MMy7lkw==", + "requires": { + "@babel/runtime": "^7.3.1", + "csstype": "^3.0.2", + "indefinite-observable": "^2.0.1", + "is-in-browser": "^1.1.3", + "tiny-warning": "^1.0.2" + } + } + } + }, "jss-preset-default": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/jss-preset-default/-/jss-preset-default-4.5.0.tgz", @@ -9381,6 +9734,11 @@ "ts-pnp": "^1.1.6" } }, + "popper.js": { + "version": "1.16.1-lts", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz", + "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==" + }, "portfinder": { "version": "1.0.28", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", @@ -10921,6 +11279,17 @@ "workbox-webpack-plugin": "4.3.1" } }, + "react-transition-group": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz", + "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==", + "requires": { + "@babel/runtime": "^7.5.5", + "dom-helpers": "^5.0.1", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2" + } + }, "read-pkg": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", @@ -12411,16 +12780,16 @@ } }, "styled-components": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.1.1.tgz", - "integrity": "sha512-1ps8ZAYu2Husx+Vz8D+MvXwEwvMwFv+hqqUwhNlDN5ybg6A+3xyW1ECrAgywhvXapNfXiz79jJyU0x22z0FFTg==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.0.tgz", + "integrity": "sha512-bPJKwZCHjJPf/hwTJl6TbkSZg/3evha+XPEizrZUGb535jLImwDUdjTNxXqjjaASt2M4qO4AVfoHJNe3XB/tpQ==", "requires": { "@babel/helper-module-imports": "^7.0.0", "@babel/traverse": "^7.4.5", "@emotion/is-prop-valid": "^0.8.8", "@emotion/stylis": "^0.8.4", "@emotion/unitless": "^0.7.4", - "babel-plugin-styled-components": ">= 1", + "babel-plugin-styled-components": ">= 1.12.0", "css-to-react-native": "^3.0.0", "hoist-non-react-statics": "^3.0.0", "shallowequal": "^1.1.0", diff --git a/package.json b/package.json index 7d4d75f..73a1852 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,8 @@ "version": "0.1.0", "private": true, "dependencies": { + "@material-ui/core": "^4.11.4", + "@material-ui/icons": "^4.11.2", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.5.0", "@testing-library/user-event": "^7.2.1", @@ -12,7 +14,7 @@ "react-dom": "^16.13.1", "react-jss": "8.0.0", "react-scripts": "^3.4.3", - "styled-components": "^5.1.0" + "styled-components": "^5.3.0" }, "scripts": { "start": "react-scripts start", diff --git a/public/imagens/labelogo.png b/public/imagens/labelogo.png new file mode 100644 index 0000000000000000000000000000000000000000..0097c72e3063c87bfd248e0470f701342dce8fde GIT binary patch literal 14638 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 literal 0 HcmV?d00001 diff --git a/src/icon/labeninjas2.png b/public/imagens/labeninjas.png similarity index 100% rename from src/icon/labeninjas2.png rename to public/imagens/labeninjas.png diff --git a/src/App.js b/src/App.js index 53bf4af..ec4dce3 100644 --- a/src/App.js +++ b/src/App.js @@ -1,15 +1,32 @@ -import React from 'react' -import GlobalStyle from './global' - -export default class App extends React.Component { - render() { - return ( - <> - -
-

Prontos(as) para começar!

-
- - ) +import React from 'react'; +import { ThemeProvider, createMuiTheme, makeStyles } from +'@material-ui/core'; +import Header from './Header'; + +const useStyles= makeStyles({ + root: { + } +}); + +function App() { + const theme = createMuiTheme({ + spacing: 4, + palette: { + primary: { + main: '#E5E3EF', + }, + secondary: { + main:'#8265C9', + }, + }, + }); + + return ( + +
+ + ); } + +export default App; \ No newline at end of file diff --git a/src/Header.js b/src/Header.js new file mode 100644 index 0000000..5e9020b --- /dev/null +++ b/src/Header.js @@ -0,0 +1,44 @@ +import React from 'react' +import { makeStyles, AppBar, Toolbar, IconButton, Typography, Button } from +'@material-ui/core'; +import AccountCircle from '@material-ui/icons/AccountCircle'; + +const useStyles= makeStyles((theme) => ({ + root: { + height: '100vh', + }, + appBar: { + boxShadow: 'none', + }, + grow: { + flexGrow: '1', + }, + logo: { + padding: '20px', + height: '100px', + }, + button: { + paddingRight: theme.spacing(5), + } +})); + +function Header() { + const classes = useStyles(); + + return ( +
+ + + + logo + +
+ + + + +
+ ) +} + +export default Header; \ No newline at end of file diff --git a/src/icon/carrinho.png b/src/icon/carrinho.png deleted file mode 100644 index c0596f43d5f38ef1be0de098712edccdfb29f2c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18458 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 diff --git a/src/icon/favoritos.png b/src/icon/favoritos.png deleted file mode 100644 index 274a40c9b1dc5b06de12042717c3064721a6f174..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19275 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 Z7B-Aw9@_M7{92?6QPZNsOQ#A}{vY9^n=b$W diff --git a/src/icon/lupa.png b/src/icon/lupa.png deleted file mode 100644 index 616c54a267833446d2867eeafde9e45ecba80026..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4535 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 V&1~n9jOqXY002ovPDHLkV1hohy3POq diff --git a/src/index.js b/src/index.js index f36c1ba..e799fc7 100644 --- a/src/index.js +++ b/src/index.js @@ -1,10 +1,12 @@ import React from 'react'; import ReactDOM from 'react-dom'; +import { CssBaseline } from '@material-ui/core'; import App from './App'; ReactDOM.render( + , document.getElementById('root') From 1487cd1b66ef309de540f6607091ac2c825087ad Mon Sep 17 00:00:00 2001 From: Venus Date: Thu, 27 May 2021 16:59:13 -0300 Subject: [PATCH 03/20] tentavida de criar header segundo dia --- public/favicon.ico | Bin 3150 -> 0 bytes public/logo192.png | Bin 5347 -> 0 bytes public/logo512.png | Bin 9664 -> 0 bytes src/Header.js | 31 ++++++++++++------ .../Cadastro/CadastrarPrestadorServicos.js | 12 ------- .../EscolherPrestadorStyled.js | 0 src/index.js | 15 +++++---- src/pages/CartPage/CartPage.js | 11 +++++++ .../CartPage/styles.js} | 0 src/pages/InitialPage/InitialPage.js | 11 +++++++ .../InitialPage/styles.js} | 0 src/pages/ProductsPage/ProductsPage.js | 11 +++++++ .../ProductsPage/styles.js} | 0 src/pages/SellPage/SellPage.js | 11 +++++++ .../SellPage/styles.js} | 0 15 files changed, 73 insertions(+), 29 deletions(-) delete mode 100644 public/favicon.ico delete mode 100644 public/logo192.png delete mode 100644 public/logo512.png delete mode 100644 src/components/Marketplace/Cadastro/CadastrarPrestadorServicos.js delete mode 100644 src/components/Marketplace/EscolherPrestador/EscolherPrestadorStyled.js create mode 100644 src/pages/CartPage/CartPage.js rename src/{components/Marketplace/Cadastro/CasdastrarPrestadorStyled.js => pages/CartPage/styles.js} (100%) create mode 100644 src/pages/InitialPage/InitialPage.js rename src/{components/Marketplace/Carrinho/Carrinho.js => pages/InitialPage/styles.js} (100%) create mode 100644 src/pages/ProductsPage/ProductsPage.js rename src/{components/Marketplace/Carrinho/CarrinhoStyled.js => pages/ProductsPage/styles.js} (100%) create mode 100644 src/pages/SellPage/SellPage.js rename src/{components/Marketplace/EscolherPrestador/EscolherPrestador.js => pages/SellPage/styles.js} (100%) diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index bcd5dfd67cd0361b78123e95c2dd96031f27f743..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3150 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 MDeX2GIKR{Qf5okjU;qFB diff --git a/public/logo192.png b/public/logo192.png deleted file mode 100644 index fc44b0a3796c0e0a64c3d858ca038bd4570465d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5347 zcmZWtbyO6NvR-oO24RV%BvuJ&=?+<7=`LvyB&A_#M7mSDYw1v6DJkiYl9XjT!%$dLEBTQ8R9|wd3008in6lFF3GV-6mLi?MoP_y~}QUnaDCHI#t z7w^m$@6DI)|C8_jrT?q=f8D?0AM?L)Z}xAo^e^W>t$*Y0KlT5=@bBjT9kxb%-KNdk zeOS1tKO#ChhG7%{ApNBzE2ZVNcxbrin#E1TiAw#BlUhXllzhN$qWez5l;h+t^q#Eav8PhR2|T}y5kkflaK`ba-eoE+Z2q@o6P$)=&` z+(8}+-McnNO>e#$Rr{32ngsZIAX>GH??tqgwUuUz6kjns|LjsB37zUEWd|(&O!)DY zQLrq%Y>)Y8G`yYbYCx&aVHi@-vZ3|ebG!f$sTQqMgi0hWRJ^Wc+Ibv!udh_r%2|U) zPi|E^PK?UE!>_4`f`1k4hqqj_$+d!EB_#IYt;f9)fBOumGNyglU(ofY`yHq4Y?B%- zp&G!MRY<~ajTgIHErMe(Z8JG*;D-PJhd@RX@QatggM7+G(Lz8eZ;73)72Hfx5KDOE zkT(m}i2;@X2AT5fW?qVp?@WgN$aT+f_6eo?IsLh;jscNRp|8H}Z9p_UBO^SJXpZew zEK8fz|0Th%(Wr|KZBGTM4yxkA5CFdAj8=QSrT$fKW#tweUFqr0TZ9D~a5lF{)%-tTGMK^2tz(y2v$i%V8XAxIywrZCp=)83p(zIk6@S5AWl|Oa2hF`~~^W zI;KeOSkw1O#TiQ8;U7OPXjZM|KrnN}9arP)m0v$c|L)lF`j_rpG(zW1Qjv$=^|p*f z>)Na{D&>n`jOWMwB^TM}slgTEcjxTlUby89j1)|6ydRfWERn3|7Zd2&e7?!K&5G$x z`5U3uFtn4~SZq|LjFVrz$3iln-+ucY4q$BC{CSm7Xe5c1J<=%Oagztj{ifpaZk_bQ z9Sb-LaQMKp-qJA*bP6DzgE3`}*i1o3GKmo2pn@dj0;He}F=BgINo};6gQF8!n0ULZ zL>kC0nPSFzlcB7p41doao2F7%6IUTi_+!L`MM4o*#Y#0v~WiO8uSeAUNp=vA2KaR&=jNR2iVwG>7t%sG2x_~yXzY)7K& zk3p+O0AFZ1eu^T3s};B%6TpJ6h-Y%B^*zT&SN7C=N;g|#dGIVMSOru3iv^SvO>h4M=t-N1GSLLDqVTcgurco6)3&XpU!FP6Hlrmj}f$ zp95;b)>M~`kxuZF3r~a!rMf4|&1=uMG$;h^g=Kl;H&Np-(pFT9FF@++MMEx3RBsK?AU0fPk-#mdR)Wdkj)`>ZMl#^<80kM87VvsI3r_c@_vX=fdQ`_9-d(xiI z4K;1y1TiPj_RPh*SpDI7U~^QQ?%0&!$Sh#?x_@;ag)P}ZkAik{_WPB4rHyW#%>|Gs zdbhyt=qQPA7`?h2_8T;-E6HI#im9K>au*(j4;kzwMSLgo6u*}-K`$_Gzgu&XE)udQ zmQ72^eZd|vzI)~!20JV-v-T|<4@7ruqrj|o4=JJPlybwMg;M$Ud7>h6g()CT@wXm` zbq=A(t;RJ^{Xxi*Ff~!|3!-l_PS{AyNAU~t{h;(N(PXMEf^R(B+ZVX3 z8y0;0A8hJYp@g+c*`>eTA|3Tgv9U8#BDTO9@a@gVMDxr(fVaEqL1tl?md{v^j8aUv zm&%PX4^|rX|?E4^CkplWWNv*OKM>DxPa z!RJ)U^0-WJMi)Ksc!^ixOtw^egoAZZ2Cg;X7(5xZG7yL_;UJ#yp*ZD-;I^Z9qkP`} zwCTs0*%rIVF1sgLervtnUo&brwz?6?PXRuOCS*JI-WL6GKy7-~yi0giTEMmDs_-UX zo=+nFrW_EfTg>oY72_4Z0*uG>MnXP=c0VpT&*|rvv1iStW;*^={rP1y?Hv+6R6bxFMkxpWkJ>m7Ba{>zc_q zEefC3jsXdyS5??Mz7IET$Kft|EMNJIv7Ny8ZOcKnzf`K5Cd)&`-fTY#W&jnV0l2vt z?Gqhic}l}mCv1yUEy$%DP}4AN;36$=7aNI^*AzV(eYGeJ(Px-j<^gSDp5dBAv2#?; zcMXv#aj>%;MiG^q^$0MSg-(uTl!xm49dH!{X0){Ew7ThWV~Gtj7h%ZD zVN-R-^7Cf0VH!8O)uUHPL2mO2tmE*cecwQv_5CzWeh)ykX8r5Hi`ehYo)d{Jnh&3p z9ndXT$OW51#H5cFKa76c<%nNkP~FU93b5h-|Cb}ScHs@4Q#|}byWg;KDMJ#|l zE=MKD*F@HDBcX@~QJH%56eh~jfPO-uKm}~t7VkHxHT;)4sd+?Wc4* z>CyR*{w@4(gnYRdFq=^(#-ytb^5ESD?x<0Skhb%Pt?npNW1m+Nv`tr9+qN<3H1f<% zZvNEqyK5FgPsQ`QIu9P0x_}wJR~^CotL|n zk?dn;tLRw9jJTur4uWoX6iMm914f0AJfB@C74a;_qRrAP4E7l890P&{v<}>_&GLrW z)klculcg`?zJO~4;BBAa=POU%aN|pmZJn2{hA!d!*lwO%YSIzv8bTJ}=nhC^n}g(ld^rn#kq9Z3)z`k9lvV>y#!F4e{5c$tnr9M{V)0m(Z< z#88vX6-AW7T2UUwW`g<;8I$Jb!R%z@rCcGT)-2k7&x9kZZT66}Ztid~6t0jKb&9mm zpa}LCb`bz`{MzpZR#E*QuBiZXI#<`5qxx=&LMr-UUf~@dRk}YI2hbMsAMWOmDzYtm zjof16D=mc`^B$+_bCG$$@R0t;e?~UkF?7<(vkb70*EQB1rfUWXh$j)R2)+dNAH5%R zEBs^?N;UMdy}V};59Gu#0$q53$}|+q7CIGg_w_WlvE}AdqoS<7DY1LWS9?TrfmcvT zaypmplwn=P4;a8-%l^e?f`OpGb}%(_mFsL&GywhyN(-VROj`4~V~9bGv%UhcA|YW% zs{;nh@aDX11y^HOFXB$a7#Sr3cEtNd4eLm@Y#fc&j)TGvbbMwze zXtekX_wJqxe4NhuW$r}cNy|L{V=t#$%SuWEW)YZTH|!iT79k#?632OFse{+BT_gau zJwQcbH{b}dzKO?^dV&3nTILYlGw{27UJ72ZN){BILd_HV_s$WfI2DC<9LIHFmtyw? zQ;?MuK7g%Ym+4e^W#5}WDLpko%jPOC=aN)3!=8)s#Rnercak&b3ESRX3z{xfKBF8L z5%CGkFmGO@x?_mPGlpEej!3!AMddChabyf~nJNZxx!D&{@xEb!TDyvqSj%Y5@A{}9 zRzoBn0?x}=krh{ok3Nn%e)#~uh;6jpezhA)ySb^b#E>73e*frBFu6IZ^D7Ii&rsiU z%jzygxT-n*joJpY4o&8UXr2s%j^Q{?e-voloX`4DQyEK+DmrZh8A$)iWL#NO9+Y@!sO2f@rI!@jN@>HOA< z?q2l{^%mY*PNx2FoX+A7X3N}(RV$B`g&N=e0uvAvEN1W^{*W?zT1i#fxuw10%~))J zjx#gxoVlXREWZf4hRkgdHx5V_S*;p-y%JtGgQ4}lnA~MBz-AFdxUxU1RIT$`sal|X zPB6sEVRjGbXIP0U+?rT|y5+ev&OMX*5C$n2SBPZr`jqzrmpVrNciR0e*Wm?fK6DY& zl(XQZ60yWXV-|Ps!A{EF;=_z(YAF=T(-MkJXUoX zI{UMQDAV2}Ya?EisdEW;@pE6dt;j0fg5oT2dxCi{wqWJ<)|SR6fxX~5CzblPGr8cb zUBVJ2CQd~3L?7yfTpLNbt)He1D>*KXI^GK%<`bq^cUq$Q@uJifG>p3LU(!H=C)aEL zenk7pVg}0{dKU}&l)Y2Y2eFMdS(JS0}oZUuVaf2+K*YFNGHB`^YGcIpnBlMhO7d4@vV zv(@N}(k#REdul8~fP+^F@ky*wt@~&|(&&meNO>rKDEnB{ykAZ}k>e@lad7to>Ao$B zz<1(L=#J*u4_LB=8w+*{KFK^u00NAmeNN7pr+Pf+N*Zl^dO{LM-hMHyP6N!~`24jd zXYP|Ze;dRXKdF2iJG$U{k=S86l@pytLx}$JFFs8e)*Vi?aVBtGJ3JZUj!~c{(rw5>vuRF$`^p!P8w1B=O!skwkO5yd4_XuG^QVF z`-r5K7(IPSiKQ2|U9+`@Js!g6sfJwAHVd|s?|mnC*q zp|B|z)(8+mxXyxQ{8Pg3F4|tdpgZZSoU4P&9I8)nHo1@)9_9u&NcT^FI)6|hsAZFk zZ+arl&@*>RXBf-OZxhZerOr&dN5LW9@gV=oGFbK*J+m#R-|e6(Loz(;g@T^*oO)0R zN`N=X46b{7yk5FZGr#5&n1!-@j@g02g|X>MOpF3#IjZ_4wg{dX+G9eqS+Es9@6nC7 zD9$NuVJI}6ZlwtUm5cCAiYv0(Yi{%eH+}t)!E^>^KxB5^L~a`4%1~5q6h>d;paC9c zTj0wTCKrhWf+F#5>EgX`sl%POl?oyCq0(w0xoL?L%)|Q7d|Hl92rUYAU#lc**I&^6p=4lNQPa0 znQ|A~i0ip@`B=FW-Q;zh?-wF;Wl5!+q3GXDu-x&}$gUO)NoO7^$BeEIrd~1Dh{Tr` z8s<(Bn@gZ(mkIGnmYh_ehXnq78QL$pNDi)|QcT*|GtS%nz1uKE+E{7jdEBp%h0}%r zD2|KmYGiPa4;md-t_m5YDz#c*oV_FqXd85d@eub?9N61QuYcb3CnVWpM(D-^|CmkL z(F}L&N7qhL2PCq)fRh}XO@U`Yn<?TNGR4L(mF7#4u29{i~@k;pLsgl({YW5`Mo+p=zZn3L*4{JU;++dG9 X@eDJUQo;Ye2mwlRs?y0|+_a0zY+Zo%Dkae}+MySoIppb75o?vUW_?)>@g{U2`ERQIXV zeY$JrWnMZ$QC<=ii4X|@0H8`si75jB(ElJb00HAB%>SlLR{!zO|C9P3zxw_U8?1d8uRZ=({Ga4shyN}3 zAK}WA(ds|``G4jA)9}Bt2Hy0+f3rV1E6b|@?hpGA=PI&r8)ah|)I2s(P5Ic*Ndhn^ z*T&j@gbCTv7+8rpYbR^Ty}1AY)YH;p!m948r#%7x^Z@_-w{pDl|1S4`EM3n_PaXvK z1JF)E3qy$qTj5Xs{jU9k=y%SQ0>8E$;x?p9ayU0bZZeo{5Z@&FKX>}s!0+^>C^D#z z>xsCPvxD3Z=dP}TTOSJhNTPyVt14VCQ9MQFN`rn!c&_p?&4<5_PGm4a;WS&1(!qKE z_H$;dDdiPQ!F_gsN`2>`X}$I=B;={R8%L~`>RyKcS$72ai$!2>d(YkciA^J0@X%G4 z4cu!%Ps~2JuJ8ex`&;Fa0NQOq_nDZ&X;^A=oc1&f#3P1(!5il>6?uK4QpEG8z0Rhu zvBJ+A9RV?z%v?!$=(vcH?*;vRs*+PPbOQ3cdPr5=tOcLqmfx@#hOqX0iN)wTTO21jH<>jpmwRIAGw7`a|sl?9y9zRBh>(_%| zF?h|P7}~RKj?HR+q|4U`CjRmV-$mLW>MScKnNXiv{vD3&2@*u)-6P@h0A`eeZ7}71 zK(w%@R<4lLt`O7fs1E)$5iGb~fPfJ?WxhY7c3Q>T-w#wT&zW522pH-B%r5v#5y^CF zcC30Se|`D2mY$hAlIULL%-PNXgbbpRHgn<&X3N9W!@BUk@9g*P5mz-YnZBb*-$zMM z7Qq}ic0mR8n{^L|=+diODdV}Q!gwr?y+2m=3HWwMq4z)DqYVg0J~^}-%7rMR@S1;9 z7GFj6K}i32X;3*$SmzB&HW{PJ55kT+EI#SsZf}bD7nW^Haf}_gXciYKX{QBxIPSx2Ma? zHQqgzZq!_{&zg{yxqv3xq8YV+`S}F6A>Gtl39_m;K4dA{pP$BW0oIXJ>jEQ!2V3A2 zdpoTxG&V=(?^q?ZTj2ZUpDUdMb)T?E$}CI>r@}PFPWD9@*%V6;4Ag>D#h>!s)=$0R zRXvdkZ%|c}ubej`jl?cS$onl9Tw52rBKT)kgyw~Xy%z62Lr%V6Y=f?2)J|bZJ5(Wx zmji`O;_B+*X@qe-#~`HFP<{8$w@z4@&`q^Q-Zk8JG3>WalhnW1cvnoVw>*R@c&|o8 zZ%w!{Z+MHeZ*OE4v*otkZqz11*s!#s^Gq>+o`8Z5 z^i-qzJLJh9!W-;SmFkR8HEZJWiXk$40i6)7 zZpr=k2lp}SasbM*Nbn3j$sn0;rUI;%EDbi7T1ZI4qL6PNNM2Y%6{LMIKW+FY_yF3) zSKQ2QSujzNMSL2r&bYs`|i2Dnn z=>}c0>a}>|uT!IiMOA~pVT~R@bGlm}Edf}Kq0?*Af6#mW9f9!}RjW7om0c9Qlp;yK z)=XQs(|6GCadQbWIhYF=rf{Y)sj%^Id-ARO0=O^Ad;Ph+ z0?$eE1xhH?{T$QI>0JP75`r)U_$#%K1^BQ8z#uciKf(C701&RyLQWBUp*Q7eyn76} z6JHpC9}R$J#(R0cDCkXoFSp;j6{x{b&0yE@P7{;pCEpKjS(+1RQy38`=&Yxo%F=3y zCPeefABp34U-s?WmU#JJw23dcC{sPPFc2#J$ZgEN%zod}J~8dLm*fx9f6SpO zn^Ww3bt9-r0XaT2a@Wpw;C23XM}7_14#%QpubrIw5aZtP+CqIFmsG4`Cm6rfxl9n5 z7=r2C-+lM2AB9X0T_`?EW&Byv&K?HS4QLoylJ|OAF z`8atBNTzJ&AQ!>sOo$?^0xj~D(;kS$`9zbEGd>f6r`NC3X`tX)sWgWUUOQ7w=$TO&*j;=u%25ay-%>3@81tGe^_z*C7pb9y*Ed^H3t$BIKH2o+olp#$q;)_ zfpjCb_^VFg5fU~K)nf*d*r@BCC>UZ!0&b?AGk_jTPXaSnCuW110wjHPPe^9R^;jo3 zwvzTl)C`Zl5}O2}3lec=hZ*$JnkW#7enKKc)(pM${_$9Hc=Sr_A9Biwe*Y=T?~1CK z6eZ9uPICjy-sMGbZl$yQmpB&`ouS8v{58__t0$JP%i3R&%QR3ianbZqDs<2#5FdN@n5bCn^ZtH992~5k(eA|8|@G9u`wdn7bnpg|@{m z^d6Y`*$Zf2Xr&|g%sai#5}Syvv(>Jnx&EM7-|Jr7!M~zdAyjt*xl;OLhvW-a%H1m0 z*x5*nb=R5u><7lyVpNAR?q@1U59 zO+)QWwL8t zyip?u_nI+K$uh{y)~}qj?(w0&=SE^8`_WMM zTybjG=999h38Yes7}-4*LJ7H)UE8{mE(6;8voE+TYY%33A>S6`G_95^5QHNTo_;Ao ztIQIZ_}49%{8|=O;isBZ?=7kfdF8_@azfoTd+hEJKWE!)$)N%HIe2cplaK`ry#=pV z0q{9w-`i0h@!R8K3GC{ivt{70IWG`EP|(1g7i_Q<>aEAT{5(yD z=!O?kq61VegV+st@XCw475j6vS)_z@efuqQgHQR1T4;|-#OLZNQJPV4k$AX1Uk8Lm z{N*b*ia=I+MB}kWpupJ~>!C@xEN#Wa7V+7{m4j8c?)ChV=D?o~sjT?0C_AQ7B-vxqX30s0I_`2$in86#`mAsT-w?j{&AL@B3$;P z31G4(lV|b}uSDCIrjk+M1R!X7s4Aabn<)zpgT}#gE|mIvV38^ODy@<&yflpCwS#fRf9ZX3lPV_?8@C5)A;T zqmouFLFk;qIs4rA=hh=GL~sCFsXHsqO6_y~*AFt939UYVBSx1s(=Kb&5;j7cSowdE;7()CC2|-i9Zz+_BIw8#ll~-tyH?F3{%`QCsYa*b#s*9iCc`1P1oC26?`g<9))EJ3%xz+O!B3 zZ7$j~To)C@PquR>a1+Dh>-a%IvH_Y7^ys|4o?E%3`I&ADXfC8++hAdZfzIT#%C+Jz z1lU~K_vAm0m8Qk}K$F>|>RPK%<1SI0(G+8q~H zAsjezyP+u!Se4q3GW)`h`NPSRlMoBjCzNPesWJwVTY!o@G8=(6I%4XHGaSiS3MEBK zhgGFv6Jc>L$4jVE!I?TQuwvz_%CyO!bLh94nqK11C2W$*aa2ueGopG8DnBICVUORP zgytv#)49fVXDaR$SukloYC3u7#5H)}1K21=?DKj^U)8G;MS)&Op)g^zR2($<>C*zW z;X7`hLxiIO#J`ANdyAOJle4V%ppa*(+0i3w;8i*BA_;u8gOO6)MY`ueq7stBMJTB; z-a0R>hT*}>z|Gg}@^zDL1MrH+2hsR8 zHc}*9IvuQC^Ju)^#Y{fOr(96rQNPNhxc;mH@W*m206>Lo<*SaaH?~8zg&f&%YiOEG zGiz?*CP>Bci}!WiS=zj#K5I}>DtpregpP_tfZtPa(N<%vo^#WCQ5BTv0vr%Z{)0q+ z)RbfHktUm|lg&U3YM%lMUM(fu}i#kjX9h>GYctkx9Mt_8{@s%!K_EI zScgwy6%_fR?CGJQtmgNAj^h9B#zmaMDWgH55pGuY1Gv7D z;8Psm(vEPiwn#MgJYu4Ty9D|h!?Rj0ddE|&L3S{IP%H4^N!m`60ZwZw^;eg4sk6K{ ziA^`Sbl_4~f&Oo%n;8Ye(tiAdlZKI!Z=|j$5hS|D$bDJ}p{gh$KN&JZYLUjv4h{NY zBJ>X9z!xfDGY z+oh_Z&_e#Q(-}>ssZfm=j$D&4W4FNy&-kAO1~#3Im;F)Nwe{(*75(p=P^VI?X0GFakfh+X-px4a%Uw@fSbmp9hM1_~R>?Z8+ ziy|e9>8V*`OP}4x5JjdWp}7eX;lVxp5qS}0YZek;SNmm7tEeSF*-dI)6U-A%m6YvCgM(}_=k#a6o^%-K4{`B1+}O4x zztDT%hVb;v#?j`lTvlFQ3aV#zkX=7;YFLS$uIzb0E3lozs5`Xy zi~vF+%{z9uLjKvKPhP%x5f~7-Gj+%5N`%^=yk*Qn{`> z;xj&ROY6g`iy2a@{O)V(jk&8#hHACVDXey5a+KDod_Z&}kHM}xt7}Md@pil{2x7E~ zL$k^d2@Ec2XskjrN+IILw;#7((abu;OJii&v3?60x>d_Ma(onIPtcVnX@ELF0aL?T zSmWiL3(dOFkt!x=1O!_0n(cAzZW+3nHJ{2S>tgSK?~cFha^y(l@-Mr2W$%MN{#af8J;V*>hdq!gx=d0h$T7l}>91Wh07)9CTX zh2_ZdQCyFOQ)l(}gft0UZG`Sh2`x-w`5vC2UD}lZs*5 zG76$akzn}Xi))L3oGJ75#pcN=cX3!=57$Ha=hQ2^lwdyU#a}4JJOz6ddR%zae%#4& za)bFj)z=YQela(F#Y|Q#dp}PJghITwXouVaMq$BM?K%cXn9^Y@g43$=O)F&ZlOUom zJiad#dea;-eywBA@e&D6Pdso1?2^(pXiN91?jvcaUyYoKUmvl5G9e$W!okWe*@a<^ z8cQQ6cNSf+UPDx%?_G4aIiybZHHagF{;IcD(dPO!#=u zWfqLcPc^+7Uu#l(Bpxft{*4lv#*u7X9AOzDO z1D9?^jIo}?%iz(_dwLa{ex#T}76ZfN_Z-hwpus9y+4xaUu9cX}&P{XrZVWE{1^0yw zO;YhLEW!pJcbCt3L8~a7>jsaN{V3>tz6_7`&pi%GxZ=V3?3K^U+*ryLSb)8^IblJ0 zSRLNDvIxt)S}g30?s_3NX>F?NKIGrG_zB9@Z>uSW3k2es_H2kU;Rnn%j5qP)!XHKE zPB2mHP~tLCg4K_vH$xv`HbRsJwbZMUV(t=ez;Ec(vyHH)FbfLg`c61I$W_uBB>i^r z&{_P;369-&>23R%qNIULe=1~T$(DA`ev*EWZ6j(B$(te}x1WvmIll21zvygkS%vwG zzkR6Z#RKA2!z!C%M!O>!=Gr0(J0FP=-MN=5t-Ir)of50y10W}j`GtRCsXBakrKtG& zazmITDJMA0C51&BnLY)SY9r)NVTMs);1<=oosS9g31l{4ztjD3#+2H7u_|66b|_*O z;Qk6nalpqdHOjx|K&vUS_6ITgGll;TdaN*ta=M_YtyC)I9Tmr~VaPrH2qb6sd~=AcIxV+%z{E&0@y=DPArw zdV7z(G1hBx7hd{>(cr43^WF%4Y@PXZ?wPpj{OQ#tvc$pABJbvPGvdR`cAtHn)cSEV zrpu}1tJwQ3y!mSmH*uz*x0o|CS<^w%&KJzsj~DU0cLQUxk5B!hWE>aBkjJle8z~;s z-!A=($+}Jq_BTK5^B!`R>!MulZN)F=iXXeUd0w5lUsE5VP*H*oCy(;?S$p*TVvTxwAeWFB$jHyb0593)$zqalVlDX=GcCN1gU0 zlgU)I$LcXZ8Oyc2TZYTPu@-;7<4YYB-``Qa;IDcvydIA$%kHhJKV^m*-zxcvU4viy&Kr5GVM{IT>WRywKQ9;>SEiQD*NqplK-KK4YR`p0@JW)n_{TU3bt0 zim%;(m1=#v2}zTps=?fU5w^(*y)xT%1vtQH&}50ZF!9YxW=&7*W($2kgKyz1mUgfs zfV<*XVVIFnohW=|j+@Kfo!#liQR^x>2yQdrG;2o8WZR+XzU_nG=Ed2rK?ntA;K5B{ z>M8+*A4!Jm^Bg}aW?R?6;@QG@uQ8&oJ{hFixcfEnJ4QH?A4>P=q29oDGW;L;= z9-a0;g%c`C+Ai!UmK$NC*4#;Jp<1=TioL=t^YM)<<%u#hnnfSS`nq63QKGO1L8RzX z@MFDqs1z ztYmxDl@LU)5acvHk)~Z`RW7=aJ_nGD!mOSYD>5Odjn@TK#LY{jf?+piB5AM-CAoT_ z?S-*q7}wyLJzK>N%eMPuFgN)Q_otKP;aqy=D5f!7<=n(lNkYRXVpkB{TAYLYg{|(jtRqYmg$xH zjmq?B(RE4 zQx^~Pt}gxC2~l=K$$-sYy_r$CO(d=+b3H1MB*y_5g6WLaWTXn+TKQ|hNY^>Mp6k*$ zwkovomhu776vQATqT4blf~g;TY(MWCrf^^yfWJvSAB$p5l;jm@o#=!lqw+Lqfq>X= z$6~kxfm7`3q4zUEB;u4qa#BdJxO!;xGm)wwuisj{0y2x{R(IGMrsIzDY9LW>m!Y`= z04sx3IjnYvL<4JqxQ8f7qYd0s2Ig%`ytYPEMKI)s(LD}D@EY>x`VFtqvnADNBdeao zC96X+MxnwKmjpg{U&gP3HE}1=s!lv&D{6(g_lzyF3A`7Jn*&d_kL<;dAFx!UZ>hB8 z5A*%LsAn;VLp>3${0>M?PSQ)9s3}|h2e?TG4_F{}{Cs>#3Q*t$(CUc}M)I}8cPF6% z=+h(Kh^8)}gj(0}#e7O^FQ6`~fd1#8#!}LMuo3A0bN`o}PYsm!Y}sdOz$+Tegc=qT z8x`PH$7lvnhJp{kHWb22l;@7B7|4yL4UOOVM0MP_>P%S1Lnid)+k9{+3D+JFa#Pyf zhVc#&df87APl4W9X)F3pGS>@etfl=_E5tBcVoOfrD4hmVeTY-cj((pkn%n@EgN{0f zwb_^Rk0I#iZuHK!l*lN`ceJn(sI{$Fq6nN& zE<-=0_2WN}m+*ivmIOxB@#~Q-cZ>l136w{#TIJe478`KE7@=a{>SzPHsKLzYAyBQO zAtuuF$-JSDy_S@6GW0MOE~R)b;+0f%_NMrW(+V#c_d&U8Z9+ec4=HmOHw?gdjF(Lu zzra83M_BoO-1b3;9`%&DHfuUY)6YDV21P$C!Rc?mv&{lx#f8oc6?0?x zK08{WP65?#>(vPfA-c=MCY|%*1_<3D4NX zeVTi-JGl2uP_2@0F{G({pxQOXt_d{g_CV6b?jNpfUG9;8yle-^4KHRvZs-_2siata zt+d_T@U$&t*xaD22(fH(W1r$Mo?3dc%Tncm=C6{V9y{v&VT#^1L04vDrLM9qBoZ4@ z6DBN#m57hX7$C(=#$Y5$bJmwA$T8jKD8+6A!-IJwA{WOfs%s}yxUw^?MRZjF$n_KN z6`_bGXcmE#5e4Ym)aQJ)xg3Pg0@k`iGuHe?f(5LtuzSq=nS^5z>vqU0EuZ&75V%Z{ zYyhRLN^)$c6Ds{f7*FBpE;n5iglx5PkHfWrj3`x^j^t z7ntuV`g!9Xg#^3!x)l*}IW=(Tz3>Y5l4uGaB&lz{GDjm2D5S$CExLT`I1#n^lBH7Y zDgpMag@`iETKAI=p<5E#LTkwzVR@=yY|uBVI1HG|8h+d;G-qfuj}-ZR6fN>EfCCW z9~wRQoAPEa#aO?3h?x{YvV*d+NtPkf&4V0k4|L=uj!U{L+oLa(z#&iuhJr3-PjO3R z5s?=nn_5^*^Rawr>>Nr@K(jwkB#JK-=+HqwfdO<+P5byeim)wvqGlP-P|~Nse8=XF zz`?RYB|D6SwS}C+YQv+;}k6$-%D(@+t14BL@vM z2q%q?f6D-A5s$_WY3{^G0F131bbh|g!}#BKw=HQ7mx;Dzg4Z*bTLQSfo{ed{4}NZW zfrRm^Ca$rlE{Ue~uYv>R9{3smwATcdM_6+yWIO z*ZRH~uXE@#p$XTbCt5j7j2=86e{9>HIB6xDzV+vAo&B?KUiMP|ttOElepnl%|DPqL b{|{}U^kRn2wo}j7|0ATu<;8xA7zX}7|B6mN diff --git a/src/Header.js b/src/Header.js index 5e9020b..21f4758 100644 --- a/src/Header.js +++ b/src/Header.js @@ -1,12 +1,14 @@ import React from 'react' -import { makeStyles, AppBar, Toolbar, IconButton, Typography, Button } from -'@material-ui/core'; +import { makeStyles, AppBar, Toolbar, IconButton, Button } from '@material-ui/core'; import AccountCircle from '@material-ui/icons/AccountCircle'; +import MenuIcon from '@material-ui/icons/Menu'; -const useStyles= makeStyles((theme) => ({ - root: { + + +const useStyles = makeStyles((theme) => ({ + root: { height: '100vh', - }, + }, appBar: { boxShadow: 'none', }, @@ -19,6 +21,9 @@ const useStyles= makeStyles((theme) => ({ }, button: { paddingRight: theme.spacing(5), + }, + menu: { + width: '10px', } })); @@ -29,16 +34,22 @@ function Header() {
- - logo + + logo -
+ +
+ - +
) } -export default Header; \ No newline at end of file +export default Header; + diff --git a/src/components/Marketplace/Cadastro/CadastrarPrestadorServicos.js b/src/components/Marketplace/Cadastro/CadastrarPrestadorServicos.js deleted file mode 100644 index a761f90..0000000 --- a/src/components/Marketplace/Cadastro/CadastrarPrestadorServicos.js +++ /dev/null @@ -1,12 +0,0 @@ -import React, { Component } from 'react' - - -export class CadastrarPrestadorServicos extends Component { - render() { - return ( - <> - - - ) - } -} diff --git a/src/components/Marketplace/EscolherPrestador/EscolherPrestadorStyled.js b/src/components/Marketplace/EscolherPrestador/EscolherPrestadorStyled.js deleted file mode 100644 index e69de29..0000000 diff --git a/src/index.js b/src/index.js index e799fc7..1c6cabb 100644 --- a/src/index.js +++ b/src/index.js @@ -1,14 +1,15 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import { CssBaseline } from '@material-ui/core'; -import App from './App'; +import React from 'react' +import ReactDOM from 'react-dom' +import App from './App' +import Header from './Header' ReactDOM.render( - - + +
+ , document.getElementById('root') -); +) diff --git a/src/pages/CartPage/CartPage.js b/src/pages/CartPage/CartPage.js new file mode 100644 index 0000000..8b094a3 --- /dev/null +++ b/src/pages/CartPage/CartPage.js @@ -0,0 +1,11 @@ +// import React from "react" + +// export default class CartPage extends React.Component { + +// render(){ + +// return( +//
Carrinho
+// ) +// } +// } \ No newline at end of file diff --git a/src/components/Marketplace/Cadastro/CasdastrarPrestadorStyled.js b/src/pages/CartPage/styles.js similarity index 100% rename from src/components/Marketplace/Cadastro/CasdastrarPrestadorStyled.js rename to src/pages/CartPage/styles.js diff --git a/src/pages/InitialPage/InitialPage.js b/src/pages/InitialPage/InitialPage.js new file mode 100644 index 0000000..4ce1d5f --- /dev/null +++ b/src/pages/InitialPage/InitialPage.js @@ -0,0 +1,11 @@ +// import React from "react" + +// export default class InitialPage extends React.Component { + +// render(){ + +// return( +//
Home
+// ) +// } +// } \ No newline at end of file diff --git a/src/components/Marketplace/Carrinho/Carrinho.js b/src/pages/InitialPage/styles.js similarity index 100% rename from src/components/Marketplace/Carrinho/Carrinho.js rename to src/pages/InitialPage/styles.js diff --git a/src/pages/ProductsPage/ProductsPage.js b/src/pages/ProductsPage/ProductsPage.js new file mode 100644 index 0000000..5c17d64 --- /dev/null +++ b/src/pages/ProductsPage/ProductsPage.js @@ -0,0 +1,11 @@ +// import React from "react" + +// export default class ProductsPage extends React.Component { + +// render(){ + +// return( +//
Serviços
+// ) +// } +// } \ No newline at end of file diff --git a/src/components/Marketplace/Carrinho/CarrinhoStyled.js b/src/pages/ProductsPage/styles.js similarity index 100% rename from src/components/Marketplace/Carrinho/CarrinhoStyled.js rename to src/pages/ProductsPage/styles.js diff --git a/src/pages/SellPage/SellPage.js b/src/pages/SellPage/SellPage.js new file mode 100644 index 0000000..754e351 --- /dev/null +++ b/src/pages/SellPage/SellPage.js @@ -0,0 +1,11 @@ +// import React from "react" + +// export default class SellPage extends React.Component { + +// render(){ + +// return( +//
Cadastre-se
+// ) +// } +// } \ No newline at end of file diff --git a/src/components/Marketplace/EscolherPrestador/EscolherPrestador.js b/src/pages/SellPage/styles.js similarity index 100% rename from src/components/Marketplace/EscolherPrestador/EscolherPrestador.js rename to src/pages/SellPage/styles.js From 40f20b04706f9b7e3cc48bb56105448365510051 Mon Sep 17 00:00:00 2001 From: Drilias Date: Fri, 28 May 2021 02:45:11 -0300 Subject: [PATCH 04/20] =?UTF-8?q?fazendo=20renderiza=C3=A7ao=20de=20pagina?= =?UTF-8?q?s,=20formulario=20e=20cards=20dos=20servi=C3=A7os?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 68 ++++++--- src/Header.js | 22 +-- src/pages/CartPage/CartPage.js | 2 +- src/pages/InitialPage/InitialPage.js | 18 +-- src/pages/ProductsPage/ProductsPage.js | 11 -- src/pages/RegisterPage/RegisterPage.js | 134 ++++++++++++++++++ .../{ProductsPage => RegisterPage}/styles.js | 0 src/pages/SellPage/SellPage.js | 53 +++++-- src/pages/ServicesCards/ServicesCards.js | 43 ++++++ src/pages/ServicesCards/styles.js | 0 10 files changed, 286 insertions(+), 65 deletions(-) delete mode 100644 src/pages/ProductsPage/ProductsPage.js create mode 100644 src/pages/RegisterPage/RegisterPage.js rename src/pages/{ProductsPage => RegisterPage}/styles.js (100%) create mode 100644 src/pages/ServicesCards/ServicesCards.js create mode 100644 src/pages/ServicesCards/styles.js diff --git a/src/App.js b/src/App.js index ec4dce3..ec404d5 100644 --- a/src/App.js +++ b/src/App.js @@ -1,32 +1,60 @@ import React from 'react'; -import { ThemeProvider, createMuiTheme, makeStyles } from -'@material-ui/core'; +import { createMuiTheme, makeStyles } from '@material-ui/core'; +import { ThemeProvider } from '@material-ui/styles'; +import { withStyles } from '@material-ui/core/styles'; import Header from './Header'; +import RegisterPage from './pages/RegisterPage/RegisterPage'; +import SellPage from './pages/SellPage/SellPage'; +import InitialPage from './pages/InitialPage/InitialPage'; -const useStyles= makeStyles({ + +const useStyles = makeStyles({ root: { - + } }); -function App() { - const theme = createMuiTheme({ - spacing: 4, - palette: { - primary: { - main: '#E5E3EF', - }, - secondary: { - main:'#8265C9', - }, +const theme = createMuiTheme({ + spacing: 4, + palette: { + primary: { + main: '#E5E3EF', + }, + secondary: { + main: '#8265C9', }, - }); + }, +}); + +class App extends React.Component { - return ( - -
- - ); + state = { + currentPage: "registerPage" + }; + + changePage = (currentPage) => { + this.setState({ currentPage: currentPage }) + } + + render() { + const choosePage = () => { + switch (this.state.currentPage) { + case "registerPage": + return + case "initialPage": //aqui ficará o valor do state para a página Login + return //aqui ficará a página Login + default: + return //aqui deve ficar a Home + } + } + return ( + +
+ {choosePage()} + + + ); + } } export default App; \ No newline at end of file diff --git a/src/Header.js b/src/Header.js index 21f4758..56d94dd 100644 --- a/src/Header.js +++ b/src/Header.js @@ -1,8 +1,6 @@ import React from 'react' import { makeStyles, AppBar, Toolbar, IconButton, Button } from '@material-ui/core'; import AccountCircle from '@material-ui/icons/AccountCircle'; -import MenuIcon from '@material-ui/icons/Menu'; - const useStyles = makeStyles((theme) => ({ @@ -21,35 +19,27 @@ const useStyles = makeStyles((theme) => ({ }, button: { paddingRight: theme.spacing(5), - }, - menu: { - width: '10px', } })); -function Header() { +function Header(props) { + const classes = useStyles(); return (
- + logo -
- - - + +
) } -export default Header; - +export default Header; \ No newline at end of file diff --git a/src/pages/CartPage/CartPage.js b/src/pages/CartPage/CartPage.js index 8b094a3..9f04e95 100644 --- a/src/pages/CartPage/CartPage.js +++ b/src/pages/CartPage/CartPage.js @@ -3,7 +3,7 @@ // export default class CartPage extends React.Component { // render(){ - + // return( //
Carrinho
// ) diff --git a/src/pages/InitialPage/InitialPage.js b/src/pages/InitialPage/InitialPage.js index 4ce1d5f..508d4c2 100644 --- a/src/pages/InitialPage/InitialPage.js +++ b/src/pages/InitialPage/InitialPage.js @@ -1,11 +1,11 @@ -// import React from "react" +import React from "react" -// export default class InitialPage extends React.Component { +export default class InitialPage extends React.Component { -// render(){ - -// return( -//
Home
-// ) -// } -// } \ No newline at end of file + render() { + + return ( +
Home
+ ) + } +} \ No newline at end of file diff --git a/src/pages/ProductsPage/ProductsPage.js b/src/pages/ProductsPage/ProductsPage.js deleted file mode 100644 index 5c17d64..0000000 --- a/src/pages/ProductsPage/ProductsPage.js +++ /dev/null @@ -1,11 +0,0 @@ -// import React from "react" - -// export default class ProductsPage extends React.Component { - -// render(){ - -// return( -//
Serviços
-// ) -// } -// } \ No newline at end of file diff --git a/src/pages/RegisterPage/RegisterPage.js b/src/pages/RegisterPage/RegisterPage.js new file mode 100644 index 0000000..8f7d70e --- /dev/null +++ b/src/pages/RegisterPage/RegisterPage.js @@ -0,0 +1,134 @@ +import React from 'react'; +import axios from "axios"; +import styled from 'styled-components'; + + +const ServiceRegisterContainer = styled.div` + width:30vw; + height:40vh; + display: flex; + flex-direction: column; + align-items: start; + margin-left: 50px; + margin-top: -650px; + text-align: center; +` + +const ServiceRegisterForm = styled.form` + display: flex; + flex-direction: column; + align-items: start; + text-align: center; + margin: auto; + padding: 0; + height:22vh; + justify-content:space-around + ` + +export default class RegisterPage extends React.Component { + + state = { + tituloServico: "", + descricaoServico: "", + valorServico: "", + metodoPagamento: "", + dataVencimento: "" + } + + alteraTituloServico = (event) => { + this.setState({ tituloServico: event.target.value }) + } + + descricaoServico = (event) => { + this.setState({ descricaoServico: event.target.value }) + } + + valorServico = (event) => { + this.setState({ valorServico: event.target.value }) + } + + metodoPagamento = (event) => { + this.setState({ metodoPagamento: event.target.value }) + } + dataVencimento = (event) => { + this.setState({ dataVencimento: event.target.value }) + } + + registerService = (event) => { + event.preventDefault(); + const body = { + title: this.state.tituloServico, + description: this.state.descricaoServico, + price: this.state.valorServico, + paymentMethods: this.state.metodoPagamento, + dueDate: this.state.dataVencimento + }; + + axios.post("https://labeninjas.herokuapp.com/jobs", + body, { + header: { + Authorization: "291b2d5d-77e2-402f-8bbb-635e73274daf" + } + }) + .then(() => { + alert('Cadastrado com sucesso') + }).catch((err) => [ + alert('Ocorreu um erro! Tente novamente'), + console.log(err) + ]); + this.setState({ + tituloServico: "", + descricaoServico: "", + valorServico: "", + metodoPagamento: "", + dataVencimento: "" + }); + }; + + render() { + /*const {classes} = useStyles();*/ + return ( + +

Conquiste clientes pelo celular e aumente sua renda

+

Cadastre-se já e veja todos os serviços que estão disponíveis para você!

+ + + + + +
+ + Preço: +

+ + Pagamento: +

+ + Vencimento: +

+ + + + + + + + + + + + + + ) } -}; +}; \ No newline at end of file diff --git a/src/pages/RegisterPage/styles.js b/src/pages/RegisterPage/styles.js index b924b0a..611bece 100644 --- a/src/pages/RegisterPage/styles.js +++ b/src/pages/RegisterPage/styles.js @@ -1,24 +1,106 @@ import styled from 'styled-components' -export const ServiceRegisterContainer = styled.div` - width:40vw; - height:40vh; - display: flex; - flex-direction: column; - align-items: start; - margin-left: 50px; - margin-top: -650px; - text-align: center; -` - -export const ServiceRegisterForm = styled.form` - display: flex; - flex-direction: column; - align-items: start; - text-align: center; - margin: auto; - padding: 0; - height:30vh; - justify-content:space-around; - ` +export const ContainerServiceRegister = styled.div` + display: flex; + width: 100vw; + height:80vh; + @media(max-width: 800px) { + flex-direction: column; + position: relative; + img{ + display: none; + } + } +` + +export const ServiceRegisterArea = styled.div` + width:70vw; + height:70vh; + margin-left: 5rem; + margin-top: 8rem; + text-align: center; + h3{ + margin-top: 1rem; + } +` + +export const TextoArea = styled.div` + width:36vw; + color: #505050; + padding:12px; +` + +export const ServiceRegisterForm = styled.form` + position: absolute; + display: block; +` + +export const InternalForm = styled.fieldset` + width: 340px; + height: 280px; +` + +export const LabelName = styled.label` + position: absolute; + left: 19px; + margin-right: 6px; +` + +export const InputFormName = styled.input` + position: absolute; + left: 95px; + top: 23px; + width: 222px; +` + +export const InputFormPrice = styled.input` + position: absolute; + left: 95px; + margin-top: 2px; + width: 222px; +` + +export const InputFormPayment = styled.input` + position: absolute; + left: 95px; + margin-top: 2px; + width: 210px; + margin-left: 12px; +` +export const InputFormDue = styled.input` + position: absolute; + left: 95px; + margin-top: 2px; + width: 209px; + margin-left: 15px; +` + +export const ContainerImagens = styled.div` + position: relative; + width: 100%; + top: 5%; +` + +export const ContainerPrimeiraImagem = styled.div` + padding: 0; + margin:0; +` + +export const ImagemServicePage = styled.img` + margin-top:65%; + padding-right: 2%; + width: 70%; +` + +export const ContainerSegundaImagem = styled.div` + padding:0; + margin:0; +` +export const ImagemService = styled.img` + position: absolute; + right: 0; + top: 50%; + width: 60%; + z-index: -1; +` diff --git a/src/pages/SellPage/SellPage.js b/src/pages/SellPage/SellPage.js index 82ad28a..37ce388 100644 --- a/src/pages/SellPage/SellPage.js +++ b/src/pages/SellPage/SellPage.js @@ -1,55 +1,76 @@ import React from 'react'; import axios from 'axios'; -import ServicesCards from '../ServicesCards/ServicesCards'; -import { axiosConfig, baseUrl } from '../constants/constants'; -import Filter from '../Filter/Filter'; -import { Grid } from "@material-ui/core"; - +import { axiosConfig, baseUrl } from '../../constants/constants'; +import Filter from '../../components/Filter/Filter'; +import ServicesCards from '../../components/ServicesCards/ServicesCards'; export default class SellPage extends React.Component { state = { + min: "", + max: "", + name: "", + order: 'maior', jobs: [] - }; - - componentDidMount = () => { - this.getServices() } + componentDidMount = () => { this.getServices() } + getServices = () => { axios.get(baseUrl, axiosConfig) - .then(response => { - this.setState({ jobs: response.data.jobs }) + .then(res => { + this.setState({ jobs: res.data.jobs }) + + const orderedList = this.state.jobs + .filter((job) => this.state.max ? job.price <= this.state.max : true) + .filter((job) => this.state.min ? job.price >= this.state.min : true) + .filter((job) => this.state.name ? job.title.toLowerCase().includes(`${this.state.name.toLowerCase()}`) : true) + .sort((a, b) => + this.state.order === "menor" ? a.price - b.price : b.price - a.price + ); + this.setState({ jobs: orderedList }) + }).catch(err => { - console.log(err) + alert('Ocorreu um erro. Tente novamente!') }) } - render() { + onChangeMin = (e) => { this.setState({ min: e.target.value }) }; + + onChangeMax = (e) => { this.setState({ max: e.target.value }) }; - const services = this.state.jobs.map(service => { - return ( - - - - - - ) - }) + onChangeName = (e) => { this.setState({ name: e.target.value }) }; + toOrder = (e) => { + this.setState({ order: e.target.value }) + this.getServices() + } + + toUpdate = () => { this.getServices() } + + render() { return (
- - {services} + +
) - }; -}; - + } +} diff --git a/src/pages/SellPage/styles.js b/src/pages/SellPage/styles.js deleted file mode 100644 index 8b13789..0000000 --- a/src/pages/SellPage/styles.js +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/pages/ServicesCards/ServicesCards.js b/src/pages/ServicesCards/ServicesCards.js deleted file mode 100644 index a535c86..0000000 --- a/src/pages/ServicesCards/ServicesCards.js +++ /dev/null @@ -1,37 +0,0 @@ -import React from 'react'; -import { Grid, Card, CardMedia, CardContent, CardActions, Typography, Button } from '@material-ui/core'; -import useStyles from './styles'; -import Filter from '../Filter/Filter'; - - -export default function ServicesCards(props) { - - const classes = useStyles(); - - return ( - - - - imagem - - -
- - {props.title} - - - R${props.price},00 - - - {props.description} - -
- - - - - - - ); -} - diff --git a/src/pages/ServicesCards/styles.js b/src/pages/ServicesCards/styles.js deleted file mode 100644 index d260868..0000000 --- a/src/pages/ServicesCards/styles.js +++ /dev/null @@ -1,43 +0,0 @@ -import { makeStyles } from '@material-ui/core/styles'; - -export default makeStyles(() => ({ - root: { - minWidth: '200', - borderRadius: '10px', - - }, - media: { - height: 0, - paddingTop: '56,25%', //16:9 - paddingBottom: '5px', - - }, - cardAction: { - display: 'flex', - justifyContent: 'flex-end', - - }, - button: { - marginTop: '5px', - display: 'flex', - flexDirection: 'row-reverse', - }, - cardContent: { - display: 'flex', - flexDirection: 'column', - justifyContent: 'center', - alignItems: 'center', - }, - text: { - textJustify: 'center', - padding: '5px', - fontSize: '16px', - marginTop: '10px', - }, - imagem: { - margin: '5px', - height: '80px', - width: '80px', - }, -})); - diff --git a/src/theme.js b/src/theme.js deleted file mode 100644 index de1665f..0000000 --- a/src/theme.js +++ /dev/null @@ -1,25 +0,0 @@ -// import { createMuiTheme } from '@material-ui/core/styles'; - -// export const theme = createMuiTheme({ -// palette: { -// primary: { -// // light: will be calculated from palette.primary.main, -// main: '#E5E3EF', -// // dark: will be calculated from palette.primary.main, -// // contrastText: will be calculated to contrast with palette.primary.main -// }, -// secondary: { -// light: '#8265C9', -// main: '#0044ff', -// // dark: will be calculated from palette.secondary.main, -// contrastText: '#ffcc00', -// }, -// // Used by `getContrastText()` to maximize the contrast between -// // the background and the text. -// contrastThreshold: 3, -// // Used by the functions below to shift a color's luminance by approximately -// // two indexes within its tonal palette. -// // E.g., shift from Red 500 to Red 300 or Red 700. -// tonalOffset: 0.2, -// }, -// }); \ No newline at end of file From 960521fb64f22fd37b34cb66a50602e2aff59b5a Mon Sep 17 00:00:00 2001 From: Adriana Elias Ferreira <78874092+Drilias@users.noreply.github.com> Date: Mon, 14 Jun 2021 10:44:59 -0300 Subject: [PATCH 09/20] Update README.md --- README.md | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d735847..a115606 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,24 @@ -Integrantes do grupo: -Adriana Elias Ferreira -João Pedro Martins Gontijo -Sarah Migliorini Rocha -Tania Eliza de Oliveira -Túlio Dias +Projeto Marketplace LabeNinjas + +Funcionalidades: +• Cadastro de serviços +• Renderização dos objetos +• Filtro dos serviços +• Ordenação dos serviços +• Adição e remoção dos serviços ao Carrinho +• Contratação dos serviços + +Todas as funcionalidades citadas funcionam + +Tecnologia utilizada: +• React.JS Surge: -http://zippy-scarf.surge.sh/ \ No newline at end of file +http://zippy-scarf.surge.sh/ + +Grupo: +• Túlio Dias +• Sarah Migliorini Rocha +• Tânia Eliza de Oliveira +• Adriana Elias Ferreira +• João Pedro Martins Gontijo From 7df1915ec658e2b3b09175511d26c927ca8365fb Mon Sep 17 00:00:00 2001 From: Adriana Elias Ferreira <78874092+Drilias@users.noreply.github.com> Date: Mon, 14 Jun 2021 10:46:01 -0300 Subject: [PATCH 10/20] Update README.md --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index a115606..aafdd9e 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,37 @@ Projeto Marketplace LabeNinjas Funcionalidades: + • Cadastro de serviços + • Renderização dos objetos + • Filtro dos serviços + • Ordenação dos serviços + • Adição e remoção dos serviços ao Carrinho + • Contratação dos serviços Todas as funcionalidades citadas funcionam Tecnologia utilizada: + • React.JS Surge: + http://zippy-scarf.surge.sh/ Grupo: + • Túlio Dias + • Sarah Migliorini Rocha + • Tânia Eliza de Oliveira + • Adriana Elias Ferreira + • João Pedro Martins Gontijo From eb87e77ae3217816c356b81e2effd7f311ecc9d5 Mon Sep 17 00:00:00 2001 From: Adriana Elias Ferreira <78874092+Drilias@users.noreply.github.com> Date: Mon, 14 Jun 2021 10:47:40 -0300 Subject: [PATCH 11/20] Update README.md --- README.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index aafdd9e..6805d2c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ Projeto Marketplace LabeNinjas -Funcionalidades: + +FUNCIONALIDADES: • Cadastro de serviços @@ -14,17 +15,21 @@ Funcionalidades: • Contratação dos serviços + Todas as funcionalidades citadas funcionam -Tecnologia utilizada: + +TECNOLOGIA UTILIZADA: • React.JS -Surge: + +SURGE: http://zippy-scarf.surge.sh/ -Grupo: + +GRUPO: • Túlio Dias From 260bc6ac37ae1fce4d714836c314185eef08bfa8 Mon Sep 17 00:00:00 2001 From: Adriana Elias Ferreira <78874092+Drilias@users.noreply.github.com> Date: Mon, 14 Jun 2021 11:00:35 -0300 Subject: [PATCH 12/20] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6805d2c..4cd4d5a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ Projeto Marketplace LabeNinjas + FUNCIONALIDADES: • Cadastro de serviços @@ -19,14 +20,17 @@ FUNCIONALIDADES: Todas as funcionalidades citadas funcionam + TECNOLOGIA UTILIZADA: • React.JS + SURGE: -http://zippy-scarf.surge.sh/ +http://selfish-brush.surge.sh + GRUPO: From a4f933f0b2acdddcb4414dcd419909bf419b4ce3 Mon Sep 17 00:00:00 2001 From: Adriana Elias Ferreira <78874092+Drilias@users.noreply.github.com> Date: Mon, 21 Jun 2021 10:03:51 -0300 Subject: [PATCH 13/20] Update README.md --- README.md | 98 ++++++++++--------------------------------------------- 1 file changed, 18 insertions(+), 80 deletions(-) diff --git a/README.md b/README.md index 5254df2..4e278a1 100644 --- a/README.md +++ b/README.md @@ -1,101 +1,35 @@ -marketplace-continuacao -# Getting Started with Create React App -This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). +PROJETO MARKETPLACE LABENINJAS -## Available Scripts -In the project directory, you can run: -### `npm start` - -Runs the app in the development mode.\ -Open [http://localhost:3000](http://localhost:3000) to view it in the browser. - -The page will reload if you make edits.\ -You will also see any lint errors in the console. - -### `npm test` - -Launches the test runner in the interactive watch mode.\ -See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. - -### `npm run build` - -Builds the app for production to the `build` folder.\ -It correctly bundles React in production mode and optimizes the build for the best performance. - -The build is minified and the filenames include the hashes.\ -Your app is ready to be deployed! - -See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. - -### `npm run eject` - -**Note: this is a one-way operation. Once you `eject`, you can’t go back!** - -If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. - -Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. - -You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. - -## Learn More - -You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). - -To learn React, check out the [React documentation](https://reactjs.org/). - -### Code Splitting - -This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting) - -### Analyzing the Bundle Size - -This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size) - -### Making a Progressive Web App - -This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app) - -### Advanced Configuration - -This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration) - -### Deployment - -This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment) - -### `npm run build` fails to minify - -This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify) -======= -Projeto Marketplace LabeNinjas +FUNCIONALIDADES: +• cadastro de serviços; -FUNCIONALIDADES: +• renderização dos objetos; -• Cadastro de serviços +• filtro dos serviços; -• Renderização dos objetos +• ordenação dos serviços; -• Filtro dos serviços +• adição e remoção dos serviços ao carrinho; -• Ordenação dos serviços +• contratação dos serviços. -• Adição e remoção dos serviços ao Carrinho -• Contratação dos serviços -Todas as funcionalidades citadas funcionam +TECNOLOGIAS UTILIZADAS: -TECNOLOGIA UTILIZADA: +- React.JS; +- axios; +- material-ui; +- styled-components. -• React.JS @@ -105,6 +39,7 @@ http://selfish-brush.surge.sh + GRUPO: • Túlio Dias @@ -116,4 +51,7 @@ GRUPO: • Adriana Elias Ferreira • João Pedro Martins Gontijo -master + + + + From 09b47e3bd8be9145067435ba8e89ce996f5a620e Mon Sep 17 00:00:00 2001 From: Drilias Date: Mon, 21 Jun 2021 19:49:54 -0300 Subject: [PATCH 14/20] ajustes --- README.md | 82 +++++++----------- public/favicon.ico | Bin 0 -> 14638 bytes src/App.js | 2 +- src/components/Filter/styles.js | 1 + src/components/ServicesCards/ServicesCards.js | 6 +- src/components/ServicesCards/styles.js | 11 +-- src/index.css | 7 +- src/pages/HomePage/HomePage.js | 17 ++-- src/pages/HomePage/styles.js | 11 +-- src/pages/RegisterPage/RegisterPage.js | 10 +-- src/pages/RegisterPage/styles.js | 34 ++++---- 11 files changed, 75 insertions(+), 106 deletions(-) create mode 100644 public/favicon.ico diff --git a/README.md b/README.md index 4e278a1..ce373f2 100644 --- a/README.md +++ b/README.md @@ -1,57 +1,39 @@ -PROJETO MARKETPLACE LABENINJAS - - - -FUNCIONALIDADES: - - -• cadastro de serviços; - -• renderização dos objetos; - -• filtro dos serviços; - -• ordenação dos serviços; - -• adição e remoção dos serviços ao carrinho; - -• contratação dos serviços. - - - - - - -TECNOLOGIAS UTILIZADAS: - +

+ logo +
+ Projeto Marketplace +

+
+ +

Funcionalidades:

+
+- cadastro de serviços; +- renderização dos objetos; +- filtro dos serviços; +- ordenação dos serviços; +- adição e remoção dos serviços ao carrinho; +- contratação dos serviços. +
+ +

Tecnologias utilizadas:

+
- React.JS; - axios; - material-ui; - styled-components. +
- - - -SURGE: - +

Link:

+
http://selfish-brush.surge.sh - - - - -GRUPO: - -• Túlio Dias - -• Sarah Migliorini Rocha - -• Tânia Eliza de Oliveira - -• Adriana Elias Ferreira - -• João Pedro Martins Gontijo - - - - +
+ +

Grupo:

+
+- Túlio Dias +- Sarah Migliorini Rocha +- Tânia Eliza de Oliveira +- Adriana Elias Ferreira +- João Pedro Martins Gontijo +
diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..0097c72e3063c87bfd248e0470f701342dce8fde GIT binary patch literal 14638 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 literal 0 HcmV?d00001 diff --git a/src/App.js b/src/App.js index c3da57d..6fb8396 100644 --- a/src/App.js +++ b/src/App.js @@ -8,7 +8,7 @@ import HomePage from './pages/HomePage/HomePage' import RegisterPage from './pages/RegisterPage/RegisterPage'; import SellPage from './pages/SellPage/SellPage'; import CartPage from './pages/CartPage/CartPage'; -import CartItem from './components/CartItem/CartItem'; + const GlobalStyle = createGlobalStyle` * { diff --git a/src/components/Filter/styles.js b/src/components/Filter/styles.js index 7a0f5b9..3a9a97e 100644 --- a/src/components/Filter/styles.js +++ b/src/components/Filter/styles.js @@ -8,6 +8,7 @@ justify-content: space-between; margin-top:7rem; margin-left:4rem; margin-right:6rem; +width:80vw; label{ color:#505050; font-size: 13px; diff --git a/src/components/ServicesCards/ServicesCards.js b/src/components/ServicesCards/ServicesCards.js index 32e3e87..47a3bab 100644 --- a/src/components/ServicesCards/ServicesCards.js +++ b/src/components/ServicesCards/ServicesCards.js @@ -19,7 +19,7 @@ export default class ServicesCards extends React.Component { this.props.getAllJobs(); }) .catch((err) => { - alert('Erro.Tente novamente!') + alert('Clique no ícone para finalizar a contratação!') }) } @@ -28,7 +28,7 @@ export default class ServicesCards extends React.Component { jobs={this.props.state && this.props.state.jobs} jobsInCart={this.props.state && this.props.state.jobsInCart} /> - const services = this.props.jobs && this.props.jobs.map(job => { + const services = this.props.jobs ? this.props.jobs.map(job => { return ( @@ -40,7 +40,7 @@ export default class ServicesCards extends React.Component { ); - }) + }) :
Carregando...
return (
diff --git a/src/components/ServicesCards/styles.js b/src/components/ServicesCards/styles.js index 3b242bd..e94ca78 100644 --- a/src/components/ServicesCards/styles.js +++ b/src/components/ServicesCards/styles.js @@ -4,13 +4,14 @@ import styled from 'styled-components'; export const CardBlock = styled.ul` display: inline-flex; justify-items: center; - height: 50vh; - width: 27vw; + height: 42vh; + width: 30vw; margin: 0.1rem; padding:0; - margin-top:0.9rem; + margin-top: 1rem; margin-bottom:-10.5rem; @media(max-width: 800px) { + display:flex; flex-direction: column; position: relative; } @@ -19,7 +20,7 @@ export const CardContainer = styled.li` list-style-type: none; padding: 0; height:10rem; - margin-left:5.5rem; + margin-left:5.5rem; ` export const CardServices = styled.div` display: flex; @@ -37,5 +38,5 @@ export const CardServices = styled.div` ` export const IconContainer = styled.div` - margin-left: 50rem; + margin-left: 68rem; ` \ No newline at end of file diff --git a/src/index.css b/src/index.css index 909382c..721027a 100644 --- a/src/index.css +++ b/src/index.css @@ -1,11 +1,8 @@ -html{ - box-sizing:border-box; -} - body { margin: 0; - height: 100vh; + height: 90vh; width: 100vw; + box-sizing:border-box; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; diff --git a/src/pages/HomePage/HomePage.js b/src/pages/HomePage/HomePage.js index c761ba1..936b05e 100644 --- a/src/pages/HomePage/HomePage.js +++ b/src/pages/HomePage/HomePage.js @@ -5,18 +5,13 @@ import { HomeContainer } from './styles'; const useStyles = makeStyles((theme) => ({ - root: { - display: 'flex', - justifyContent: 'space-around', - width: '90vw', - height: '50vh', - marginTop: '7rem', - marginLeft: '3rem', - }, content: { + display: 'flex', + textAlign: 'center', flexGrow: 1, padding: 10, marginTop: '1rem', + width: '600px', }, title: { flexGrow: 1, @@ -33,10 +28,8 @@ const useStyles = makeStyles((theme) => ({ buttonservicos: { display: "flex", marginTop: '2rem', - marginLeft: '4rem', - justifyContent: 'center', - alignItems: "center", - width: '60%', + margin: 'auto', + width: '30%', border: ".5px solid", }, engrenagem: { diff --git a/src/pages/HomePage/styles.js b/src/pages/HomePage/styles.js index 79c513a..cf67a3a 100644 --- a/src/pages/HomePage/styles.js +++ b/src/pages/HomePage/styles.js @@ -5,12 +5,13 @@ export const HomeContainer = styled.div` display: flex; justify-content: space-around; width: 90vw; - height: 50vh; - margin-top: 7rem; - margin-left: 3.5rem; + height: 100vh; + margin-top: 12rem; + margin-left: 4rem; + margin-bottom:0.2rem;; @media(max-width: 800px) { - flex-direction: column; - position: relative; + display:flex; + flex-direction: column; img{ display: none; } diff --git a/src/pages/RegisterPage/RegisterPage.js b/src/pages/RegisterPage/RegisterPage.js index 05f3a4a..0eda814 100644 --- a/src/pages/RegisterPage/RegisterPage.js +++ b/src/pages/RegisterPage/RegisterPage.js @@ -5,7 +5,7 @@ import { axiosConfig, baseUrl } from '../../constants/constants'; import { ServiceRegisterForm, ServiceRegisterArea, TextoArea, ContainerImagens, InternalForm, LabelName, InputFormName, InputFormPrice, InputFormPayment, ImagemService, - InputFormDue, ContainerServiceRegister, ContainerPrimeiraImagem, ImagemServicePage, ContainerSegundaImagem + InputFormDue, ContainerServiceRegister, ContainerImagem } from './styles'; @@ -93,13 +93,9 @@ export default class RegisterPage extends React.Component { - - - - - + - + ) diff --git a/src/pages/RegisterPage/styles.js b/src/pages/RegisterPage/styles.js index 611bece..d36a934 100644 --- a/src/pages/RegisterPage/styles.js +++ b/src/pages/RegisterPage/styles.js @@ -4,10 +4,11 @@ import styled from 'styled-components' export const ContainerServiceRegister = styled.div` display: flex; width: 100vw; - height:80vh; + height:100vh; + margin-top:3rem; @media(max-width: 800px) { - flex-direction: column; - position: relative; + display:flex; + flex-direction: column; img{ display: none; } @@ -17,7 +18,7 @@ export const ContainerServiceRegister = styled.div` export const ServiceRegisterArea = styled.div` width:70vw; height:70vh; - margin-left: 5rem; + margin-left: 7rem; margin-top: 8rem; text-align: center; h3{ @@ -29,11 +30,13 @@ export const TextoArea = styled.div` width:36vw; color: #505050; padding:12px; + margin-left:10%; ` export const ServiceRegisterForm = styled.form` position: absolute; - display: block; + width: 30px; + margin-left:10%; ` export const InternalForm = styled.fieldset` @@ -82,25 +85,20 @@ export const ContainerImagens = styled.div` top: 5%; ` -export const ContainerPrimeiraImagem = styled.div` +export const ContainerImagem = styled.div` padding: 0; margin:0; ` -export const ImagemServicePage = styled.img` - margin-top:65%; - padding-right: 2%; - width: 70%; -` - -export const ContainerSegundaImagem = styled.div` - padding:0; - margin:0; -` export const ImagemService = styled.img` position: absolute; - right: 0; - top: 50%; + left: 8%; + top: 22%; width: 60%; z-index: -1; ` +/*export const ImagemServicePage = styled.img` + margin-top:65%; + padding-right: 2%; + width: 70%; + `*/ \ No newline at end of file From 0b342e899dab39838fb88971d8398462468b55f3 Mon Sep 17 00:00:00 2001 From: Drilias Date: Mon, 21 Jun 2021 20:03:36 -0300 Subject: [PATCH 15/20] mais ajustes --- src/pages/HomePage/styles.js | 2 +- src/pages/RegisterPage/styles.js | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/pages/HomePage/styles.js b/src/pages/HomePage/styles.js index cf67a3a..e8f43ab 100644 --- a/src/pages/HomePage/styles.js +++ b/src/pages/HomePage/styles.js @@ -8,7 +8,7 @@ export const HomeContainer = styled.div` height: 100vh; margin-top: 12rem; margin-left: 4rem; - margin-bottom:0.2rem;; + margin-bottom:0.2rem; @media(max-width: 800px) { display:flex; flex-direction: column; diff --git a/src/pages/RegisterPage/styles.js b/src/pages/RegisterPage/styles.js index d36a934..89deafd 100644 --- a/src/pages/RegisterPage/styles.js +++ b/src/pages/RegisterPage/styles.js @@ -94,11 +94,7 @@ export const ImagemService = styled.img` position: absolute; left: 8%; top: 22%; + bottom:0.2rem; width: 60%; z-index: -1; ` -/*export const ImagemServicePage = styled.img` - margin-top:65%; - padding-right: 2%; - width: 70%; - `*/ \ No newline at end of file From 20ed9c37fc94489ccae912fe42b7afa892d13341 Mon Sep 17 00:00:00 2001 From: Adriana Elias Ferreira <78874092+Drilias@users.noreply.github.com> Date: Mon, 21 Jun 2021 20:07:06 -0300 Subject: [PATCH 16/20] Update README.md --- README.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ce373f2..a741463 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,33 @@

- logo
- Projeto Marketplace + Projeto Marketplace Labeninjas


Funcionalidades:


- cadastro de serviços; + - renderização dos objetos; + - filtro dos serviços; + - ordenação dos serviços; + - adição e remoção dos serviços ao carrinho; + - contratação dos serviços.

Tecnologias utilizadas:


- React.JS; + - axios; + - material-ui; +- - styled-components.
@@ -32,8 +39,12 @@ http://selfish-brush.surge.sh

Grupo:


- Túlio Dias + - Sarah Migliorini Rocha + - Tânia Eliza de Oliveira + - Adriana Elias Ferreira + - João Pedro Martins Gontijo
From 61eb92e36da0d333be6b6a0c231faeab5c13eaa2 Mon Sep 17 00:00:00 2001 From: Adriana Elias Ferreira <78874092+Drilias@users.noreply.github.com> Date: Mon, 21 Jun 2021 20:07:30 -0300 Subject: [PATCH 17/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a741463..5ccb792 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ - axios; - material-ui; -- + - styled-components.
From bb8c43da7377442d24ddfbe5e01039eb4817e0b8 Mon Sep 17 00:00:00 2001 From: Adriana Elias Ferreira <78874092+Drilias@users.noreply.github.com> Date: Mon, 21 Jun 2021 20:08:03 -0300 Subject: [PATCH 18/20] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 5ccb792..d8bced2 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@

Funcionalidades:


+ - cadastro de serviços; - renderização dos objetos; @@ -22,6 +23,7 @@

Tecnologias utilizadas:


+ - React.JS; - axios; @@ -38,6 +40,7 @@ http://selfish-brush.surge.sh

Grupo:


+ - Túlio Dias - Sarah Migliorini Rocha From 3e472a4f1e950404ac28a86e4e2921bdddecc86d Mon Sep 17 00:00:00 2001 From: Adriana Elias Ferreira <78874092+Drilias@users.noreply.github.com> Date: Mon, 21 Jun 2021 20:08:44 -0300 Subject: [PATCH 19/20] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d8bced2..fec8b93 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@
http://selfish-brush.surge.sh
+

Grupo:


From 9ba60c62540e786b98e464a868d4342446752dbc Mon Sep 17 00:00:00 2001 From: Adriana Elias Ferreira <78874092+Drilias@users.noreply.github.com> Date: Mon, 21 Jun 2021 20:17:27 -0300 Subject: [PATCH 20/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fec8b93..376003d 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@

Link:


-http://selfish-brush.surge.sh +http://paiva-marketplace4.surge.sh