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

Composite access gates #6030

Merged
merged 66 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
086d21d
bit of organising
julianjelfs Jul 5, 2024
bcef256
Merge branch 'master' into composite-list
julianjelfs Jul 5, 2024
bcf17a9
made some progress
julianjelfs Jul 5, 2024
b95cfc8
wip
julianjelfs Jul 6, 2024
487dcdd
getting close
julianjelfs Jul 8, 2024
073356b
getting there slowly
julianjelfs Jul 8, 2024
aefba4b
successfully rountripped composite gate
julianjelfs Jul 9, 2024
e1af737
readonly version
julianjelfs Jul 9, 2024
d49bd87
checkpoint
julianjelfs Jul 10, 2024
6eb8198
show both gates in the preview footer
julianjelfs Jul 10, 2024
a4d1a56
refactor home modal to use a union type
julianjelfs Jul 11, 2024
ac1b3d3
mechanics are just about all in place now
julianjelfs Jul 11, 2024
0f4f0fc
fill in current decide ai VC details
julianjelfs Jul 12, 2024
ae219e3
tweaks to the edit UI
julianjelfs Jul 12, 2024
a735687
fix new groups with composite gates
julianjelfs Jul 12, 2024
cef8dfc
remove some unnecessary stuff
julianjelfs Jul 12, 2024
9b85cac
remove some unused css
julianjelfs Jul 12, 2024
9d65d94
Merge branch 'master' into composite-list
julianjelfs Jul 12, 2024
9343d3b
multiple credentials
julianjelfs Jul 12, 2024
cb89d17
corrected multi credential stuff
julianjelfs Jul 12, 2024
f414c3b
fix up some types
julianjelfs Jul 15, 2024
f73bbca
translations
julianjelfs Jul 15, 2024
2a9c111
modify how unique person gates are evaluated slightly
julianjelfs Jul 15, 2024
606209a
add instructions
julianjelfs Jul 15, 2024
e64ce51
update the VC config for poh
julianjelfs Jul 15, 2024
c5323d1
fix build
julianjelfs Jul 15, 2024
e66a1a5
Merge branch 'master' into composite-list
julianjelfs Jul 15, 2024
a41cee8
add modal for manual verification of personhood
julianjelfs Jul 15, 2024
6d0b831
checkbox -> radio
julianjelfs Jul 16, 2024
f9a9378
merge master
julianjelfs Jul 16, 2024
2e11c6c
wired up the unique person user property
julianjelfs Jul 16, 2024
b4a3451
fix build
julianjelfs Jul 16, 2024
af7c9f3
more fixing
julianjelfs Jul 16, 2024
0b53a96
another test fix
julianjelfs Jul 16, 2024
6622078
fix app
julianjelfs Jul 16, 2024
fabcc83
small improvement to readonly view
julianjelfs Jul 16, 2024
46dd864
lang
julianjelfs Jul 16, 2024
cb7afbc
Merge branch 'master' into composite-list
julianjelfs Jul 16, 2024
a04580c
Merge branch 'master' into composite-list
julianjelfs Jul 17, 2024
2aaca8d
work in progress
julianjelfs Jul 17, 2024
c56270b
refactoring for re-use
julianjelfs Jul 18, 2024
11552cc
merge master
julianjelfs Jul 18, 2024
d161a8d
update polish
julianjelfs Jul 18, 2024
1a47265
couple of fixes
julianjelfs Jul 18, 2024
83062a5
Merge branch 'composite-list' into link-identity
julianjelfs Jul 18, 2024
8e7d53f
disable link accounts stuff
julianjelfs Jul 18, 2024
2a7376c
merge master
julianjelfs Jul 18, 2024
83f526a
fix
julianjelfs Jul 18, 2024
c27d076
integrate diamond payment into the access gate evaluation flow
julianjelfs Jul 18, 2024
f9e9402
lang
julianjelfs Jul 18, 2024
cf0a9f8
no need to submit proof when verifying gate
julianjelfs Jul 19, 2024
551d1fe
Merge branch 'master' into composite-list
julianjelfs Jul 19, 2024
c5c1e94
Merge branch 'master' into composite-list
julianjelfs Jul 19, 2024
37781e6
Merge branch 'master' into composite-list
julianjelfs Jul 19, 2024
b5e3d08
mapping fix
julianjelfs Jul 19, 2024
3c96315
merge master
julianjelfs Jul 19, 2024
cea1194
disable unique person gate for now
julianjelfs Jul 19, 2024
80fdf70
Merge branch 'master' into composite-list
julianjelfs Jul 20, 2024
62afd41
Merge branch 'master' into composite-list
julianjelfs Jul 22, 2024
ba8a570
wire up diamond payment proof
julianjelfs Jul 22, 2024
aa2f299
Merge branch 'composite-list' of github.com:open-chat-labs/open-chat …
julianjelfs Jul 22, 2024
b132aa2
Merge branch 'master' into composite-list
julianjelfs Jul 22, 2024
7134bbe
update dfx version
Jul 22, 2024
b0e68f4
Merge branch 'composite-list' of github.com:open-chat-labs/open-chat …
Jul 22, 2024
b063d5a
Merge branch 'master' into composite-list
julianjelfs Jul 22, 2024
5229fb7
Merge branch 'master' into composite-list
julianjelfs Jul 22, 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
19 changes: 5 additions & 14 deletions dfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,7 @@
},
"website": {
"build": "",
"source": [
"frontend/app/build",
"frontend/app/public"
],
"source": ["frontend/app/build", "frontend/app/public"],
"type": "assets"
},
"sns_governance": {
Expand Down Expand Up @@ -195,23 +192,17 @@
}
},
"ic": {
"providers": [
"https://ic0.app/"
],
"providers": ["https://ic0.app/"],
"type": "persistent"
},
"ic_test": {
"providers": [
"https://ic0.app/"
],
"providers": ["https://ic0.app/"],
"type": "persistent"
},
"web_test": {
"providers": [
"https://ic0.app/"
],
"providers": ["https://ic0.app/"],
"type": "persistent"
}
},
"version": 1
}
}
34 changes: 34 additions & 0 deletions frontend/app/public/assets/human.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion frontend/app/src/components/ErrorMessage.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
<style lang="scss">
.error {
@include font(book, normal, fs-80);
color: var(--error);
margin-bottom: $sp3;
background-color: var(--error);
padding: $sp3 $sp4;
}
</style>
2 changes: 1 addition & 1 deletion frontend/app/src/components/Input.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
}

