From a0936483475cdd1849bb278b78fcf65d04cc1d2e Mon Sep 17 00:00:00 2001
From: Believethehype <tobias_baur@yahoo.com>
Date: Wed, 6 Mar 2024 14:12:36 +0100
Subject: [PATCH] optimizations

---
 ui/noogle/src/components/ImageGeneration.vue  | 18 ++++++----
 ui/noogle/src/components/Login.vue            |  1 -
 ui/noogle/src/components/Newnote.vue          |  7 ++--
 .../components/RecommendationGeneration.vue   | 36 ++++++++++---------
 ui/noogle/src/components/Search.vue           |  9 ++---
 .../components/SummarizationGeneration.vue    | 32 +++++++++--------
 ui/noogle/src/layouts/ThreeColumnLayout.vue   |  2 +-
 ui/noogle/src/router/index.js                 |  2 +-
 ui/noogle/src/store.js                        |  6 ++--
 9 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/ui/noogle/src/components/ImageGeneration.vue b/ui/noogle/src/components/ImageGeneration.vue
index 10ad486..80059a5 100644
--- a/ui/noogle/src/components/ImageGeneration.vue
+++ b/ui/noogle/src/components/ImageGeneration.vue
@@ -93,8 +93,9 @@ async function generate_image(message) {
 
         store.commit('set_current_request_id_image', requestid)
         if (!store.state.imagehasEventListener){
-           listen()
            store.commit('set_imagehasEventListener', true)
+           listen()
+
         }
         else{
           console.log("Already has event listener")
@@ -115,14 +116,14 @@ async function  listen() {
     const handle = {
         // Handle event
         handleEvent: async (relayUrl, event) => {
-              if (store.state.imagehasEventListener === false){
+             /* if (store.state.imagehasEventListener === false){
                 return true
-              }
+              }*/
             //const dvmname =  getNamefromId(event.author.toHex())
             console.log("Received new event from", relayUrl);
               console.log(event.asJson())
            let resonsetorequest = false
-            sleep(1000).then(async () => {
+            sleep(0).then(async () => {
               for (let tag in event.tags) {
                 if (event.tags[tag].asVec()[0] === "e") {
                   //console.log("IMAGE ETAG: " + event.tags[tag].asVec()[1])
@@ -360,10 +361,13 @@ const submitHandler = async () => {
 
 
             <template #footer>
-            <div class="content-center">
-              <VueDatePicker :min-date="new Date()"  :dark="true"   className="bg-base-200 content-center" teleport-center v-model="datetopost"></VueDatePicker>
-              <br>
 
+              <div class="inline-flex flex-none">
+                 <VueDatePicker :min-date="new Date()"  :dark="true" style="max-width: 200px;"  className="bg-base-200" teleport-center v-model="datetopost"></VueDatePicker>
+
+              </div>
+
+           <div class="content-center">
               <button className="v-Button" @click="schedule(modalcontent, datetopost)"  @click.stop="closeModal"><img width="25px" style="margin-right: 5px" src="../../public/shipyard.ico"/>Schedule Note with Shipyard DVM</button>
                <br>
               or
diff --git a/ui/noogle/src/components/Login.vue b/ui/noogle/src/components/Login.vue
index c3659af..bce8a0f 100644
--- a/ui/noogle/src/components/Login.vue
+++ b/ui/noogle/src/components/Login.vue
@@ -59,7 +59,6 @@
         </div>
       </div>
     </div>
-      <Nip89></Nip89>
     </template>
   </div>
 </template>
diff --git a/ui/noogle/src/components/Newnote.vue b/ui/noogle/src/components/Newnote.vue
index 63577e8..8a6321d 100644
--- a/ui/noogle/src/components/Newnote.vue
+++ b/ui/noogle/src/components/Newnote.vue
@@ -18,7 +18,6 @@ onClickOutside(target, ()=>emit('modal-close'))
 </script>
 
 <template>
-
   <div v-if="isOpen" class="modal-mask" >
     <div class="modal-wrapper"  >
       <div class="modal-container" ref="target">
@@ -45,17 +44,19 @@ onClickOutside(target, ()=>emit('modal-close'))
 .modal-mask {
 
 
+  max-height: 100%;
+  overflow-y: scroll;
   position: fixed;
   z-index: 9998;
   top: 0;
   left: 0;
   width: 100%;
-  height: 100%;
+
   background-color: rgba(0, 0, 0, 0.5);
 }
 .modal-container {
   @apply bg-base-200;
-  width: 600px;
+
   margin: 15% auto;
   padding: 20px 30px;
   border-radius: 2px;
diff --git a/ui/noogle/src/components/RecommendationGeneration.vue b/ui/noogle/src/components/RecommendationGeneration.vue
index 5329547..63a2aaa 100644
--- a/ui/noogle/src/components/RecommendationGeneration.vue
+++ b/ui/noogle/src/components/RecommendationGeneration.vue
@@ -22,7 +22,7 @@ import {data} from "autoprefixer";
 import {requestProvider} from "webln";
 import Newnote from "@/components/Newnote.vue";
 import SummarizationGeneration from "@/components/SummarizationGeneration.vue"
-import {post_note, schedule, copyurl, copyinvoice, sleep, getEvents, get_user_infos, nextInput, getEventsOriginalOrder} from "../components/helper/Helper.vue"
+import {post_note, schedule, copyurl, copyinvoice, sleep, getEvents, get_user_infos, nextInput, createBolt11Lud16, getEventsOriginalOrder} from "../components/helper/Helper.vue"
 import amberSignerService from "./android-signer/AndroidSigner";
 import StringUtil from "@/components/helper/string.ts";
 
@@ -63,7 +63,7 @@ async function generate_feed() {
           res = await amberSignerService.signEvent(draft)
           await client.sendEvent(Event.fromJson(JSON.stringify(res)))
           requestid = res.id;
-          res = res.id;
+
         }
         else {
 
@@ -82,8 +82,9 @@ async function generate_feed() {
 
         store.commit('set_current_request_id_recommendation', requestid)
         if (!store.state.recommendationehasEventListener){
-           listen()
            store.commit('set_recommendationEventListener', true)
+           listen()
+
         }
         else{
           console.log("Already has event listener")
@@ -105,18 +106,22 @@ async function  listen() {
     const handle = {
         // Handle event
         handleEvent: async (relayUrl, event) => {
-              if (store.state.recommendationehasEventListener === false){
+             /* if (store.state.recommendationehasEventListener === false){
                 return true
-              }
+              }*/
             //const dvmname =  getNamefromId(event.author.toHex())
-            console.log("Received new event from", relayUrl);
-              console.log(event.asJson())
+          console.log("Received new event from", relayUrl);
+          //console.log(event.asJson())
            let resonsetorequest = false
-            sleep(1000).then(async () => {
+            sleep(0).then(async () => {
               for (let tag in event.tags) {
                 if (event.tags[tag].asVec()[0] === "e") {
-                  if (event.tags[tag].asVec()[1] === store.state.requestidRecommendation) {
+                  console.log(event.tags[tag].asVec()[1])
+                  let test = store.state.requestidRecommendation
+                  console.log(test)
+                  if (event.tags[tag].asVec()[1] === test) {
                     resonsetorequest = true
+                    console.log("YES")
                   }
                 }
 
@@ -156,8 +161,6 @@ async function  listen() {
                           else{
                             let profiles = await get_user_infos([event.author])
                            let created = 0
-                            let current
-                          console.log("NUM KIND0 FOUND " + profiles.length)
                             if (profiles.length > 0){
                              // for (const profile of profiles){
                                 console.log(profiles[0].profile)
@@ -389,7 +392,7 @@ const submitHandler = async () => {
     </h3>
   </div>
   <br>
-  <div>
+
        <ModalComponent  :isOpen="isModalOpened" @modal-close="closeModal" @submit="submitHandler" name="first-modal">
             <template #header>Summarize Results <br></template>
             <template #content>
@@ -413,12 +416,11 @@ const submitHandler = async () => {
               </div> -->
             </template>
           </ModalComponent>
-      </div>
 
   <div class=" relative space-y-3">
     <div class="grid grid-cols-1 gap-6">
 
-        <div className="card w-70 bg-base-100 shadow-xl flex flex-col"   v-for="dvm in store.state.recommendationhdvms"
+        <div className="card w-70 bg-base-100 shadow-xl flex flex-col"   v-for="dvm in store.state.recommendationdvms"
             :key="dvm.id">
 
 
@@ -441,7 +443,7 @@ const submitHandler = async () => {
 
           <div className="card-actions justify-end mt-auto" >
 
-              <div className="tooltip mt-auto" :data-tip="dvm.status">
+              <div className="tooltip mt-auto">
 
 
                 <button v-if="dvm.status !== 'finished' && dvm.status !== 'paid' && dvm.status !== 'payment-required' && dvm.status !== 'error'"  className="btn">{{dvm.status}}</button>
@@ -466,8 +468,8 @@ const submitHandler = async () => {
 </div> -->
 
 
-    <details v-if="dvm.status === 'finished'" class="collapse bg-base">
-  <summary class="collapse-title  "><div class="btn">Show/Hide Results</div></summary>
+    <details open v-if="dvm.status === 'finished'" class="collapse bg-base">
+  <summary class="collapse-title   "><div class="btn">Show/Hide Results</div></summary>
   <div class="collapse-content font-size-0" className="z-10" id="collapse">
 
      <NoteTable  :data="dvm.result"  ></NoteTable>
diff --git a/ui/noogle/src/components/Search.vue b/ui/noogle/src/components/Search.vue
index 5ac1745..6a78f50 100644
--- a/ui/noogle/src/components/Search.vue
+++ b/ui/noogle/src/components/Search.vue
@@ -155,8 +155,9 @@ async function send_search_request(msg) {
         store.commit('set_current_request_profile_id_search', requestid_profile)
 
         if (!store.state.hasEventListener){
-            listen()
             store.commit('set_hasEventListener', true)
+            listen()
+
         }
         else{
           console.log("Already has event listener")
@@ -178,13 +179,13 @@ async function  listen() {
     const handle = {
         // Handle event
         handleEvent: async (relayUrl, event) => {
-              if (store.state.hasEventListener === false){
+             /* if (store.state.hasEventListener === false){
                 return true
-              }
+              }*/
             console.log("Received new event from", relayUrl);
             let resonsetorequest = false
 
-            sleep(1200).then(async () => {
+            sleep(500).then(async () => {
 
               for (let tag in event.tags) {
                 if (event.tags[tag].asVec()[0] === "e") {
diff --git a/ui/noogle/src/components/SummarizationGeneration.vue b/ui/noogle/src/components/SummarizationGeneration.vue
index b1ae87d..7624427 100644
--- a/ui/noogle/src/components/SummarizationGeneration.vue
+++ b/ui/noogle/src/components/SummarizationGeneration.vue
@@ -39,8 +39,8 @@ async function summarizefeed(eventids) {
      }
 
         dvms = []
-
         store.commit('set_summarization_dvms', dvms)
+
         let client = store.state.client
         let content = "NIP 90 Summarization request"
         let kind = 5001
@@ -86,8 +86,9 @@ async function summarizefeed(eventids) {
 
         store.commit('set_current_request_id_summarization', requestid)
         if (!store.state.summarizationhasEventListener){
-           listen()
            store.commit('set_summariarizationEventListener', true)
+           listen()
+
         }
         else{
           console.log("Already has event listener")
@@ -109,14 +110,14 @@ async function  listen() {
     const handle = {
         // Handle event
         handleEvent: async (relayUrl, event) => {
-              if (store.state.summarizationhasEventListener === false){
+           /*   if (store.state.summarizationhasEventListener === false){
                 return true
-              }
+              }*/
             //const dvmname =  getNamefromId(event.author.toHex())
             console.log("Received new event from", relayUrl);
               console.log(event.asJson())
            let resonsetorequest = false
-            sleep(1000).then(async () => {
+            sleep(0).then(async () => {
               for (let tag in event.tags) {
                 if (event.tags[tag].asVec()[0] === "e") {
 
@@ -327,11 +328,11 @@ const submitHandler = async () => {
 
   </div>
   <br>
-<div class="overflow-y-auto scrollbar w-full" style="max-height: 60pc">
 
 
-  <div class=" relative space-y-3">
-    <div class="grid grid-cols-1 gap-4 "  >
+
+  <div class=" relative space-y-2">
+    <div class="grid grid-cols-1 gap-2 "  >
 
         <div className="card w-70 bg-base-100 shadow-xl"   v-for="dvm in store.state.summarizationdvms"
             :key="dvm.id">
@@ -356,7 +357,7 @@ const submitHandler = async () => {
 
           <div className="card-actions justify-end mt-auto" >
 
-              <div className="tooltip mt-auto" :data-tip="dvm.status">
+              <div className="tooltip mt-auto">
 
 
                 <button v-if="dvm.status !== 'finished' && dvm.status !== 'paid' && dvm.status !== 'payment-required' && dvm.status !== 'error'"  className="btn">{{dvm.status}}</button>
@@ -379,17 +380,18 @@ const submitHandler = async () => {
 
         </div>
 </div> -->
+ <p  v-if="dvm.status === 'finished'">{{dvm.result}}</p>
 
-
-    <details v-if="dvm.status === 'finished'" class="collapse bg-base">
+  <!--   <details v-if="dvm.status === 'finished'" class="collapse bg-base">
   <summary class="collapse-title  "><div class="btn">Show/Hide Results</div></summary>
-  <div class="collapse-content font-size-0" className="z-10" id="collapse">
 
-     <p>{{dvm.result}}</p>
+ <div class="collapse-content font-size-0" className="z-10" id="collapse">
+
+
 
 
     </div>
-</details>
+</details>-->
 
 
            </div>
@@ -399,7 +401,7 @@ const submitHandler = async () => {
 
 
   </div>
-  </div>
+
 </template>
 
 <style scoped>
diff --git a/ui/noogle/src/layouts/ThreeColumnLayout.vue b/ui/noogle/src/layouts/ThreeColumnLayout.vue
index af5058e..4ed1a45 100644
--- a/ui/noogle/src/layouts/ThreeColumnLayout.vue
+++ b/ui/noogle/src/layouts/ThreeColumnLayout.vue
@@ -12,7 +12,7 @@ import {isVisible} from "bootstrap/js/src/util/index.js";
   </div>
   <div className="flex-1">
     <router-link  class="menu" to="/">Noogle</router-link>
-    <router-link class="menu" to="/recommendation">Discover</router-link>
+    <router-link class="menu" to="/discover">Discover</router-link>
     <router-link class="menu" to="/image">ImageGen</router-link>
     <!--<router-link class="menu" to="/about">About</router-link> -->
     <router-link class="menu" to="/nip89">DVMs</router-link>
diff --git a/ui/noogle/src/router/index.js b/ui/noogle/src/router/index.js
index 87c6ff6..54084d9 100644
--- a/ui/noogle/src/router/index.js
+++ b/ui/noogle/src/router/index.js
@@ -8,7 +8,7 @@ const routes = [
   { path: "/donate", component: () => import("@/components/Donate.vue") },
   { path: "/nip89", component: () => import("@/components/Nip89view.vue") },
   { path: "/image", component: () => import("@/components/Image.vue") },
-  { path: "/recommendation", component: () => import("@/components/Recommendation.vue") },
+  { path: "/discover", component: () => import("@/components/Recommendation.vue") },
   { path: "/article/:id", component: () => import("@/components/Home.vue") },
   { path: '/:pathMatch(.*)*', component: () => import("@/components/Home.vue") },
 ];
diff --git a/ui/noogle/src/store.js b/ui/noogle/src/store.js
index c4c35f2..fe4bf40 100644
--- a/ui/noogle/src/store.js
+++ b/ui/noogle/src/store.js
@@ -22,7 +22,7 @@ const store = createStore({
       imagedvmreplies: [],
       nip89dvms: [],
       activesearchdvms: [],
-      recommendationhdvms: [],
+      recommendationdvms: [],
       summarizationdvms: [],
       results:  [],
       profile_results: [],
@@ -92,8 +92,8 @@ const store = createStore({
       state.activesearchdvms.push.apply(state.activesearchdvms, dvms)
     },
     set_recommendation_dvms(state, dvms) {
-      state.recommendationhdvms.length = 0
-      state.recommendationhdvms.push.apply(state.recommendationhdvms, dvms)
+      state.recommendationdvms.length = 0
+      state.recommendationdvms.push.apply(state.recommendationdvms, dvms)
     },
 
     set_summarization_dvms(state, dvms) {