Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ Design ] 랜딩페이지 로띠 gif로 변경 #307

Merged
merged 6 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added src/assets/gif/logoGif.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/assets/lottie/welcome.json

This file was deleted.

19 changes: 16 additions & 3 deletions src/pages/join/JoinPage.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { BigMainLogoIc } from '@assets/svgs';
import styled from '@emotion/styled';
import JoinButton from '@pages/join/components/Button';
// import Welcome from '@pages/join/components/Welcome';
import logoGif from '@assets/gif/logoGif.gif';
import googleLogin from '@pages/login/utils/googleLogin';
import { JoinBgImgSvg } from '@assets/svgs';

const JoinPage = () => {
return (
<>
{/* <Welcome /> */}
<JoinGif src={logoGif} />
<JoinBgImgSvgIcon />
<Wrapper>
<BigMainLogoIcon />
Expand All @@ -19,6 +19,7 @@ const JoinPage = () => {
<SubTitle $isHighlight={true}>특별한 약속</SubTitle>
</TitleContainer>
</TitleWrapper>

<Gap />
<JoinButton />
<SignupContainer>
Expand Down Expand Up @@ -55,8 +56,20 @@ const JoinBgImgSvgIcon = styled(JoinBgImgSvg)`
height: 100dvh;
`;

const JoinGif = styled.img`
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);

z-index: 3;
`;

const BigMainLogoIcon = styled(BigMainLogoIc)`
z-index: 2;

width: 17.1rem;
height: 4.5rem;
`;

const TitleWrapper = styled.div`
Expand Down Expand Up @@ -120,4 +133,4 @@ const Underline = styled.hr`

const Gap = styled.div`
flex-grow: 1;
`;
`;
56 changes: 0 additions & 56 deletions src/pages/join/components/Welcome.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/pages/juniorPromise/apis/getSeniorProfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const getSeniorProfile = async (fields: string[], positions: string[]): P
const positionQuery = positions.map((position) => `position=${position}`).join('&');
const queryString = fieldQuery && positionQuery ? `${fieldQuery}&${positionQuery}` : `${fieldQuery}${positionQuery}`;
try {
const response = await authAxios.get<GetSeniorProfileResponse>(`/v1/senior/search?${queryString}`);
const response = await authAxios.get<GetSeniorProfileResponse>(`/api/v1/senior/search?${queryString}`);

return response.data;
} catch (error) {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/juniorPromiseRequest/apis/getSeniorTimeAxios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { authAxios } from '@utils/apis';

export const getSeniorTimeAxios = async (seniorId: number) => {
try {
const response = await authAxios.get(`/v1/senior/time/${seniorId}`);
const response = await authAxios.get(`/api/v1/senior/time/${seniorId}`);
// console.log(response.data.data.preferredTimeList);
return response.data.data.preferredTimeList;
} catch (error) {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/juniorPromiseRequest/apis/postAppointment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export interface postAppointmentType {

export const postAppointment = async ({ seniorId, topic, personalTopic, timeList }: postAppointmentType) => {
try {
const response = await authAxios.post('/v1/appointment', { seniorId, topic, personalTopic, timeList });
const response = await authAxios.post('/api/v1/appointment', { seniorId, topic, personalTopic, timeList });

// console.log(response.data);
return response.data;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/login/apis/loginAxios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { axios } from '@utils/apis';

export const loginAxios = (authorizationCode: string) => {
return axios.post(
'/v1/auth/login',
'/api/v1/auth/login',
{
redirectUri: import.meta.env.VITE_APP_GOOGLE_AUTH_REDIRECT_URI,
socialType: 'GOOGLE',
Expand Down
2 changes: 1 addition & 1 deletion src/pages/onboarding/apis/businesscardAxios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const businessCardAxios = async (file: File) => {
const formData = new FormData();
formData.append('businessCardImage', file);

const response = await authAxios.patch('/v1/businesscard-image', formData, {
const response = await authAxios.patch('/api/v1/businesscard-image', formData, {
headers: {
'Content-Type': 'multipart/form-data',
},
Expand Down
2 changes: 1 addition & 1 deletion src/pages/onboarding/apis/joinAxios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ export const joinAxios = (requestBody: JoinPropType) => {
// 불필요한 데이터 필터링
const { imageFile, ...request } = requestBody;

return authAxios.patch('/v1/auth/join', { ...request, isSubscribed: requestBody.isSubscribed[4] });
return authAxios.patch('/api/v1/auth/join', { ...request, isSubscribed: requestBody.isSubscribed[4] });
};
2 changes: 1 addition & 1 deletion src/pages/onboarding/apis/nicknameAxios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { axios } from "@utils/apis"

export const nicknameAxios = (nickname: string) => {
return axios.post(
'/v1/nickname',
'/api/v1/nickname',
{
nickname
},
Expand Down
4 changes: 2 additions & 2 deletions src/pages/onboarding/apis/ocrAxios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { axios } from '@utils/apis';

export const ocrUnivAxios = (imageFile: File) => {
return axios.post(
'/v1/ocr/univ',
'/api/v1/ocr/univ',
{
imageFile,
},
Expand All @@ -16,7 +16,7 @@ export const ocrUnivAxios = (imageFile: File) => {

export const ocrNameCardAxios = (imageFile: File) => {
return axios.post(
'/v1/ocr/business-card',
'/api/v1/ocr/business-card',
{
imageFile,
},
Expand Down
4 changes: 2 additions & 2 deletions src/pages/onboarding/apis/phoneAxios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { axios } from "@utils/apis"

export const phoneVerifyAxios = (phoneNumber: string) => {
return axios.post(
'/v1/phone/verify',
'/api/v1/phone/verify',
{
phoneNumber,
}
Expand All @@ -16,7 +16,7 @@ export interface phoneVerifycodePropType {

export const phoneVerifycodeAxios = ({ phoneNumber, verificationCode }: phoneVerifycodePropType) => {
return axios.post(
'/v1/phone/verifycode',
'/api/v1/phone/verifycode',
{
phoneNumber,
verificationCode,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/onboarding/apis/profileImageAxios.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { authAxios, axios } from '@utils/apis';

export const presignedUrlAxios = () => {
return authAxios.get('/v1/image');
return authAxios.get('/api/v1/image');
};

export const uploadProfileImageAxios = async (url: string, file: File) => {
Expand Down
4 changes: 2 additions & 2 deletions src/pages/onboarding/apis/searchAxios.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { axios } from '@utils/apis';

export const univNameAxios = (univName: string) => {
return axios.get('/v1/search/univ', {
return axios.get('/api/v1/search/univ', {
params: {
univName,
},
});
};

export const departmentAxios = (univName: string, deptName: string) => {
return axios.get('/v1/search/dept', {
return axios.get('/api/v1/search/dept', {
params: {
univName,
deptName,
Expand Down
4 changes: 2 additions & 2 deletions src/pages/onboarding/apis/univAxios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export interface univVerifyPropType {

export const univVerifyAxios = ({ email, univName }: univVerifyPropType) => {
return axios.post(
'/v1/univ/verify',
'/api/v1/univ/verify',
{
email,
univName,
Expand All @@ -19,7 +19,7 @@ export const univVerifyAxios = ({ email, univName }: univVerifyPropType) => {

export const univVerifycodeAxios = ({ email, univName, code }: univVerifyPropType) => {
return axios.post(
'/v1/univ/verifycode',
'/api/v1/univ/verifycode',
{
email,
univName,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/promiseDetail/apis/getPromiseDetail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { authAxios } from '@utils/apis';

export const getPromiseDetail = async (appointmentId: number) => {
try {
const response = await authAxios.get(`/v1/appointment/${appointmentId}`);
const response = await authAxios.get(`/api/v1/appointment/${appointmentId}`);
// console.log(response.data.data);
return response.data.data;
} catch (error) {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/promiseDetail/apis/patchSeniorPromiseAccept.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export interface patchSeniorAcceptRequestType {

export const patchSeniorAccept = async ({ appointmentId, googleMeetLink, timeList }: patchSeniorAcceptRequestType) => {
try {
const response = await authAxios.patch('/v1/appointment/accept', {
const response = await authAxios.patch('/api/v1/appointment/accept', {
appointmentId,
googleMeetLink,
timeList,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/promiseDetail/apis/patchSeniorReject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const patchSeniorReject = async ({
rejectDetail,
}: patchSeniorRejectRequestType) => {
try {
const response = await authAxios.patch('/v1/appointment/reject', {
const response = await authAxios.patch('/api/v1/appointment/reject', {
appointmentId,
rejectReason,
rejectDetail,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/promiseDetail/apis/postGoogleMeetLink.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { authAxios } from '@utils/apis';

export const postGoogleMeetLink = async () => {
try {
const response = await authAxios.post('/v1/google-meet');
const response = await authAxios.post('/api/v1/google-meet');
// console.log(response.data.data.googleMeet);
return response.data.data.googleMeet;
} catch (err) {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/promiseList/apis/getGoogleMeetLink.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { authAxios } from '@utils/apis';

export const getGoogleMeetLink = async (appointmentId: number) => {
try {
const response = await authAxios.get(`/v1/google-meet/${appointmentId}`);
const response = await authAxios.get(`/api/v1/google-meet/${appointmentId}`);
// console.log(response.data.data.googleMeetLink);
return response.data.data.googleMeetLink;
} catch (error) {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/promiseList/apis/getPromiseList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { authAxios } from '@utils/apis';

export const getPromiseList = async () => {
try {
const response = await authAxios.get(`/v1/appointment`);
const response = await authAxios.get(`/api/v1/appointment`);
// console.log(response.data);
return response.data.data;
} catch (error) {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/seniorProfile/apis/getSeniorProfileAxios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ import { authAxios } from "@utils/apis"

export const getSeniorProfileAxios = (seniorId: string) => {
return authAxios.get(
`/v1/senior/${seniorId}`
`/api/v1/senior/${seniorId}`
)
}
2 changes: 1 addition & 1 deletion src/pages/seniorProfile/apis/seniorCardAxios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ import { authAxios } from "@utils/apis"

export const seniorCardAxios = (seniorId: string) => {
return authAxios.get(
`/v1/senior/card/${seniorId}`
`/api/v1/senior/card/${seniorId}`
)
}
2 changes: 1 addition & 1 deletion src/pages/seniorProfile/apis/seniorProfileAxios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { seniorProfileAPIType } from '@pages/seniorProfile/types';
import { authAxios } from '@utils/apis';

export const seniorProfileAxios = ({ catchphrase, career, award, story, preferredTimeList }: seniorProfileAPIType) => {
return authAxios.patch('/v1/senior/profile', {
return authAxios.patch('/api/v1/senior/profile', {
catchphrase,
career,
award,
Expand Down
6 changes: 4 additions & 2 deletions src/utils/apis/index.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import { getToken } from '@utils/storage';
import * as _axios from 'axios';

const baseUrl = import.meta.env.VITE_APP_API_BASE_URL;

export const axios = _axios.default.create({
baseURL: '/api',
baseURL: `${baseUrl}`,
headers: {
'Content-Type': 'application/json',
},
});

export const authAxios = _axios.default.create({
baseURL: '/api',
baseURL: `${baseUrl}`,
headers: {
'Content-Type': 'application/json',
},
Expand Down
Loading