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

merge #7

Merged
merged 60 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
d76cfa9
feat: finish NIG-380 login ui and invite ui
aboutmydreams Jan 22, 2024
486d712
fix: delete unuse import
aboutmydreams Jan 22, 2024
10b29c1
fix: delete unuse import
aboutmydreams Jan 22, 2024
6ce5267
fix: delete unuse import
aboutmydreams Jan 22, 2024
a919ea9
feat: explore and activity page
hujie123456 Jan 23, 2024
6b6e4d0
Merge pull request #1 from BuidlerDAO/xpet
aboutmydreams Jan 23, 2024
f903a31
feat: finish CongratulationPage
aboutmydreams Jan 24, 2024
8476437
Merge pull request #2 from BuidlerDAO/congration
aboutmydreams Jan 24, 2024
b746ca3
feat: add targetElements observer
aboutmydreams Jan 25, 2024
d8122c7
feat: wallet page
hujie123456 Jan 25, 2024
3b608ed
feat: wallet page
hujie123456 Jan 30, 2024
c6eebaf
feat: finish vote component
aboutmydreams Jan 30, 2024
2b1a713
Merge pull request #3 from BuidlerDAO/congration
aboutmydreams Jan 30, 2024
05d8ad4
fix: add https to host_permissions
aboutmydreams Jan 30, 2024
487af1c
feat: all modal
hujie123456 Jan 31, 2024
c5cf59e
Merge remote-tracking branch 'origin/main' into wallet
hujie123456 Jan 31, 2024
56fd4d8
Merge pull request #5 from BuidlerDAO/wallet
hujie123456 Jan 31, 2024
bfc656b
feat: antd component is replaced with the mui component
hujie123456 Feb 1, 2024
50e2813
Merge pull request #6 from BuidlerDAO/NIG-431
hujie123456 Feb 1, 2024
9c0ec9e
fix: delete ususe import
aboutmydreams Feb 1, 2024
2892b47
fix: delete yarn in action
aboutmydreams Feb 1, 2024
309fcc0
Merge pull request #7 from BuidlerDAO/congration
aboutmydreams Feb 1, 2024
efcb07c
feat: avatar add profile modal
hujie123456 Feb 1, 2024
124d934
fix: add https to host_permissions
aboutmydreams Jan 30, 2024
19ec07b
fix: delete yarn in action
aboutmydreams Feb 1, 2024
c40232a
Merge branch 'main' into NIG-431
hujie123456 Feb 1, 2024
471f375
Merge pull request #9 from BuidlerDAO/NIG-431
hujie123456 Feb 1, 2024
14f210a
feat: static page and remove antd
hujie123456 Feb 1, 2024
3690ef5
Merge pull request #10 from BuidlerDAO/review
hujie123456 Feb 1, 2024
697d938
fix: finish userEthIcon
aboutmydreams Feb 1, 2024
1a11963
fix: finish userEthIcon
aboutmydreams Feb 1, 2024
7666a7e
Merge pull request #11 from BuidlerDAO/user-tw-profile
aboutmydreams Feb 1, 2024
9ee25d0
feat: review and community
hujie123456 Feb 1, 2024
0822bb7
Merge pull request #12 from BuidlerDAO/review
hujie123456 Feb 1, 2024
10ead81
feat: change logo
hujie123456 Feb 1, 2024
3ce8852
Merge pull request #13 from BuidlerDAO/review
hujie123456 Feb 1, 2024
3b80c03
fix: add openProfile
aboutmydreams Feb 2, 2024
9262369
fix: add openProfile
aboutmydreams Feb 2, 2024
e951c4b
feat: static page and remove antd
hujie123456 Feb 1, 2024
772f9e7
fix: finish userEthIcon
aboutmydreams Feb 1, 2024
76cc1a5
fix: finish userEthIcon
aboutmydreams Feb 1, 2024
aba9862
feat: review and community
hujie123456 Feb 1, 2024
fc40840
feat: change logo
hujie123456 Feb 1, 2024
7f2fbbf
fix: add openProfile
aboutmydreams Feb 2, 2024
7bbaada
fix: add openProfile
aboutmydreams Feb 2, 2024
57de829
feat: review style
hujie123456 Feb 4, 2024
72462a3
feat: static page and remove antd
hujie123456 Feb 1, 2024
f831947
fix: finish userEthIcon
aboutmydreams Feb 1, 2024
619672a
fix: finish userEthIcon
aboutmydreams Feb 1, 2024
431f5c9
fix: add openProfile
aboutmydreams Feb 2, 2024
4fb3633
Merge branch 'main' into NIG-431
hujie123456 Feb 4, 2024
d534279
Merge pull request #16 from BuidlerDAO/NIG-431
hujie123456 Feb 4, 2024
6e77b36
feat: review style and replace logo
hujie123456 Feb 4, 2024
4df8bc8
Merge pull request #17 from BuidlerDAO/NIG-431
hujie123456 Feb 4, 2024
b0f743b
feat: replace logo
hujie123456 Feb 4, 2024
4932f7f
Merge pull request #18 from BuidlerDAO/NIG-431
hujie123456 Feb 4, 2024
fc84ed2
fix: divider bug
hujie123456 Feb 4, 2024
f81b2f6
Merge pull request #19 from BuidlerDAO/NIG-431
hujie123456 Feb 4, 2024
95860f6
feat: style review
hujie123456 Feb 4, 2024
2fd8656
Merge pull request #20 from BuidlerDAO/NIG-431
hujie123456 Feb 4, 2024
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
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 16.x
cache: 'yarn'
cache: 'pnpm'

