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

Develop #82

Merged
merged 55 commits into from
Nov 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
199260a
Updating navigation in progress
jongwooha98 Nov 2, 2021
2dbc31b
feat: Initial 2048 attempt
jongwooha98 Nov 3, 2021
53e769b
feat: Update game2048
jongwooha98 Nov 4, 2021
2ef13f7
Merge pull request #70 from karrotmvp/feat/game-2048
jongwooha98 Nov 4, 2021
d9286ba
Merge pull request #71 from karrotmvp/Game2048
jongwooha98 Nov 4, 2021
4079d14
Change useHistory(react-router) to useNavigator(karrotframe)
jongwooha98 Nov 4, 2021
35bf54c
restructure routing
jongwooha98 Nov 4, 2021
2f0930f
Remove unused lines
jongwooha98 Nov 4, 2021
6f0f831
Merge pull request #72 from karrotmvp/restructure-navigation
jongwooha98 Nov 4, 2021
192bece
Change folder, no code change
jongwooha98 Nov 4, 2021
e2e3b84
feat: Add react-swipeable
jongwooha98 Nov 4, 2021
aa7d34e
update css
jongwooha98 Nov 4, 2021
25f720a
feat: Add openapi generator
jongwooha98 Nov 5, 2021
ffd83fc
feat: Add minigame API context
jongwooha98 Nov 5, 2021
e2478ec
OldButton is deprecated
jongwooha98 Nov 5, 2021
0f63a48
chore: Add codegen (openapi generator)
jongwooha98 Nov 5, 2021
0170dc8
Merge pull request #73 from karrotmvp/feat/game-2048
jongwooha98 Nov 5, 2021
3a2e38a
Update develop-deploy.yml
jongwooha98 Nov 5, 2021
6e4506c
chore: openapi generator
jongwooha98 Nov 5, 2021
44fade9
Merge branch 'develop' of https://github.com/karrotmvp/minigame-karro…
jongwooha98 Nov 5, 2021
732609f
Update develop-deploy.yml
jongwooha98 Nov 5, 2021
9c00927
wip: update styles
jongwooha98 Nov 6, 2021
7386a91
wip: style update
jongwooha98 Nov 6, 2021
2e544f6
update: Run openapi generator
jongwooha98 Nov 6, 2021
809b82c
wip: game 2048
jongwooha98 Nov 7, 2021
da36a64
wip: game 2048
jongwooha98 Nov 7, 2021
0ffca22
wip: Delete unused imports
jongwooha98 Nov 7, 2021
c7bad01
wip: openapi generator
jongwooha98 Nov 8, 2021
83a7b62
fix: Fix circular dependency problem of useAccessToken
jongwooha98 Nov 9, 2021
a6ad61a
fix: Fix circular dependency issue of access-token
jongwooha98 Nov 9, 2021
b706194
design update
jongwooha98 Nov 9, 2021
a50677f
temporary direct '/' page to karro-clicker
jongwooha98 Nov 9, 2021
a1486f1
Merge branch 'develop' into feat/game-2048
jongwooha98 Nov 9, 2021
e7d5da8
Merge pull request #76 from karrotmvp/feat/game-2048
jongwooha98 Nov 9, 2021
ebee766
refactor: Refactor karrot-clicker
jongwooha98 Nov 10, 2021
8443086
Attach revised FA log events
jongwooha98 Nov 10, 2021
917df5e
wip: fix navigation
jongwooha98 Nov 10, 2021
19cc335
fix: Fix modal non-closing issue &
jongwooha98 Nov 11, 2021
dea57d4
fix: Fix incorrectly linked redux state
jongwooha98 Nov 11, 2021
fba8f9e
Refactor: Rename 'userName' to 'nickname'
jongwooha98 Nov 11, 2021
a535dec
fix: Fix karrot clicker game
jongwooha98 Nov 11, 2021
e7e7cec
update design
jongwooha98 Nov 11, 2021
0bd187a
Merge pull request #81 from karrotmvp/fix/karrot-clicker-game
jongwooha98 Nov 11, 2021
b3e785d
Update develop-deploy.yml
jongwooha98 Nov 11, 2021
6610446
chore: Inject basepath from github actions
jongwooha98 Nov 11, 2021
979eefc
chore: change app title
jongwooha98 Nov 11, 2021
c394e30
update css
jongwooha98 Nov 11, 2021
6950601
fix: preset to game start flow
jongwooha98 Nov 11, 2021
a149942
fix: Fix user data saving issue for new user
jongwooha98 Nov 11, 2021
ad14994
delete unused lines
jongwooha98 Nov 11, 2021
f2c7052
Merge branch 'main' into develop
jongwooha98 Nov 11, 2021
25807f1
chore: delete codegen script on github actions
jongwooha98 Nov 11, 2021
b5a7799
fix: Don't display user's row if user score is 0
jongwooha98 Nov 11, 2021
1c182ea
fix: Set user info
jongwooha98 Nov 11, 2021
9ceb5f1
feat: Throttle leaderboard refresh button & Add FA
jongwooha98 Nov 11, 2021
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
6 changes: 1 addition & 5 deletions .github/workflows/develop-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@ jobs:
run: npm install

- name: Build
env:
SWAGGER_URL: 'https://api-alpha.daangn-ourapt.com/v2/api-docs'
run: |
npm run codegen
npm run build
run: npm run build

- name: Deploy to S3
uses: jakejarvis/s3-sync-action@master
Expand Down
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "pwa-chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:8080",
"webRoot": "${workspaceFolder}"
}
]
}
7 changes: 7 additions & 0 deletions openapitools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
"spaces": 2,
"generator-cli": {
"version": "5.3.0"
}
}
Loading