From 50fc47e6e387c3b278526ef773badf63913389d6 Mon Sep 17 00:00:00 2001
From: Terry Truong <terry06890@gmail.com>
Date: Fri, 6 Jan 2023 16:59:54 +1100
Subject: Add settings modal

Add saving, loading, default vals, and device-detection, to store.ts.
Add setting for hiding minor tick labels.
---
 src/components/SButton.vue       |  12 ++++
 src/components/SettingsModal.vue | 127 +++++++++++++++++++++++++++++++++++++++
 src/components/TimeLine.vue      |  15 +++--
 3 files changed, 148 insertions(+), 6 deletions(-)
 create mode 100644 src/components/SButton.vue
 create mode 100644 src/components/SettingsModal.vue

(limited to 'src/components')

diff --git a/src/components/SButton.vue b/src/components/SButton.vue
new file mode 100644
index 0000000..487d6bd
--- /dev/null
+++ b/src/components/SButton.vue
@@ -0,0 +1,12 @@
+<template>
+<button :disabled="disabled" class="block rounded px-4 py-2"
+	:class="{'hover:brightness-125': !disabled, 'brightness-50': disabled}">
+	<slot>?</slot>
+</button>
+</template>
+
+<script setup lang="ts">
+defineProps({
+	disabled: {type: Boolean, default: false},
+});
+</script>
diff --git a/src/components/SettingsModal.vue b/src/components/SettingsModal.vue
new file mode 100644
index 0000000..1ccea2a
--- /dev/null
+++ b/src/components/SettingsModal.vue
@@ -0,0 +1,127 @@
+<template>
+<div class="fixed left-0 top-0 w-full h-full bg-black/40" @click="onClose" ref="rootRef">
+	<div class="absolute left-1/2 -translate-x-1/2 top-1/2 -translate-y-1/2
+		min-w-[8cm] max-w-[80%] max-h-[80%] overflow-auto" :style="styles">
+		<close-icon @click.stop="onClose" ref="closeRef"
+			class="absolute top-1 right-1 md:top-2 md:right-2 w-8 h-8 hover:cursor-pointer" />
+		<h1 class="text-xl md:text-2xl font-bold text-center py-2" :class="borderBClasses">Settings</h1>
+		<div class="pb-2" :class="borderBClasses">
+			<h2 class="font-bold md:text-xl text-center pt-1 md:pt-2 md:pb-1">Categories</h2>
+			<ul class="px-2 grid grid-cols-3">
+				<!-- Row 1 -->
+				<li> <label> <input type="checkbox" v-model="store.ctgs.event"
+					@change="onSettingChg('ctgs.event')"/> Event </label> </li>
+				<li> <label> <input type="checkbox" v-model="store.ctgs.person"
+					@change="onSettingChg('ctgs.person')"/> Person </label> </li>
+				<li> <label> <input type="checkbox" v-model="store.ctgs.work"
+					@change="onSettingChg('ctgs.work')"/> Work </label> </li>
+				<!-- Row 2 -->
+				<li> <label> <input type="checkbox" v-model="store.ctgs.place"
+					@change="onSettingChg('ctgs.place')"/> Place </label> </li>
+				<li> <label> <input type="checkbox" v-model="store.ctgs.organism"
+					@change="onSettingChg('ctgs.organism')"/> Organism </label> </li>
+				<li> <label> <input type="checkbox" v-model="store.ctgs.discovery"
+					@change="onSettingChg('ctgs.discovery')"/> Discovery </label> </li>
+			</ul>
+		</div>
+		<div class="pb-2" :class="borderBClasses">
+			<h2 class="font-bold md:text-xl text-center pt-1 md:pt-2 md:pb-1">Display</h2>
+			<div class="px-2">
+				<label> <input type="checkbox" v-model="store.showEventCounts"
+					@change="onSettingChg('showEventCounts')"/> Show event count indicators </label>
+			</div>
+			<div class="px-2">
+				<label> <input type="checkbox" v-model="store.showMinorTicks"
+					@change="onSettingChg('showMinorTicks')"/> Show minor tick labels </label>
+			</div>
+		</div>
+		<div v-if="store.touchDevice == false" class="pb-2" :class="borderBClasses">
+			<h2 class="font-bold md:text-xl text-center pt-1 md:pt-2 md:pb-1">Input</h2>
+			<div class="px-2">
+				<label> <input type="checkbox" v-model="store.disableShortcuts"
+					@change="onSettingChg('disableShortcuts')"/> Disable keyboard shortcuts </label>
+			</div>
+			<div class="grid grid-cols-[100px_minmax(0,1fr)_65px] gap-1 w-fit mx-auto px-2 md:px-3">
+				<!-- Row 1 -->
+				<label for="scrollRatio" @click="onResetOne('scrollRatio')" :class="rLabelClasses">
+					Scroll ratio
+				</label>
+				<input type="range" min="0.1" max="0.8" step="0.1" v-model.number="store.scrollRatio"
+					@change="onSettingChg('scrollRatio')" name="scrollRatio"/>
+				<div class="my-auto text-right">{{store.scrollRatio}}</div>
+				<!-- Row 2 -->
+				<label for="zoomRatio" @click="onResetOne('zoomRatio')" :class="rLabelClasses">
+					Zoom ratio
+				</label>
+				<input type="range" min="1.2" max="5" step="0.2" v-model.number="store.zoomRatio"
+					@change="onSettingChg('zoomRatio')" name="zoomRatio"/>
+				<div class="my-auto text-right">{{store.zoomRatio}}</div>
+			</div>
+		</div>
+		<s-button class="mx-auto my-2" :style="{color: store.color.text, backgroundColor: store.color.bg}"
+			@click="onReset">
+			Reset
+		</s-button>
+		<transition name="fade">
+			<div v-if="saved" class="absolute right-1 bottom-1" ref="saveIndRef"> Saved </div>
+		</transition>
+	</div>
+</div>
+</template>
+
+<script setup lang="ts">
+import {ref, computed} from 'vue';
+import SButton from './SButton.vue';
+import CloseIcon from './icon/CloseIcon.vue';
+import {useStore} from '../store';
+
+// Refs
+const rootRef = ref(null as HTMLDivElement | null);
+const closeRef = ref(null as typeof CloseIcon | null);
+const saveIndRef = ref(null as HTMLDivElement | null);
+
+// Global store
+const store = useStore();
+
+// Events
+const emit = defineEmits(['close']);
+
+// Settings change handling
+const saved = ref(false); // Set to true after a setting is saved
+function onSettingChg(option: string){ 
+	store.save(option);
+	// Make 'Saved' indicator appear/animate
+	if (!saved.value){
+		saved.value = true;
+	} else {
+		let el = saveIndRef.value!;
+		el.classList.remove('animate-flash-yellow');
+		el.offsetWidth; // Triggers reflow
+		el.classList.add('animate-flash-yellow');
+	}
+}
+function onResetOne(option: string){
+	store.resetOne(option);
+	onSettingChg(option);
+}
+function onReset(){
+	store.reset();
+	store.clear();
+	saved.value = false;
+}
+
+// Close handling
+function onClose(evt: Event){
+	if (evt.target == rootRef.value || closeRef.value!.$el.contains(evt.target)){
+		emit('close');
+	}
+}
+
+// Styles and classes
+const styles = computed(() => ({
+	backgroundColor: store.color.bgAlt,
+	borderRadius: store.borderRadius + 'px',
+}));
+const borderBClasses = 'border-b border-stone-400';
+const rLabelClasses = "w-fit hover:cursor-pointer hover:text-yellow-600"; // For reset-upon-click labels
+</script>
diff --git a/src/components/TimeLine.vue b/src/components/TimeLine.vue
index e41a729..13589d2 100644
--- a/src/components/TimeLine.vue
+++ b/src/components/TimeLine.vue
@@ -38,11 +38,14 @@
 				:style="tickStyles(tick)" class="animate-fadein"/>
 		</template>
 		<!-- Tick labels -->
