Skip to content

Commit

Permalink
Merge pull request #43 from cardano2vn/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
independenceee authored Oct 27, 2024
2 parents 0eb6000 + 2f2ca3d commit 4aca0c2
Show file tree
Hide file tree
Showing 50 changed files with 2,051 additions and 479 deletions.
245 changes: 245 additions & 0 deletions et --hard HEAD~1
Original file line number Diff line number Diff line change
@@ -0,0 +1,245 @@
commit fc105a7a1f1cab9a6a9c0c06219737b1b79108c9 (HEAD -> frontend/connect-wallet, origin/frontend/connect-wallet)
Author: Nguyễn Khánh <[email protected]>
Date: Wed Oct 9 01:08:59 2024 +0700

develop: update home page and config footer

commit 136f1271245654aabd03d7ae07752a48ea6866cd
Author: Nguyễn Khánh <[email protected]>
Date: Tue Oct 8 21:24:07 2024 +0700

develop connect wallet and update image configs add

commit cd72168ac5d7dc3aec44fbea0ac02d95d46b504f (origin/frontend/landing, frontend/landing)
Merge: ba7f77a ad033b8
Author: Nguyễn Khánh <[email protected]>
Date: Tue Oct 8 20:21:14 2024 +0700

fix: conflic code

commit ba7f77aa4ef889f7046c6fc06af20ef25dc7c9eb
Author: Nguyễn Khánh <[email protected]>
Date: Tue Oct 8 20:17:51 2024 +0700

develop: create connect wallet and landing and network

commit ad033b886d44875d9cb1cbcfb8a15da5085ec0fd
Merge: 44eaec7 6189365
Author: Phùng Tiến Dũng <[email protected]>
Date: Tue Oct 8 18:56:24 2024 +0700

Merge pull request #13 from cardano2vn/add-utilities-page

add utilities

commit 61893659a0f63e5c01ef1c6b3ddcaddad46b5804
Author: tidvn <[email protected]>
Date: Tue Oct 8 17:44:44 2024 +0700

add utilities

commit 44eaec7e53f064f6d04a0e4264c6847526febb50
Merge: 7410770 06a8474
Author: Phùng Tiến Dũng <[email protected]>
Date: Tue Oct 8 16:38:25 2024 +0700

Merge pull request #12 from cardano2vn/add-dashboard-layout

fix layout

commit 06a847417ecf0053902161003612803bfc6373e5 (origin/add-dashboard-layout)
Author: tidvn <[email protected]>
Date: Tue Oct 8 16:37:52 2024 +0700

fix layout

commit 74107700810b1b9b6631a6707d32744cbee64b8d
Merge: b252fd9 55470e8
Author: Phùng Tiến Dũng <[email protected]>
Date: Tue Oct 8 14:03:51 2024 +0700

Merge pull request #11 from cardano2vn/add-dashboard-layout

add dashboard layout

commit 55470e81af4df6608d35035c85445884596956a5
Author: tidvn <[email protected]>
Date: Tue Oct 8 11:58:49 2024 +0700

fix active menu

commit 0d8045b0aef4ea2c9644ea8611128207a8043dc5
Author: tidvn <[email protected]>
Date: Tue Oct 8 11:44:40 2024 +0700

add bg button

commit 5c37025f0163af95a713f6feefc56fd9e0684e29
Author: tidvn <[email protected]>
Date: Tue Oct 8 11:40:38 2024 +0700

change style , fix menu , remove metamask wallet

commit b6b9b8652e6c38623531bc0218cf009d994733cc
Author: tidvn <[email protected]>
Date: Tue Oct 8 10:57:54 2024 +0700

done layout

commit b252fd9b6badcc01fcf2549acd6eb68f5ecdaefe
Author: tidvn <[email protected]>
Date: Tue Oct 8 02:01:46 2024 +0700

add meshjs

commit 521273912334312bab9aabbba41b504951ea340c
Author: tidvn <[email protected]>
Date: Mon Oct 7 23:03:35 2024 +0700

add ignore

commit a420bbbb837df42b0e1bb1061e8597d696aaeb94
Author: tidvn <[email protected]>
Date: Mon Oct 7 22:49:04 2024 +0700

hotfix: edit eslint config

commit f410a36c92ce898a6c389c848d3dfaa298c59dc0
Author: tidvn <[email protected]>
Date: Mon Oct 7 22:36:01 2024 +0700

add .vscode to .gitignore

commit 3fe5614a6343ebc9c4def0b9fd91689dba5c20a0
Author: tidvn <[email protected]>
Date: Mon Oct 7 22:29:26 2024 +0700

resolve conflict

commit a1dd4e52fb66c615f4290fb2390dff6240000fcf
Merge: f130887 f6cf240
Author: Phùng Tiến Dũng <[email protected]>
Date: Mon Oct 7 22:03:33 2024 +0700

Merge pull request #8 from cardano2vn/add-meshjs

add connect wallet

commit f6cf2405296e12c5bb546c95e89b115dd9670a62
Merge: a2682af f130887
Author: Phùng Tiến Dũng <[email protected]>
Date: Mon Oct 7 22:03:17 2024 +0700

