2.2.1 - Misc improvements and cleanup
All checks were successful
Docker Deploy / build-and-push (push) Successful in 4m3s
All checks were successful
Docker Deploy / build-and-push (push) Successful in 4m3s
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "chronus",
|
||||
"type": "module",
|
||||
"version": "2.2.0",
|
||||
"version": "2.2.1",
|
||||
"scripts": {
|
||||
"dev": "astro dev",
|
||||
"build": "astro build",
|
||||
|
||||
31
pnpm-lock.yaml
generated
31
pnpm-lock.yaml
generated
@@ -1711,8 +1711,8 @@ packages:
|
||||
supports-color:
|
||||
optional: true
|
||||
|
||||
decode-named-character-reference@1.2.0:
|
||||
resolution: {integrity: sha512-c6fcElNV6ShtZXmsgNgFFV5tVX2PaV4g+MOAkb8eXHvn6sryJBrZa9r0zV6+dtTyoCKxtDy5tyQ5ZwQuidtd+Q==}
|
||||
decode-named-character-reference@1.3.0:
|
||||
resolution: {integrity: sha512-GtpQYB283KrPp6nRw50q3U9/VfOutZOe103qlN7BPP6Ad27xYnOIWv4lPzo8HCAL+mMZofJ9KEy30fq6MfaK6Q==}
|
||||
|
||||
decompress-response@6.0.0:
|
||||
resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
|
||||
@@ -2366,6 +2366,7 @@ packages:
|
||||
|
||||
libsql@0.5.22:
|
||||
resolution: {integrity: sha512-NscWthMQt7fpU8lqd7LXMvT9pi+KhhmTHAJWUB/Lj6MWa0MKFv0F2V4C6WKKpjCVZl0VwcDz4nOI3CyaT1DDiA==}
|
||||
cpu: [x64, arm64, wasm32, arm]
|
||||
os: [darwin, linux, win32]
|
||||
|
||||
lightningcss-android-arm64@1.30.2:
|
||||
@@ -2672,8 +2673,8 @@ packages:
|
||||
nlcst-to-string@4.0.0:
|
||||
resolution: {integrity: sha512-YKLBCcUYKAg0FNlOBT6aI91qFmSiFKiluk655WzPF+DDMA02qIyy8uiRqI8QXtcFpEvll12LpL5MXqEmAZ+dcA==}
|
||||
|
||||
node-abi@3.86.0:
|
||||
resolution: {integrity: sha512-sn9Et4N3ynsetj3spsZR729DVlGH6iBG4RiDMV7HEp3guyOW6W3S0unGpLDxT50mXortGUMax/ykUNQXdqc/Xg==}
|
||||
node-abi@3.87.0:
|
||||
resolution: {integrity: sha512-+CGM1L1CgmtheLcBuleyYOn7NWPVu0s0EJH2C4puxgEZb9h8QpR9G2dBfZJOAUhi7VQxuBPMd0hiISWcTyiYyQ==}
|
||||
engines: {node: '>=10'}
|
||||
|
||||
node-domexception@1.0.0:
|
||||
@@ -3157,8 +3158,8 @@ packages:
|
||||
resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
|
||||
engines: {node: '>=6'}
|
||||
|
||||
tar@7.5.3:
|
||||
resolution: {integrity: sha512-ENg5JUHUm2rDD7IvKNFGzyElLXNjachNLp6RaGf4+JOgxXHkqA+gq81ZAMCUmtMtqBsoU62lcp6S27g1LCYGGQ==}
|
||||
tar@7.5.4:
|
||||
resolution: {integrity: sha512-AN04xbWGrSTDmVwlI4/GTlIIwMFk/XEv7uL8aa57zuvRy6s4hdBed+lVq2fAZ89XDa7Us3ANXcE3Tvqvja1kTA==}
|
||||
engines: {node: '>=18'}
|
||||
|
||||
tiny-inflate@1.0.3:
|
||||
@@ -4246,7 +4247,7 @@ snapshots:
|
||||
local-pkg: 1.1.2
|
||||
pathe: 2.0.3
|
||||
svgo: 3.3.2
|
||||
tar: 7.5.3
|
||||
tar: 7.5.4
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
@@ -5522,7 +5523,7 @@ snapshots:
|
||||
dependencies:
|
||||
ms: 2.1.3
|
||||
|
||||
decode-named-character-reference@1.2.0:
|
||||
decode-named-character-reference@1.3.0:
|
||||
dependencies:
|
||||
character-entities: 2.0.2
|
||||
|
||||
@@ -6268,7 +6269,7 @@ snapshots:
|
||||
dependencies:
|
||||
'@types/mdast': 4.0.4
|
||||
'@types/unist': 3.0.3
|
||||
decode-named-character-reference: 1.2.0
|
||||
decode-named-character-reference: 1.3.0
|
||||
devlop: 1.1.0
|
||||
mdast-util-to-string: 4.0.0
|
||||
micromark: 4.0.2
|
||||
@@ -6381,7 +6382,7 @@ snapshots:
|
||||
|
||||
micromark-core-commonmark@2.0.3:
|
||||
dependencies:
|
||||
decode-named-character-reference: 1.2.0
|
||||
decode-named-character-reference: 1.3.0
|
||||
devlop: 1.1.0
|
||||
micromark-factory-destination: 2.0.1
|
||||
micromark-factory-label: 2.0.1
|
||||
@@ -6514,7 +6515,7 @@ snapshots:
|
||||
|
||||
micromark-util-decode-string@2.0.1:
|
||||
dependencies:
|
||||
decode-named-character-reference: 1.2.0
|
||||
decode-named-character-reference: 1.3.0
|
||||
micromark-util-character: 2.1.1
|
||||
micromark-util-decode-numeric-character-reference: 2.0.2
|
||||
micromark-util-symbol: 2.0.1
|
||||
@@ -6552,7 +6553,7 @@ snapshots:
|
||||
dependencies:
|
||||
'@types/debug': 4.1.12
|
||||
debug: 4.4.3
|
||||
decode-named-character-reference: 1.2.0
|
||||
decode-named-character-reference: 1.3.0
|
||||
devlop: 1.1.0
|
||||
micromark-core-commonmark: 2.0.3
|
||||
micromark-factory-space: 2.0.1
|
||||
@@ -6623,7 +6624,7 @@ snapshots:
|
||||
dependencies:
|
||||
'@types/nlcst': 2.0.3
|
||||
|
||||
node-abi@3.86.0:
|
||||
node-abi@3.87.0:
|
||||
dependencies:
|
||||
semver: 7.7.3
|
||||
optional: true
|
||||
@@ -6809,7 +6810,7 @@ snapshots:
|
||||
minimist: 1.2.8
|
||||
mkdirp-classic: 0.5.3
|
||||
napi-build-utils: 2.0.0
|
||||
node-abi: 3.86.0
|
||||
node-abi: 3.87.0
|
||||
pump: 3.0.3
|
||||
rc: 1.2.8
|
||||
simple-get: 4.0.1
|
||||
@@ -7240,7 +7241,7 @@ snapshots:
|
||||
readable-stream: 3.6.2
|
||||
optional: true
|
||||
|
||||
tar@7.5.3:
|
||||
tar@7.5.4:
|
||||
dependencies:
|
||||
'@isaacs/fs-minipass': 4.0.1
|
||||
chownr: 3.0.0
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
<template>
|
||||
<div style="position: relative; height: 100%; width: 100%;">
|
||||
<div style="position: relative; height: 100%; width: 100%">
|
||||
<Bar :data="chartData" :options="chartOptions" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue';
|
||||
import { Bar } from 'vue-chartjs';
|
||||
import { computed } from "vue";
|
||||
import { Bar } from "vue-chartjs";
|
||||
import {
|
||||
Chart as ChartJS,
|
||||
BarElement,
|
||||
@@ -14,10 +14,18 @@ import {
|
||||
LinearScale,
|
||||
Tooltip,
|
||||
Legend,
|
||||
BarController
|
||||
} from 'chart.js';
|
||||
BarController,
|
||||
type ChartOptions,
|
||||
} from "chart.js";
|
||||
|
||||
ChartJS.register(BarElement, CategoryScale, LinearScale, Tooltip, Legend, BarController);
|
||||
ChartJS.register(
|
||||
BarElement,
|
||||
CategoryScale,
|
||||
LinearScale,
|
||||
Tooltip,
|
||||
Legend,
|
||||
BarController,
|
||||
);
|
||||
|
||||
interface ClientData {
|
||||
name: string;
|
||||
@@ -29,57 +37,61 @@ const props = defineProps<{
|
||||
}>();
|
||||
|
||||
const chartData = computed(() => ({
|
||||
labels: props.clients.map(c => c.name),
|
||||
datasets: [{
|
||||
label: 'Time Tracked',
|
||||
data: props.clients.map(c => c.totalTime / (1000 * 60)), // Convert to minutes
|
||||
backgroundColor: '#6366f1',
|
||||
borderColor: '#4f46e5',
|
||||
borderWidth: 1,
|
||||
}]
|
||||
labels: props.clients.map((c) => c.name),
|
||||
datasets: [
|
||||
{
|
||||
label: "Time Tracked",
|
||||
data: props.clients.map((c) => c.totalTime / (1000 * 60)), // Convert to minutes
|
||||
backgroundColor: "#6366f1",
|
||||
borderColor: "#4f46e5",
|
||||
borderWidth: 1,
|
||||
},
|
||||
],
|
||||
}));
|
||||
|
||||
const chartOptions = {
|
||||
const chartOptions: ChartOptions<"bar"> = {
|
||||
responsive: true,
|
||||
maintainAspectRatio: false,
|
||||
scales: {
|
||||
y: {
|
||||
beginAtZero: true,
|
||||
ticks: {
|
||||
color: '#e2e8f0',
|
||||
callback: function(value: number) {
|
||||
const hours = Math.floor(value / 60);
|
||||
const mins = value % 60;
|
||||
color: "#e2e8f0",
|
||||
callback: function (value: string | number) {
|
||||
const numValue =
|
||||
typeof value === "string" ? parseFloat(value) : value;
|
||||
const hours = Math.floor(numValue / 60);
|
||||
const mins = Math.round(numValue % 60);
|
||||
return hours > 0 ? `${hours}h ${mins}m` : `${mins}m`;
|
||||
}
|
||||
},
|
||||
},
|
||||
grid: {
|
||||
color: '#334155'
|
||||
}
|
||||
color: "#334155",
|
||||
},
|
||||
},
|
||||
x: {
|
||||
ticks: {
|
||||
color: '#e2e8f0'
|
||||
color: "#e2e8f0",
|
||||
},
|
||||
grid: {
|
||||
display: false
|
||||
}
|
||||
}
|
||||
display: false,
|
||||
},
|
||||
},
|
||||
},
|
||||
plugins: {
|
||||
legend: {
|
||||
display: false
|
||||
display: false,
|
||||
},
|
||||
tooltip: {
|
||||
callbacks: {
|
||||
label: function(context: any) {
|
||||
const minutes = Math.round(context.raw);
|
||||
label: function (context) {
|
||||
const minutes = Math.round(context.raw as number);
|
||||
const hours = Math.floor(minutes / 60);
|
||||
const mins = minutes % 60;
|
||||
return ` ${hours}h ${mins}m`;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
@@ -23,7 +23,6 @@ const isSubmitting = ref(false);
|
||||
const error = ref("");
|
||||
const success = ref(false);
|
||||
|
||||
// Set default dates to today
|
||||
const today = new Date().toISOString().split("T")[0];
|
||||
startDate.value = today;
|
||||
endDate.value = today;
|
||||
@@ -114,12 +113,10 @@ async function submitManualEntry() {
|
||||
if (res.ok) {
|
||||
success.value = true;
|
||||
|
||||
// Calculate duration for success message
|
||||
const start = new Date(startDateTime);
|
||||
const end = new Date(endDateTime);
|
||||
const duration = formatDuration(start, end);
|
||||
|
||||
// Reset form
|
||||
description.value = "";
|
||||
selectedClientId.value = "";
|
||||
selectedCategoryId.value = "";
|
||||
@@ -129,7 +126,6 @@ async function submitManualEntry() {
|
||||
startTime.value = "";
|
||||
endTime.value = "";
|
||||
|
||||
// Emit event and reload after a short delay
|
||||
setTimeout(() => {
|
||||
emit("entryCreated");
|
||||
window.location.reload();
|
||||
|
||||
@@ -58,9 +58,11 @@ const chartOptions: ChartOptions<"bar"> = {
|
||||
beginAtZero: true,
|
||||
ticks: {
|
||||
color: "#e2e8f0",
|
||||
callback: function (value: any) {
|
||||
const hours = Math.floor(value / 60);
|
||||
const mins = value % 60;
|
||||
callback: function (value: string | number) {
|
||||
const numValue =
|
||||
typeof value === "string" ? parseFloat(value) : value;
|
||||
const hours = Math.floor(numValue / 60);
|
||||
const mins = Math.round(numValue % 60);
|
||||
return hours > 0 ? `${hours}h ${mins}m` : `${mins}m`;
|
||||
},
|
||||
},
|
||||
@@ -83,8 +85,8 @@ const chartOptions: ChartOptions<"bar"> = {
|
||||
},
|
||||
tooltip: {
|
||||
callbacks: {
|
||||
label: function (context: any) {
|
||||
const minutes = Math.round(context.raw);
|
||||
label: function (context) {
|
||||
const minutes = Math.round(context.raw as number);
|
||||
const hours = Math.floor(minutes / 60);
|
||||
const mins = minutes % 60;
|
||||
return ` ${hours}h ${mins}m`;
|
||||
|
||||
@@ -31,7 +31,6 @@ function formatTime(ms: number) {
|
||||
|
||||
const timeStr = `${hours.toString().padStart(2, "0")}:${minutes.toString().padStart(2, "0")}:${seconds.toString().padStart(2, "0")}`;
|
||||
|
||||
// Calculate rounded version
|
||||
const totalMinutes = Math.round(ms / 1000 / 60);
|
||||
const roundedHours = Math.floor(totalMinutes / 60);
|
||||
const roundedMinutes = totalMinutes % 60;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue';
|
||||
import { Icon } from '@iconify/vue';
|
||||
import { startAuthentication } from '@simplewebauthn/browser';
|
||||
import { ref } from "vue";
|
||||
import { Icon } from "@iconify/vue";
|
||||
import { startAuthentication } from "@simplewebauthn/browser";
|
||||
|
||||
const loading = ref(false);
|
||||
const error = ref<string | null>(null);
|
||||
@@ -11,45 +11,41 @@ async function handlePasskeyLogin() {
|
||||
error.value = null;
|
||||
|
||||
try {
|
||||
// 1. Get options from server
|
||||
const resp = await fetch('/api/auth/passkey/login/start');
|
||||
const resp = await fetch("/api/auth/passkey/login/start");
|
||||
|
||||
if (!resp.ok) {
|
||||
throw new Error('Failed to start passkey login');
|
||||
throw new Error("Failed to start passkey login");
|
||||
}
|
||||
|
||||
const options = await resp.json();
|
||||
|
||||
// 2. Browser handles interaction
|
||||
let asseResp;
|
||||
try {
|
||||
asseResp = await startAuthentication(options);
|
||||
asseResp = await startAuthentication({ optionsJSON: options });
|
||||
} catch (err) {
|
||||
if ((err as any).name === 'NotAllowedError') {
|
||||
// User cancelled or timed out
|
||||
if ((err as any).name === "NotAllowedError") {
|
||||
return;
|
||||
}
|
||||
console.error(err);
|
||||
error.value = 'Failed to authenticate with passkey';
|
||||
error.value = "Failed to authenticate with passkey";
|
||||
return;
|
||||
}
|
||||
|
||||
// 3. Verify with server
|
||||
const verificationResp = await fetch('/api/auth/passkey/login/finish', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
const verificationResp = await fetch("/api/auth/passkey/login/finish", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify(asseResp),
|
||||
});
|
||||
|
||||
const verificationJSON = await verificationResp.json();
|
||||
if (verificationJSON.verified) {
|
||||
window.location.href = '/dashboard';
|
||||
window.location.href = "/dashboard";
|
||||
} else {
|
||||
error.value = 'Login failed. Please try again.';
|
||||
error.value = "Login failed. Please try again.";
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Error during passkey login:', err);
|
||||
error.value = 'An error occurred during login';
|
||||
console.error("Error during passkey login:", err);
|
||||
error.value = "An error occurred during login";
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
|
||||
@@ -48,7 +48,6 @@ async function createToken() {
|
||||
|
||||
const { token, ...tokenMeta } = data;
|
||||
|
||||
// Add to beginning of list
|
||||
tokens.value.unshift({
|
||||
id: tokenMeta.id,
|
||||
name: tokenMeta.name,
|
||||
|
||||
@@ -31,7 +31,6 @@ function formatDate(dateString: string | null) {
|
||||
async function registerPasskey() {
|
||||
loading.value = true;
|
||||
try {
|
||||
// 1. Get options from server
|
||||
const resp = await fetch("/api/auth/passkey/register/start");
|
||||
|
||||
if (!resp.ok) {
|
||||
@@ -40,13 +39,11 @@ async function registerPasskey() {
|
||||
|
||||
const options = await resp.json();
|
||||
|
||||
// 2. Browser handles interaction
|
||||
let attResp;
|
||||
try {
|
||||
attResp = await startRegistration(options);
|
||||
attResp = await startRegistration({ optionsJSON: options });
|
||||
} catch (error) {
|
||||
if ((error as any).name === "NotAllowedError") {
|
||||
// User cancelled or timed out
|
||||
return;
|
||||
}
|
||||
console.error(error);
|
||||
@@ -54,7 +51,6 @@ async function registerPasskey() {
|
||||
return;
|
||||
}
|
||||
|
||||
// 3. Verify with server
|
||||
const verificationResp = await fetch("/api/auth/passkey/register/finish", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
@@ -63,8 +59,6 @@ async function registerPasskey() {
|
||||
|
||||
const verificationJSON = await verificationResp.json();
|
||||
if (verificationJSON.verified) {
|
||||
// Reload to show the new passkey since the API doesn't return the created object
|
||||
// Ideally we would return the object and append it to 'passkeys' to avoid reload
|
||||
window.location.reload();
|
||||
} else {
|
||||
alert("Passkey registration failed");
|
||||
@@ -88,7 +82,6 @@ async function deletePasskey(id: string) {
|
||||
});
|
||||
|
||||
if (response.ok) {
|
||||
// Optimistically remove from list
|
||||
passkeys.value = passkeys.value.filter((pk) => pk.id !== id);
|
||||
} else {
|
||||
alert("Failed to delete passkey");
|
||||
|
||||
@@ -37,12 +37,10 @@ async function changePassword() {
|
||||
|
||||
if (response.ok) {
|
||||
message.value = { type: 'success', text: 'Password changed successfully!' };
|
||||
// Reset form
|
||||
currentPassword.value = '';
|
||||
newPassword.value = '';
|
||||
confirmPassword.value = '';
|
||||
|
||||
// Hide success message after 3 seconds
|
||||
setTimeout(() => {
|
||||
message.value = null;
|
||||
}, 3000);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue';
|
||||
import { Icon } from '@iconify/vue';
|
||||
import { ref } from "vue";
|
||||
import { Icon } from "@iconify/vue";
|
||||
|
||||
const props = defineProps<{
|
||||
user: {
|
||||
@@ -12,33 +12,38 @@ const props = defineProps<{
|
||||
|
||||
const name = ref(props.user.name);
|
||||
const loading = ref(false);
|
||||
const message = ref<{ type: 'success' | 'error'; text: string } | null>(null);
|
||||
const message = ref<{ type: "success" | "error"; text: string } | null>(null);
|
||||
|
||||
async function updateProfile() {
|
||||
loading.value = true;
|
||||
message.value = null;
|
||||
|
||||
try {
|
||||
const response = await fetch('/api/user/update-profile', {
|
||||
method: 'POST',
|
||||
const response = await fetch("/api/user/update-profile", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({ name: name.value }),
|
||||
});
|
||||
|
||||
if (response.ok) {
|
||||
message.value = { type: 'success', text: 'Profile updated successfully!' };
|
||||
// Hide success message after 3 seconds
|
||||
message.value = {
|
||||
type: "success",
|
||||
text: "Profile updated successfully!",
|
||||
};
|
||||
setTimeout(() => {
|
||||
message.value = null;
|
||||
}, 3000);
|
||||
} else {
|
||||
const data = await response.json().catch(() => ({}));
|
||||
message.value = { type: 'error', text: data.error || 'Failed to update profile' };
|
||||
message.value = {
|
||||
type: "error",
|
||||
text: data.error || "Failed to update profile",
|
||||
};
|
||||
}
|
||||
} catch (error) {
|
||||
message.value = { type: 'error', text: 'An error occurred' };
|
||||
message.value = { type: "error", text: "An error occurred" };
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
@@ -48,8 +53,21 @@ async function updateProfile() {
|
||||
<template>
|
||||
<div>
|
||||
<!-- Success/Error Message Display -->
|
||||
<div v-if="message" :class="['alert mb-6', message.type === 'success' ? 'alert-success' : 'alert-error']">
|
||||
<Icon :icon="message.type === 'success' ? 'heroicons:check-circle' : 'heroicons:exclamation-circle'" class="w-6 h-6 shrink-0" />
|
||||
<div
|
||||
v-if="message"
|
||||
:class="[
|
||||
'alert mb-6',
|
||||
message.type === 'success' ? 'alert-success' : 'alert-error',
|
||||
]"
|
||||
>
|
||||
<Icon
|
||||
:icon="
|
||||
message.type === 'success'
|
||||
? 'heroicons:check-circle'
|
||||
: 'heroicons:exclamation-circle'
|
||||
"
|
||||
class="w-6 h-6 shrink-0"
|
||||
/>
|
||||
<span>{{ message.text }}</span>
|
||||
</div>
|
||||
|
||||
@@ -63,7 +81,9 @@ async function updateProfile() {
|
||||
<form @submit.prevent="updateProfile" class="space-y-5">
|
||||
<div class="form-control">
|
||||
<label class="label pb-2">
|
||||
<span class="label-text font-medium text-sm sm:text-base">Full Name</span>
|
||||
<span class="label-text font-medium text-sm sm:text-base"
|
||||
>Full Name</span
|
||||
>
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
@@ -76,7 +96,9 @@ async function updateProfile() {
|
||||
|
||||
<div class="form-control">
|
||||
<label class="label pb-2">
|
||||
<span class="label-text font-medium text-sm sm:text-base">Email</span>
|
||||
<span class="label-text font-medium text-sm sm:text-base"
|
||||
>Email</span
|
||||
>
|
||||
</label>
|
||||
<input
|
||||
type="email"
|
||||
@@ -85,13 +107,23 @@ async function updateProfile() {
|
||||
disabled
|
||||
/>
|
||||
<div class="label pt-2">
|
||||
<span class="label-text-alt text-base-content/60 text-xs sm:text-sm">Email cannot be changed</span>
|
||||
<span
|
||||
class="label-text-alt text-base-content/60 text-xs sm:text-sm"
|
||||
>Email cannot be changed</span
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex justify-end pt-4">
|
||||
<button type="submit" class="btn btn-primary w-full sm:w-auto" :disabled="loading">
|
||||
<span v-if="loading" class="loading loading-spinner loading-sm"></span>
|
||||
<button
|
||||
type="submit"
|
||||
class="btn btn-primary w-full sm:w-auto"
|
||||
:disabled="loading"
|
||||
>
|
||||
<span
|
||||
v-if="loading"
|
||||
class="loading loading-spinner loading-sm"
|
||||
></span>
|
||||
<Icon v-else icon="heroicons:check" class="w-5 h-5" />
|
||||
Save Changes
|
||||
</button>
|
||||
|
||||
@@ -4,7 +4,6 @@ import * as schema from "./schema";
|
||||
import path from "path";
|
||||
import fs from "fs";
|
||||
|
||||
// Define the database type based on the schema
|
||||
type Database = ReturnType<typeof drizzle<typeof schema>>;
|
||||
|
||||
let _db: Database | null = null;
|
||||
|
||||
@@ -270,19 +270,19 @@ export const invoices = sqliteTable(
|
||||
organizationId: text("organization_id").notNull(),
|
||||
clientId: text("client_id").notNull(),
|
||||
number: text("number").notNull(),
|
||||
type: text("type").notNull().default("invoice"), // 'invoice' or 'quote'
|
||||
status: text("status").notNull().default("draft"), // 'draft', 'sent', 'paid', 'void', 'accepted', 'declined'
|
||||
type: text("type").notNull().default("invoice"),
|
||||
status: text("status").notNull().default("draft"),
|
||||
issueDate: integer("issue_date", { mode: "timestamp" }).notNull(),
|
||||
dueDate: integer("due_date", { mode: "timestamp" }).notNull(),
|
||||
notes: text("notes"),
|
||||
currency: text("currency").default("USD").notNull(),
|
||||
subtotal: integer("subtotal").notNull().default(0), // in cents
|
||||
subtotal: integer("subtotal").notNull().default(0),
|
||||
discountValue: real("discount_value").default(0),
|
||||
discountType: text("discount_type").default("percentage"), // 'percentage' or 'fixed'
|
||||
discountAmount: integer("discount_amount").default(0), // in cents
|
||||
taxRate: real("tax_rate").default(0), // percentage
|
||||
taxAmount: integer("tax_amount").notNull().default(0), // in cents
|
||||
total: integer("total").notNull().default(0), // in cents
|
||||
discountType: text("discount_type").default("percentage"),
|
||||
discountAmount: integer("discount_amount").default(0),
|
||||
taxRate: real("tax_rate").default(0),
|
||||
taxAmount: integer("tax_amount").notNull().default(0),
|
||||
total: integer("total").notNull().default(0),
|
||||
createdAt: integer("created_at", { mode: "timestamp" }).$defaultFn(
|
||||
() => new Date(),
|
||||
),
|
||||
@@ -312,8 +312,8 @@ export const invoiceItems = sqliteTable(
|
||||
invoiceId: text("invoice_id").notNull(),
|
||||
description: text("description").notNull(),
|
||||
quantity: real("quantity").notNull().default(1),
|
||||
unitPrice: integer("unit_price").notNull().default(0), // in cents
|
||||
amount: integer("amount").notNull().default(0), // in cents
|
||||
unitPrice: integer("unit_price").notNull().default(0),
|
||||
amount: integer("amount").notNull().default(0),
|
||||
},
|
||||
(table: any) => ({
|
||||
invoiceFk: foreignKey({
|
||||
@@ -327,13 +327,13 @@ export const invoiceItems = sqliteTable(
|
||||
export const passkeys = sqliteTable(
|
||||
"passkeys",
|
||||
{
|
||||
id: text("id").primaryKey(), // The Credential ID
|
||||
id: text("id").primaryKey(),
|
||||
userId: text("user_id").notNull(),
|
||||
publicKey: text("public_key").notNull(), // Base64 encoded public key
|
||||
publicKey: text("public_key").notNull(),
|
||||
counter: integer("counter").notNull(),
|
||||
deviceType: text("device_type").notNull(), // 'singleDevice' or 'multiDevice'
|
||||
deviceType: text("device_type").notNull(),
|
||||
backedUp: integer("backed_up", { mode: "boolean" }).notNull(),
|
||||
transports: text("transports"), // JSON stringified array
|
||||
transports: text("transports"),
|
||||
lastUsedAt: integer("last_used_at", { mode: "timestamp" }),
|
||||
createdAt: integer("created_at", { mode: "timestamp" }).$defaultFn(
|
||||
() => new Date(),
|
||||
|
||||
@@ -18,7 +18,6 @@ if (!user) {
|
||||
return Astro.redirect('/login');
|
||||
}
|
||||
|
||||
// Get user's team memberships
|
||||
const userMemberships = await db.select({
|
||||
membership: members,
|
||||
organization: organizations,
|
||||
@@ -28,7 +27,6 @@ const userMemberships = await db.select({
|
||||
.where(eq(members.userId, user.id))
|
||||
.all();
|
||||
|
||||
// Get current team from cookie or use first membership
|
||||
const currentTeamId = Astro.cookies.get('currentTeamId')?.value || userMemberships[0]?.organization.id;
|
||||
const currentTeam = userMemberships.find(m => m.organization.id === currentTeamId);
|
||||
---
|
||||
|
||||
@@ -24,7 +24,6 @@ export async function validateApiToken(token: string) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// Update last used at
|
||||
await db
|
||||
.update(apiTokens)
|
||||
.set({ lastUsedAt: new Date() })
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
* @returns Formatted string like "01:23:45 (1h 24m)" or "00:05:23 (5m)"
|
||||
*/
|
||||
export function formatDuration(ms: number): string {
|
||||
// Calculate rounded version for easy reading
|
||||
const totalMinutes = Math.round(ms / 1000 / 60);
|
||||
const hours = Math.floor(totalMinutes / 60);
|
||||
const minutes = totalMinutes % 60;
|
||||
|
||||
@@ -13,7 +13,6 @@ export const GET: APIRoute = async ({ request, locals }) => {
|
||||
});
|
||||
}
|
||||
|
||||
// Get user's existing passkeys to prevent registering the same authenticator twice
|
||||
const userPasskeys = await db.query.passkeys.findMany({
|
||||
where: eq(passkeys.userId, user.id),
|
||||
});
|
||||
|
||||
@@ -14,7 +14,6 @@ export const POST: APIRoute = async ({ redirect, locals, params }) => {
|
||||
return new Response("Invoice ID required", { status: 400 });
|
||||
}
|
||||
|
||||
// Fetch invoice to verify existence
|
||||
const invoice = await db
|
||||
.select()
|
||||
.from(invoices)
|
||||
@@ -31,7 +30,6 @@ export const POST: APIRoute = async ({ redirect, locals, params }) => {
|
||||
});
|
||||
}
|
||||
|
||||
// Verify membership
|
||||
const membership = await db
|
||||
.select()
|
||||
.from(members)
|
||||
@@ -48,7 +46,6 @@ export const POST: APIRoute = async ({ redirect, locals, params }) => {
|
||||
}
|
||||
|
||||
try {
|
||||
// Generate next invoice number
|
||||
const lastInvoice = await db
|
||||
.select()
|
||||
.from(invoices)
|
||||
@@ -74,11 +71,6 @@ export const POST: APIRoute = async ({ redirect, locals, params }) => {
|
||||
}
|
||||
}
|
||||
|
||||
// Convert quote to invoice:
|
||||
// 1. Change type to 'invoice'
|
||||
// 2. Set status to 'draft' (so user can review before sending)
|
||||
// 3. Update number to next invoice sequence
|
||||
// 4. Update issue date to today
|
||||
await db
|
||||
.update(invoices)
|
||||
.set({
|
||||
|
||||
@@ -20,7 +20,6 @@ export const GET: APIRoute = async ({ params, locals }) => {
|
||||
return new Response("Unauthorized", { status: 401 });
|
||||
}
|
||||
|
||||
// Fetch invoice with related data
|
||||
const invoiceResult = await db
|
||||
.select({
|
||||
invoice: invoices,
|
||||
@@ -39,7 +38,6 @@ export const GET: APIRoute = async ({ params, locals }) => {
|
||||
|
||||
const { invoice, client, organization } = invoiceResult;
|
||||
|
||||
// Verify access
|
||||
const membership = await db
|
||||
.select()
|
||||
.from(members)
|
||||
@@ -55,7 +53,6 @@ export const GET: APIRoute = async ({ params, locals }) => {
|
||||
return new Response("Forbidden", { status: 403 });
|
||||
}
|
||||
|
||||
// Fetch items
|
||||
const items = await db
|
||||
.select()
|
||||
.from(invoiceItems)
|
||||
@@ -66,8 +63,6 @@ export const GET: APIRoute = async ({ params, locals }) => {
|
||||
return new Response("Client not found", { status: 404 });
|
||||
}
|
||||
|
||||
// Generate PDF using Vue PDF
|
||||
// Suppress verbose logging from PDF renderer
|
||||
const originalConsoleLog = console.log;
|
||||
const originalConsoleWarn = console.warn;
|
||||
console.log = () => {};
|
||||
@@ -83,7 +78,6 @@ export const GET: APIRoute = async ({ params, locals }) => {
|
||||
|
||||
const stream = await renderToStream(pdfDocument);
|
||||
|
||||
// Restore console.log
|
||||
console.log = originalConsoleLog;
|
||||
console.warn = originalConsoleWarn;
|
||||
|
||||
|
||||
@@ -64,7 +64,6 @@ export const POST: APIRoute = async ({
|
||||
const quantity = parseFloat(quantityStr);
|
||||
const unitPriceMajor = parseFloat(unitPriceStr);
|
||||
|
||||
// Convert to cents
|
||||
const unitPrice = Math.round(unitPriceMajor * 100);
|
||||
const amount = Math.round(quantity * unitPrice);
|
||||
|
||||
@@ -77,7 +76,6 @@ export const POST: APIRoute = async ({
|
||||
amount,
|
||||
});
|
||||
|
||||
// Update invoice totals
|
||||
await recalculateInvoiceTotals(invoiceId);
|
||||
|
||||
return redirect(`/dashboard/invoices/${invoiceId}`);
|
||||
|
||||
@@ -20,7 +20,6 @@ export const POST: APIRoute = async ({
|
||||
return new Response("Invoice ID required", { status: 400 });
|
||||
}
|
||||
|
||||
// Fetch invoice to verify existence and check status
|
||||
const invoice = await db
|
||||
.select()
|
||||
.from(invoices)
|
||||
@@ -31,7 +30,6 @@ export const POST: APIRoute = async ({
|
||||
return new Response("Invoice not found", { status: 404 });
|
||||
}
|
||||
|
||||
// Verify membership
|
||||
const membership = await db
|
||||
.select()
|
||||
.from(members)
|
||||
@@ -47,7 +45,6 @@ export const POST: APIRoute = async ({
|
||||
return new Response("Unauthorized", { status: 401 });
|
||||
}
|
||||
|
||||
// Only allow editing if draft
|
||||
if (invoice.status !== "draft") {
|
||||
return new Response("Cannot edit a finalized invoice", { status: 400 });
|
||||
}
|
||||
@@ -59,7 +56,6 @@ export const POST: APIRoute = async ({
|
||||
return new Response("Item ID required", { status: 400 });
|
||||
}
|
||||
|
||||
// Verify item belongs to invoice
|
||||
const item = await db
|
||||
.select()
|
||||
.from(invoiceItems)
|
||||
@@ -73,7 +69,6 @@ export const POST: APIRoute = async ({
|
||||
try {
|
||||
await db.delete(invoiceItems).where(eq(invoiceItems.id, itemId));
|
||||
|
||||
// Update invoice totals
|
||||
await recalculateInvoiceTotals(invoiceId);
|
||||
|
||||
return redirect(`/dashboard/invoices/${invoiceId}`);
|
||||
|
||||
@@ -35,7 +35,6 @@ export const POST: APIRoute = async ({
|
||||
return new Response("Invalid status", { status: 400 });
|
||||
}
|
||||
|
||||
// Fetch invoice to verify existence and check ownership
|
||||
const invoice = await db
|
||||
.select()
|
||||
.from(invoices)
|
||||
@@ -46,7 +45,6 @@ export const POST: APIRoute = async ({
|
||||
return new Response("Invoice not found", { status: 404 });
|
||||
}
|
||||
|
||||
// Verify membership
|
||||
const membership = await db
|
||||
.select()
|
||||
.from(members)
|
||||
|
||||
@@ -20,7 +20,6 @@ export const POST: APIRoute = async ({
|
||||
return new Response("Invoice ID required", { status: 400 });
|
||||
}
|
||||
|
||||
// Fetch invoice to verify existence
|
||||
const invoice = await db
|
||||
.select()
|
||||
.from(invoices)
|
||||
@@ -31,7 +30,6 @@ export const POST: APIRoute = async ({
|
||||
return new Response("Invoice not found", { status: 404 });
|
||||
}
|
||||
|
||||
// Verify membership
|
||||
const membership = await db
|
||||
.select()
|
||||
.from(members)
|
||||
|
||||
@@ -294,7 +294,7 @@ const isDraft = invoice.status === 'draft';
|
||||
<span class="text-base-content/60">Subtotal</span>
|
||||
<span class="font-medium">{formatCurrency(invoice.subtotal)}</span>
|
||||
</div>
|
||||
{(invoice.discountAmount > 0) && (
|
||||
{(invoice.discountAmount && invoice.discountAmount > 0) && (
|
||||
<div class="flex justify-between text-sm">
|
||||
<span class="text-base-content/60">
|
||||
Discount
|
||||
|
||||
@@ -24,7 +24,6 @@ export async function recalculateInvoiceTotals(invoiceId: string) {
|
||||
.all();
|
||||
|
||||
// Calculate totals
|
||||
// Note: amounts are in cents
|
||||
const subtotal = items.reduce((acc, item) => acc + item.amount, 0);
|
||||
|
||||
// Calculate discount
|
||||
|
||||
Reference in New Issue
Block a user