-		<text v-for="tick in ticks" :key="tick.date.toInt()"
-			x="0" y="0" :text-anchor="vert ? 'start' : 'middle'" dominant-baseline="middle"
-			:fill="store.color.textDark" :style="tickLabelStyles(tick)" class="text-sm animate-fadein cursor-default">
-			{{tick.date.toDisplayString()}}
-		</text>
+		<template v-for="tick in ticks" :key="tick.date.toInt()">
+			<text v-if="tick.major || store.showMinorTicks"
+				x="0" y="0" :text-anchor="vert ? 'start' : 'middle'" dominant-baseline="middle"
+				:fill="store.color.textDark" :style="tickLabelStyles(tick)"
+				class="text-sm animate-fadein cursor-default">
+				{{tick.date.toDisplayString()}}
+			</text>
+		</template>
 	</svg>
 	<!-- Events -->
 	<div v-for="id in idToPos.keys()" :key="id" class="absolute animate-fadein z-20" :style="eventStyles(id)">
@@ -1222,7 +1225,7 @@ function eventImgStyles(eventId: number){
 		//backgroundImage: `url(${getImagePath(event.imgId)})`,
 		backgroundColor: 'black',
 		backgroundSize: 'cover',
-		borderColor: isSearchResult ? 'red' : (event.ctg == 'discovery' ? store.color.alt2 : store.color.altDark),
+		borderColor: isSearchResult ? 'red' : (event.ctg == 'discovery' ? '#2563eb' : store.color.altDark),
 		borderWidth: '1px',
 	};
 }
-- 
cgit v1.2.3