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

2.0.0 배포 #609

Merged
merged 24 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4c55e87
[FE] Feat/#554 search 지도 검색 기능 구현 (#555)
jiwonh423 Oct 6, 2023
5a96390
[FE] refactor/#450 모아보기 기능 비회원도 가능하도록 수정 (#516)
GC-Park Oct 6, 2023
8ef188d
chore: eslint 설정 적용 (#557)
jiwonh423 Oct 6, 2023
df6ba08
[FE] Refactor/eslint ESLint 추가 적용 (#559)
semnil5202 Oct 6, 2023
d21a556
feat/#564 poi 적용 (#566)
jiwonh423 Oct 12, 2023
73896dd
hotfix: dotenv 추가 (#574)
jiwonh423 Oct 12, 2023
f31be53
hotfix: env 이름 형식 통일 (#575)
GC-Park Oct 12, 2023
1fca8df
hotfix: DotenvWebpackPlugin추가 (#576)
jiwonh423 Oct 12, 2023
88d3978
fix: require 수정 (#577)
jiwonh423 Oct 12, 2023
d3bd94e
[FE] Feature/#560 메인 페이지에 swiper 및 배너 적용 (#569)
semnil5202 Oct 13, 2023
02872e2
[FE] Refactor/#572 핀 이미지 태그로 교체 및 아이콘 소스 검토 (#573)
semnil5202 Oct 13, 2023
df8f0cc
Hotfix/swiper UI (#579)
semnil5202 Oct 13, 2023
ff18a09
[FE] Feature/#550 토픽 이미지 수정 및 핀 이미지 삭제 기능 (#583)
GC-Park Oct 13, 2023
45d395d
[FE] Feat/#588 현재 위치 이동 버튼 (#589)
jiwonh423 Oct 16, 2023
a9be810
[FE] Refactor/#578 지도 핀 Boundary 조정 (#590)
semnil5202 Oct 17, 2023
a28aaec
Hotfix/current position (#594)
semnil5202 Oct 17, 2023
9ee045a
refactor: 사용자 위치 조회 로직 수정 (#596)
semnil5202 Oct 17, 2023
f9c8a8b
refactor: 현재 위치 요청 로직 변경 (#599)
semnil5202 Oct 17, 2023
4f477d0
refactor: watchPosition 에서 getCurrentPosition으로 변경 (#600)
semnil5202 Oct 17, 2023
d7fc2e0
[FE] Feat/#592 핀 디테일의 핀 이미지 클릭 시 모달을 통해 크게 보이는 기능 구현 (#595)
GC-Park Oct 19, 2023
d0eab4d
[FE] Feat/#597 댓글 기능 구현 (#598)
jiwonh423 Oct 19, 2023
4574c3a
[FE] Feat/#604 image swiper 적용 및 image size limit 적용 (#608)
GC-Park Oct 19, 2023
4dce3c3
[FE] Refactor/#593 모아보기와 단일조회페이지 분리 및 리팩토링 (#607)
semnil5202 Oct 19, 2023
f7279ce
Merge branch 'main' into develop-FE
semnil5202 Oct 19, 2023
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
3 changes: 2 additions & 1 deletion .github/workflows/fe-merge-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:

pull_request:
branches: [develop-FE-2]
branches: [develop-FE]
types: [closed]
paths: frontend/**

Expand Down Expand Up @@ -35,6 +35,7 @@ jobs:
working-directory: frontend
env:
REACT_APP_GOOGLE_ANALYTICS: ${{ secrets.REACT_APP_GOOGLE_ANALYTICS }}
REACT_APP_TMAP_API_KEY: ${{ secrets.REACT_APP_TMAP_API_KEY }}
APP_URL: "https://mapbefine.kro.kr/api"

- name: upload to artifact
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fe-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Frontend CI For Test Validation
on:
# pull request open과 reopen 시 실행한다.
pull_request:
branches: [main, develop-FE-2]
branches: [main, develop-FE]
paths: frontend/**

defaults:
Expand Down
21 changes: 21 additions & 0 deletions frontend/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,27 @@ module.exports = {
],
'simple-import-sort/imports': 'error',
'simple-import-sort/exports': 'error',
'no-undef': 'off',
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': 'off',
'import/prefer-default-export': 'off',
'no-use-before-define': 'off',
'react/require-default-props': 'off',
'react/destructuring-assignment': 'off',
'react/jsx-no-constructed-context-values': 'off',
'no-restricted-globals': 'off',
'no-shadow': 'off',
'consistent-return': 'off',
'no-restricted-syntax': 'off',
'no-await-in-loop': 'off',
'no-param-reassign': 'off',
'jsx-a11y/tabindex-no-positive': 'off',
'react/no-array-index-key': 'off',
'react/jsx-no-useless-fragment': 'off',
'no-unused-expressions': 'off',
'react/jsx-props-no-spreading': 'off',
'react/no-unused-prop-types': 'off',
'import/no-extraneous-dependencies': 'off',
},
settings: {
'import/resolver': {
Expand Down
203 changes: 199 additions & 4 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
"license": "ISC",
"dependencies": {
"history": "^5.3.0",
"map-befine-swiper": "^0.8.2",
"msw-storybook-addon": "^1.8.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-ga4": "^2.1.0",
"react-router-dom": "^6.14.1",
"styled-components": "^6.0.3"
"styled-components": "^6.0.3",
"zustand": "^4.4.3"
},
"devDependencies": {
"@babel/core": "^7.22.8",
Expand All @@ -48,6 +50,7 @@
"@types/react-dom": "^18.2.6",
"@types/react-router-dom": "^5.3.3",
"@types/styled-components": "^5.1.26",
"@typescript-eslint/parser": "^6.7.4",
"babel-loader": "^9.1.3",
"babel-plugin-styled-components": "^2.1.4",
"browser-image-compression": "^2.0.2",
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<base href="/" />
<link
rel="icon"
href="https://velog.velcdn.com/images/semnil5202/post/1e21ec8d-7139-4b78-b298-161515a5edd2/image.svg"
href="https://dr702blqc4x5d.cloudfront.net/2023-map-be-fine/icon/favicon.svg"
/>
<meta charset="utf-8" />
<meta name="theme-color" content="#000000" />
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { RouterProvider } from 'react-router-dom';

import router from './router';

const App = () => {
function App() {
return <RouterProvider router={router} />;
};
}

export default App;
6 changes: 3 additions & 3 deletions frontend/src/GlobalStyle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ const GlobalStyle = createGlobalStyle`
font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
}

a{
a {
text-decoration:none;
color: #000;
transition: all 0.3s ease-in-out;
}

ul{
ul {
padding-left: 0;
margin:0;
list-style-type: none;
}

*{
* {
box-sizing:border-box;
}

Expand Down
Loading
Loading