Skip to content
Merged
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
1 change: 1 addition & 0 deletions docker/dev/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ API_URL=https://backend:5101/
SCRIPT_API_URL=https://localhost:5101/
SCRIPT_FRONTEND_URL=https://localhost:5100/
SCRIPT_ILPAY_URL=https://interledgerpay.com/extension/
SCRIPT_EMBED_URL=https://localhost:5100/

# BACKEND
AWS_ACCESS_KEY_ID=
Expand Down
2 changes: 2 additions & 0 deletions docker/dev/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ services:
VITE_SCRIPT_API_URL: ${SCRIPT_API_URL}
VITE_SCRIPT_FRONTEND_URL: ${SCRIPT_FRONTEND_URL}
VITE_SCRIPT_ILPAY_URL: ${SCRIPT_ILPAY_URL}
VITE_INIT_SCRIPT_URL: ${SCRIPT_EMBED_URL}
ports:
- '5100:5100'
expose:
Expand All @@ -48,6 +49,7 @@ services:
API_URL: ${API_URL}
ILPAY_URL: ${SCRIPT_ILPAY_URL}
FRONTEND_URL: ${SCRIPT_FRONTEND_URL}
INIT_SCRIPT_URL: ${SCRIPT_EMBED_URL}
networks:
- wm-tools
command: pnpm run dev
Expand Down
2 changes: 2 additions & 0 deletions docker/prod/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ services:
VITE_SCRIPT_API_URL: ${SCRIPT_API_URL}
VITE_SCRIPT_FRONTEND_URL: ${SCRIPT_FRONTEND_URL}
VITE_SCRIPT_ILPAY_URL: ${SCRIPT_ILPAY_URL}
VITE_INIT_SCRIPT_URL: ${SCRIPT_EMBED_URL}
ports:
- '5100:5100'
expose:
Expand All @@ -40,6 +41,7 @@ services:
API_URL: ${API_URL}
ILPAY_URL: ${SCRIPT_ILPAY_URL}
FRONTEND_URL: ${SCRIPT_FRONTEND_URL}
INIT_SCRIPT_URL: ${SCRIPT_EMBED_URL}
networks:
- wm-tools
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion frontend/app/lib/presets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export const availableTools = [
"The banner informs visitors who don't have the Web Monetization extension active, with a call-to-action linking to the extension or providing details about the options available. It also adds your wallet address for your site to be monetized."
},
{
enabled: true,
enabled: false,
title: 'Widget',
image: 'widget_representation.svg',
bgColor: 'from-wm-red to-wm-red-fade',
Expand Down
15 changes: 10 additions & 5 deletions frontend/app/routes/create.$type.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,26 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
const defaultConfig: ElementConfigType = apiResponse?.payload?.default

const ilpayUrl = process.env.ILPAY_URL || ''
const toolsUrl = process.env.FRONTEND_URL || ''
const scriptInitUrl = process.env.SCRIPT_EMBED_URL || ''

return {
elementType,
defaultConfig,
message,
ilpayUrl,
toolsUrl,
scriptInitUrl,
contentOnlyParam
}
}

export default function Create() {
const { elementType, defaultConfig, ilpayUrl, toolsUrl, contentOnlyParam } =
useLoaderData<typeof loader>()
const {
elementType,
defaultConfig,
ilpayUrl,
scriptInitUrl,
contentOnlyParam
} = useLoaderData<typeof loader>()
const response = useActionData<typeof action>()
const { state } = useNavigation()
const isSubmitting = state === 'submitting'
Expand All @@ -94,7 +99,7 @@ export default function Create() {
const wa = (toolConfig?.walletAddress || '')
.replace('$', '')
.replace('https://', '')
const scriptToDisplay = `<script id="wmt-init-script" type="module" src="${toolsUrl}init.js?wa=${wa}&tag=[version]&types=[elements]"></script>`
const scriptToDisplay = `<script id="wmt-init-script" type="module" src="${scriptInitUrl}init.js?wa=${wa}&tag=[version]&types=[elements]"></script>`
const submitForm = useSubmit()

const onConfirm = () => {
Expand Down