Skip to content

Commit

Permalink
#4 [Fix] Kakao share description & MyPage Edit
Browse files Browse the repository at this point in the history
์นด์นด์˜ค ๊ณต์œ  ์„ค๋ช… ๋ฌธ๊ตฌ ์ˆ˜์ • & ๋งˆ์ดํŽ˜์ด์ง€ ๋‹‰๋„ค์ž„ ์ˆ˜์ • ๋ชจ๋“œ ์‚ญ์ œ
issue: #4
  • Loading branch information
zhtmahthgus committed Aug 2, 2022
1 parent 04bfacf commit d9b8119
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
14 changes: 8 additions & 6 deletions src/pages/MyPage/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import React, { useState, useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { currentUser } from 'apis/User.apis';
import { useInput, usePrivateAxios, logout } from 'hooks';
import { usePrivateAxios, logout } from 'hooks';
import { CustomCalendar } from 'components';
import { User, WhiteLeft, WhiteNormalPencil, WhiteOutlinePencil } from 'assets';
import { User, WhiteLeft } from 'assets';
import {
StyledRoot,
DesktopHeader,
Expand All @@ -21,7 +21,7 @@ import {

function MyPage() {
const navigate = useNavigate();
const [isEditMode, setIsEditMode] = useState(1);
// const [isEditMode, setIsEditMode] = useState(1);
const [userData, setUserData] = useState({});
const privateAxios = usePrivateAxios();
const getUser = async () => {
Expand Down Expand Up @@ -52,13 +52,14 @@ function MyPage() {
<UserTextWrapper>
<NameText
placeholder={userData.fullName}
value={useInput.value}
disabled={isEditMode}
onChange={useInput.onChange}
// value={useInput.value}
disabled={1}
// onChange={useInput.onChange}
/>
<EmailText>{userData.email}</EmailText>
</UserTextWrapper>
</div>
{/*
<button
type="button"
className="EditButton"
Expand All @@ -72,6 +73,7 @@ function MyPage() {
<img src={WhiteOutlinePencil} alt="EditButton" />
)}
</button>
*/}
</UserWrapper>
<CustomCalendar />
<MobileFooter>
Expand Down
2 changes: 1 addition & 1 deletion src/utils/shareKakao.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default async function shareKakao(tem, rain) {
objectType: 'feed',
content: {
title: '์ด์ƒ์ฒญ',
description: `์ง€๊ธˆ ์ดํ™”๋Š” ${tem}ยฐC, ๊ฐ•์ˆ˜ํ™•๋ฅ ์€ ${rain}%์ž…๋‹ˆ๋‹ค. ์ง€๊ธˆ ์ดํ™”์ธ๋“ค์˜ ์ถ”์ฒœ ์˜ท์ฐจ๋ฆผ์€?`,
description: `์ง€๊ธˆ ์ดํ™”๋Š” ${tem}ยฐC, ๊ฐ•์ˆ˜ํ™•๋ฅ ์€ ${rain}%์ž…๋‹ˆ๋‹ค. ์‹ค์‹œ๊ฐ„ ์ดํ™”์ธ ์ถ”์ฒœ ์˜ท์ฐจ๋ฆผ์€?`,
imageUrl: imageUrl,
link: {
webUrl: process.env.REACT_APP_GOOGLE_OAUTH_REDIRECT_URL,
Expand Down

0 comments on commit d9b8119

Please sign in to comment.