From 5e5e7943a345ca6ff2d1aa324be213226cc91411 Mon Sep 17 00:00:00 2001 From: Eloi Zalczer Date: Wed, 19 Jun 2024 10:45:59 +0200 Subject: [PATCH] Removed debug logging, reload restaurants on login and fixed leaflet marker icons. --- index.html | 2 +- public/icon/layers-2x.png | Bin 0 -> 1259 bytes public/icon/layers.png | Bin 0 -> 696 bytes public/icon/marker-icon-2x.png | Bin 0 -> 2464 bytes public/icon/marker-icon.png | Bin 0 -> 1466 bytes public/icon/marker-shadow.png | Bin 0 -> 618 bytes src/components/RatingField.vue | 1 - src/components/RestaurantsMap.vue | 5 ++--- src/components/RestaurantsTable.vue | 2 -- src/components/ReviewsList.vue | 2 -- src/stores/restaurants.ts | 11 ++++++++--- src/views/ListView.vue | 7 +------ src/views/LoginView.vue | 12 +++--------- 13 files changed, 15 insertions(+), 27 deletions(-) create mode 100644 public/icon/layers-2x.png create mode 100644 public/icon/layers.png create mode 100644 public/icon/marker-icon-2x.png create mode 100644 public/icon/marker-icon.png create mode 100644 public/icon/marker-shadow.png diff --git a/index.html b/index.html index 43fea63..a54d554 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - Vite + Vue + DOXFOOD
diff --git a/public/icon/layers-2x.png b/public/icon/layers-2x.png new file mode 100644 index 0000000000000000000000000000000000000000..200c333dca9652ac4cba004d609e5af4eee168c1 GIT binary patch literal 1259 zcmVFhCYNy;#0irRPomHqW|G1C*;4?@4#E?jH>?v@U%cy?3dQAc-DchXVErpOh~ z-jbon+tNbnl6hoEb;)TVk+%hTDDi_G%i3*RZ&15!$Fjr^f;Ke&A@|?=`2&+{zr+3a z{D*=t(`AXyS%X7N z%a#RZw6vD^t_rnM`L4E>m=U&R!A-&}nZIi$BOPvkhrCuUe@BN~-lRD)f44;J%TwgE zcze8u!PQ_NR7?o(NylLXVTfDO zxs5=@|GsYEsNo4M#nT%N!UE(?dnS)t2+{ELYAFp*3=iF=|EQnTp`#vlSXuGVraYo? z+RCzXo6h3qA8{KG?S4nE(lM+;Eb4nT3XV;7gcAxUi5m)`k5tv}cPy()8ZR3TLW3I- zAS^}cq-IJvL7a4RgR!yk@~RT%$lA7{L5ES*hyx)M4(yxI$Ub(4f)K|^v1>zvwQY!_ zIrWw8q9GS^!Dp~}+?mbnB6jDF8mVlbQ!jFKDY;w=7;XO{9bq7>LXGK24WA`;rL)_Z z)&j}pbV(;6gY;VMhbxgvn`X;6x}VUEE-7 z%)7j-%t8S=ZL3yc)HbXDAqJZvBTPoiW_A-+a8m3_Z?v{DN7Tnr#O_VUMT0UBt$;p` zDh6JbGHN8JJ*JN%y2%msb97@_S>9!%Egwk;?PEkU9ntz&3uR}%Fj5d$JHQbQb3}a{ zSzFT^#n=VInPpcAS}CNxj?_ zVscANk5Cfz(51EI1pz};AWWb|kgbYNb4wCEGUn3+eMUMV?1-{=I4TlmLJMot@rd07 zZuo2hk1ccu{YmGkcYdWAVdk{Z4Nm?^cTD&}jGm+Q1SYIXMwmG*oO*83&#>l%nbR`G zhh=lZ%xIb7kU3#;TBbfECrnC9P=-XpL|TG2BoZdj61*XiFbW8?1Z_wp%#;>${SUIy V$8qr;L*)Pf002ovPDHLkV1hYLS~36t literal 0 HcmV?d00001 diff --git a/public/icon/layers.png b/public/icon/layers.png new file mode 100644 index 0000000000000000000000000000000000000000..1a72e5784b2b456eac5d7670738db80697af3377 GIT binary patch literal 696 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 e-I|>x8~*?ZhF3snGbtJX0000cOl4 literal 0 HcmV?d00001 diff --git a/public/icon/marker-icon.png b/public/icon/marker-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..950edf24677ded147df13b26f91baa2b0fa70513 GIT binary patch literal 1466 zcmV;r1x5OaP)P001cn1^@s6z>|W`000GnNklGNuHDcIX17Zdjl&3`L?0sTjIws<{((Dh&g-s0<@jYQyl?D*X^?%13;ml^gy> ziMrY_^1WI=(g@LMizu=zCoA>C`6|QEq1eV92k*7m>G65*&@&6)aC&e}G zI)pf-Za|N`DT&Cn1J|o`19mumxW~hiKiKyc-P`S@q)rdTo84@QI@;0yXrG%9uhI>A zG5QHb6s4=<6xy{1 z@NMxEkryp{LS44%z$3lP^cX!9+2-;CTt3wM4(k*#C{aiIiLuB>jJj;KPhPzIC00bL zU3a#;aJld94lCW=`4&aAy8M7PY=HQ>O%$YEP4c4UY#CRxfgbE~(|uiI=YS8q;O9y6 zmIkXzR`}p7ti|PrM3a}WMnR=3NVnWdAAR>b9X@)DKL6=YsvmH%?I24wdq?Gh54_;# z$?_LvgjEdspdQlft#4CQ z`2Zyvy?*)N1Ftw|{_hakhG9WjS?Az@I@+IZ8JbWewR!XUK4&6346+d#~gsE0SY(LX8&JfY>Aj)RxGy96nwhs2rv zzW6pTnMpFkDSkT*a*6Dx|u@ds6ISVn0@^RmIsKZ5Y;bazbc;tTSq(kg(=481ODrPyNB6n z-$+U}(w$m6U6H$w17Bw+wDaFIe~GvNMYvnw31MpY0eQKT9l>SU``8k7w4)z!GZKMI z#_cEKq7k~i%nlK@6c-K?+R;B#5$?T#YpKD`t_4bAs^#E+@5QW$@OX3*`;(#{U^d-vY)&xEE>n5lYl&T?Amke9$Lam@{1K@O ze*LXqlKQHiv=gx+V^Cbb2?z@ISBQ*3amF;9UJ3SBg(N|710TLamQmYZ&Qjn2LuO<* zCZlB4n%@pc&7NNnY1}x+NWpHlq`OJEo|`aYN9<`RBUB+79g;>dgb6YlfN#kGL?lO_ z!6~M^7sOnbsUkKk<@Ysie&`G>ruxH&Mgy&8;i=A zB9OO!xR{AyODw>DS-q5YM{0ExFEAzt zm>RdS+ssW(-8|?xr0(?$vBVB*%(xDLtq3Hf0I5yFm<_g=W2`QWAax{1rWVH=I!VrP zs(rTFX@W#t$hXNvbgX`gK&^w_YD;CQ!B@e0QbLIWaKAXQe2-kkloo;{iF#6}z!4=W zi$giRj1{ zt;2w`VSCF#WE&*ev7jpsC=6175@(~nTE2;7M-L((0bH@yG}-TB$R~WXd?tA$s3|%y zA`9$sA(>F%J3ioz<-LJl*^o1|w84l>HBR`>3l9c8$5Xr@xCiIQ7{x$fMCzOk_-M=% z+{a_Q#;42`#KfUte@$NT77uaTz?b-fBe)1s5XE$yA79fm?KqM^VgLXD07*qoM6N<$ Ef<_J(9smFU literal 0 HcmV?d00001 diff --git a/src/components/RatingField.vue b/src/components/RatingField.vue index 9ff7790..de8f0c7 100644 --- a/src/components/RatingField.vue +++ b/src/components/RatingField.vue @@ -27,7 +27,6 @@ const text = computed(() => { if (model.value === undefined || model.value === null) { return "0"; } - console.log(model.value); return `${round(model.value, 1)}`; }); diff --git a/src/components/RestaurantsMap.vue b/src/components/RestaurantsMap.vue index d23ae57..95d203b 100644 --- a/src/components/RestaurantsMap.vue +++ b/src/components/RestaurantsMap.vue @@ -7,6 +7,8 @@ import LatLng from "../models/map"; import { storeToRefs } from "pinia"; import { useRestaurantsStore } from "../stores/restaurants"; +L.Icon.Default.imagePath = "icon/"; + const map = ref(null); const { restaurants } = storeToRefs(useRestaurantsStore()); @@ -50,17 +52,14 @@ onMounted(() => { watch( () => props.highlighted, (newval, oldval) => { - console.log(markers.value); if (oldval != null) { var old = markers.value.get(oldval); - console.log("old", old, oldval); if (old.isPopupOpen()) { old.closePopup(); } } if (newval != null) { var marker = markers.value.get(newval); - console.log("new", marker, newval); if (!marker.isPopupOpen()) { marker.openPopup(); } diff --git a/src/components/RestaurantsTable.vue b/src/components/RestaurantsTable.vue index d548e1c..662a02f 100644 --- a/src/components/RestaurantsTable.vue +++ b/src/components/RestaurantsTable.vue @@ -41,7 +41,6 @@ const hovered = ref(); function onMouseOver(e) { const row = e.target?._DT_CellIndex?.row; - console.log("row", row); if (row !== undefined && props.data !== undefined) { if (hovered.value != props.data[row]) { @@ -51,7 +50,6 @@ function onMouseOver(e) { } else { if (hovered.value !== null) { emit("restaurantHovered", null); - console.log("hovered"); } hovered.value = null; } diff --git a/src/components/ReviewsList.vue b/src/components/ReviewsList.vue index ca817cc..2b39490 100644 --- a/src/components/ReviewsList.vue +++ b/src/components/ReviewsList.vue @@ -15,13 +15,11 @@ async function load(restaurantId: string) { expand: "user", sort: "-created", }); - console.log(reviews.value); } watch( () => props.restaurant, async (newval, oldval) => { - console.log("fetch"); if (props.restaurant === undefined) { reviews.value = []; } else { diff --git a/src/stores/restaurants.ts b/src/stores/restaurants.ts index 78cd941..39bf254 100644 --- a/src/stores/restaurants.ts +++ b/src/stores/restaurants.ts @@ -1,9 +1,10 @@ import { defineStore } from "pinia"; -import { pb } from "../pocketbase"; +import { currentUser, pb } from "../pocketbase"; import { average } from "../utils/math"; import Restaurant from "../models/restaurant"; import _ from "lodash"; +import { watch } from "vue"; export const useRestaurantsStore = defineStore("restaurants", { state: () => ({ @@ -44,11 +45,15 @@ export const useRestaurantsStore = defineStore("restaurants", { await this.load(); pb.collection("restaurants").subscribe("*", async (e) => { - this.load(); + await this.load(); }); pb.collection("reviews").subscribe("*", async (e) => { - this.load(); + await this.load(); + }); + + watch(currentUser, async (newUser, oldUser) => { + await this.load(); }); }, }, diff --git a/src/views/ListView.vue b/src/views/ListView.vue index b6e670a..d03544f 100644 --- a/src/views/ListView.vue +++ b/src/views/ListView.vue @@ -1,15 +1,11 @@ diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index 62d02c4..dfcff0b 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -15,17 +15,13 @@ async function login() { return; } - await pb.collection("users").authWithPassword(username.value, password.value); + await pb.collection("users").authWithPassword(username.value!, password.value!); }