From 52e08f834a31265efd3ada945910a29c4d134ec4 Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Sat, 24 Feb 2024 01:12:35 +0100
Subject: [PATCH 1/5] New page ProofDetail

---
 src/i18n/locales/en.json  |  4 +++
 src/router.js             |  1 +
 src/views/ProofDetail.vue | 72 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 src/views/ProofDetail.vue

diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index b2da4e8817..fa8bdeaf63 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -219,6 +219,10 @@
 		"DeleteTitle": "Delete a proof",
 		"Success": "Proof deleted!"
 	},
+	"ProofDetail": {
+		"Prices": "Prices",
+		"LoadMore": "Load more"
+	},
 	"Router": {
 		"AddPrice": {
 			"Title": "Add a price"
diff --git a/src/router.js b/src/router.js
index 35ff03b6ac..4a328a9c90 100644
--- a/src/router.js
+++ b/src/router.js
@@ -21,6 +21,7 @@ const routes = [
   { path: '/locations', name: 'locations', component: () => import('./views/LocationList.vue'), meta: { title: 'TopLocations', icon: 'mdi-medal-outline', drawerMenu: true }},
   { path: '/locations/:id', name: 'location-detail', component: () => import('./views/LocationDetail.vue'), meta: { title: 'Location detail' }},
   { path: '/brands/:id', name: 'brand-detail', component: () => import('./views/BrandDetail.vue'), meta: { title: 'Brand detail' }},
+  { path: '/proofs/:id', name: 'proof-detail', component: () => import('./views/ProofDetail.vue'), meta: { title: 'Proof detail', requiresAuth: true }},
   { path: '/users', name: 'users', component: () => import('./views/UserList.vue'), meta: { title: 'TopContributors', icon: 'mdi-medal-outline', drawerMenu: true }},
   { path: '/users/:username', name: 'user-detail', component: () => import('./views/UserDetail.vue'), meta: { title: 'User detail' }},
   { path: '/stats', name: 'stats', component: () => import('./views/Stats.vue'), meta: { title: 'Stats' }},
diff --git a/src/views/ProofDetail.vue b/src/views/ProofDetail.vue
new file mode 100644
index 0000000000..2d4541cfef
--- /dev/null
+++ b/src/views/ProofDetail.vue
@@ -0,0 +1,72 @@
+<template>
+  <v-row>
+    <v-col cols="12" sm="6">
+      <ProofCard v-if="proof" :proof="proof"></ProofCard>
+    </v-col>
+  </v-row>
+
+  <br />
+
+  <h2 class="text-h6 mb-1">
+    {{ $t('ProofDetail.Prices') }}
+    <v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
+  </h2>
+
+  <v-row>
+    <v-col cols="12" sm="6" md="4" v-for="price in proofPriceList" :key="price">
+      <PriceCard :price="price" :product="price.product" elevation="1" height="100%"></PriceCard>
+    </v-col>
+  </v-row>
+
+  <v-row v-if="proofPriceList.length < proofPriceTotal" class="mb-2">
+    <v-col align="center">
+      <v-btn size="small" :loading="loading" @click="getProofPrices">{{ $t('ProofDetail.LoadMore') }}</v-btn>
+    </v-col>
+  </v-row>
+</template>
+
+<script>
+import api from '../services/api'
+import { defineAsyncComponent } from 'vue'
+
+export default {
+  components: {
+    'ProofCard': defineAsyncComponent(() => import('../components/ProofCard.vue')),
+    'PriceCard': defineAsyncComponent(() => import('../components/PriceCard.vue')),
+  },
+  data() {
+    return {
+      proofId: this.$route.params.id,
+      proof: null,
+      proofPriceList: [],
+      proofPriceTotal: null,
+      proofPricePage: 0,
+      loading: false,
+    }
+  },
+  mounted() {
+    this.getProof()
+    this.getProofPrices()
+  },
+  methods: {
+    getProof() {
+      return api.getProofById(this.proofId)
+        .then((data) => {
+          if (data.id) {
+            this.proof = data
+          }
+        })
+    },
+    getProofPrices() {
+      this.loading = true
+      this.proofPricePage += 1
+      return api.getPrices({ proof_id: this.proofId, page: this.proofPricePage })
+        .then((data) => {
+          this.proofPriceList.push(...data.items)
+          this.proofPriceTotal = data.total
+          this.loading = false
+        })
+    },
+  }
+}
+</script>

From 0a1148641cb34e29efd004d4c746455d2447b9bf Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Sat, 24 Feb 2024 12:51:26 +0100
Subject: [PATCH 2/5] PriceCard: hide price proof

---
 src/components/PriceCard.vue   | 3 ++-
 src/components/PriceFooter.vue | 3 ++-
 src/views/ProofDetail.vue      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/PriceCard.vue b/src/components/PriceCard.vue
index 8591faf18c..af72da440b 100644
--- a/src/components/PriceCard.vue
+++ b/src/components/PriceCard.vue
@@ -35,7 +35,7 @@
         </v-col>
       </v-row>
 
-      <PriceFooter v-if="price && !hidePriceFooter" class="mt-2" :price="price" :hidePriceLocation="hidePriceLocation" :readonly="readonly"></PriceFooter>
+      <PriceFooter v-if="price && !hidePriceFooter" class="mt-2" :price="price" :hidePriceLocation="hidePriceLocation" :hidePriceProof="hidePriceProof" :readonly="readonly"></PriceFooter>
     </v-container>
   </v-card>
 </template>
@@ -61,6 +61,7 @@ export default {
     'hidePriceDate': false,
     'hidePriceFooter': false,
     'hidePriceLocation': false,
+    'hidePriceProof': false,
     'readonly': false
   },
   data() {
diff --git a/src/components/PriceFooter.vue b/src/components/PriceFooter.vue
index 722619ddd5..79b6eec1c3 100644
--- a/src/components/PriceFooter.vue
+++ b/src/components/PriceFooter.vue
@@ -13,7 +13,7 @@
 
     <RelativeDateTimeChip :dateTime="price.created"></RelativeDateTimeChip>
 
-    <PriceProof v-if="price.proof && price.proof.is_public" :proof="price.proof"></PriceProof>
+    <PriceProof v-if="price.proof && price.proof.is_public && !hidePriceProof" :proof="price.proof"></PriceProof>
 
     <PriceDeleteChip v-if="userIsPriceOwner" :price="price"></PriceDeleteChip>
   </div>
@@ -34,6 +34,7 @@ export default {
   props: {
     'price': null,
     'hidePriceLocation': false,
+    'hidePriceProof': false,
     'readonly': false
   },
   data() {
diff --git a/src/views/ProofDetail.vue b/src/views/ProofDetail.vue
index 2d4541cfef..f4db72a6a0 100644
--- a/src/views/ProofDetail.vue
+++ b/src/views/ProofDetail.vue
@@ -14,7 +14,7 @@
 
   <v-row>
     <v-col cols="12" sm="6" md="4" v-for="price in proofPriceList" :key="price">
-      <PriceCard :price="price" :product="price.product" elevation="1" height="100%"></PriceCard>
+      <PriceCard :price="price" :product="price.product" :hidePriceProof="true" elevation="1" height="100%"></PriceCard>
     </v-col>
   </v-row>
 

From 7f5eb88c89a0002621c13578bd24f4d1806f6e21 Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Sat, 24 Feb 2024 12:57:47 +0100
Subject: [PATCH 3/5] ProofCard: add link to proof detail on price count chip

---
 src/components/ProofCard.vue   |  6 +++++-
 src/components/ProofFooter.vue | 21 ++++++++++++++++++---
 src/views/ProofDetail.vue      |  2 +-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/components/ProofCard.vue b/src/components/ProofCard.vue
index bd092d6460..5da13858a3 100644
--- a/src/components/ProofCard.vue
+++ b/src/components/ProofCard.vue
@@ -5,7 +5,7 @@
     </v-card-text>
     <v-divider></v-divider>
     <v-card-text>
-      <ProofFooter :proof="proof" :hideProofDelete="hideProofDelete"></ProofFooter>
+      <ProofFooter :proof="proof" :hideProofDelete="hideProofDelete" :readonly="readonly"></ProofFooter>
     </v-card-text>
   </v-card>
 </template>
@@ -27,6 +27,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
diff --git a/src/components/ProofFooter.vue b/src/components/ProofFooter.vue
index c92bddea1e..ac630e6cd6 100644
--- a/src/components/ProofFooter.vue
+++ b/src/components/ProofFooter.vue
@@ -11,9 +11,9 @@
       <span v-if="proof.type !== 'GDPR_REQUEST'">
         {{ proofType }}
       </span>
-      
+
     </v-chip>
-    <PriceCountChip :count="proof.price_count" :withLabel="true"></PriceCountChip>
+    <PriceCountChip :count="proof.price_count" :withLabel="true" @click="goToProof()"></PriceCountChip>
     <RelativeDateTimeChip :dateTime="proof.created"></RelativeDateTimeChip>
     <ProofDeleteChip v-if="!hideProofDelete && userCanDeleteProof" :proof="proof"></ProofDeleteChip>
   </div>
@@ -37,6 +37,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -48,14 +52,25 @@ export default {
     username() {
       return this.appStore.user.username
     },
+    isProofOwner() {
+      return this.username && (this.proof.owner === this.username)
+    },
     userCanDeleteProof() {
       // user must be proof owner
       // and proof must not have any prices
-      return this.username && (this.proof.owner === this.username) && (this.proof.price_count === 0)
+      return this.isProofOwner && (this.proof.price_count === 0)
     },
     proofType() {
       return this.$t(`ProofCard.${this.proof.type}`)
     }
+  },
+  methods: {
+    goToProof() {
+      if (this.readonly || !this.isProofOwner) {
+        return
+      }
+      this.$router.push({ path: `/proofs/${this.proof.id}` })
+    },
   }
 }
 </script>
diff --git a/src/views/ProofDetail.vue b/src/views/ProofDetail.vue
index f4db72a6a0..3faa05f8c4 100644
--- a/src/views/ProofDetail.vue
+++ b/src/views/ProofDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <v-row>
     <v-col cols="12" sm="6">
-      <ProofCard v-if="proof" :proof="proof"></ProofCard>
+      <ProofCard v-if="proof" :proof="proof" :readonly="true"></ProofCard>
     </v-col>
   </v-row>
 

From 3df02cf825b6d5282a8788ad169f4589aeefd004 Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Sat, 24 Feb 2024 13:06:37 +0100
Subject: [PATCH 4/5] Error message if Proof not found or not owner

---
 src/i18n/locales/en.json  | 3 ++-
 src/views/ProofDetail.vue | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index fa8bdeaf63..3bc41bf51a 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -220,8 +220,9 @@
 		"Success": "Proof deleted!"
 	},
 	"ProofDetail": {
+		"LoadMore": "Load more",
 		"Prices": "Prices",
-		"LoadMore": "Load more"
+		"ProofNotFound": "Proof not found (or not the owner)"
 	},
 	"Router": {
 		"AddPrice": {
diff --git a/src/views/ProofDetail.vue b/src/views/ProofDetail.vue
index 3faa05f8c4..1f3ed4fc28 100644
--- a/src/views/ProofDetail.vue
+++ b/src/views/ProofDetail.vue
@@ -2,23 +2,24 @@
   <v-row>
     <v-col cols="12" sm="6">
       <ProofCard v-if="proof" :proof="proof" :readonly="true"></ProofCard>
+      <p v-if="!loading && !proof" class="text-red">{{ $t('ProofDetail.ProofNotFound') }}</p>
     </v-col>
   </v-row>
 
   <br />
 
-  <h2 class="text-h6 mb-1">
+  <h2 class="text-h6 mb-1" v-if="proof">
     {{ $t('ProofDetail.Prices') }}
     <v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
   </h2>
 
-  <v-row>
+  <v-row v-if="proof">
     <v-col cols="12" sm="6" md="4" v-for="price in proofPriceList" :key="price">
       <PriceCard :price="price" :product="price.product" :hidePriceProof="true" elevation="1" height="100%"></PriceCard>
     </v-col>
   </v-row>
 
-  <v-row v-if="proofPriceList.length < proofPriceTotal" class="mb-2">
+  <v-row v-if="proof && (proofPriceList.length < proofPriceTotal)" class="mb-2">
     <v-col align="center">
       <v-btn size="small" :loading="loading" @click="getProofPrices">{{ $t('ProofDetail.LoadMore') }}</v-btn>
     </v-col>
@@ -46,7 +47,6 @@ export default {
   },
   mounted() {
     this.getProof()
-    this.getProofPrices()
   },
   methods: {
     getProof() {
@@ -54,6 +54,7 @@ export default {
         .then((data) => {
           if (data.id) {
             this.proof = data
+            this.getProofPrices()
           }
         })
     },

From bf0feefbb648d39365dc0fbe155807ccaf3286aa Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Mon, 26 Feb 2024 11:58:46 +0100
Subject: [PATCH 5/5] Rebase

---
 src/components/UserRecentProofsDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/UserRecentProofsDialog.vue b/src/components/UserRecentProofsDialog.vue
index c84f5b2662..059bdea5c5 100644
--- a/src/components/UserRecentProofsDialog.vue
+++ b/src/components/UserRecentProofsDialog.vue
@@ -8,7 +8,7 @@
       <v-card-text style="overflow-y:scroll;">
         <v-row>
           <v-col cols="12" sm="6" md="3" v-for="proof in userProofList" :key="proof">
-            <ProofCard :proof="proof" :hideProofDelete="true" :isSelectable="true" @proofSelected="selectProof"></ProofCard>
+            <ProofCard :proof="proof" :hideProofDelete="true" :isSelectable="true" :readonly="true" @proofSelected="selectProof"></ProofCard>
           </v-col>
         </v-row>
       </v-card-text>