From 7bbd3891a76d3a6da20a4aa3888e6da87e41aa6d Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Mon, 10 Oct 2022 00:42:33 +0800 Subject: refactor/fix: Small refactors/fixes, update imports --- code/app/src/lib/helpers.ts | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'code/app/src/lib/helpers.ts') diff --git a/code/app/src/lib/helpers.ts b/code/app/src/lib/helpers.ts index 3fa1653..b659506 100644 --- a/code/app/src/lib/helpers.ts +++ b/code/app/src/lib/helpers.ts @@ -1,7 +1,7 @@ import { browser } from "$app/environment"; -import type { TimeEntryDto } from "$lib/models/TimeEntryDto"; -import type { UnwrappedEntryDateTime } from "$lib/models/UnwrappedEntryDateTime"; -import { logInfo } from "$lib/logger"; +import type { WorkEntry } from "$lib/models/work/WorkEntry"; +import type { UnwrappedEntryDateTime } from "$lib/models/internal/UnwrappedEntryDateTime"; +import { log_info } from "$lib/logger"; import { Temporal } from "temporal-polyfill"; export const EMAIL_REGEX = new RegExp(/^([a-z0-9]+(?:([._\-])[a-z0-9]+)*@(?:[a-z0-9]+(?:(-)[a-z0-9]+)?\.)+[a-z0-9](?:[a-z0-9]*[a-z0-9])?)$/i); @@ -9,7 +9,7 @@ export const URL_REGEX = new RegExp(/^(http:\/\/www\.|https:\/\/www\.|http:\/\/| export const GUID_REGEX = new RegExp(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i); export const NORWEGIAN_PHONE_NUMBER_REGEX = new RegExp(/(0047|\+47|47)?\d{8,12}/); -export function get_default_sorted(unsorted: Array): Array { +export function get_default_sorted(unsorted: Array): Array { if (unsorted.length < 1) return unsorted; const byStart = unsorted.sort((a, b) => { return Temporal.Instant.compare(Temporal.Instant.from(b.start), Temporal.Instant.from(a.start)); @@ -43,17 +43,7 @@ export function is_norwegian_phone_number(value: string): boolean { return NORWEGIAN_PHONE_NUMBER_REGEX.test(String(value)); } -export function get_cookie(name: string) { - const value = `; ${document.cookie}`; - const parts = value.split(`; ${name}=`); - if (parts.length === 2) return parts.pop()?.split(";").shift(); -} - -export function set_cookie(name: string, value: string, baseDomain = window.location.hostname) { - document.cookie = name + "=" + encodeURIComponent(value) + (baseDomain ? ";domain=" + baseDomain : ""); -} - -export function unwrap_date_time_from_entry(entry: TimeEntryDto): UnwrappedEntryDateTime { +export function unwrap_date_time_from_entry(entry: WorkEntry): UnwrappedEntryDateTime { if (!entry) throw new Error("entry was undefined"); const currentTimeZone = Temporal.Now.timeZone().id; const startInstant = Temporal.Instant.from(entry.start).toZonedDateTimeISO(currentTimeZone); @@ -425,7 +415,7 @@ export function can_use_dom(): boolean { export function session_storage_remove_regex(regex: RegExp): void { if (!browser) { - logInfo("sessionStorage is not available in non-browser contexts"); + log_info("sessionStorage is not available in non-browser contexts"); return; } let n = sessionStorage.length; @@ -439,7 +429,7 @@ export function session_storage_remove_regex(regex: RegExp): void { export function local_storage_remove_regex(regex: RegExp): void { if (!browser) { - logInfo("sessionStorage is not available in non-browser contexts"); + log_info("sessionStorage is not available in non-browser contexts"); return; } let n = localStorage.length; -- cgit v1.3