Merge branch 'nostr-dev' into develop

Author: lightningnetworkstores

nuxt/assets/images/nostr.bitcoin-stores.com.png

@@ -15,10 +15,7 @@
     </v-btn>
 
     <!-- Add store modal -->
-    <v-dialog
-      v-model="showAddDialog"
-      max-width="500"
-    >
+    <v-dialog v-model="showAddDialog" max-width="500">
       <template v-if="showAddDialog">
         <v-card>
           <v-layout v-if="addAlert.message">
@@ -103,9 +100,9 @@
                   </v-row>
                   <v-row>
                     <v-text-field
-                      v-model="addDialogForm.uri"
-                      label="Node URI (optional)"
-                      hint="eg. 03864ef025fde8fb587d989186ce6a4a186895ee44a926bfc370e2c366597a3f8f@34.239.230.56:9735 (optional)"
+                      v-model="addDialogForm.nostr"
+                      label="Nostr (optional)"
+                      hint=""
                     ></v-text-field>
                   </v-row>
                   <v-row>
@@ -120,10 +117,12 @@
                     ></v-text-field>
                   </v-row>
                   <v-row>
-                    <span class="font-weight-bold"
-                      >We reserve the right to remove this entry if it doesn't
-                      accept bitcoin and is not about bitcoin</span
-                    >
+                    <div class="d-flex justify-center my-4">
+                      <v-switch
+                        v-model="lightningAccepted"
+                        color="orange"
+                        label="Lightning accepted?"/>
+                    </div>
                   </v-row>
                 </v-container>
                 <v-card-actions>
@@ -203,6 +202,7 @@ export default {
       expiryTime: new Date(),
       isPaid: false,
       tweet: null,
+      lightningAccepted: false,
 
       checkPaymentTimer: null,
       successModalMessage: '',
@@ -284,9 +284,9 @@ export default {
             name: this.addDialogForm.name,
             description: this.addDialogForm.description,
             url: this.addDialogForm.url,
-            uri: this.addDialogForm.uri,
+            nostr: this.addDialogForm.nostr,
             contributor: this.addDialogForm.contributor,
-            accepted: {BTC: {payments: true}, BTCLN: {payments: true}},
+            accepted: {BTC: {payments: this.lightningAccepted}, BTCLN: {'payments': this.lightningAccepted}},
             recaptcha: token,
           })
           .then(

nuxt/assets/images/nostr.bitcoin-stores.com.svg

@@ -57,12 +57,8 @@ import Head from '~/mixins/Head'
 
 export default {
   mixins: [Head],
-  head() {
-    return this.getMetadata(
-      'Project contest',
-      'Vote regularly on your favorite project. Guess the most voted project and earn sats',
-      '/ogimage.png'
-    )
+  head() { return this.getMetadata('Project contest', 'Vote regularly on your favorite project. Guess the most voted project and earn sats',
+    '/og/index.jpg')
   },
   computed: {
     ...mapGetters({

nuxt/components/AddStoreModal.vue

@@ -92,7 +92,7 @@ export default {
         })
       }
 
-      return this.filterTags
+      return this.filterTags.filter(({name}) => name != 'nostr')
     },
   },
 

nuxt/components/ContestView.vue

@@ -4,7 +4,7 @@
       <template v-slot:activator="{ on, attrs }">
         <div class="d-flex justify-start align-center" style="height: 100%">
           <nuxt-link to="/">
-            <img src="@/assets/images/LightningNetworkStores.svg" class="nav-logo" alt="Lightning Network Stores logo"/>
+            <img src="@/static/nostr.bitcoin-stores.com.png" class="nav-logo" alt="Nostrich.fun logo"/>
           </nuxt-link>
           <v-icon large color="grey lighten-1" v-bind="attrs" v-on="on" class="sister-site-dropdown-btn">
             mdi-chevron-down
@@ -26,7 +26,7 @@
     <v-toolbar-items class="hidden-sm-and-down">
       <!-- Menu List - Web -->
 
-      <v-menu open-on-hover offset-y>
+      <!-- <v-menu open-on-hover offset-y>
         <template v-slot:activator="{ on, attrs }">
           <v-btn text v-bind="attrs" v-on="on"> Explore </v-btn>
         </template>
@@ -40,7 +40,7 @@
             </v-btn>
           </v-list-item>
         </v-list>
-      </v-menu>
+      </v-menu> -->
 
       <v-menu open-on-hover offset-y>
         <template v-slot:activator="{ on, attrs }">
@@ -120,7 +120,7 @@
           </v-list-item>
         </v-list-item>
         <!-- Menu Explore -->
-        <v-list-item>
+        <!-- <v-list-item>
           <v-menu offset-x absolute :content-class="positionExploreCard">
             <template v-slot:activator="{ on, attrs }">
               <v-list-item v-bind="attrs" v-on="on">
@@ -143,7 +143,8 @@
               </v-list-item>
             </v-list>
           </v-menu>
-        </v-list-item>
+        </v-list-item> -->
+
         <!-- Menu Community -->
         <v-list-item>
           <v-menu offset-x absolute :content-class="positionExploreCard">
@@ -229,7 +230,7 @@ export default {
       showMenu: false,
       routes: [
         { url: '/discuss', text: 'Discuss' },
-        { url: '/faucet', text: 'Faucet' },
+        //{ url: '/faucet', text: 'Faucet' },
         { url: '/stats', text: 'Statistics' },
         //{ url: '/wallets', text: 'Wallets' },
         //{ url: '/donations', text: 'Donations' },
@@ -247,9 +248,13 @@ export default {
         { url: '/contributors', text: 'Contributors' },
       ],
       sisterSites: [
+        // {
+        //   url: 'https://nostr.bitcoin-stores.com',
+        //   svgPath: '/nostr.bitcoin-stores.com.png',
+        // },
         {
-          url: 'https://nostrich.fun',
-          svgPath: '/nostrich-fun.svg',
+          url: 'https://lightningnetworkstores.com',
+          svgPath: '/lns.png'
         },
         // {
         //   url: 'https://yp.bitcoin-stores.com',
@@ -315,26 +320,25 @@ export default {
   height: 64px !important;
 }
 .sister-site-entry {
-  max-width: 380px;
+  max-height: 48px;
 }
 .sister-site-dropdown-btn {
-  margin-left: -0.3em;
+  margin-left: -0.7em;
   align-self: end;
 }
 @media (min-width: 768px) {
   .sister-site-dropdown-btn {
-    margin-left: -0.4em;
+    margin-left: -1.3em;
   }
 }
 .nav-logo {
-  height: 55px;
+  width: 28vmax;
   position: relative;
   max-width: 380px;
   right: 1rem;
 }
 @media (min-width: 768px) {
   .nav-logo {
-    margin-left: 1em;
     right: 1.5rem;
   }
 }

nuxt/components/FilterStores.vue

@@ -23,7 +23,7 @@
                 hide-details
                 v-resize="onResizeWidth"
             >
-                <template v-slot:append>
+                <!-- <template v-slot:append>
                     <v-btn
                         rounded
                         :class="!showTextButton ? 'd-none' : ''"
@@ -44,7 +44,7 @@
                         v-else
                         >Popular Searches</v-btn
                     >
-                </template>
+                </template> -->
             </v-text-field>
             <v-btn
                 fab