From 8bc63084f5dc9e1925212aa1102951e2565ae7a5 Mon Sep 17 00:00:00 2001 From: Engels Baca Sevilla Date: Wed, 18 Aug 2021 14:42:35 -0600 Subject: [PATCH 01/11] Trello#138 Adding lightning accepted field --- nuxt/components/AddStoreModal.vue | 18 ++++++++++++++---- nuxt/store/actions.js | 17 +++++------------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/nuxt/components/AddStoreModal.vue b/nuxt/components/AddStoreModal.vue index 99d071d2..da54cd6c 100644 --- a/nuxt/components/AddStoreModal.vue +++ b/nuxt/components/AddStoreModal.vue @@ -125,6 +125,14 @@ +
+ +
+ { diff --git a/nuxt/store/actions.js b/nuxt/store/actions.js index 68dc3239..140914d2 100644 --- a/nuxt/store/actions.js +++ b/nuxt/store/actions.js @@ -92,21 +92,14 @@ const actions = { }, addStore( { state }, - { - name: name, - description: description, - url: url, - uri: uri, - sector: sector, - digitalGoods: digitalGoods, - contributor: contributor, - recaptcha: recaptcha, - } + { contributor, description, lightningAccepted, name, recaptcha, uri, url } ) { - let params = { + const BTCLNMode = lightningAccepted ? ['payments'] : [] + + const params = { accepted: { BTC: { modes: ['payments'] }, - BTCLN: { modes: ['payments'] }, + BTCLN: { modes: BTCLNMode }, }, name: encodeURIComponent(name), description: encodeURIComponent(description), From d3dd08e8bf7d5866f30453fce6ac8f160ed6fb22 Mon Sep 17 00:00:00 2001 From: Engels Baca Sevilla Date: Wed, 18 Aug 2021 15:00:59 -0600 Subject: [PATCH 02/11] Refactor, deconstructing addDialogForm --- nuxt/components/AddStoreModal.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nuxt/components/AddStoreModal.vue b/nuxt/components/AddStoreModal.vue index da54cd6c..8d64a785 100644 --- a/nuxt/components/AddStoreModal.vue +++ b/nuxt/components/AddStoreModal.vue @@ -296,15 +296,17 @@ export default { this.isLoading = true this.addAlert = { message: '', success: true } this.isPaid = false + + const { contributor, url, name, description, uri } = this.addDialogForm this.$store .dispatch('addStore', { - contributor: this.addDialogForm.contributor, - description: this.addDialogForm.description, + contributor, + description, lightningAccepted: this.lightningAccepted, - name: this.addDialogForm.name, + name, recaptcha: token, - uri: this.addDialogForm.uri, - url: this.addDialogForm.url, + uri, + url, }) .then( (response) => { From aaea4eb2d6b089dbfcfce40ac730c1af6f457b92 Mon Sep 17 00:00:00 2001 From: pedro-roberto Date: Fri, 20 Aug 2021 20:57:01 +0100 Subject: [PATCH 03/11] Configure port and axios interceptor --- nuxt/nuxt.config.js | 2 +- nuxt/plugins/axios.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nuxt/nuxt.config.js b/nuxt/nuxt.config.js index ceec22bb..636426f4 100644 --- a/nuxt/nuxt.config.js +++ b/nuxt/nuxt.config.js @@ -11,7 +11,7 @@ const Meta = { export default { target: 'server', server: { - port: 3000, + port: 3001, host: '0.0.0.0', headers: { 'Access-Control-Allow-Origin': '*' }, }, diff --git a/nuxt/plugins/axios.js b/nuxt/plugins/axios.js index a8b8ce7b..0c143579 100644 --- a/nuxt/plugins/axios.js +++ b/nuxt/plugins/axios.js @@ -1,6 +1,6 @@ export default function ({ $axios }) { $axios.onRequest(config => { - config.headers['Original-Host'] = 'lightningnetworkstores.com' + config.headers['Original-Host'] = 'bitcoinyellow.page' return config }) } \ No newline at end of file From 0f39a032f1f74a5c82a0e7cbbb6263a425a76349 Mon Sep 17 00:00:00 2001 From: pedro-roberto Date: Fri, 20 Aug 2021 22:19:09 +0100 Subject: [PATCH 04/11] Remove wallets page. Use temporary logo. --- nuxt/assets/images/LightningNetworkStores.svg | 72 ++----- nuxt/components/Header.vue | 2 +- nuxt/pages/Wallets.vue | 183 ------------------ 3 files changed, 13 insertions(+), 244 deletions(-) delete mode 100644 nuxt/pages/Wallets.vue diff --git a/nuxt/assets/images/LightningNetworkStores.svg b/nuxt/assets/images/LightningNetworkStores.svg index a49ed753..cf47b1ce 100644 --- a/nuxt/assets/images/LightningNetworkStores.svg +++ b/nuxt/assets/images/LightningNetworkStores.svg @@ -1,60 +1,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Layer 1 + + + + + + Yellow Page + + + \ No newline at end of file diff --git a/nuxt/components/Header.vue b/nuxt/components/Header.vue index f0bd9941..2b1d2013 100644 --- a/nuxt/components/Header.vue +++ b/nuxt/components/Header.vue @@ -109,7 +109,7 @@ export default { { url: '/discuss', text: 'Discuss' }, { url: '/faucet', text: 'Faucet' }, { url: '/stats', text: 'Statistics' }, - { url: '/wallets', text: 'Wallets' }, + //{ url: '/wallets', text: 'Wallets' }, //{ url: '/donations', text: 'Donations' }, { url: '/about', text: 'About' }, ], diff --git a/nuxt/pages/Wallets.vue b/nuxt/pages/Wallets.vue deleted file mode 100644 index 0ff048b4..00000000 --- a/nuxt/pages/Wallets.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - From df7d2bb274510e19273ac02e1ab73f909a5adbb0 Mon Sep 17 00:00:00 2001 From: pedro-roberto Date: Fri, 20 Aug 2021 23:26:55 +0100 Subject: [PATCH 05/11] Change base URL --- nuxt/package.json | 4 ++-- nuxt/pages/store/_id.vue | 2 +- nuxt/static/opensearch.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nuxt/package.json b/nuxt/package.json index e4ff67f6..d93b4859 100644 --- a/nuxt/package.json +++ b/nuxt/package.json @@ -3,8 +3,8 @@ "version": "1.0.0", "private": true, "scripts": { - "dev": "BASE_URL=https://bitcoin-stores.com/ nuxt", - "build": "BASE_URL=https://bitcoin-stores.com/ nuxt build", + "dev": "BASE_URL=https://yp.bitcoin-stores.com/ nuxt", + "build": "BASE_URL=https://yp.bitcoin-stores.com/ nuxt build", "start": "nuxt start", "format": "prettier --write \"**/*.{js,json,vue}\" \"{.babelrc,.eslintrc}\"", "generate": "node --max-old-space-size=1024 node_modules/nuxt/bin/nuxt.js generate" diff --git a/nuxt/pages/store/_id.vue b/nuxt/pages/store/_id.vue index 40ad1525..c3e1bb51 100644 --- a/nuxt/pages/store/_id.vue +++ b/nuxt/pages/store/_id.vue @@ -133,7 +133,7 @@ diff --git a/nuxt/static/opensearch.xml b/nuxt/static/opensearch.xml index 22641487..a691c191 100644 --- a/nuxt/static/opensearch.xml +++ b/nuxt/static/opensearch.xml @@ -5,5 +5,5 @@ Search stores/apps/projects that accept bitcoin through the lightning network. UTF-8 /favicon-16x16.ico - + From 60eae3f3e70510704166a6217040aaf6eb213d00 Mon Sep 17 00:00:00 2001 From: pedro-roberto Date: Sat, 21 Aug 2021 00:35:58 +0100 Subject: [PATCH 06/11] Fix missing URL --- nuxt/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuxt/package.json b/nuxt/package.json index d93b4859..fe94820d 100644 --- a/nuxt/package.json +++ b/nuxt/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "BASE_URL=https://yp.bitcoin-stores.com/ nuxt", "build": "BASE_URL=https://yp.bitcoin-stores.com/ nuxt build", - "start": "nuxt start", + "start": "BASE_URL=https://yp.bitcoin-stores.com/ nuxt start", "format": "prettier --write \"**/*.{js,json,vue}\" \"{.babelrc,.eslintrc}\"", "generate": "node --max-old-space-size=1024 node_modules/nuxt/bin/nuxt.js generate" }, From add44d4693d0949a2b4e502ac92019a070296b42 Mon Sep 17 00:00:00 2001 From: Engels Baca Sevilla Date: Mon, 23 Aug 2021 10:21:40 -0600 Subject: [PATCH 07/11] Trello#135 Adding lightning accepted switch to settings modal --- nuxt/components/SettingsModal.vue | 46 ++++++++++++++++++------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/nuxt/components/SettingsModal.vue b/nuxt/components/SettingsModal.vue index 57576906..7ec2e4ba 100644 --- a/nuxt/components/SettingsModal.vue +++ b/nuxt/components/SettingsModal.vue @@ -21,7 +21,16 @@
Email
- + + +
+ +
+
Notifications
+ label="New reviews (coming feature)" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nuxt/components/Header.vue b/nuxt/components/Header.vue index 3a9b62c2..8efb1a8e 100644 --- a/nuxt/components/Header.vue +++ b/nuxt/components/Header.vue @@ -13,7 +13,11 @@ v-model="showMenu" absolute open-on-hover - style="max-width: 600px" + style="width: 900px; max-width: 900px" + :offset-y="true" + bottom + left + content-class="open-chevron-down-lighthing" > - + From c0b232af286e2bcee2b16c0df3776fae96fdd19e Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 10 Jan 2023 14:31:20 -0600 Subject: [PATCH 10/11] resolved --- nuxt/components/Header.vue | 67 +++++++++----------------------------- 1 file changed, 15 insertions(+), 52 deletions(-) diff --git a/nuxt/components/Header.vue b/nuxt/components/Header.vue index 8efb1a8e..75662be8 100644 --- a/nuxt/components/Header.vue +++ b/nuxt/components/Header.vue @@ -1,54 +1,39 @@ From ea9253bb7e1be07dc3f35f1533b8ae0028bf239f Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 10 Jan 2023 14:33:25 -0600 Subject: [PATCH 11/11] changes to header.vue for showing sister sites --- nuxt/components/Header.vue | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/nuxt/components/Header.vue b/nuxt/components/Header.vue index 75662be8..b76cdac1 100644 --- a/nuxt/components/Header.vue +++ b/nuxt/components/Header.vue @@ -1,19 +1,13 @@