&.invalid {
border: 1px solid var(--error);
border: var(--bw) solid var(--error);
}

&::placeholder {
Expand Down
5 changes: 4 additions & 1 deletion frontend/app/src/components/MatchingUser.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@
{searchTerm}
me={user.userId === $createdUser.userId}
username={user.displayName ?? user.username} />
<Badges diamondStatus={user.diamondStatus} streak={client.getStreak(user.userId)} />
<Badges
uniquePerson={user.isUniquePerson}
diamondStatus={user.diamondStatus}
streak={client.getStreak(user.userId)} />
</h4>
<div class="username">
<FilteredUsername {searchTerm} username={"@" + user.username} />
Expand Down
6 changes: 3 additions & 3 deletions frontend/app/src/components/ModalContent.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
{#if !hideHeader}
<div class="header">
<h4>
<slot name="header" />
<slot {onClose} name="header" />
</h4>
{#if closeIcon}
<span title={$_("close")} class="close" class:rtl={$rtlStore} on:click={onClose}>
Expand All @@ -111,12 +111,12 @@
{/if}
{#if !hideBody}
<div class="body" class:fill>
<slot name="body" />
<slot {onClose} name="body" />
</div>
{/if}
{#if !hideFooter}
<div class="footer" class:rtl={$rtlStore} class:compact={compactFooter}>
<slot name="footer">
<slot {onClose} name="footer">
<Button on:click={onClose} small={!$mobileWidth} tiny={$mobileWidth}>
<Translatable resourceKey={i18nKey("close")} />
</Button>
Expand Down
9 changes: 5 additions & 4 deletions frontend/app/src/components/Select.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
<select class:invalid class:margin {disabled} bind:value class={`select`} on:change>
<slot />
</select>
<div class="icon">
<MenuDown color={"var(--primary)"} size="1.8em" />
</div>
{#if !disabled}
<div class="icon">
<MenuDown color={"var(--primary)"} size="1.8em" />
</div>
{/if}
</div>

<style lang="scss">
Expand Down Expand Up @@ -65,7 +67,6 @@

&.invalid {
border: var(--bw) solid var(--error);
box-shadow: 0 0 5px 1px var(--error);
}
}

Expand Down
4 changes: 4 additions & 0 deletions frontend/app/src/components/SelectChatModal.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
description: string;
username: string | undefined;
lastUpdated: bigint;
uniquePerson: boolean;
};
type ShareCommunity = {
kind: "community";
Expand Down Expand Up @@ -203,6 +204,7 @@
description,
username: "@" + them.username,
lastUpdated: chatSummary.lastUpdated,
uniquePerson: them.isUniquePerson,
};

default:
Expand All @@ -217,6 +219,7 @@
description: buildGroupChatDescription(chatSummary),
username: undefined,
lastUpdated: chatSummary.lastUpdated,
uniquePerson: false,
};
}
}
Expand Down Expand Up @@ -318,6 +321,7 @@
{target.name}
</span>
<Badges
uniquePerson={target.uniquePerson}
diamondStatus={target.diamondStatus}
streak={target.streak} />
{#if target.username !== undefined}
Expand Down
16 changes: 0 additions & 16 deletions frontend/app/src/components/home/AccessGateCheckFailed.svelte

This file was deleted.

Loading
Loading