Skip to content

Commit aca79c4

Browse files
jabbate19jabbate19
committed
Format Frontend
1 parent 459f666 commit aca79c4

File tree

5 files changed

+71
-34
lines changed

5 files changed

+71
-34
lines changed

‎src/frontend/src/components/CreateEventModal.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export default defineComponent({
133133
name: authStore.user!.given_name + ' ' + authStore.user!.family_name,
134134
email: authStore.user!.email!
135135
},
136-
needsRide: [],
136+
needsRide: []
137137
};
138138
eventStore.addEvent(newEvent);
139139
eventStore.selectEvent(newEvent);

‎src/frontend/src/components/JoinCarButton.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ export default defineComponent({
4141
email: authStore.user!.email!
4242
});
4343
44-
let needRideIndex = eventStore.selectedEvent?.needsRide.findIndex((user) => user.id === authStore.user?.id);
44+
let needRideIndex = eventStore.selectedEvent?.needsRide.findIndex(
45+
(user) => user.id === authStore.user?.id
46+
);
4547
if (needRideIndex !== undefined && needRideIndex !== -1) {
4648
eventStore.selectedEvent?.needsRide.splice(needRideIndex, 1);
4749
}

‎src/frontend/src/components/NeedsRideButton.vue‎

Lines changed: 43 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,22 @@ import BellSlash from './icons/BellSlash.vue';
44
</script>
55

66
<template>
7-
<button
8-
type="button"
9-
class="btn btn-danger mb-2"
10-
@click="sendDataRemove"
11-
v-if="userInNeedsRide"
12-
>
13-
<BellSlash style="vertical-align: text-top;"/> No Longer Need Ride ({{ eventStore.selectedEvent?.needsRide.length }})
14-
</button>
15-
<button
16-
type="button"
17-
class="btn btn-primary mb-2"
18-
@click="sendDataAdd"
19-
:disabled="userInCar"
20-
v-else
21-
>
22-
<BellAlert style="vertical-align: text-top;"/> Need Ride ({{ eventStore.selectedEvent?.needsRide.length }})
23-
</button>
7+
<button type="button" class="btn btn-danger mb-2" @click="sendDataRemove" v-if="userInNeedsRide">
8+
<BellSlash style="vertical-align: text-top" /> No Longer Need Ride ({{
9+
eventStore.selectedEvent?.needsRide.length
10+
}})
11+
</button>
12+
<button
13+
type="button"
14+
class="btn btn-primary mb-2"
15+
@click="sendDataAdd"
16+
:disabled="userInCar"
17+
v-else
18+
>
19+
<BellAlert style="vertical-align: text-top" /> Need Ride ({{
20+
eventStore.selectedEvent?.needsRide.length
21+
}})
22+
</button>
2423
</template>
2524

