Skip to content

Commit

Permalink
Merge pull request #71 from LM-channel-team-project/fix/config
Browse files Browse the repository at this point in the history
Fix/config
  • Loading branch information
pkiop authored Aug 1, 2021
2 parents 3174789 + 739d9d5 commit c1e8e78
Show file tree
Hide file tree
Showing 10 changed files with 31,696 additions and 59 deletions.
2 changes: 2 additions & 0 deletions client/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
.env.test.local
.env.production.local

.env

npm-debug.log*
yarn-debug.log*
yarn-error.log*
Expand Down
31,716 changes: 31,688 additions & 28 deletions client/package-lock.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"aws-amplify-react": "^4.2.30",
"aws-appsync": "^4.0.3",
"aws-appsync-auth-link": "^3.0.4",
"dotenv": "^8.6.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router-dom": "^5.2.0",
Expand Down Expand Up @@ -70,7 +71,8 @@
},
"lint-staged": {
"*.{ts,tsx}": [
"prettier --write", "eslint --fix"
"prettier --write",
"eslint --fix"
]
}
}
Binary file removed client/public/favicon.ico
Binary file not shown.
2 changes: 0 additions & 2 deletions client/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Expand Down
Binary file removed client/public/logo192.png
Binary file not shown.
Binary file removed client/public/logo512.png
Binary file not shown.
25 changes: 0 additions & 25 deletions client/public/manifest.json

This file was deleted.

4 changes: 2 additions & 2 deletions client/src/Apollo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import Amplify, { Auth } from 'aws-amplify';

Amplify.configure(appSyncConfig);

const url = appSyncConfig.aws_appsync_graphqlEndpoint;
const region = appSyncConfig.aws_appsync_region;
const url = appSyncConfig.aws_appsync_graphqlEndpoint as string;
const region = appSyncConfig.aws_appsync_region as string;
const authenticationType = ['AMAZON_COGNITO_USER_POOLS', 'API_KEY'];

const apiAuthLink = createAuthLink({
Expand Down
2 changes: 1 addition & 1 deletion client/src/page/Login/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const LoginPage = ({ className }: any) => {
return (
<S.LoginPage className={className}>
<S.wrapper>
<S.Title>Team Auto Mathcer</S.Title>
<S.Title>Team Auto Matcher</S.Title>
<S.Explanation>로그인이 필요합니다.</S.Explanation>
<S.Explanation>
로그인을 하셨다면
Expand Down

0 comments on commit c1e8e78

Please sign in to comment.