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: Implement Dasboard Wallet Branding Changes #236

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions examples/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,9 @@ <h2 class="section-heading">STATUS</h2>
</div>
<script src="../dist/standalone/auth.umd.js"></script>
<script src="./index.js"></script>
<link
href="https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&family=Nunito+Sans:ital,opsz,wght@0,6..12,200..1000;1,6..12,200..1000&family=Onest:wght@100..900&family=PT+Sans:ital,wght@0,400;0,700;1,400;1,700&family=Syne:wght@400..800&display=swap"
rel="stylesheet"
/>
</body>
</html>
4 changes: 2 additions & 2 deletions src/appInfo.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AppThemeInfo, AppInfo, Theme } from './typings'
import { AppInfo, AppThemeInfo, Theme } from './typings'

function getImageUrls(appId: string, theme: Theme, gatewayUrl: string) {
const u = new URL(`/api/v2/app/${appId}/logo/?type=${theme}`, gatewayUrl)
Expand All @@ -20,4 +20,4 @@ async function getAppInfo(appId: string, gatewayUrl: string) {
return appInfo
}

export { getImageUrls, getAppInfo, getAppThemeInfo }
export { getAppInfo, getAppThemeInfo, getImageUrls }
61 changes: 35 additions & 26 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
import { ArcanaProvider } from './provider'
import IframeWrapper from './iframeWrapper'
import {
getConstructorParams,
getErrorReporter,
getParamsFromClientId,
isClientId,
onWindowReady,
preLoadIframe,
removeHexPrefix,
validateAppAddress,
} from './utils'
import { getAppInfo, getAppThemeInfo, getImageUrls } from './appInfo'
import { getNetworkConfig } from './config'
import { ArcanaAuthError, ErrorNotInitialized } from './errors'
import IframeWrapper from './iframeWrapper'
import { LOG_LEVEL, setExceptionReporter, setLogLevel } from './logger'
import Popup from './popup'
import { ArcanaProvider } from './provider'
import { ArcanaSolanaAPI } from './solana'
import {
AppConfig,
AppMode,
BearerAuthentication,
BearerAuthParams,
ChainType,
ConstructorParams,
CustomProviderParams,
EIP6963ProviderInfo,
EthereumProvider,
BearerAuthParams,
InitStatus,
Logins,
NetworkConfig,
Expand All @@ -29,12 +24,17 @@
ThemeConfig,
UserInfo,
} from './typings'
import { getAppInfo, getAppThemeInfo, getImageUrls } from './appInfo'
import { ArcanaAuthError, ErrorNotInitialized } from './errors'
import { LOG_LEVEL, setExceptionReporter, setLogLevel } from './logger'
import Popup from './popup'
import { ModalController } from './ui/modalController'
import { ArcanaSolanaAPI } from './solana'
import {
getConstructorParams,
getErrorReporter,
getParamsFromClientId,
isClientId,
onWindowReady,
preLoadIframe,
removeHexPrefix,
validateAppAddress,
} from './utils'

import isEmail from 'validator/es/lib/isEmail'

Expand All @@ -54,7 +54,7 @@
private connectCtrl: ModalController
private _standaloneMode: {
mode: 1 | 2
handler: (...args: any) => void | undefined

Check warning on line 57 in src/index.ts

View workflow job for this annotation

GitHub Actions / ESLint

src/index.ts#L57

Unexpected any. Specify a different type (@typescript-eslint/no-explicit-any)
}
constructor(clientId: string, p?: Partial<ConstructorParams>) {
let network = p?.network
Expand Down Expand Up @@ -192,6 +192,7 @@
mode: this.theme,
logo: this.logo.vertical,
options: this.params.connectOptions,
theme_settings: this.appConfig.theme_settings,
})
}
return new Promise((resolve, reject) => {
Expand Down Expand Up @@ -462,9 +463,10 @@
getAppThemeInfo(this.appId, this.networkConfig.gatewayUrl),
getAppInfo(this.appId, this.networkConfig.gatewayUrl),
])

const appImageURLs = getImageUrls(
this.appId,
this.params.theme,
appThemeInfo.theme,
this.networkConfig.gatewayUrl
)
const horizontalLogo =
Expand All @@ -484,7 +486,14 @@
vertical: verticalLogo ? appImageURLs.vertical : '',
},
},
theme: this.params.theme,
theme: appThemeInfo.theme,
},
theme_settings: {
accent_color: appInfo.theme_settings.accent_color,
font_pairing: appInfo.theme_settings.font_pairing,
font_color: appInfo.theme_settings.font_color,
radius: appInfo.theme_settings.radius,
font_size: appInfo.theme_settings.font_size,
},
}
}
Expand Down Expand Up @@ -585,7 +594,7 @@

private standaloneMode(
mode: 1 | 2,
handler: (eventName: string, data: any) => void

Check warning on line 597 in src/index.ts

View workflow job for this annotation

GitHub Actions / ESLint

src/index.ts#L597

Unexpected any. Specify a different type (@typescript-eslint/no-explicit-any)
) {
this._standaloneMode = {
mode,
Expand All @@ -595,15 +604,15 @@
}

export {
AppConfig,
AuthProvider,
BearerAuthentication,
ConstructorParams,
EthereumProvider,
BearerAuthentication,
AppConfig,
Theme,
Position,
Logins,
UserInfo,
ThemeConfig,
NetworkConfig,
Position,
Theme,
ThemeConfig,
UserInfo,
}
15 changes: 15 additions & 0 deletions src/typings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ export interface JsonRpcSuccess<T> extends JsonRpcResponseBase {
result: Maybe<T>
}

export type FirebaseBearer = {
uid?: string | undefined
token: string
}

export type JsonRpcResponse<T> = JsonRpcSuccess<T> | JsonRpcFailure
/* end of json-rpc-engine types */

Expand Down Expand Up @@ -84,15 +89,25 @@ export interface AppThemeInfo {
light_vertical?: string
}
}

export interface ThemeSettings {
accent_color: string
font_pairing: string
font_size: string
font_color: string
radius: string
}
export interface AppInfo {
name: string
chain_type: 'evm' | 'solana'
theme_settings: ThemeSettings
}

export interface AppConfig {
name: string
chainType: ChainType
themeConfig: ThemeConfig
theme_settings: ThemeSettings
}

export interface UserInfo {
Expand Down
Loading
Loading