From 948e960c6cb5a0f33af66b8b4a26dd56bcf13988 Mon Sep 17 00:00:00 2001 From: Mel Date: Thu, 17 Feb 2022 22:30:43 +0100 Subject: Rename stores/ to state/ since it no longer includes just state in stores. --- assets/src/entries/request.ts | 2 +- assets/src/entries/share.ts | 2 +- assets/src/state/constant_state.ts | 33 +++++++++++++++++++++++++++++++++ assets/src/state/data.ts | 21 +++++++++++++++++++++ assets/src/state/received_requests.ts | 17 +++++++++++++++++ assets/src/stores/constant_state.ts | 33 --------------------------------- assets/src/stores/data.ts | 21 --------------------- assets/src/stores/received_requests.ts | 17 ----------------- assets/src/utils/getShareToken.ts | 2 +- 9 files changed, 74 insertions(+), 74 deletions(-) create mode 100644 assets/src/state/constant_state.ts create mode 100644 assets/src/state/data.ts create mode 100644 assets/src/state/received_requests.ts delete mode 100644 assets/src/stores/constant_state.ts delete mode 100644 assets/src/stores/data.ts delete mode 100644 assets/src/stores/received_requests.ts (limited to 'assets') diff --git a/assets/src/entries/request.ts b/assets/src/entries/request.ts index fcdda2f..4b13ca7 100644 --- a/assets/src/entries/request.ts +++ b/assets/src/entries/request.ts @@ -1,6 +1,6 @@ import RequestPage from "../components/RequestPage.svelte"; import { RookType } from "../models/rook_type"; -import { setClientType } from "../stores/constant_state"; +import { setClientType } from "../state/constant_state"; setClientType(RookType.REQUEST); diff --git a/assets/src/entries/share.ts b/assets/src/entries/share.ts index cc2ab9c..f38ce98 100644 --- a/assets/src/entries/share.ts +++ b/assets/src/entries/share.ts @@ -1,6 +1,6 @@ import SharePage from "../components/SharePage.svelte"; import { RookType } from "../models/rook_type"; -import { setClientType } from "../stores/constant_state"; +import { setClientType } from "../state/constant_state"; setClientType(RookType.SHARE); diff --git a/assets/src/state/constant_state.ts b/assets/src/state/constant_state.ts new file mode 100644 index 0000000..aeda86e --- /dev/null +++ b/assets/src/state/constant_state.ts @@ -0,0 +1,33 @@ +// Cannot be changed after being set. + +import { RookType } from "../models/rook_type"; + +let clientType: RookType = null; + +export function setClientType(type: RookType) { + if (clientType !== null) { + clientType = type; + } else { + throw new Error("Tried changing client type after initialization."); + } +} + +export function isClientShare() { + if (clientType === null) { + throw new Error( + "Tried accessing client type before initialization was completed." + ); + } + + return clientType === RookType.SHARE; +} + +export function isClientRequest() { + if (clientType === null) { + throw new Error( + "Tried accessing client type before initialization was completed." + ); + } + + return clientType === RookType.REQUEST; +} diff --git a/assets/src/state/data.ts b/assets/src/state/data.ts new file mode 100644 index 0000000..d59183c --- /dev/null +++ b/assets/src/state/data.ts @@ -0,0 +1,21 @@ +import { writable } from "svelte/store"; + +const createDataStore = () => { + const { subscribe, update } = writable({ locked: false, data: null }); + + return { + subscribe, + set: data => { + update(state => { + if (!state.locked) { + return { locked: true, data }; + } else { + console.error("Tried setting data after locking."); + return state; + } + }); + }, + }; +}; + +export default createDataStore(); diff --git a/assets/src/state/received_requests.ts b/assets/src/state/received_requests.ts new file mode 100644 index 0000000..48916ad --- /dev/null +++ b/assets/src/state/received_requests.ts @@ -0,0 +1,17 @@ +import { writable } from "svelte/store"; +import type { IncomingRequest } from "../models/incoming_request"; + +const createRequestStore = () => { + const { subscribe, update } = writable([]); + + return { + subscribe, + addRequest: (request: IncomingRequest) => update(state => [request, ...state]), + removeRequest: (token: string) => + update(state => + state.filter(request => request.info.token !== token) + ), + }; +}; + +export default createRequestStore(); diff --git a/assets/src/stores/constant_state.ts b/assets/src/stores/constant_state.ts deleted file mode 100644 index aeda86e..0000000 --- a/assets/src/stores/constant_state.ts +++ /dev/null @@ -1,33 +0,0 @@ -// Cannot be changed after being set. - -import { RookType } from "../models/rook_type"; - -let clientType: RookType = null; - -export function setClientType(type: RookType) { - if (clientType !== null) { - clientType = type; - } else { - throw new Error("Tried changing client type after initialization."); - } -} - -export function isClientShare() { - if (clientType === null) { - throw new Error( - "Tried accessing client type before initialization was completed." - ); - } - - return clientType === RookType.SHARE; -} - -export function isClientRequest() { - if (clientType === null) { - throw new Error( - "Tried accessing client type before initialization was completed." - ); - } - - return clientType === RookType.REQUEST; -} diff --git a/assets/src/stores/data.ts b/assets/src/stores/data.ts deleted file mode 100644 index d59183c..0000000 --- a/assets/src/stores/data.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { writable } from "svelte/store"; - -const createDataStore = () => { - const { subscribe, update } = writable({ locked: false, data: null }); - - return { - subscribe, - set: data => { - update(state => { - if (!state.locked) { - return { locked: true, data }; - } else { - console.error("Tried setting data after locking."); - return state; - } - }); - }, - }; -}; - -export default createDataStore(); diff --git a/assets/src/stores/received_requests.ts b/assets/src/stores/received_requests.ts deleted file mode 100644 index 48916ad..0000000 --- a/assets/src/stores/received_requests.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { writable } from "svelte/store"; -import type { IncomingRequest } from "../models/incoming_request"; - -const createRequestStore = () => { - const { subscribe, update } = writable([]); - - return { - subscribe, - addRequest: (request: IncomingRequest) => update(state => [request, ...state]), - removeRequest: (token: string) => - update(state => - state.filter(request => request.info.token !== token) - ), - }; -}; - -export default createRequestStore(); diff --git a/assets/src/utils/getShareToken.ts b/assets/src/utils/getShareToken.ts index b470695..3bae6f1 100644 --- a/assets/src/utils/getShareToken.ts +++ b/assets/src/utils/getShareToken.ts @@ -1,4 +1,4 @@ -import { isClientRequest } from "../stores/constant_state"; +import { isClientRequest } from "../state/constant_state"; export default function (): string { if (!isClientRequest()) { -- cgit 1.4.1