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

Feat/list #137

Merged
merged 124 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
8b81db6
list feature
harjaapdhillon16 Aug 1, 2024
b6c053f
changes
harjaapdhillon16 Aug 1, 2024
c75950a
changes
harjaapdhillon16 Aug 2, 2024
201087f
changes
harjaapdhillon16 Aug 7, 2024
ca248c0
changes
harjaapdhillon16 Aug 7, 2024
da5dd8b
changes
harjaapdhillon16 Aug 8, 2024
c748217
changes
harjaapdhillon16 Aug 11, 2024
7487edc
changes
harjaapdhillon16 Aug 12, 2024
e84a1d0
fix: Revert unintended changes to the schema
carina-akaia Aug 12, 2024
c41b9f1
fix: Install missing dependencies
carina-akaia Aug 12, 2024
e773241
Fix type mismatch
carina-akaia Aug 12, 2024
135cae9
chore: Format
carina-akaia Aug 12, 2024
62cee40
changes
harjaapdhillon16 Aug 12, 2024
d1ff871
Merge branch 'staging' of https://github.com/PotLock/potlock-nextjs-a…
harjaapdhillon16 Aug 13, 2024
01b069a
changes
harjaapdhillon16 Aug 15, 2024
b1f1a51
changes
harjaapdhillon16 Aug 15, 2024
7d6181b
changes
harjaapdhillon16 Aug 15, 2024
4f741af
changes
harjaapdhillon16 Aug 16, 2024
98b0906
changes
harjaapdhillon16 Aug 21, 2024
8824b3f
merged staging
Ebube111 Sep 4, 2024
c71bbdd
mobile resposiveness
Ebube111 Sep 5, 2024
8c281c0
optimized code
Ebube111 Sep 5, 2024
727d63f
added admin access control
Ebube111 Sep 6, 2024
4431de4
es lint changed files
Ebube111 Sep 6, 2024
37528be
done with delete list modal
Ebube111 Sep 9, 2024
9bc908f
transfer owner done
Ebube111 Sep 9, 2024
dccfda7
done with transfer owner function call
Ebube111 Sep 9, 2024
0c8e7f9
Merge branch 'staging' into feat/list
Ebube111 Sep 9, 2024
7a9aea7
delete list
Ebube111 Sep 10, 2024
8aad6f7
delete list
Ebube111 Sep 10, 2024
79eb1bb
pulled from staging
Ebube111 Sep 10, 2024
863e100
pulled from staging
Ebube111 Sep 10, 2024
658ca80
bug fixes
Ebube111 Sep 10, 2024
956acfc
bug fixes
Ebube111 Sep 10, 2024
8cda789
mobile fix
Ebube111 Sep 10, 2024
ff31d36
es lint
Ebube111 Sep 10, 2024
a42ef8f
fix build
Ebube111 Sep 10, 2024
e44e0d1
es lint changes
Ebube111 Sep 10, 2024
bcfe3aa
es lint changes
Ebube111 Sep 10, 2024
71dcd54
migrated from _components
Ebube111 Sep 10, 2024
3dbf0f0
es lint fix
Ebube111 Sep 10, 2024
111f5c2
removed dummy fields
Ebube111 Sep 10, 2024
e26233f
fix list resposiveness
Ebube111 Sep 10, 2024
2ffefc5
worked on some fixes with styling
Ebube111 Sep 11, 2024
923718a
es lint fix
Ebube111 Sep 11, 2024
e4f9afb
handled account card states
Ebube111 Sep 11, 2024
23fca75
es lint
Ebube111 Sep 11, 2024
f9ed4a6
done with donate modal logic
Ebube111 Sep 12, 2024
f89fb5d
feat: register projects modal done
Ebube111 Sep 12, 2024
7db2395
done with filter and account search
Ebube111 Sep 12, 2024
a8ec342
done with filter and search logic for accounts (optimized the flow
Ebube111 Sep 12, 2024
4cd9171
feat: filter by status
Ebube111 Sep 12, 2024
c54aab3
changes done
Ebube111 Sep 12, 2024
cfcc30c
worked on popup for update registration status
Ebube111 Sep 12, 2024
1736c59
Merge branch 'staging' into feat/list
Ebube111 Sep 12, 2024
e428ffe
done with updating project status
Ebube111 Sep 13, 2024
3fff659
changes being saved
Ebube111 Sep 16, 2024
7a43259
changed logic for admins modal
Ebube111 Sep 16, 2024
ced02f4
remove an admin
Ebube111 Sep 16, 2024
04b13e6
chnaged logic back for delete admin
Ebube111 Sep 16, 2024
5a5c094
updated logic for modals (projects and admins)
Ebube111 Sep 16, 2024
ac1f94a
done with access modals
Ebube111 Sep 18, 2024
5be754c
es lint fix
Ebube111 Sep 18, 2024
5fc5d9c
hid delete button
Ebube111 Sep 18, 2024
7a2a8ba
done with social
Ebube111 Sep 19, 2024
ca1159c
handled redux for form
Ebube111 Sep 24, 2024
9627747
done with changes and PR comments
Ebube111 Sep 26, 2024
3a58181
Merge branch 'staging' of https://github.com/PotLock/potlock-nextjs-a…
carina-akaia Sep 30, 2024
9624cc5
chore: Format
carina-akaia Sep 30, 2024
f450e69
adjustments made to listings
Ebube111 Oct 1, 2024
461ef3b
es-lint fix
Ebube111 Oct 1, 2024
670c1aa
wip: Implement detailed breakdown for group allocation
carina-akaia Oct 1, 2024
58b3f13
wip: Implement detailed breakdown for group allocation
carina-akaia Oct 1, 2024
d10fa7d
commited changes and made changes to Account Card and List Card, as w…
Ebube111 Oct 1, 2024
ec3b585
added lists to navbar
Ebube111 Oct 1, 2024
a0483e8
Sync nav links order with design reference
carina-akaia Oct 2, 2024
af23af3
wip: Implement detailed breakdown for group donations
carina-akaia Oct 2, 2024
6ceb2b6
chore: Regroup UI primitives
carina-akaia Oct 2, 2024
d547061
chore: Format
carina-akaia Oct 2, 2024
2c53126
wip: Implement detailed breakdown for group donations
carina-akaia Oct 2, 2024
0eca047
wip: Implement detailed breakdown for group donations
carina-akaia Oct 2, 2024
97b2788
Implement detailed breakdown for group donations
carina-akaia Oct 2, 2024
82b15d5
Add tx blockchain explorer link & Adjust styles
carina-akaia Oct 2, 2024
4106c5a
chore: Format
carina-akaia Oct 2, 2024
93725b1
wip: Use client-side image loading
carina-akaia Oct 2, 2024
8cf0222
wip: Use client-side image loading
carina-akaia Oct 2, 2024
a2cd8f3
wip: Use client-side image loading & Fix type mismatches
carina-akaia Oct 2, 2024
9e819c8
Relocate icon asset
carina-akaia Oct 2, 2024
c7b0569
wip: Use client-side image loading
carina-akaia Oct 2, 2024
9c55254
wip: Use client-side image loading
carina-akaia Oct 2, 2024
ed46cdd
Remove unused and mark deprecated code
carina-akaia Oct 2, 2024
f47ec42
chore: Format
carina-akaia Oct 3, 2024
3835099
wip: Extract recipient share assignment UI
carina-akaia Oct 3, 2024
b4a20be
changes to enum field on hooks
Ebube111 Oct 3, 2024
430dc2e
es lint fix
Ebube111 Oct 3, 2024
f3cf91e
Merge branch 'feat/list' of https://github.com/PotLock/potlock-nextjs…
Ebube111 Oct 3, 2024
e761687
Added Toaster to app js
Ebube111 Oct 3, 2024
b76e893
es lint fix
Ebube111 Oct 3, 2024
42bb7eb
Merge branch 'staging' of https://github.com/PotLock/potlock-nextjs-a…
carina-akaia Oct 6, 2024
52492ba
chore: Format
carina-akaia Oct 6, 2024
f6e2480
Merge branch 'staging' of https://github.com/PotLock/potlock-nextjs-a…
carina-akaia Oct 7, 2024
1a37fff
final changes to lists
Ebube111 Oct 7, 2024
877c652
Merge branch 'feat/list' of https://github.com/PotLock/potlock-nextjs…
Ebube111 Oct 7, 2024
aa190c2
final changes to accounts logic for no data
Ebube111 Oct 7, 2024
5a5c974
done with minor bugs due to onchain id change
Ebube111 Oct 8, 2024
86ac97d
eased caching and returned state back in access modal
Ebube111 Oct 9, 2024
6f1029b
wip
carina-akaia Oct 9, 2024
0f890ea
chore: Format
carina-akaia Oct 9, 2024
d82fe87
updated account control list with other minor bugs
Ebube111 Oct 10, 2024
42bd7c2
done with bugs from indexer
Ebube111 Oct 10, 2024
c4691b8
trying to fix deployment error
Ebube111 Oct 11, 2024
07af036
es lint fix
Ebube111 Oct 11, 2024
0362aff
made changes to modal in list form
Ebube111 Oct 11, 2024
d0c5193
es lint fix
Ebube111 Oct 11, 2024
bcbea2f
removed minor edge case
Ebube111 Oct 11, 2024
246b129
fixed admin addition
Ebube111 Oct 11, 2024
4ba84c2
wip
carina-akaia Oct 14, 2024
e6a2c2c
wip
carina-akaia Oct 14, 2024
6c3bb9f
fix: Disable pot account id validation for list donations
carina-akaia Oct 15, 2024
c06c1d5
wip
carina-akaia Oct 15, 2024
851d9f0
Merge branch 'feat/list' of https://github.com/PotLock/potlock-nextjs…
carina-akaia Oct 15, 2024
02fe7a2
Merge branch 'staging' of https://github.com/PotLock/potlock-nextjs-a…
carina-akaia Oct 15, 2024
a5e5365
Handle list donations
carina-akaia Oct 15, 2024
ed23563
Integrate Donation module for list donations
carina-akaia Oct 15, 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
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"dontcare",
"fastnear",
"foodbank",
"graylisted",
"hookform",
"kubb",
"linktree",
Expand All @@ -40,6 +41,7 @@
"svgr",
"typecheck",
"unocss",
"upvote",
"welldone",
"wpdas",
"xdefi",
Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"@radix-ui/react-select": "^2.0.0",
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-switch": "^1.0.3",
"@radix-ui/react-toast": "^1.2.2",
"@radix-ui/react-toggle": "^1.0.3",
"@radix-ui/react-toggle-group": "^1.0.4",
"@radix-ui/react-tooltip": "^1.1.2",
Expand Down Expand Up @@ -86,6 +87,7 @@
"react-hook-form": "^7.52.0",
"react-icons": "^5.3.0",
"react-infinite-scroll-component": "^6.1.0",
"react-lazy-load-image-component": "^1.6.2",
"react-markdown": "^9.0.1",
"react-redux": "^9.1.2",
"redux": "^5.0.1",
Expand All @@ -107,6 +109,7 @@
"@types/react": "^18.3.3",
"@types/react-copy-to-clipboard": "^5.0.7",
"@types/react-dom": "^18.3.0",
"@types/react-lazy-load-image-component": "^1.6.4",
"@typescript-eslint/eslint-plugin": "^7.9.0",
"@typescript-eslint/parser": "^7.9.0",
"@unocss/preset-attributify": "^0.60.4",
Expand Down
2 changes: 1 addition & 1 deletion potlock-indexer.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const targetPath = "./src/common/api/potlock/generated/client.ts";

module.exports = {
"potlock-indexer": {
input: "https://dev.potlock.io/api/schema",
input: "https://test-dev.potlock.io/api/schema",

output: {
target: targetPath,
Expand Down
4 changes: 4 additions & 0 deletions public/assets/icons/modal-danger.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/assets/icons/no-list.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/assets/images/default-backdrop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/assets/images/list-gradient-01.png
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/assets/images/list-gradient-2.png
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/assets/images/list-gradient-3.png
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/assets/images/list-gradient-4.png
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/assets/images/list-gradient-5.png
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/assets/images/listCard.png
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/assets/images/list_backdrop_2.png
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/assets/images/list_bg_image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/common/api/images.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@ export const getImage = async ({
} else if (socialImage?.ipfs_cid) {
return `https://ipfs.near.social/ipfs/${socialImage.ipfs_cid}`;
} else {
return fallbackurl ?? type === "image"
return (fallbackurl ?? type === "image")
Ebube111 marked this conversation as resolved.
Show resolved Hide resolved
? "/assets/images/profile-image.png"
: "/assets/images/profile-banner.png";
}
} catch (err) {
console.log("error fetching image ", err);
return fallbackurl ?? type === "image"
return (fallbackurl ?? type === "image")
Ebube111 marked this conversation as resolved.
Show resolved Hide resolved
? "/assets/images/profile-image.png"
: "/assets/images/profile-banner.png";
}
Expand Down
2 changes: 1 addition & 1 deletion src/common/api/pagoda/generated/client.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Generated by orval v6.30.2 🍺
* Generated by orval v6.31.0 🍺
* Do not edit manually.
* NEAR Enhanced API powered by Pagoda
* Try out our newly released Enhanced APIs - Balances (in Beta) and get what you need for all kinds of balances and token information at ease.
Expand Down
Loading
Loading