Skip to content

Commit

Permalink
Merge pull request #44 from lunguyenhat/develop
Browse files Browse the repository at this point in the history
Integration
  • Loading branch information
lunguyenhat authored Jun 13, 2023
2 parents febb832 + 9af0f88 commit f1fa12e
Show file tree
Hide file tree
Showing 51 changed files with 746 additions and 1,663 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

# production
/build
/dist

#vscode
.vscode
Expand Down
32 changes: 20 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
{
"name": "aesirx-crm",
"name": "aesirx-crm-app",
"version": "1.0.1",
"license": "GPL-3.0-only",
"author": "AesirX",
"repository": "https://github.com/aesirxio/crm-app",
"main": "dist/index.js",
"module": "dist/index.js",
"dependencies": {
"@ckeditor/ckeditor5-build-classic": "^35.3.2",
"@ckeditor/ckeditor5-font": "^35.2.0",
"@ckeditor/ckeditor5-html-embed": "^35.2.0",
"@ckeditor/ckeditor5-react": "^5.0.3",
"@fortawesome/fontawesome-svg-core": "^6.2.0",
"@fortawesome/free-regular-svg-icons": "^6.2.0",
"@fortawesome/free-solid-svg-icons": "^6.2.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"aesirx-ckeditor": "^1.0.0",
"aesirx-dam-app": "^1.2.11",
"aesirx-sso": "^1.0.10",
"aesirx-lib": "^1.9.7",
"aesirx-uikit": "^1.0.8",
"date-fns": "^2.16.1",
"date-fns-tz": "^1.1.6",
Expand All @@ -27,8 +24,8 @@
"react-bootstrap-typeahead": "^6.0.0",
"react-datepicker": "^4.8.0",
"react-dom": "^18.2.0",
"react-i18next": "^11.7.3",
"react-number-format": "^4.6.4",
"react-i18next": "^12.3.1",
"react-number-format": "^5.2.1",
"react-router-dom": "^5.2.0",
"react-select": "^5.4.0",
"react-table": "^7.6.2",
Expand All @@ -45,7 +42,10 @@
"lint:check": "eslint \"src/**/\"",
"lint:nowarns": "eslint --quiet \"src/**/\"",
"format:check": "prettier --check 'src/**/*.{js,jsx,ts,tsx}'",
"format:write": "prettier --write 'src/**/*.{js,jsx,ts,tsx}'"
"format:write": "prettier --write 'src/**/*.{js,jsx,ts,tsx}'",
"build:lib": "NODE_ENV=production tsup",
"dev:lib": "NODE_ENV=development tsup --watch --onSuccess 'yalc push --no-scripts'",
"prepublishOnly": "yarn build:lib"
},
"eslintConfig": {
"extends": [
Expand All @@ -72,17 +72,25 @@
"@testing-library/jest-dom": "^5.16.3",
"@testing-library/react": "^12.1.4",
"@testing-library/user-event": "^13.5.0",
"esbuild-plugin-inline-image": "^0.0.9",
"esbuild-sass-plugin": "^2.9.0",
"esbuild-scss-modules-plugin": "^1.1.1",
"eslint": "^8.17",
"git-revision-webpack-plugin": "^5.0.0",
"prettier": "^2.8.4",
"react-inject-env": "^2.1.0",
"react-scripts": "^5.0.1",
"sass": "^1.52",
"serve": "^13.0.2"
"serve": "^13.0.2",
"tsup": "^6.7.0"
},
"resolutions": {
"bootstrap": "5.2.3",
"react": "^18",
"react-dom": "^18"
}
},
"files": [
"dist",
"public/assets/images"
]
}
1 change: 0 additions & 1 deletion public/assets/data/continents/africa.json

This file was deleted.

1 change: 0 additions & 1 deletion public/assets/data/continents/asia.json

This file was deleted.

1 change: 0 additions & 1 deletion public/assets/data/continents/europe.json

This file was deleted.

1 change: 0 additions & 1 deletion public/assets/data/continents/na.json

This file was deleted.

1 change: 0 additions & 1 deletion public/assets/data/continents/oceania.json

This file was deleted.

1 change: 0 additions & 1 deletion public/assets/data/continents/sa.json

This file was deleted.

1 change: 0 additions & 1 deletion public/assets/data/continents/world.json

This file was deleted.

Loading

0 comments on commit f1fa12e

Please sign in to comment.