Removed debug logging, reload restaurants on login and fixed leaflet marker icons.
Eloi Zalczer
parent
b25d8dd7bd
commit
5e5e7943a3
|
|
@ -4,7 +4,7 @@
|
|||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Vite + Vue</title>
|
||||
<title>DOXFOOD</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 696 B |
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 618 B |
|
|
@ -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)}`;
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -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<L.Map | null>(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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@ const hovered = ref<Restaurant | null>();
|
|||
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
});
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,15 +1,11 @@
|
|||
<script setup lang="ts">
|
||||
import { onMounted, ref } from "vue";
|
||||
import { pb } from "../pocketbase";
|
||||
import { ref } from "vue";
|
||||
import RestaurantsTable from "../components/RestaurantsTable.vue";
|
||||
import RestaurantsMap from "../components/RestaurantsMap.vue";
|
||||
import ReviewsDrawer from "../components/ReviewsDrawer.vue";
|
||||
import { average } from "../utils/math";
|
||||
import { storeToRefs } from "pinia";
|
||||
import { useRestaurantsStore } from "../stores/restaurants";
|
||||
|
||||
const data = ref<Object[]>([]);
|
||||
|
||||
const drawer = ref<typeof ReviewsDrawer>();
|
||||
const table = ref<typeof RestaurantsTable>();
|
||||
|
||||
|
|
@ -28,7 +24,6 @@ function onRestaurantHovered(id: string) {
|
|||
}
|
||||
|
||||
function onDrawerClosed() {
|
||||
console.log("closed");
|
||||
table.value?.deselectAll();
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -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!);
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<p v-if="currentUser">Signed in as {{ currentUser.username }}</p>
|
||||
<form
|
||||
v-else
|
||||
class="flex flex-col place-content-center items-center h-full"
|
||||
@submit.prevent=""
|
||||
>
|
||||
<form v-else class="flex flex-col place-content-center items-center h-full" @submit.prevent="">
|
||||
<div class="flex flex-row flex-nowrap">
|
||||
<div class="mx-5 my-4 w-full">
|
||||
<label class="form-label"> Username </label>
|
||||
|
|
@ -40,8 +36,6 @@ async function login() {
|
|||
</div>
|
||||
|
||||
<button @click="login" :disabled="!valid">Log In</button>
|
||||
<p>
|
||||
New to DOXFOOD ? <RouterLink to="/signup">Create an account !</RouterLink>
|
||||
</p>
|
||||
<p>New to DOXFOOD ? <RouterLink to="/signup">Create an account !</RouterLink></p>
|
||||
</form>
|
||||
</template>
|
||||
|
|
|
|||
Loading…
Reference in New Issue