- name: Install dependencies
run: rm -rf node_modules && yarn install --frozen-lockfile
run: rm -rf node_modules && pnpm install --frozen-lockfile

- name: Build
run: yarn build
run: pnpm build

lint:
runs-on: ubuntu-latest
Expand All @@ -32,13 +32,13 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 16.x
cache: 'yarn'
cache: 'pnpm'

- name: Install dependencies
run: rm -rf node_modules && yarn install --frozen-lockfile
run: rm -rf node_modules && pnpm install --frozen-lockfile

- name: Lint
run: yarn ci:test:lint
run: pnpm ci:test:lint

typecheck:
runs-on: ubuntu-latest
Expand All @@ -47,13 +47,13 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 16.x
cache: 'yarn'
cache: 'pnpm'

- name: Install dependencies
run: rm -rf node_modules && yarn install --frozen-lockfile
run: rm -rf node_modules && pnpm install --frozen-lockfile

- name: Test types
run: yarn ci:test:types
run: pnpm ci:test:types

unit:
runs-on: ${{ matrix.os }}
Expand All @@ -71,10 +71,10 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
registry-url: https://registry.npmjs.org/
cache: yarn
cache: pnpm

- name: Install dependencies
run: rm -rf node_modules && yarn install --frozen-lockfile
run: rm -rf node_modules && pnpm install --frozen-lockfile

- name: Unit test
run: yarn ci:test:unit
run: pnpm ci:test:unit
Binary file added dist.zip
Binary file not shown.
20 changes: 16 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,41 @@
"format:eslint": "run-s \" lint:eslint --fix \"",
"format:prettier": "run-s \" lint:prettier --write \"",
"format:stylelint": "run-s \" lint:stylelint --fix \"",
"lint": "run-p lint:*",
"lint:eslint": "eslint . --ext .js,.ts,.tsx --max-warnings 0 --ignore-path .gitignore",
"lint": "npm-run-all -p lint:*",
"lint:eslint": "eslint . --ext .js,.ts,.tsx --max-warnings 0 --ignore-path .gitignore --fix",
"lint:prettier": "prettier \"**/*.(md|json|yml)\" --ignore-path .gitignore --check",
"lint:stylelint": "stylelint \"**/*.css\" --ignore-path .gitignore",
"lint:stylelint": "stylelint \"**/*.css\" --ignore-path .gitignore --fix",
"test": "jest",
"test:types": "tsc --noEmit",
"prepare": "simple-git-hooks"
},
"dependencies": {
"@ant-design/cssinjs": "1.18.4",
"@eduardoac-skimlinks/webext-redux": "3.0.1-release-candidate",
"@emotion/react": "11.11.3",
"@emotion/styled": "11.11.0",
"@material-ui/core": "4.12.4",
"@material-ui/icons": "4.11.3",
"@mui/base": "5.0.0-beta.33",
"@mui/icons-material": "5.15.5",
"@mui/lab": "5.0.0-alpha.162",
"@mui/material": "5.15.5",
"@mui/system": "5.15.6",
"@reduxjs/toolkit": "1.8.4",
"@types/mockjs": "1.0.10",
"@types/redux-thunk": "2.1.0",
"ahooks": "3.7.9",
"clsx": "2.1.0",
"install": "0.13.0",
"mockjs": "1.1.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-redux": "7.2.8",
"redux-persist-webextension-storage": "1.0.2",
"redux-thunk": "2.4.2",
"reduxjs-toolkit-persist": "7.2.1",
"webextension-polyfill": "0.9.0"
"webextension-polyfill": "0.9.0",
"zustand": "4.5.0"
},
"devDependencies": {
"@commitlint/cli": "17.0.3",
Expand Down
Loading
Loading