From bf31ef25ac802be7b31c71a50f5c02b06c3b8c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EA=B7=9C=EB=AF=BC?=
<131234408+kyumin7487@users.noreply.github.com>
Date: Tue, 30 Jul 2024 15:33:26 +0900
Subject: [PATCH 01/55] =?UTF-8?q?fix=20::=20global=20Regular=EC=A0=9C?=
=?UTF-8?q?=EA=B1=B0=20#15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/styles/global.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/styles/global.ts b/src/styles/global.ts
index ba7eae4..b18af69 100644
--- a/src/styles/global.ts
+++ b/src/styles/global.ts
@@ -6,7 +6,7 @@ ${reset}
* {
margin: 0;
padding: 0;
- font-family: 'Pretendard-Regular' !important;
+ font-family: 'Pretendard' !important;
}
`
export default globalStyles;
\ No newline at end of file
From d9b9b8ea2e9f4853e7864fb1c9e6c26b4f87f2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EA=B7=9C=EB=AF=BC?=
<131234408+kyumin7487@users.noreply.github.com>
Date: Tue, 30 Jul 2024 15:34:58 +0900
Subject: [PATCH 02/55] =?UTF-8?q?feat=20::=20=ED=94=84=EB=A1=9C=ED=95=84Na?=
=?UTF-8?q?me,=20Button=20=EC=A0=9C=EC=9E=91=20#15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/imgs/profile/write.svg | 3 +
src/components/home/profile/index.tsx | 10 --
src/components/home/profile/profile/index.tsx | 31 ++++++
src/components/home/profile/profile/style.ts | 105 ++++++++++++++++++
src/pages/profile/page.tsx | 2 +-
5 files changed, 140 insertions(+), 11 deletions(-)
create mode 100644 src/assets/imgs/profile/write.svg
delete mode 100644 src/components/home/profile/index.tsx
create mode 100644 src/components/home/profile/profile/index.tsx
create mode 100644 src/components/home/profile/profile/style.ts
diff --git a/src/assets/imgs/profile/write.svg b/src/assets/imgs/profile/write.svg
new file mode 100644
index 0000000..04d8c5f
--- /dev/null
+++ b/src/assets/imgs/profile/write.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/components/home/profile/index.tsx b/src/components/home/profile/index.tsx
deleted file mode 100644
index ab26524..0000000
--- a/src/components/home/profile/index.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from "react";
-
-const Profile =()=>{
-return(
- <>
-
- >
-)
-}
-export default Profile;
\ No newline at end of file
diff --git a/src/components/home/profile/profile/index.tsx b/src/components/home/profile/profile/index.tsx
new file mode 100644
index 0000000..9b7f9d9
--- /dev/null
+++ b/src/components/home/profile/profile/index.tsx
@@ -0,0 +1,31 @@
+import React from "react";
+import * as S from "./style";
+import AvatarImg from "src/assets/imgs/header/AvatarImg.svg";
+import Pencil from "src/assets/imgs/profile/write.svg";
+
+const Profile = () => {
+ return (
+
+ {renderEmptyMessage()}
+
&*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><7lyVpN AR?q@1U59 zO+)QW wL8t 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_AQ 7B-vxqX30s0I_`2$in86#`mAsT-w?j{&AL@B3$;P z31G4(lV|b}uSD CIrjk+M1R!X7s 4Aabn<)zpgT}#gE|mIvV38^ODy@<&yflpCwS#fRf9ZX3lPV_?8@C5)A;T zqmouFLFk;qIs4rA=hh=GL~sCFsXHsqO6_y~*AFt93 9UYVBSx1s(=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(f u}i#kjX9h>GYctkx9Mt_8{@s%!K_EI zScgwy6%_fR?CG JQtmgNAj^h9B#zma MDWgH55pGuY1Gv7D 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?X 0GFakfh+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?~cF ha^y(l@-Mr2W$%MN{#af8J;V*>hdq!gx=d0h$T7l}>91Wh07)9CTX zh2_ZdQCyFOQ)l(}gft0UZ G`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%?_G4a IiybZHHagF{ ;IcD(dPO!#=u zWfqLcPc^+7Uu#l(B pxft{*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~VaPrH2q b6sd~=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@MFDq s1z 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#i ZuHK!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 zzra 83M_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#LTkw zVR@=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{3s mwATcdM_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/my-markdown-editor/public/manifest.json b/my-markdown-editor/public/manifest.json deleted file mode 100644 index 080d6c7..0000000 --- a/my-markdown-editor/public/manifest.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "short_name": "React App", - "name": "Create React App Sample", - "icons": [ - { - "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" - }, - { - "src": "logo192.png", - "type": "image/png", - "sizes": "192x192" - }, - { - "src": "logo512.png", - "type": "image/png", - "sizes": "512x512" - } - ], - "start_url": ".", - "display": "standalone", - "theme_color": "#000000", - "background_color": "#ffffff" -} diff --git a/my-markdown-editor/public/robots.txt b/my-markdown-editor/public/robots.txt deleted file mode 100644 index e9e57dc..0000000 --- a/my-markdown-editor/public/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# https://www.robotstxt.org/robotstxt.html -User-agent: * -Disallow: diff --git a/my-markdown-editor/src/App.css b/my-markdown-editor/src/App.css deleted file mode 100644 index 74b5e05..0000000 --- a/my-markdown-editor/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/my-markdown-editor/src/App.test.tsx b/my-markdown-editor/src/App.test.tsx deleted file mode 100644 index 2a68616..0000000 --- a/my-markdown-editor/src/App.test.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import React from 'react'; -import { render, screen } from '@testing-library/react'; -import App from './App'; - -test('renders learn react link', () => { - render( ); - const linkElement = screen.getByText(/learn react/i); - expect(linkElement).toBeInTheDocument(); -}); diff --git a/my-markdown-editor/src/App.tsx b/my-markdown-editor/src/App.tsx deleted file mode 100644 index a53698a..0000000 --- a/my-markdown-editor/src/App.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import React from 'react'; -import logo from './logo.svg'; -import './App.css'; - -function App() { - return ( - -- ); -} - -export default App; diff --git a/my-markdown-editor/src/index.css b/my-markdown-editor/src/index.css deleted file mode 100644 index ec2585e..0000000 --- a/my-markdown-editor/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/my-markdown-editor/src/index.tsx b/my-markdown-editor/src/index.tsx deleted file mode 100644 index 032464f..0000000 --- a/my-markdown-editor/src/index.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import React from 'react'; -import ReactDOM from 'react-dom/client'; -import './index.css'; -import App from './App'; -import reportWebVitals from './reportWebVitals'; - -const root = ReactDOM.createRoot( - document.getElementById('root') as HTMLElement -); -root.render( -- --
- Edit
- - Learn React - -src/App.tsx
and save to reload. -- -); - -// If you want to start measuring performance in your app, pass a function -// to log results (for example: reportWebVitals(console.log)) -// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals -reportWebVitals(); diff --git a/my-markdown-editor/src/logo.svg b/my-markdown-editor/src/logo.svg deleted file mode 100644 index 9dfc1c0..0000000 --- a/my-markdown-editor/src/logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/my-markdown-editor/src/react-app-env.d.ts b/my-markdown-editor/src/react-app-env.d.ts deleted file mode 100644 index 6431bc5..0000000 --- a/my-markdown-editor/src/react-app-env.d.ts +++ /dev/null @@ -1 +0,0 @@ -///- diff --git a/my-markdown-editor/src/reportWebVitals.ts b/my-markdown-editor/src/reportWebVitals.ts deleted file mode 100644 index 49a2a16..0000000 --- a/my-markdown-editor/src/reportWebVitals.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { ReportHandler } from 'web-vitals'; - -const reportWebVitals = (onPerfEntry?: ReportHandler) => { - if (onPerfEntry && onPerfEntry instanceof Function) { - import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => { - getCLS(onPerfEntry); - getFID(onPerfEntry); - getFCP(onPerfEntry); - getLCP(onPerfEntry); - getTTFB(onPerfEntry); - }); - } -}; - -export default reportWebVitals; diff --git a/my-markdown-editor/src/setupTests.ts b/my-markdown-editor/src/setupTests.ts deleted file mode 100644 index 8f2609b..0000000 --- a/my-markdown-editor/src/setupTests.ts +++ /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'; diff --git a/my-markdown-editor/tsconfig.json b/my-markdown-editor/tsconfig.json deleted file mode 100644 index a273b0c..0000000 --- a/my-markdown-editor/tsconfig.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "compilerOptions": { - "target": "es5", - "lib": [ - "dom", - "dom.iterable", - "esnext" - ], - "allowJs": true, - "skipLibCheck": true, - "esModuleInterop": true, - "allowSyntheticDefaultImports": true, - "strict": true, - "forceConsistentCasingInFileNames": true, - "noFallthroughCasesInSwitch": true, - "module": "esnext", - "moduleResolution": "node", - "resolveJsonModule": true, - "isolatedModules": true, - "noEmit": true, - "jsx": "react-jsx" - }, - "include": [ - "src" - ] -} From 7c9a2c521416719d2568700af24f15542d68837e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=95=B4=EC=A4=80?= <127281057+ftery0@users.noreply.github.com> Date: Tue, 30 Jul 2024 16:50:33 +0900 Subject: [PATCH 13/55] fix :: auth --- src/assets/imgs/Expand_down.svg | 3 + src/components/auth/Signup/index.tsx | 2 + .../auth/Signup/signupFirst/index.tsx | 12 +- .../auth/Signup/signupSecond/index.tsx | 104 ++++++++++++------ .../auth/Signup/signupSecond/style.ts | 82 +++++++++++++- src/components/auth/Signup/style.ts | 2 +- src/components/auth/style.ts | 2 +- src/components/home/main/style.ts | 2 +- src/components/textFields/index.tsx | 4 +- src/hooks/auth/useSign.ts | 62 ++++++++--- src/queries/auth/queries.ts | 6 +- .../authRepository/authRepository.ts | 8 ++ .../authRepository/authRepositoryImpl.ts | 11 +- src/types/auth/signup.type.ts | 17 +-- 14 files changed, 243 insertions(+), 74 deletions(-) create mode 100644 src/assets/imgs/Expand_down.svg diff --git a/src/assets/imgs/Expand_down.svg b/src/assets/imgs/Expand_down.svg new file mode 100644 index 0000000..089cd4e --- /dev/null +++ b/src/assets/imgs/Expand_down.svg @@ -0,0 +1,3 @@ + diff --git a/src/components/auth/Signup/index.tsx b/src/components/auth/Signup/index.tsx index cab6397..c3eafff 100644 --- a/src/components/auth/Signup/index.tsx +++ b/src/components/auth/Signup/index.tsx @@ -24,6 +24,8 @@ const Signup = ({ setIsLogin }: Props) => { handleSignupData={sign.handleSigUpData} submitSignupDataSecond={sign.submitSignupDataSecond} keydownButton={sign.firstHandleKeyDown} + chckEmailAuthCode={sign.checkEmailAuthCode} + isWaiting={sign.isWaiting} />, ]; diff --git a/src/components/auth/Signup/signupFirst/index.tsx b/src/components/auth/Signup/signupFirst/index.tsx index 2bf6189..f92428a 100644 --- a/src/components/auth/Signup/signupFirst/index.tsx +++ b/src/components/auth/Signup/signupFirst/index.tsx @@ -27,8 +27,8 @@ const SignupFirst = ({ 아이디 *
* * >; - signupData: Sign; - handleSignupData: (e: React.ChangeEvent ) => void; - submitSignupDataSecond: () => void; - keydownButton: (e: React.KeyboardEvent) => void; - } + setSection: Dispatch >; + signupData: Sign; + handleSignupData: ( + e: React.ChangeEvent + ) => void; + submitSignupDataSecond: () => void; + keydownButton: (e: React.KeyboardEvent) => void; + chckEmailAuthCode:()=>void + isWaiting:boolean; +} -const SignupSecond = ({ setSection,signupData, - handleSignupData, - keydownButton, - submitSignupDataSecond, - }:Props) => { +const SignupSecond = ({ + setSection, + signupData, + handleSignupData, + keydownButton, + submitSignupDataSecond, + chckEmailAuthCode, + isWaiting, +}: Props) => { + return ( <> - -setSection("first")}> - - 돌아가기 +
setSection("first")}> + + 돌아가기
이름 *
- 이메일 *
+ 학교*
-+ > + + + + + + 이메일 +*
+ ++ + ++ 인증하기 ++ + + {" "} 이메일 인증번호 *
+ + {isWaiting ? "이메일 전송중.." :null} +