From dd07b7c945783f46e4c65ccb70a8be6e74ef6ae2 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Tue, 4 Jul 2023 06:44:19 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=ED=94=BC=EB=93=9C=EB=B0=B1=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 2 + src/assets/checkIcon.png | Bin 0 -> 2014 bytes src/assets/xIcon.png | Bin 0 -> 2352 bytes src/components/ChatBlock.jsx | 8 ++-- src/pages/ChattingResultPage.jsx | 76 ++++++++++++++++++++++-------- src/styles/ChattingResultPags.css | 4 +- 6 files changed, 65 insertions(+), 25 deletions(-) create mode 100644 src/assets/checkIcon.png create mode 100644 src/assets/xIcon.png diff --git a/src/App.js b/src/App.js index 4ddc5ef..dba6cc7 100644 --- a/src/App.js +++ b/src/App.js @@ -7,6 +7,7 @@ import ChattingPage from "./pages/ChattingPage"; import SelfSettingPage from "./pages/SelfSettingPage"; import { BrowserRouter, Routes, Route } from "react-router-dom"; +import ChattingResultPage from "./pages/ChattingResultPage"; function App() { return ( @@ -18,6 +19,7 @@ function App() { } /> } /> } /> + }/> diff --git a/src/assets/checkIcon.png b/src/assets/checkIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..992aab9254c40fdec9b464116d0a57a02ef0f3b0 GIT binary patch literal 2014 zcmWkvdt6e<9zVW87jEQRFcS*IKD}-VzPhcgikjjhU2Dzc)T(_55g)0QtzuZI_taXZ zTVQ(=wM=1;bwhkqfc8$?z2$cHiiPE)61DQGl}UH}V`k2L=ll50d_FU$JeJEL*t*$5 z5JZRw4~Yk3J7{Nd)}VK@-Cqv|yeNEUE(Ce{Ej6>ynvFaFn&rlGwnEB&${R4T%m|JS zhM=}nc3)sC2(rnI2nkLoG@BgS97Ewiciy`$yEpX_7ot<{dBoY!WcD9JzuC59G0WOX zWmQx(u>DO`Sv(yHJ^J{K-c_1+^W_(UD6Ra=Ib-fCvBgwcYI?!*3%4Y~;C902jpxbv z`Hj3sd!*}YGP=e;%qApdPEJ$uB|QziNAa7nNY&Mzzl<%L4m3HXm@|awjr-APuGpU4 zqF;v5Gc@JWM1JnLHmczBoXtiT)qVUsymrTZA7k=#?>=mwDsXMGH1Of8=NY~y^{olD z=;)&PCEtM3+>!J~Z!DpUwwfn(v*7AmV?knO1%I~Ww`t|N6K=0$(ox~w ztkJ}|4^h}e0<)tKT^!r-bQwoj)5191^0+Jo+ZPs@IEd@7k|G53Y;0itO}?wPT#B@s zVe|=59zhX|(OWeB+6C8djRd!@-QJFL!biY$q9d>v$J+tWhffI0gu| zuK+-7n}&q|^Ku8W;E5LizHQU72mq*Z4ir3DY3Oy&Zq~3;YyeOLJhq6YddtxSc>a<^ zKg^ZgqZ&P$XVz0XXcg#z$Y#aS$(|!GPp;Da>5BQ$r*Kq3$`(P0Ud+KdCs0zh4F#UC z)`s=E?~^FV)?`va2}vb%SR#aCo!LtS2YBLx1`xs}iidW90FhKm93Wf(4)ti&jNPSo zLEmYu!?4c3qgC7WH!_aJyfC3{m7H5`CR}oo6Dvox^P)}i{Thw@Y~zk!iVF+oMkdFL zEonxNL@^>W+%z8yG28%5M;4zl|1H+kE4EklTMM3gO;w@M<>m}Q-CFGOMtuiQy4-?` z1xV32n%YjwT5T>v52#@If3s^#Gb<>5@Wk5^gnv5)uVTg85is9glQA%{o+j9CDHj3r1hoJQN@e}qW!k4tH-)XSd(T+6oK8doeG1c z=1Za`SpGm=r(qo=g4lIDd1PR=OgFU+|9<{|f3+(X>k2OE&ft>AZCT#Ppfl#o%nlk@ zRK2zk>Hh4HAd$m!MAdx@kdR9tJ3dbzTPvvU({^odU%C$0bioqEj2X+@C+9F>fnV3W z=`3P6?*2zCK&@C0kieB#(;ZMxKLhh}o`PU0-v%7R3!c19ZE-B~3IS}QNP>jDJPE1p z2Y|d!wq(L>caq?YFUXs5Wx1&xTs#FngLO5E*`WceI8Q(!l80P6Xk|k$n&Wfc^A`Hr zyjXJ-7)_N|8gg-E`~0yfq6?ehRwf z^UU9$Urd>!1A#R;nr_>*zJv7*sA#JMp?8jdxE}7LikSM^+5VyRD?_5Nb7YYUK ztItk`cN=@|w#?ob826(KQtqK~S=UFhS-$6@4)Jqb^Jjm&RlUo@XYaZ^?DZbz&zf^g zYwY!d0Jiwr4xXI+_2Q~`d6jsUTj8*S_)?Mp{p0r*b9_+U9&il1A4ePBJFgM=Y{XBJ+3Jk=YG8y;*X6{;I8$!9y0R*H`&@zFS@ z{)DE78H!!@5r!B{wcdgRJew*i-sZ}>@=r2JUED|{@6;kV{ja#>3<6l0C(WgOpG`9_ zaE4R+0)VEEgRxtz*wlApRHJs_7@1VKNSb@czm4F!Z{iN;U4Ip3Dcqu4kxEmO#DkUS z%zz6J4bY5Vd@BI=6Rv9q0w}wKbn7nIgIZ=d*k}%L`S=mnRm25B9xLFahyFmrrWxNJ z6oZvCNhTvpL<3hvda#V#_>Bym9CH^|Q$;$}ueIv9NDaR0LicSX9^zuNqrO6iO(LC= zJ)JFg5!>f4T8YWGEoG>b>7w_tHb{nc1rLXLS}=_1c0{%<$q#0y{;ZA**Wd@EwJ*aw zA%>v93L$?28ADD%!V#KCm!ImOu8IMKQ}tS;2xOQX9EBsx{osYfJav_wK{A8szrH!H39NWsDF8}9t_c=2!IlbgNz=ut!9cML^@azm6`d8Pjc DgD=4u literal 0 HcmV?d00001 diff --git a/src/assets/xIcon.png b/src/assets/xIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..e10f05d0c479b06f64f49845cd10cd89267d1954 GIT binary patch literal 2352 zcmX9=d05g}7X}qEP+KN7T&J2Qa}rA?63UH)7SeJri9jux(O(9NTZ@4{gXKD3W@ccT zOq!!Om?J7>;jUQ(m4YIrISQ6Kx#g3Ye!sr&k8{uap7Y1K_r1@3pL^}N-$65kH39;G zm>oXk698txw=gjV*UZLNUofp<9y%EhfoyjB7Et2N-E^=BjSo0TfYiusCqQDv@b>kF zKx*@l%i%Bx#H8b}k9SZqbV@trYjfDPYX*gc;kpj{!P&o`g6qt?krCU^M>sW-VO#{- zZurqP=NX>)A^33vJEI*;^Q&`1%i(a-PZtzZ8>Pt~Wyx(jii9ToOLfQoC9}VH>0DZ|j7guz51m(wduQ|y2|A;p zEm#Z1=LrVG9!2{jv#qAhcNfb8TgH*@s=o zz7|rCL+8rmibppyf>E(pvaajsTAPH7{NG)XsFIQQ5foEQ@qme@Z+tvS{y8SZ^CwKP z5>;b{MS$fny0H2gyHi%*0Zzm8%(wwu-?O&G|EUNHR9m*aikSmERb%eRZEH1F4C)H8Ef3VK1Ov)o51wl}c31iAW||T*;}y zGe(sgs9TxnT9EA5jVcYO=a?Q~Cl+^pRJo4o%=7>|)4Ts2RYHnCRlQy(_D^28KwCGu z*(dKjAb9rX$?E-!Rw5L7Bak(={}l{pFUXVT_o)8V1g9Zq_<>_r(fS#MSA*rL?ze&? z(~m#T#<_lOcXi~=+$V%0(7f}pcW2JOny@D~-s+6BlNJnbX)8ZsNzESh=fzG0NB^O| z?_c{0Um0PS*R*alnDX77XUz4Hl$}LI=-+0NS6Zi`r?#krltS{a`z@7PF4>gt6vp0> zn?dOMuA@BDoceUsTaS;==ygy2g}rB!U`0JJQEPH!xv(UWJi8C@%xJq@>7xCbPY`HN z(H3cT4m7bB*^WQy<)NAMd=~4a`|Ffgx$oE=Kd$^TE?jtXCDjn0G{(yb`VPZn;) z{yA^qq!{=q6nH)8yQN1M|7dAz0S5bLoQcL$H^inz)?AAwz0{Od{<(m@mau)dW^)?t1vD^>>qM$y^++hj+gTw)z3*mEC>c}9)3C*{Z~Z^ZtmRXjtyE~SH%Ld#yK7mV52ShT+{^kOuBFZOTQ*??g8 zBaCem|k{Ec7st&}X^w9d2}_i%Kux8cLY)*W_zJ z>KUr9PB)Y!$8qIOZuBe{jlTL^2HBoJboJ>50NtLP=$RPuzyO_IG*!B_-9b5Fz^o`ZVk*eLksE~h(XV^@7)>?IVm5Ca-*xi`j zR}bpb3)L=JgA->tHIGQ368KUI=smJ>2ZeJeQqZ30_%{256h*u3k-!$rxwvf4KQ`E) zYThi~lc#u&^Sl?2IB`2?>_zM`9WU%l09Qo)Tbw=osN}u*m4W-a0tNO>SELIAUh??uUUQzpHip4+ab1NuMzvzrL?WOWt`b%wAfy6ubATj;f3(tS3t; z1URs*iKN;{VZDvQk>G$u6G3H6VXcniz|QRflFE`YvuWx zWjH8y@8ve@C~KRu^GAL*&h3F?)4#b>SR!{%x3T0M>$!?qZiq#G-IQ~|C8{nTk12Kr zIwCcdKjP_io9=3s7d`|rJR5yMhpbxD?-pR8-nkgP|FHs>sliI##i&IQkw1uWfOfqn zT5LhvSXlf0) -
-
+
+
-
hi
+
+ I think he is so kind and he really cares about me.
+
이렇게 표현하면 더 좋아요
- -
hi
+ +
I like playing with Princce.
-
이렇게 표현하면 더 좋아요
- -
hi
+
I like playing with Prince.
-
-
hi
+
+
+
+ + + {/* */} +
diff --git a/src/styles/ChattingResultPags.css b/src/styles/ChattingResultPags.css index f02aecc..4257160 100644 --- a/src/styles/ChattingResultPags.css +++ b/src/styles/ChattingResultPags.css @@ -4,11 +4,13 @@ .chatWrap { justify-content: center; display: flex; + flex-direction: column; flex-wrap: wrap; } .wrap { display: flex; - margin-left: 400px; + justify-content: flex-end; + margin-right: 173px; } .oChat { width: 700px; From 733e51c863578586d7a10b586b4b45a19e8a94c5 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Tue, 4 Jul 2023 06:46:39 +0900 Subject: [PATCH 2/3] confilct fix --- src/components/ChatBlock.jsx | 46 +++++++++++++++++------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/src/components/ChatBlock.jsx b/src/components/ChatBlock.jsx index f806a23..c79e23b 100644 --- a/src/components/ChatBlock.jsx +++ b/src/components/ChatBlock.jsx @@ -1,30 +1,28 @@ import React from 'react'; import chatblock from "../assets/rectangle.png"; -const styles= { - ic: { - position: "relative", - marginBottom: "100px" - }, - to: { - position: "absolute", - top: "20%", - left: "38%", - transform: "translate(-50%, -50%)", - backgroundColor: "#e4e4e4", - paddingBottom: "30px", - color: "#4E5560", - fontSize: "30px", - height: '10px' - }, - text: { - margin: 15, - //paddingRight: '100px', - width: '600px', - height: '40px' - } - -} +const styles = { + ic: { + position: "relative", + marginBottom: "100px", + left: 0, + }, + to: { + position: "absolute", + top: "20%", + left: "40%", + transform: "translate(-50%, -50%)", + paddingBottom: "30px", + color: "#4E5560", + fontSize: "30px", + height: "1px", + }, + text: { + //paddingRight: '100px', + width: "600px", + height: "40px", + }, +}; function ChatBlock(props) { return ( From 2555b04dc1b6fda91bbb5e26f0ae520d38874256 Mon Sep 17 00:00:00 2001 From: jungwoo3490 Date: Tue, 4 Jul 2023 06:48:14 +0900 Subject: [PATCH 3/3] confilct fix --- src/components/ChatBlock.jsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/ChatBlock.jsx b/src/components/ChatBlock.jsx index c79e23b..4e34d45 100644 --- a/src/components/ChatBlock.jsx +++ b/src/components/ChatBlock.jsx @@ -24,10 +24,13 @@ const styles = { }, }; function ChatBlock(props) { - return (
- {props.altText} + {props.altText}

{props.text}

@@ -35,4 +38,4 @@ function ChatBlock(props) { ); } -export default ChatBlock; +export default ChatBlock; \ No newline at end of file