Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
4d746e3
commit branch develop
sinhnt-vmo Mar 2, 2022
0cbbece
[Richard] Add CICD
richard-vmo Mar 4, 2022
a439b10
Merge pull request #1 from metaxy-official/devops/add-cicid
richard-vmo Mar 4, 2022
7091233
fix yarn.lock
sinhnt-vmo Mar 8, 2022
3633238
fix yarn.lock
sinhnt-vmo Mar 8, 2022
267e1c8
baseline (#2)
Xavi-vmo Mar 8, 2022
2c21bfa
create list type user page (#3)
Xavi-vmo Mar 9, 2022
a6c446b
List type user (#4)
Xavi-vmo Mar 9, 2022
8cadf7f
fix more action (#5)
Xavi-vmo Mar 9, 2022
6747e4c
coding login component (#6)
VictorNguyen-creator Mar 10, 2022
4c0ca0a
Feature/login admin (#7)
VictorNguyen-creator Mar 10, 2022
c9e5561
merge code
DungPQ98 Mar 10, 2022
d11ad7b
add feature manager user page (#8)
Xavi-vmo Mar 10, 2022
3731ffb
add list user page and edit columns table (#9)
Xavi-vmo Mar 11, 2022
11b2cec
add page create user (#10)
Xavi-vmo Mar 11, 2022
1432268
Feature/manage player (#11)
VictorNguyen-creator Mar 11, 2022
03280f9
add modal users (#12)
Xavi-vmo Mar 14, 2022
e62d57b
Feature/manage player (#13)
VictorNguyen-creator Mar 14, 2022
19b1758
add modal confirm delete (#14)
Xavi-vmo Mar 14, 2022
2666f2a
edit three dot for table (#15)
Xavi-vmo Mar 15, 2022
cc22fc1
add modal edit bug report (#16)
Xavi-vmo Mar 16, 2022
246544e
merge code
DungPQ98 Mar 16, 2022
ad99060
Feature/manage player (#17)
VictorNguyen-creator Mar 16, 2022
a13e026
rename pages and add bug details report
Xavi-vmo Mar 16, 2022
2a00b2b
Merge pull request #18 from metaxy-official/feature/rename-pages
Xavi-vmo Mar 16, 2022
afaf5bc
add bug details page
Xavi-vmo Mar 17, 2022
efdb56f
Merge pull request #19 from metaxy-official/feature/edit-bug-pages
Xavi-vmo Mar 17, 2022
cac7388
Feature/manage player (#20)
VictorNguyen-creator Mar 18, 2022
de44595
add notification pages
Xavi-vmo Mar 18, 2022
ee9f982
Merge pull request #21 from metaxy-official/feature/notification-pages
Xavi-vmo Mar 18, 2022
001df7e
fix modal in table
Xavi-vmo Mar 20, 2022
0fa823d
Merge pull request #22 from metaxy-official/fix/modals
Xavi-vmo Mar 20, 2022
677b659
update UI game manager
DungPQ98 Mar 21, 2022
82e1bd4
Feature/manage player (#23)
VictorNguyen-creator Mar 22, 2022
b9adcb3
add ingame page
Xavi-vmo Mar 22, 2022
08ddc50
Merge pull request #24 from metaxy-official/feature/ingame-page
Xavi-vmo Mar 22, 2022
8e9b9e9
add noti type page
Xavi-vmo Mar 22, 2022
f11a49c
Merge pull request #25 from metaxy-official/feature/type-pages-noti
Xavi-vmo Mar 22, 2022
28f35b4
config api list user
Xavi-vmo Mar 23, 2022
828844f
Merge pull request #26 from metaxy-official/feature/config-api
Xavi-vmo Mar 23, 2022
60f8865
Feature/manage player (#27)
VictorNguyen-creator Mar 24, 2022
05671b3
connect to api and fill data
Xavi-vmo Mar 24, 2022
1e152a2
Merge pull request #28 from metaxy-official/feature/page-detail-user
Xavi-vmo Mar 24, 2022
7542982
Feature/manage player (#29)
VictorNguyen-creator Mar 25, 2022
a3f6f77
edit table loading
Xavi-vmo Mar 26, 2022
46e5d7a
Merge pull request #30 from metaxy-official/feature/details-pages
Xavi-vmo Mar 26, 2022
2a2c954
Feature/manage player (#31)
VictorNguyen-creator Mar 28, 2022
aba2681
add api create a new user
Xavi-vmo Mar 28, 2022
2693e1c
Merge pull request #32 from metaxy-official/feature/page-create-user
Xavi-vmo Mar 28, 2022
34cc978
Feature/manage player (#33)
VictorNguyen-creator Mar 28, 2022
2ed0593
edit user page and config store
Xavi-vmo Mar 28, 2022
58230a3
Merge pull request #34 from metaxy-official/feature/edit-user-page
Xavi-vmo Mar 28, 2022
f88a90e
update user information
Xavi-vmo Mar 29, 2022
2a6e3a7
Merge pull request #35 from metaxy-official/feature/update-user
Xavi-vmo Mar 29, 2022
77711ff
update password user
Xavi-vmo Mar 29, 2022
d3fd1f6
Merge pull request #36 from metaxy-official/feature/update-pass
Xavi-vmo Mar 29, 2022
eab22a7
Feature/manage player (#37)
VictorNguyen-creator Mar 31, 2022
f39c3a7
edit page and create page type role, fix reload bug
Xavi-vmo Mar 31, 2022
153dcee
Merge pull request #38 from metaxy-official/feature/edit-role-user
Xavi-vmo Mar 31, 2022
193dfb0
Feature/manage player (#39)
VictorNguyen-creator Mar 31, 2022
515e8f4
fix edit and create type role page
Xavi-vmo Apr 1, 2022
89592c3
Merge pull request #40 from metaxy-official/feature/edit-role-user
Xavi-vmo Apr 1, 2022
2e05515
delete type user
Xavi-vmo Apr 1, 2022
48cb56d
Merge pull request #41 from metaxy-official/feature/delete-type-user
Xavi-vmo Apr 1, 2022
802ce5a
fix route login
Xavi-vmo Apr 4, 2022
88d95c1
Merge pull request #42 from metaxy-official/feature/fix-route
Xavi-vmo Apr 4, 2022
8b1104d
done feature manager notify user
Xavi-vmo Apr 4, 2022
9387a4c
Merge pull request #43 from metaxy-official/feature/manager-user-notify
Xavi-vmo Apr 4, 2022
1b21153
Feature/manage player (#44)
VictorNguyen-creator Apr 5, 2022
66a1a5e
add list noti-type
Xavi-vmo Apr 5, 2022
2dd48f3
Merge pull request #45 from metaxy-official/feature/noti-list
Xavi-vmo Apr 5, 2022
c7eaa1d
add delete and update notify type
Xavi-vmo Apr 6, 2022
5813737
Merge pull request #47 from metaxy-official/feature/noti-list
Xavi-vmo Apr 6, 2022
acf46d8
config auth again
Xavi-vmo Apr 8, 2022
c6374bd
Merge pull request #48 from metaxy-official/feature/config-auth
Xavi-vmo Apr 8, 2022
3ebc79d
details page notify cms
Xavi-vmo Apr 12, 2022
03468da
Merge pull request #49 from metaxy-official/feature/detail-notify-cms
Xavi-vmo Apr 12, 2022
81ea9aa
create new notification in CMS
Xavi-vmo Apr 14, 2022
94ebf8f
Merge pull request #50 from metaxy-official/feature/create-notify-CMS
Xavi-vmo Apr 14, 2022
8787c6c
update notify cms
Xavi-vmo Apr 15, 2022
f593b86
Merge pull request #51 from metaxy-official/feature/update-notify-cms
Xavi-vmo Apr 15, 2022
f5e5177
update permission
Xavi-vmo Apr 15, 2022
303bab5
Merge pull request #52 from metaxy-official/feature/update-config-per…
Xavi-vmo Apr 15, 2022
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
2 changes: 2 additions & 0 deletions .env.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
NODE_ENV=development
REACT_APP_GATEKEEPER_URL=https://api-cms.metaxy.game/
76 changes: 76 additions & 0 deletions .github/workflows/deploy-develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: Deploy develop
on:
push:
branches:
- develop

env:
PROJECT_NAME: ${{ secrets.PROJECT_NAME }}
PROJECT_PATH: ${{ secrets.PROJECT_PATH }}

jobs:
build-and-run:
runs-on: ubuntu-latest
timeout-minutes: 5

strategy:
matrix:
node-version: [14.x]

steps:
- uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}

- uses: actions/cache@v2
with:
path: |
~/.cache/yarn
${{ github.workspace }}/node_modules
key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-node-

- name: Install depends
run: yarn

- name: Setup env
run: cp .env.dev .env

- name: Build
run: CI=false yarn build

- name: Zip build
run: zip -r build.zip build

- name: Configure SSH
run: |
mkdir -p ~/.ssh/
echo "$SSH_PRIVATE_KEY" > ~/.ssh/dev.key
chmod 600 ~/.ssh/dev.key
cat >>~/.ssh/config <<END
Host dev
HostName $SSH_HOST
User $SSH_USER
IdentityFile ~/.ssh/dev.key
StrictHostKeyChecking no
END
env:
SSH_USER: ${{ secrets.SSH_USER }}
SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
SSH_HOST: ${{ secrets.SSH_HOST_DEV }}

- name: Scp server
run: scp -F ~/.ssh/config build.zip dev:/tmp

- name: Unzip
run: ssh dev "rm -rf $PROJECT_PATH/$PROJECT_NAME/* && unzip -o /tmp/build.zip -d $PROJECT_PATH/$PROJECT_NAME"

- name: Deploy
run: ssh dev "cd $PROJECT_PATH && ./deploy.sh"

- name: Clean cache build
run: ssh dev "rm -rf /tmp/build.zip"
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
**
node_modules
package-lock.json
.next
4 changes: 2 additions & 2 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
trailingComma: 'none',
singleQuote: true,
trailingComma: "none",
singleQuote: false,
printWidth: 80,
semi: true,
bracketSpacing: false
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"editor.formatOnPaste": false,
"editor.formatOnSave": false,
"editor.formatOnSave": true,
"editor.formatOnType": false,
"prettier-eslint.eslintIntegration": true,
"javascript.preferences.importModuleSpecifier": "non-relative"
Expand Down
Loading