2625
<script lang="ts">
@@ -34,17 +33,21 @@ export default defineComponent({
3433
data() {
3534
return {
3635
authStore: useAuthStore(),
37-
eventStore: useEventStore(),
36+
eventStore: useEventStore()
3837
};
3938
},
4039
computed: {
4140
userInCar() {
4241
let allCars = this.eventStore.selectedEvent?.cars;
4342
let userId = this.authStore.user?.id;
44-
return allCars!.some((car) => car.riders.some((rider) => rider.id === userId) || car.driver.id === userId);
43+
return allCars!.some(
44+
(car) => car.riders.some((rider) => rider.id === userId) || car.driver.id === userId
45+
);
4546
},
4647
userInNeedsRide() {
47-
return this.eventStore.selectedEvent?.needsRide.some((user) => user.id === this.authStore.user?.id);
48+
return this.eventStore.selectedEvent?.needsRide.some(
49+
(user) => user.id === this.authStore.user?.id
50+
);
4851
}
4952
},
5053
methods: {
@@ -66,11 +69,17 @@ export default defineComponent({
6669
email: this.authStore.user!.email!
6770
});
6871
} else {
69-
popupStore.addPopup(PopupType.Danger, `Failed to Add to Need Ride List (${response.status})`);
72+
popupStore.addPopup(
73+
PopupType.Danger,
74+
`Failed to Add to Need Ride List (${response.status})`
75+
);
7076
}
7177
} catch (error) {
7278
console.error(error);
73-
popupStore.addPopup(PopupType.Danger, 'Failed to Add to Need Ride List. An unknown error occured.');
79+
popupStore.addPopup(
80+
PopupType.Danger,
81+
'Failed to Add to Need Ride List. An unknown error occured.'
82+
);
7483
}
7584
},
7685
async sendDataRemove() {
@@ -85,17 +94,25 @@ export default defineComponent({
8594
if (response.ok) {
8695
popupStore.addPopup(PopupType.Success, 'Removed from Need Ride List!');
8796
this.eventStore.selectedEvent?.needsRide.splice(
88-
this.eventStore.selectedEvent?.needsRide.findIndex((user) => user.id === this.authStore.user?.id),
97+
this.eventStore.selectedEvent?.needsRide.findIndex(
98+
(user) => user.id === this.authStore.user?.id
99+
),
89100
1
90101
);
91102
} else {
92-
popupStore.addPopup(PopupType.Danger, `Failed to Removed from Need Ride List (${response.status})`);
103+
popupStore.addPopup(
104+
PopupType.Danger,
105+
`Failed to Removed from Need Ride List (${response.status})`
106+
);
93107
}
94108
} catch (error) {
95109
console.error(error);
96-
popupStore.addPopup(PopupType.Danger, 'Failed to Removed from Need Ride List. An unknown error occured.');
110+
popupStore.addPopup(
111+
PopupType.Danger,
112+
'Failed to Removed from Need Ride List. An unknown error occured.'
113+
);
97114
}
98115
}
99-
},
116+
}
100117
});
101118
</script>

‎src/frontend/src/components/icons/BellAlert.vue‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<template>
2-
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-bell-fill" viewBox="0 0 16 16">
3-
<path d="M8 16a2 2 0 0 0 2-2H6a2 2 0 0 0 2 2m.995-14.901a1 1 0 1 0-1.99 0A5 5 0 0 0 3 6c0 1.098-.5 6-2 7h14c-1.5-1-2-5.902-2-7 0-2.42-1.72-4.44-4.005-4.901"/>
4-
</svg>
2+
<svg
3+
xmlns="http://www.w3.org/2000/svg"
4+
width="16"
5+
height="16"
6+
fill="currentColor"
7+
class="bi bi-bell-fill"
8+
viewBox="0 0 16 16"
9+
>
10+
<path
11+
d="M8 16a2 2 0 0 0 2-2H6a2 2 0 0 0 2 2m.995-14.901a1 1 0 1 0-1.99 0A5 5 0 0 0 3 6c0 1.098-.5 6-2 7h14c-1.5-1-2-5.902-2-7 0-2.42-1.72-4.44-4.005-4.901"
12+
/>
13+
</svg>
514
</template>

‎src/frontend/src/components/icons/BellSlash.vue‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<template>
2-
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-bell-slash-fill" viewBox="0 0 16 16">
3-
<path d="M5.164 14H15c-1.5-1-2-5.902-2-7q0-.396-.06-.776zm6.288-10.617A5 5 0 0 0 8.995 2.1a1 1 0 1 0-1.99 0A5 5 0 0 0 3 7c0 .898-.335 4.342-1.278 6.113zM10 15a2 2 0 1 1-4 0zm-9.375.625a.53.53 0 0 0 .75.75l14.75-14.75a.53.53 0 0 0-.75-.75z"/>
4-
</svg>
2+
<svg
3+
xmlns="http://www.w3.org/2000/svg"
4+
width="16"
5+
height="16"
6+
fill="currentColor"
7+
class="bi bi-bell-slash-fill"
8+
viewBox="0 0 16 16"
9+
>
10+
<path
11+
d="M5.164 14H15c-1.5-1-2-5.902-2-7q0-.396-.06-.776zm6.288-10.617A5 5 0 0 0 8.995 2.1a1 1 0 1 0-1.99 0A5 5 0 0 0 3 7c0 .898-.335 4.342-1.278 6.113zM10 15a2 2 0 1 1-4 0zm-9.375.625a.53.53 0 0 0 .75.75l14.75-14.75a.53.53 0 0 0-.75-.75z"
12+
/>
13+
</svg>
514
</template>

0 commit comments

Comments
 (0)