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 social login - 1 - UI #2266

Merged
merged 40 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
4c49f3b
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Mar 18, 2024
7f6e739
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Mar 27, 2024
b8eb024
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Mar 28, 2024
7618a2b
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Apr 9, 2024
4fde66d
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Apr 11, 2024
cbc1869
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Apr 11, 2024
dccb3f0
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Apr 15, 2024
56babc9
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Apr 16, 2024
aff052a
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Apr 16, 2024
1c37b73
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Apr 19, 2024
06e91a8
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Apr 19, 2024
5c01dcb
wip
svenvoskamp Apr 22, 2024
6a26900
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Apr 23, 2024
bba303b
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Apr 23, 2024
75f572c
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Apr 24, 2024
f657df5
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp Apr 26, 2024
8794a29
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp May 6, 2024
4d42433
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp May 7, 2024
a27d42b
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp May 7, 2024
8c13382
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp May 8, 2024
ce546a5
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp May 8, 2024
faaada7
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp May 8, 2024
2f316a8
Merge branch 'V4' of github.com:WalletConnect/web3modal into V4
svenvoskamp May 10, 2024
f54864f
wip
svenvoskamp May 10, 2024
6f75cd0
add UI for social login
svenvoskamp May 14, 2024
0d580f3
Merge branch 'V4' of github.com:WalletConnect/web3modal into feat/soc…
svenvoskamp May 14, 2024
c8e2f9e
remove obsolete code
svenvoskamp May 14, 2024
78bc337
update package lock
svenvoskamp May 14, 2024
574275e
remove danger line
svenvoskamp May 14, 2024
87d2630
change danger line
svenvoskamp May 14, 2024
f9534ba
refactor: update danger rules for composite check
enesozturk May 14, 2024
1a021cc
fix: type util file name
enesozturk May 14, 2024
26418e1
refactor: fix jsx type util file path
enesozturk May 14, 2024
dcf2405
feedback
svenvoskamp May 14, 2024
34e21b9
Merge branch 'feat/social-login-part-1-ui' of github.com:WalletConnec…
svenvoskamp May 14, 2024
2243ada
remove obsolete code
svenvoskamp May 14, 2024
f865f79
Merge branch 'V4' into feat/social-login-part-1-ui
svenvoskamp May 14, 2024
cca01b9
merge V4 into branch
svenvoskamp May 14, 2024
c5751ce
Merge branch 'feat/social-login-part-1-ui' of github.com:WalletConnec…
svenvoskamp May 14, 2024
0af4323
Merge branch 'V4' into feat/social-login-part-1-ui
svenvoskamp May 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
21 changes: 21 additions & 0 deletions apps/gallery/stories/composites/wui-list-button.stories.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import type { Meta } from '@storybook/web-components'
import '@web3modal/ui/src/composites/wui-list-button'
import { html } from 'lit'
import '../../components/gallery-container'
import type { WuiListButton } from '@web3modal/ui'

type Component = Meta<WuiListButton>

export default {
title: 'Composites/wui-list-button',
args: {
text: 'Continue with a wallet'
}
} as Component

export const Default: Component = {
render: args =>
html` <gallery-container width="336">
<wui-list-button text=${args.text}></wui-list-button>
</gallery-container>`
}
30 changes: 30 additions & 0 deletions apps/gallery/stories/composites/wui-list-social.stories.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import type { Meta } from '@storybook/web-components'
import '@web3modal/ui/src/composites/wui-list-social'
import { html } from 'lit'
import '../../components/gallery-container'

import type { WuiListSocial } from '@web3modal/ui'

type Component = Meta<WuiListSocial>

export default {
title: 'Composites/wui-list-social',
args: {
name: 'google',
logo: 'google',
align: 'left'
},
argTypes: {
align: {
options: ['left', 'center'],
control: { type: 'select' }
}
}
} as Component

export const Default: Component = {
render: args =>
html` <gallery-container width="336">
<wui-list-social align=${args.align} logo=${args.logo} name=${args.name}></wui-list-social>
</gallery-container>`
}
5 changes: 4 additions & 1 deletion apps/gallery/stories/composites/wui-logo-select.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { Meta } from '@storybook/web-components'
import '@web3modal/ui/src/composites/wui-logo-select'
import type { WuiLogoSelect } from '@web3modal/ui/src/composites/wui-logo-select'
import { html } from 'lit'
import '../../components/gallery-container'
import { logoOptions } from '../../utils/PresetUtils'

type Component = Meta<WuiLogoSelect>
Expand All @@ -26,5 +27,7 @@ export default {

export const Default: Component = {
render: args =>
html`<wui-logo-select ?disabled=${args.disabled} logo=${args.logo}></wui-logo-select>`
html`<gallery-container width="60"
><wui-logo-select ?disabled=${args.disabled} logo=${args.logo}></wui-logo-select>
</gallery-container>`
}
17 changes: 9 additions & 8 deletions dangerfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ async function checkUiPackage() {

const ui_index = modified_files.find(f => f.includes('ui/index.ts'))
const ui_index_diff = ui_index ? await diffForFile(ui_index) : undefined
const jsx_index = modified_files.find(f => f.includes('ui/utils/JSXTypesUtil.ts'))
const jsx_index_diff = jsx_index ? await diffForFile(jsx_index) : undefined
const types_util_index = modified_files.find(f => f.includes('ui/src/utils/JSXTypeUtil.ts'))
const types_util_diff = types_util_index ? await diffForFile(types_util_index) : undefined
const created_ui_components_index_ts = created_ui_components.filter(f => f.endsWith('index.ts'))
const created_ui_composites_index_ts = created_ui_composites.filter(f => f.endsWith('index.ts'))
const deleted_ui_composites_index_ts = deleted_ui_composites.filter(f => f.endsWith('index.ts'))
Expand All @@ -135,30 +135,31 @@ async function checkUiPackage() {
fail('New components were added, but not exported in ui/index.ts')
}

if (created_ui_composites_index_ts.length !== deleted_ui_composites_index_ts.length) {
fail('Number of created composites does not match number of deleted composites')
if (is_new_composites_added && !types_util_diff) {
fail('New composites were added, but JSXTypeUtil.ts is not modified')
}
if (is_new_composites_added && !ui_index_diff?.added.includes('src/composites')) {

if (is_new_composites_added && !types_util_diff?.added.includes('../composites')) {
fail('New composites were added, but not exported in ui/index.ts')
}

if (created_ui_layout_index_ts.length && !ui_index_diff?.added.includes('src/layout')) {
fail('New layout components were added, but not exported in ui/index.ts')
}

if (created_ui_components_index_ts.length && !jsx_index_diff?.added.includes('../components')) {
if (created_ui_components_index_ts.length && !types_util_diff?.added.includes('../components')) {
fail(
`New components were added, but not exported in ui/utils/JSXTypeUtil.ts: ${created_ui_components.join(
', '
)}`
)
}

if (is_new_composites_added && !jsx_index_diff?.added.includes('../composites')) {
if (is_new_composites_added && !types_util_diff?.added.includes('../composites')) {
fail('New composites were added, but not exported in ui/utils/JSXTypeUtil.ts')
}

if (is_new_layout_added && !jsx_index_diff?.added.includes('../layout')) {
if (is_new_layout_added && !types_util_diff?.added.includes('../layout')) {
fail('New layout components were added, but not exported in ui/utils/JSXTypeUtil.ts')
}

Expand Down
Loading
Loading