Skip to content

Commit ee0450d

Browse files
AngelaChaejungAngelaChaejung
authored
Merge pull request #101 from gnims-project/dev
Upload/Main Merge #100 test 배포
2 parents 84e3a48 + c05e1c3 commit ee0450d

File tree

134 files changed

+26414
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+26414
-0
lines changed

‎.gitignore

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2+
3+
# dependencies
4+
node_modules/
5+
/.pnp
6+
.pnp.js
7+
.env
8+
# testing
9+
/coverage
10+
11+
# production
12+
/build
13+
14+
# misc
15+
.DS_Store
16+
.env.local
17+
.env.development.local
18+
.env.test.local
19+
.env.production.local
20+
21+
npm-debug.log*
22+
yarn-debug.log*
23+
yarn-error.log*
24+
25+
node_modules
26+
yarn-error.log
27+
*.json
28+
29+
*.env

‎package.json

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"name": "gnims-pwa",
3+
"version": "0.1.0",
4+
"private": true,
5+
"dependencies": {
6+
"@reduxjs/toolkit": "^1.9.2",
7+
"@testing-library/jest-dom": "^5.16.1",
8+
"@testing-library/react": "^13.0.0",
9+
"@testing-library/user-event": "^13.5.0",
10+
"axios": "^1.3.2",
11+
"event-source-polyfill": "^1.0.31",
12+
"html-webpack-plugin": "^5.5.0",
13+
"json-server": "^0.17.1",
14+
"picker": "^0.1.4",
15+
"react": "^18.2.0",
16+
"react-date": "^2.0.0",
17+
"react-datepicker": "^4.10.0",
18+
"react-dom": "^18.2.0",
19+
"react-modal": "^3.16.1",
20+
"react-redux": "^8.0.5",
21+
"react-router-dom": "^6.8.1",
22+
"react-scripts": "5.0.1",
23+
"react-spinners": "^0.13.8",
24+
"redux": "^4.2.1",
25+
"styled-components": "^5.3.6",
26+
"styled-reset": "^4.4.5",
27+
"tailwindcss": "^3.2.6",
28+
"web-vitals": "^2.1.4",
29+
"workbox-background-sync": "^6.4.2",
30+
"workbox-broadcast-update": "^6.4.2",
31+
"workbox-cacheable-response": "^6.4.2",
32+
"workbox-core": "^6.4.2",
33+
"workbox-expiration": "^6.4.2",
34+
"workbox-google-analytics": "^6.4.2",
35+
"workbox-navigation-preload": "^6.4.2",
36+
"workbox-precaching": "^6.4.2",
37+
"workbox-range-requests": "^6.4.2",
38+
"workbox-routing": "^6.4.2",
39+
"workbox-strategies": "^6.4.2",
40+
"workbox-streams": "^6.4.2"
41+
},
42+
"scripts": {
43+
"start": "react-scripts start",
44+
"build": "react-scripts build",
45+
"test": "react-scripts test",
46+
"eject": "react-scripts eject"
47+
},
48+
"eslintConfig": {
49+
"extends": [
50+
"react-app",
51+
"react-app/jest"
52+
]
53+
},
54+
"browserslist": {
55+
"production": [
56+
">0.2%",
57+
"not dead",
58+
"not op_mini all"
59+
],
60+
"development": [
61+
"last 1 chrome version",
62+
"last 1 firefox version",
63+
"last 1 safari version"
64+
]
65+
}
66+
}

‎public/index.html

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<script
5+
type="text/javascript"
6+
src="https://static.nid.naver.com/js/naveridlogin_js_sdk_2.0.0.js"
7+
charset="utf-8"
8+
></script>
9+
<meta charset="utf-8" />
10+
<meta name="viewport" content="width=device-width, initial-scale=1" />
11+
<meta name="theme-color" content="#000000" />
12+
<meta
13+
name="description"
14+
content="Web site created using create-react-app"
15+
/>
16+
<!--
17+
manifest.json provides metadata used when your web app is installed on a
18+
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
19+
-->
20+
<link rel="/manifest" href="%PUBLIC_URL%/manifest.json" />
21+
<!--
22+
Notice the use of %PUBLIC_URL% in the tags above.
23+
It will be replaced with the URL of the `public` folder during the build.
24+
Only files inside the `public` folder can be referenced from the HTML.
25+
26+
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
27+
work correctly both with client-side routing and a non-root public URL.
28+
Learn how to configure a non-root public URL by running `npm run build`.
29+
-->
30+
<title>React App</title>
31+
</head>
32+
<body>
33+
<noscript>You need to enable JavaScript to run this app.</noscript>
34+
<div id="root"></div>
35+
<!--
36+
This HTML file is a template.
37+
If you open it directly in the browser, you will see an empty page.
38+
39+
You can add webfonts, meta tags, or analytics to this file.
40+
The build step will place the bundled scripts into the <body> tag.
41+
42+
To begin the development, run `npm start` or `yarn start`.
43+
To create a production bundle, use `npm run build` or `yarn build`.
44+
-->
45+
</body>
46+
</html>

