Skip to content

Commit 0110e87

Browse files
StanBarrowsStanBarrows
committed
wip
1 parent fd7c163 commit 0110e87

19 files changed

+52
-54
lines changed

‎e2e/timetracker.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,10 @@ test('test that entering a random value in the time range does not start the tim
187187
}) => {
188188
await goToDashboard(page);
189189
await page.getByTestId('time_entry_time').fill('asdasdasd');
190-
await page.getByTestId('time_entry_time').press('Tab'),
190+
(await page.getByTestId('time_entry_time').press('Tab'),
191191
await page.locator(
192192
'[data-testid="dashboard_timer"] [data-testid="timer_button"].bg-accent-300/70'
193-
);
193+
));
194194
});
195195

196196
test('test that entering a time starts the timer on enter', async ({ page }) => {

‎resources/js/Components/Common/Client/ClientTable.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import ClientTableHeading from '@/Components/Common/Client/ClientTableHeading.vu
1010
import { canCreateClients } from '@/utils/permissions';
1111
1212
const props = defineProps<{
13-
clients: Client[];
13+
clients: Client[];
1414
}>();
1515
1616
const createClient = ref(false);
1717
1818
const sortedClients = computed(() => {
19-
return [...props.clients].sort((a, b) => a.name.localeCompare(b.name));
19+
return [...props.clients].sort((a, b) => a.name.localeCompare(b.name));
2020
});
2121
</script>
2222

@@ -46,4 +46,4 @@ const sortedClients = computed(() => {
4646
</div>
4747
</div>
4848
</div>
49-
</template>
49+
</template>

‎resources/js/Components/Common/Client/ClientTableHeading.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import TableHeading from '@/Components/Common/TableHeading.vue';
44

55
<template>
66
<TableHeading>
7-
<div class="py-1.5 pr-3 text-left font-semibold text-text-primary pl-4 sm:pl-6 lg:pl-8">Name</div>
7+
<div class="py-1.5 pr-3 text-left font-semibold text-text-primary pl-4 sm:pl-6 lg:pl-8">
8+
Name
9+
</div>
810
<div class="px-3 py-1.5 text-left font-semibold text-text-primary">Projects</div>
911
<div class="relative py-1.5 pl-3 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
1012
<span class="sr-only">Edit</span>

‎resources/js/Components/Common/Client/ClientTableRow.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ const showEditModal = ref(false);
4141
{{ client.name }}
4242
</span>
4343
</div>
44-
<div
45-
class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
44+
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
4645
<span> {{ projectCount }} Projects </span>
4746
</div>
4847
<div

‎resources/js/Components/Common/Invitation/InvitationTableHeading.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import TableHeading from '@/Components/Common/TableHeading.vue';
44

55
<template>
66
<TableHeading>
7-
<div
8-
class="px-3 py-1.5 text-left font-semibold text-text-primary pl-4 sm:pl-6 lg:pl-8">
7+
<div class="px-3 py-1.5 text-left font-semibold text-text-primary pl-4 sm:pl-6 lg:pl-8">
98
Email
109
</div>
1110
<div class="px-3 py-1.5 text-left font-semibold text-text-primary">Role</div>

‎resources/js/Components/Common/Invitation/InvitationTableRow.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ async function resendInvitation() {
5353

5454
<template>
5555
<TableRow>
56-
<div
57-
class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary pl-4 sm:pl-6 lg:pl-8">
56+
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary pl-4 sm:pl-6 lg:pl-8">
5857
{{ invitation.email }}
5958
</div>
6059
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">

‎resources/js/Components/Common/Member/MemberTableHeading.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import TableHeading from '@/Components/Common/TableHeading.vue';
44

55
<template>
66
<TableHeading>
7-
<div
8-
class="py-1.5 pr-3 text-left font-semibold text-text-primary pl-4 sm:pl-6 lg:pl-8">
7+
<div class="py-1.5 pr-3 text-left font-semibold text-text-primary pl-4 sm:pl-6 lg:pl-8">
98
Name
109
</div>
1110
<div class="px-3 py-1.5 text-left font-semibold text-text-primary">Email</div>

‎resources/js/Components/Common/Project/ProjectTable.vue‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,20 @@ const gridTemplate = computed(() => {
3434
import { isAllowedToPerformPremiumAction } from '@/utils/billing';
3535
3636
const sortedProjects = computed(() => {
37-
return [...props.projects].sort((a, b) => {
38-
// Get client names, handling null clients
39-
const clientA = clients.value.find(client => client.id === a.client_id)?.name || '';
40-
const clientB = clients.value.find(client => client.id === b.client_id)?.name || '';
41-
42-
// First sort by client name
43-
const clientComparison = clientA.localeCompare(clientB);
44-
if (clientComparison !== 0) {
45-
return clientComparison;
46-
}
47-
48-
// Then sort by project name
49-
return a.name.localeCompare(b.name);
50-
});
37+
return [...props.projects].sort((a, b) => {
38+
// Get client names, handling null clients
39+
const clientA = clients.value.find((client) => client.id === a.client_id)?.name || '';
40+
const clientB = clients.value.find((client) => client.id === b.client_id)?.name || '';
41+
42+
// First sort by client name
43+
const clientComparison = clientA.localeCompare(clientB);
44+
if (clientComparison !== 0) {
45+
return clientComparison;
46+
}
47+
48+
// Then sort by project name
49+
return a.name.localeCompare(b.name);
50+
});
5151
});
5252
</script>
5353

‎resources/js/Components/Common/Project/ProjectTableHeading.vue‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ defineProps<{
77

88
<template>
99
<TableHeading>
10-
<div class="px-3 py-1.5 text-left font-semibold text-text-primary pl-4 sm:pl-6 lg:pl-8">Client</div>
11-
<div
12-
class="py-1.5 pr-3 text-left font-semibold text-text-primary">
13-
Name
10+
<div class="px-3 py-1.5 text-left font-semibold text-text-primary pl-4 sm:pl-6 lg:pl-8">
11+
Client
1412
</div>
13+
<div class="py-1.5 pr-3 text-left font-semibold text-text-primary">Name</div>
1514
<div class="px-3 py-1.5 text-left font-semibold text-text-primary">Client</div>
1615
<div class="px-3 py-1.5 text-left font-semibold text-text-primary">Total Time</div>
1716
<div class="px-3 py-1.5 text-left font-semibold text-text-primary">Progress</div>

‎resources/js/Components/Common/Project/ProjectTableRow.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ const showEditProjectModal = ref(false);
7272
<TableRow :href="route('projects.show', { project: project.id })">
7373
<div
7474
class="whitespace-nowrap min-w-0 px-3 py-4 text-sm text-text-secondary pl-4 sm:pl-6 lg:pl-8">
75-
<div
76-
v-if="project.client_id"
77-
class="overflow-ellipsis overflow-hidden">
75+
<div v-if="project.client_id" class="overflow-ellipsis overflow-hidden">
7876
{{ client?.name }}
7977
</div>
8078
<div v-else>No client</div>

0 commit comments

Comments
 (0)