Auction show loading

This commit is contained in:
2026-09-18 19:55:23 +03:00
parent 45499efa52
commit 9edc1a8f58
4 changed files with 31 additions and 16 deletions
+3 -3
View File
@@ -3,7 +3,7 @@ import {ref, computed, onMounted, defineProps} from "vue";
import {request} from "../lib/gateway.js"; import {request} from "../lib/gateway.js";
import {loadToken} from "../scripts/load_token.js"; import {loadToken} from "../scripts/load_token.js";
import {setAuction} from "./current_auction_store.js"; import {setAuctionId} from "./current_auction_store.js";
const pending = Symbol('pending') const pending = Symbol('pending')
@@ -40,8 +40,8 @@ const auctionPath = (id) => path + `?id=${id}`
function navigateToAuction(auction) { function navigateToAuction(auction) {
let {id} = auction let {id} = auction
let path = auctionPath(id) let path = auctionPath(id)
history.pushState({...auction}, null, path) history.pushState(id, null, path)
setAuction(auction) setAuctionId(id)
} }
</script> </script>
+22 -7
View File
@@ -1,22 +1,37 @@
<script setup> <script setup>
import {watch, useTemplateRef, onMounted, defineProps} from "vue"; import {ref, watch, useTemplateRef, onMounted, defineProps} from "vue";
import {useStore} from "@nanostores/vue"; import {useStore} from "@nanostores/vue";
import {$currentAuction, resetAuction} from "./current_auction_store.js"; import {request} from "../lib/gateway.js";
import {loadToken} from "../scripts/load_token.js";
import {$currentAuctionId, resetAuction} from "./current_auction_store.js";
const currentAuction = useStore($currentAuction) const Loading = Symbol("loading")
const currentAuctionId = useStore($currentAuctionId)
const currentAuction = ref(Loading)
const dialogRef = useTemplateRef('dialog') const dialogRef = useTemplateRef('dialog')
const {path} = defineProps(['path']) const {path} = defineProps(['path'])
const showDialog = () => dialogRef.value.showModal() const showDialog = () => dialogRef.value.showModal()
async function loadAuction() {
currentAuction.value = Loading
if(currentAuctionId.value == null) return
const res = await request(`/auctions/${currentAuctionId.value}`, {cors: true, token: loadToken().token})
currentAuction.value = await res.json()
showDialog()
}
onMounted(() => { onMounted(() => {
if(currentAuction.value !== null) showDialog() if(currentAuctionId.value !== null) loadAuction()
}) })
watch(currentAuction, watch(currentAuctionId,
(val, prevVal) => { (val, prevVal) => {
if (val !== null && prevVal == null) showDialog() if (val !== null && prevVal == null) loadAuction()
if (val == null) dialogRef.value.close() if (val == null) dialogRef.value.close()
}, },
{flush: 'post'}) {flush: 'post'})
@@ -24,7 +39,7 @@ watch(currentAuction,
<template> <template>
<dialog ref="dialog" @close="resetAuction(path)"> <dialog ref="dialog" @close="resetAuction(path)">
<div class="card" v-if="currentAuction !== null"> <div class="card" v-if="currentAuctionId !== null && currentAuction !== Loading">
<div class="card-body"> <div class="card-body">
<h2 class="h5">{{currentAuction.name}}</h2> <h2 class="h5">{{currentAuction.name}}</h2>
<div class="buttons"> <div class="buttons">
@@ -1,12 +1,12 @@
import { atom } from "nanostores"; import { atom } from "nanostores";
export const $currentAuction = atom(null); export const $currentAuctionId = atom(null);
export function setAuction(data) { export function setAuctionId(data) {
$currentAuction.set(data) $currentAuctionId.set(data)
} }
export function resetAuction(path) { export function resetAuction(path) {
history.pushState(null, null, path) history.pushState(null, null, path)
$currentAuction.set(null) $currentAuctionId.set(null)
} }
@@ -1,6 +1,6 @@
import {setAuction} from "../current_auction_store.js"; import {setAuctionId} from "../current_auction_store.js";
window.addEventListener('popstate', (event) => { window.addEventListener('popstate', (event) => {
let {state} = event let {state} = event
setAuction(state) setAuctionId(state)
}) })