‎public/manifest.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"short_name": "React App",
3+
"name": "Create React App Sample",
4+
"start_url": ".",
5+
"display": "standalone",
6+
"theme_color": "#000000",
7+
"background_color": "#ffffff"
8+
}

‎public/robots.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# https://www.robotstxt.org/robotstxt.html
2+
User-agent: *
3+
Disallow:

‎src/App.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import React from "react";
2+
import Router from "./shared/Router";
3+
import GlobalStyles from "./styles/GlobalStyle";
4+
5+
function App() {
6+
return (
7+
<>
8+
<GlobalStyles />
9+
<Router />
10+
</>
11+
);
12+
}
13+
14+
export default App;

‎src/App.test.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import React from 'react';
2+
import { render, screen } from '@testing-library/react';
3+
import App from './App';
4+
5+
test('renders learn react link', () => {
6+
render(<App />);
7+
const linkElement = screen.getByText(/learn react/i);
8+
expect(linkElement).toBeInTheDocument();
9+
});

‎src/api/LoginApi.jsx

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import { instance } from "../shared/AxiosInstance";
2+
3+
export const LoginApi = {
4+
EmailLogin: (payload) => {
5+
const data = instance.post("/auth/login", payload);
6+
return data;
7+
},
8+
9+
KakaoLogin: async (payload) => {
10+
console.log("카카오 페이로드", payload);
11+
return await instance.post("kakao/login", payload);
12+
},
13+
14+
SendEmailAuthenticationNumber: async (payload) => {
15+
return await instance.post("/auth/password", payload);
16+
},
17+
18+
SendAuthenticationNumber: async (payload) => {
19+
return await instance.patch("/auth/code", payload);
20+
},
21+
};

‎src/api/ScheduleApi.jsx

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import { instance } from "../shared/AxiosInstance";
2+
3+
export const ScheduleApi = {
4+
//스케줄 전체 조회
5+
getSccheduleApi: (payload) => {
6+
//const data = instance.get(`/v2-dto/users/${payload}/events`);
7+
const data = instance.get(`/users/${payload}/events`);
8+
return data;
9+
},
10+
11+
getInfiniteScrollPage: (payload) => {
12+
const data = instance.get(
13+
`/v2-page/users/${payload.userId}/events?page=${payload.page}&size=${3}`
14+
);
15+
return data;
16+
},
17+
18+
//스케줄 등록
19+
postScheduleApi: (payload) => {
20+
const data = instance.post("/events", payload);
21+
return data;
22+
},
23+
//스케줄 수정
24+
editScheduleApi: (payload) => {
25+
console.log("수정데이터?", payload);
26+
const data = instance.put(`/events/${payload.eventId}`, payload.Schedule);
27+
return data;
28+
},
29+
30+
//지난일정 조회
31+
getPastScheduleApi: () => {
32+
const data = instance.get("/events/past");
33+
return data;
34+
},
35+
36+
//스케줄 삭제
37+
deleteScheduleApi: (payload) => {
38+
const data = instance.delete(`/events/${payload}`);
39+
return data;
40+
},
41+
};

‎src/api/Signup.jsx

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { instance } from "../shared/AxiosInstance";
2+
3+
export const SignupApi = {
4+
emailDoubleCheck: async (payload) => {
5+
const { data } = await instance.post("/auth/email", payload);
6+
return data;
7+
},
8+
nickNameDoubleCheck: async (payload) => {
9+
const { data } = await instance.post("/auth/nickname", payload);
10+
return data;
11+
},
12+
13+
Signup: async (payload) => {
14+
const { data } = await instance.post("/auth/signup", payload);
15+
return data;
16+
},
17+
};

‎src/api/UserApi.jsx

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { async } from "q";
2+
import { instance } from "../shared/AxiosInstance";
3+
4+
export const UserApi = {
5+
userSearch: async (payload) => {
6+
const { data } = await instance.get(
7+
`/users/search?username=${payload}&page=${0}&size=${10}`,
8+
payload
9+
);
10+
return data;
11+
},
12+
editProfile: async (payload) => {
13+
const data = await instance.patch("users/profile", payload);
14+
return data;
15+
},
16+
passwordChange: async (payload) => {
17+
const { data } = await instance.patch("/auth/password", payload);
18+
return data;
19+
},
20+
};

0 commit comments

Comments
 (0)