Merge branch 'develop' into add-meshjs

commit a2682afcefa890eb42935c567ae458254efe4c32
Author: tidvn <[email protected]>
Date: Mon Oct 7 21:58:31 2024 +0700

add connect wallet

commit f130887d1efe99fc8acd834f756e2303f4710d5d
Merge: 17a2ca6 4c06c3d
Author: Nguyễn Duy Khánh <[email protected]>
Date: Mon Oct 7 21:29:10 2024 +0700

Merge pull request #7 from cardano2vn/frontend/landing

add all the necessary components to the project and config prettierc

commit 4c06c3d46c5c26850be96e808f0a11d176bbf596
Merge: 2e0b3a4 17a2ca6
Author: Nguyễn Khánh <[email protected]>
Date: Mon Oct 7 21:28:32 2024 +0700

add all the necessary components to the project and config prettierc

commit 2e0b3a40c2f6346b56ae9e28769a1bcacee31382
Author: Nguyễn Khánh <[email protected]>
Date: Mon Oct 7 21:24:15 2024 +0700

add all the necessary components to the project and config prettierc

commit 17a2ca6debae7f73a39a4fd88f5ec3422473f1ba
Merge: af3e438 aee4c45
Author: Phùng Tiến Dũng <[email protected]>
Date: Mon Oct 7 20:51:58 2024 +0700

Merge pull request #6 from cardano2vn/add-css-var

Add css var

commit aee4c45e847eec563c517b03574d4001fad1f655
Author: tidvn <[email protected]>
Date: Mon Oct 7 20:51:36 2024 +0700

add css var

commit d44fb0cc797f1085552e7269bd86eb41a70d1719
Author: tidvn <[email protected]>
Date: Mon Oct 7 20:46:13 2024 +0700

edit css var

commit af3e438851415105d8e0e0bf55227c180e18d8e5 (origin/edit-css-var, feature/readme)
Merge: 037217f 0849d39
Author: Nguyễn Duy Khánh <[email protected]>
Date: Mon Oct 7 20:27:51 2024 +0700

Merge pull request #4 from cardano2vn/feature/readme

config test with jest and add ci/cd check build test

commit 0849d39edd0c8100da6b635ef7c6960e8368f475 (origin/feature/readme)
Author: Nguyễn Khánh <[email protected]>
Date: Mon Oct 7 20:25:30 2024 +0700

config test with jest and add ci/cd check build test

commit 037217f75ad8ba5341d30477bee6700651c57f92
Merge: cdcd563 264dcf5
Author: Phùng Tiến Dũng <[email protected]>
Date: Mon Oct 7 19:12:01 2024 +0700

Merge pull request #2 from cardano2vn/add-shadcn

init , config css font

commit 264dcf52066b35683bf0aab0d763d328191f0ea2 (origin/add-shadcn)
Author: tidvn <[email protected]>
Date: Mon Oct 7 19:11:01 2024 +0700

init , config css font

commit cdcd563bf2e148a196c839816aa149cfc0b56c42
Merge: 7c0ee9c 3c1a7b2
Author: Phùng Tiến Dũng <[email protected]>
Date: Mon Oct 7 18:50:04 2024 +0700

Merge pull request #1 from cardano2vn/add-eslint-prettierc-husky

settup lint, pre-commit

commit 3c1a7b28a5e4936c5f7a417d55ba8bb1ed05c58b
Author: tidvn <[email protected]>
Date: Mon Oct 7 18:49:06 2024 +0700

settup lint, pre-commit

commit 7c0ee9cbf1b1e2b279a908f907be28eee942a356 (main)
Author: tidvn <[email protected]>
Date: Mon Oct 7 18:33:25 2024 +0700

Init code

commit ac9bcba4fdd89e7e0ae4be04934d62a66911a058 (origin/main-old)
Author: tienna <[email protected]>
Date: Fri Sep 6 21:35:44 2024 +0700

update code da chay

commit 630017d7235968478ecdd86b9157de54df240ab0
Author: C2VN <[email protected]>
Date: Fri Sep 6 21:32:21 2024 +0700

Create README
14 changes: 14 additions & 0 deletions next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,21 @@ const nextConfig = {
serverExternalPackages: ['@meshsdk/core', '@meshsdk/core-cst', '@meshsdk/react'],
experimental: {
after: true,
serverActions: {
bodySizeLimit: '100mb',
},
},
images: {
remotePatterns: [
{
protocol: 'http',
hostname: '18.143.169.117',
port: '8080',
pathname: '/ipfs/**',
},
],
},

output: 'standalone',
reactStrictMode: true,
webpack: function (config, _) {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
"@types/node": "^20.16.11",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@types/react-vertical-timeline-component": "^3.3.6",
"@typescript-eslint/eslint-plugin": "^8.8.1",
"dotenv": "^16.4.5",
"eslint": "^8.57.1",
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
1 change: 1 addition & 0 deletions public/icons/sidebar/home.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/icons/sidebar/marketplace.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/icons/sidebar/mint.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/icons/sidebar/utilitie.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/banner/faq.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4aca0c2

Please sign in to comment.