Skip to content

Commit

Permalink
Fix: user 페이지 박스 스타일, scrollbar 숨기기, url 복사 baseURL 변경 (#73)
Browse files Browse the repository at this point in the history
* Fix: scrollbar 숨기기, url 복사 baseURL 수정

* Fix: user 페이지 박스 스타일 수정
  • Loading branch information
goeun208 authored Feb 10, 2024
1 parent 80ff90f commit 40fbf24
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const nextConfig = {
watchOptions: { ignored: '/node_modules' },
images: {
domains: [
'blogfiles.naver.net',
'ldb-phinf.pstatic.net',
'naverbooking-phinf.pstatic.net',
'ldb-phinf.pstatic.net',
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
"recoil-persist": "^5.1.0",
"styled-reset": "^4.5.1",
"tailwind-scrollbar-hide": "^1.1.7",
"tailwindcss": "^3.4.1",
"typescript": "5.1.6",
"yup": "^1.2.0",
"tailwindcss": "^3.4.1"
"yup": "^1.2.0"
},
"devDependencies": {
"@svgr/webpack": "^8.0.1",
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/button/kakao/KakaoButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useRouter } from 'next/router';
const KakaoLoginButton = () => {
const router = useRouter();
const REST_API_KEY = 'da98b670c28171c6bae91e1f6fa272c3';
const REDIRECT_URI = 'https://moidot.vercel.app/login/kakao';
const REDIRECT_URI = 'http://localhost:3000/login/kakao';
const LINK = `https://kauth.kakao.com/oauth/authorize?client_id=${REST_API_KEY}&redirect_uri=${REDIRECT_URI}&response_type=code`;

function kakaoLogin() {
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/button/url/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ interface UrlProps {
}

const UrlButton = ({ pathname }: UrlProps) => {
const baseURL = 'https://www.moidot.kr'; // 배포 url로 변경하기
const baseURL = 'https://www.moidot.co.kr'; // 배포 url로 변경하기
useEffect(() => {
console.log(pathname.split('/').slice(-1)[0]);
}, [pathname]);
Expand Down
6 changes: 3 additions & 3 deletions src/components/common/home/SpaceBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import PeopleIcon from '../../../../public/assets/home/icons/people.svg';
const SpaceBox = ({ groupName, groupDate, groupParticipates, participantNames }: GetParticipateProps) => {
return (
<div className="flex flex-col">
<div className="flex flex-row justify-between rounded-tl-lg rounded-tr-lg p-3 bg-main_orange w-[585px] h-[86px] ">
<div className="flex flex-row justify-between items-center rounded-t-2xl px-10 py-5 bg-main_orange w-[585px] h-[86px] ">
<div className="font-Pretendard text-white text-h3 font-bold">{groupName}</div>
<div className="font-Pretendard text-white text-b2 font-thin">{groupDate}</div>
<div className="font-Pretendard text-white text-b2 font-thin ">{groupDate}</div>
</div>
<div className="flex flex-col rounded-bl-lg rounded-br-lg p-10 bg-white w-[585px] gap-[18px]">
<div className="flex flex-col rounded-b-2xl p-10 bg-white w-[585px] gap-[18px]">
<div className="gap-[8px]">
<div className="flex flex-row gap-[8px]">
<LocationIcon />
Expand Down
2 changes: 1 addition & 1 deletion src/components/home/Home4.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const Home4 = () => {
};
return (
<div className="flex flex-col justify-center items-center gap-10 p-4">
<div className="flex flex-col justify-center items-center">
<div className="flex flex-col justify-center items-center pt-16">
<div className="font-Pretendard text-black text-h3 font-bold ">모임장이 되어</div>
<div className="font-Pretendard text-black text-h3 font-bold ">모임원들과 장소를 정해보세요!</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/participant/[id].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const ParticipatePage = () => {

const deleteGroupMutation = useMutation((groupId: number) => deleteGroup(token, groupId), {
onSuccess: () => {
alert('스페이스 삭제 성공');
alert('모이닷 스페이스를 삭제했습니다.');
router.push('/user'); // 내 모이닷 스페이스로 수정하기
},
onError: () => {
Expand Down Expand Up @@ -74,7 +74,7 @@ const ParticipatePage = () => {
(participateId: number) => deleteGroupParticipate(token, participateId),
{
onSuccess: () => {
alert('스페이스 나가기 성공');
alert('모이닷 스페이스를 나갔습니다.');
router.push('/user'); // 내 모이닷 스페이스로 이동
},
onError: () => {
Expand Down
2 changes: 1 addition & 1 deletion tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ const config: Config = {
},
},

plugins: [require('daisyui'), require('tailwindcss'), require('autoprefixer')],
plugins: [require('daisyui'), require('tailwindcss'), require('autoprefixer'), require('tailwind-scrollbar-hide')],
};
export default config;

0 comments on commit 40fbf24

Please sign in to comment.