Skip to content

Commit

Permalink
fix: login 페이지 폴더 이름 변경(login -> loginPage) 및 컴포넌트 경로 변경(src/loginPag…
Browse files Browse the repository at this point in the history
…e -> src/container/loginPage), login/join 페이지 tag 버튼이 뷰포트 크기에 따라 변하지 않는 현상 수정 #5

fix: login 페이지 폴더 이름 변경(login -> loginPage) 및 컴포넌트 경로 변경(src/loginPage -> src/container/loginPage), login/join 페이지 tag 버튼이 뷰포트 크기에 따라 변하지 않는 현상 수정
  • Loading branch information
Joonhyung-Choi committed Aug 1, 2023
1 parent 0d3dd1e commit 8e44ccb
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion pages/login/join.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import LoginJoinContainer from "../../src/login/loginJoin/LoginJoinContainer";
import LoginJoinContainer from "../../src/container/loginPage/loginJoin/LoginJoinContainer";

const LoginJoin = () => {
return <LoginJoinContainer />;
Expand Down
2 changes: 1 addition & 1 deletion pages/login/kakao.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import axios from "axios";
import { useRouter } from "next/router";
import { useRecoilState } from "recoil";
import { signUpDataState } from "../../src/recoil/login/signUpState";
import Wrapper from "../../src/login/components/Wrapper";
import Wrapper from "../../src/container/loginPage/components/Wrapper";

const Kakao = () => {
const router = useRouter();
Expand Down
2 changes: 1 addition & 1 deletion pages/login/main.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import LoginMainContainer from "../../src/login/loginMain/LoginMainContainer";
import LoginMainContainer from "../../src/container/loginPage/loginMain/LoginMainContainer";

const LoginMain = () => {
return <LoginMainContainer />;
Expand Down
4 changes: 2 additions & 2 deletions pages/login/pick.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect } from "react";
import LoginPickContainer from "../../src/login/loginPick/LoginPickContainer";
import LoginPickContainer from "../../src/container/loginPage/loginPick/LoginPickContainer";
import { useRouter } from "next/router";
import { useRecoilState } from "recoil";
import { signUpDataState } from "../../src/recoil/login/signUpState";
Expand All @@ -10,7 +10,7 @@ const LoginPick = () => {

useEffect(() => {
console.log(signUpData);
}, []);
}, [signUpData]);
return <LoginPickContainer />;
};

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import Input from "../../components/Input";
import Tag from "../../components/Tag";
import Input from "../../../components/Input";
import Tag from "../../../components/Tag";
import styled from "styled-components";

function JoinContents() {
Expand All @@ -13,8 +13,9 @@ function JoinContents() {
<TagButtonWrapper>
<Tag
title="회원가입"
width="500px"
height="60px"
width="100%"
height="100%"
fontSize="100%"
inversion={true}
clickAble={true}
onClickHandler={() => {}}
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import React, { ReactNode } from "react";
import styled from "styled-components";
import LoginBackground from "../../../public/svg/loginPage/loginBackground.svg";
import Title from "../components/Title";
import Input from "../../components/Input";
import Input from "../../../components/Input";
import Navigaiton from "./Navigtion";
import Horizon from "./Horizon";
import Tag from "../../components/Tag";
import Tag from "../../../components/Tag";
import SocialLogin from "./SocialLogin";
import Wrapper from "../components/Wrapper";

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { ReactNode, useEffect } from "react";
import styled from "styled-components";
import GoogleLogo from "../../../public/svg/loginPage/googleLogo.svg";
import KakaoLogo from "../../../public/svg/loginPage/kakaoLogo.svg";
import GoogleLogo from "../../../../public/svg/loginPage/googleLogo.svg";
import KakaoLogo from "../../../../public/svg/loginPage/kakaoLogo.svg";

function SocialLogin() {
const Rest_api_key = process.env.NEXT_PUBLIC_REST_API_KEY; //REST API KEY
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from "react";
import styled from "styled-components";
import ContentsTitle from "./ContentsTitle";
import OwnerImage from "../../../public/svg/loginPage/owner.svg";
import UserImage from "../../../public/svg/loginPage/user.svg";
import OwnerImage from "../../../../public/svg/loginPage/owner.svg";
import UserImage from "../../../../public/svg/loginPage/user.svg";
import Explain from "./Explain";
import Tag from "../../components/Tag";
import Tag from "../../../components/Tag";
import { useRouter } from "next/router";
import { useRecoilState } from "recoil";
import { signUpDataState } from "../../recoil/login/signUpState";
import { signUpDataState } from "../../../recoil/login/signUpState";

function PickContents({ role }: { role: "owner" | "user" }) {
const router = useRouter();
Expand Down

0 comments on commit 8e44ccb

Please sign in to comment.