diff options
| author | Adam Soltys <[email protected]> | 2022-10-28 00:30:19 -0700 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2022-10-28 00:30:19 -0700 |
| commit | 3567d9d7e1a1caf4893f862020dd555d4d96550c (patch) | |
| tree | 7cf5723aec62c8ef62e1ad443af9a6c36a69a6bf | |
| parent | 14ea7e748d8d36b2624c892c9cc38f9744fc5c0b (diff) | |
| download | coinos-ui-3567d9d7e1a1caf4893f862020dd555d4d96550c.tar.gz coinos-ui-3567d9d7e1a1caf4893f862020dd555d4d96550c.zip | |
fix qr scan
| -rw-r--r-- | docker-compose.yml | 13 | ||||
| -rw-r--r-- | src/components/AppHeader.svelte | 15 | ||||
| -rw-r--r-- | src/routes/[username]/transactions/[...page]/+page.server.js | 1 | ||||
| -rw-r--r-- | src/routes/scan/+page.svelte | 2 |
4 files changed, 18 insertions, 13 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 48e12fa7..d6bd8700 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,15 +1,20 @@ version: '3.6' services: - ui: - container_name: ui - image: gcr.io/coinos-326717/github.com/coinos/coinos-ui:prod + v2: + container_name: v2 + build: . restart: always ports: - '3121:3121' environment: NODE_ENV: production - ORIGIN: 'https://v2.coinos.io' + ORIGIN: "${ORIGIN}" PORT: 3121 + PUBLIC_COINOS_URL: "${PUBLIC_COINOS_URL}" + PUBLIC_BTC: "${PUBLIC_BTC}" + PUBLIC_SOCKET: "${PUBLIC_SOCKET}" + STRIPE: "${STRIPE}" + LAUNCH: "${LAUNCH}" extra_hosts: - host.docker.internal:host-gateway networks: diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index 1cffaad8..6fb6447a 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -12,13 +12,14 @@ $: update(data); let update = (data) => ({ subject, user } = data); - let menuButtons; - if(user) menuButtons = [ - { key: 'nav.profile', icon: 'profile', href: `/${user.username}` }, - { key: 'nav.settings', icon: 'settings', href: `/${user.username}/settings` }, - { key: 'nav.support', icon: 'support', href: `/${user.username}/support` }, - { key: 'nav.signOut', icon: 'logout', href: `/logout` } - ]; + let menuButtons; + if (user) + menuButtons = [ + { key: 'nav.profile', icon: 'profile', href: `/${user.username}` }, + { key: 'nav.settings', icon: 'settings', href: `/${user.username}/settings` }, + { key: 'nav.support', icon: 'support', href: `/${user.username}/support` }, + { key: 'nav.signOut', icon: 'logout', href: `/logout` } + ]; let showMenu = false; diff --git a/src/routes/[username]/transactions/[...page]/+page.server.js b/src/routes/[username]/transactions/[...page]/+page.server.js index 95fb8094..1151d412 100644 --- a/src/routes/[username]/transactions/[...page]/+page.server.js +++ b/src/routes/[username]/transactions/[...page]/+page.server.js @@ -18,7 +18,6 @@ export async function load({ cookies, params, request }) { if (end) url += `&end=${end}`; let { total, transactions } = await get(url, auth(cookies)); - console.log("TOT", total, transactions.length); let pages = new Array(Math.ceil(total / limit)); diff --git a/src/routes/scan/+page.svelte b/src/routes/scan/+page.svelte index 392a67ad..79dbe7b0 100644 --- a/src/routes/scan/+page.svelte +++ b/src/routes/scan/+page.svelte @@ -7,7 +7,7 @@ let scanner, vid; onMount(() => { - scanner = new QrScanner(vid, (text) => goto(`/send/${text}`) && console.log(text), { + scanner = new QrScanner(vid, ({ data }) => goto(`/send/${data}`), { highlightScanRegion: true, highlightCodeOutline: true }); |