From 2647ac244d8ace24afb7dd5285b73cb53ecb8872 Mon Sep 17 00:00:00 2001 From: Nicolas Froger Date: Sat, 27 Jul 2024 02:10:59 +0200 Subject: [PATCH 01/24] frontend: run lint Signed-off-by: Nicolas Froger --- summer2024-frontend/public/posts.json | 134 ------------------ summer2024-frontend/src/App.vue | 17 ++- summer2024-frontend/src/assets/main.css | 16 +-- .../src/components/Countdown.vue | 20 +-- .../src/components/PostComponent.vue | 43 +++--- .../src/components/ui/alert/Alert.vue | 8 +- .../components/ui/alert/AlertDescription.vue | 6 +- .../src/components/ui/alert/AlertTitle.vue | 6 +- .../src/components/ui/alert/index.js | 24 ++-- .../src/components/ui/card/Card.vue | 15 +- .../src/components/ui/card/CardContent.vue | 6 +- .../components/ui/card/CardDescription.vue | 6 +- .../src/components/ui/card/CardFooter.vue | 6 +- .../src/components/ui/card/CardHeader.vue | 6 +- .../src/components/ui/card/CardTitle.vue | 12 +- .../src/components/ui/card/index.js | 12 +- .../src/components/ui/carousel/Carousel.vue | 30 ++-- .../ui/carousel/CarouselContent.vue | 22 ++- .../components/ui/carousel/CarouselItem.vue | 12 +- .../components/ui/carousel/CarouselNext.vue | 16 +-- .../ui/carousel/CarouselPrevious.vue | 16 +-- .../src/components/ui/carousel/index.js | 12 +- .../src/components/ui/carousel/interface.js | 2 +- .../src/components/ui/carousel/useCarousel.js | 53 ++++--- .../src/components/ui/form/FormControl.vue | 10 +- .../components/ui/form/FormDescription.vue | 15 +- .../src/components/ui/form/FormItem.vue | 16 +-- .../src/components/ui/form/FormLabel.vue | 17 +-- .../src/components/ui/form/FormMessage.vue | 8 +- .../src/components/ui/form/index.js | 14 +- .../src/components/ui/form/injectionKeys.js | 2 +- .../src/components/ui/form/useFormField.js | 27 ++-- .../src/components/ui/input/Input.vue | 18 +-- .../src/components/ui/input/index.js | 2 +- .../src/components/ui/label/Label.vue | 18 +-- .../src/components/ui/label/index.js | 2 +- .../src/components/ui/table/Table.vue | 6 +- .../src/components/ui/table/TableBody.vue | 6 +- .../src/components/ui/table/TableCaption.vue | 6 +- .../src/components/ui/table/TableCell.vue | 10 +- .../src/components/ui/table/TableEmpty.vue | 24 ++-- .../src/components/ui/table/TableFooter.vue | 12 +- .../src/components/ui/table/TableHead.vue | 8 +- .../src/components/ui/table/TableHeader.vue | 6 +- .../src/components/ui/table/TableRow.vue | 11 +- .../src/components/ui/table/index.js | 18 +-- .../src/components/ui/textarea/Textarea.vue | 18 +-- .../src/components/ui/textarea/index.js | 2 +- .../src/components/ui/tooltip/Tooltip.vue | 10 +- .../components/ui/tooltip/TooltipContent.vue | 26 ++-- .../components/ui/tooltip/TooltipProvider.vue | 6 +- .../components/ui/tooltip/TooltipTrigger.vue | 6 +- .../src/components/ui/tooltip/index.js | 8 +- summer2024-frontend/src/main.js | 6 +- summer2024-frontend/src/stores/auth.js | 36 +++-- summer2024-frontend/src/views/AdminView.vue | 5 +- .../src/views/CreatePostView.vue | 9 +- summer2024-frontend/src/views/LoginView.vue | 30 ++-- summer2024-frontend/src/views/MapView.vue | 50 +++---- summer2024-frontend/src/views/PostsView.vue | 30 ++-- .../src/views/SendLocationView.vue | 20 +-- 61 files changed, 426 insertions(+), 592 deletions(-) delete mode 100644 summer2024-frontend/public/posts.json diff --git a/summer2024-frontend/public/posts.json b/summer2024-frontend/public/posts.json deleted file mode 100644 index 52f6c82..0000000 --- a/summer2024-frontend/public/posts.json +++ /dev/null @@ -1,134 +0,0 @@ -[ -{ - "id": 4, - "date": "2022-07-01T22:20:43.000Z", - "location": { - "lat": 48.93071193154141, - "lon": 2.1544736306563346, - "city": "Sartrouville", - "country": "France" - }, - "description": "je suis en train de me prendre en photo dans la rue", - "assets": [ - "https://www.kektus.fr/img/DSC09764.jpg" - ] -}, -{ - "id": 5, - "date": "2023-12-28T23:18:43.511Z", - "location": { - "lat": 45.8307086344589862, - "lon": -1.107245822424634, - "city": "Marennes-Hiers-Brouage", - "country": "France" - }, - "description": "ce mec est très dangereux", - "assets": [ - "https://www.kektus.fr/img/DSC00671.jpg" - ] -}, -{ - "id": 6, - "date": "2024-07-21T18:25:43.511Z", - "location": { - "lat": 45.98963904301394, - "lon": -1.3010006132332887, - "city": "Saint-Georges-d'Oléron", - "country": "France" - }, - "description": "ceci est une **plage** avec un très long texte.\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque et viverra lacus, vitae ultrices urna. Nunc purus nulla, iaculis at turpis ac, pretium vestibulum odio. Nullam posuere, magna nec ornare interdum, purus sem malesuada lectus, eget mattis lacus turpis et diam. Quisque orci sapien, elementum vitae pretium a, varius vitae ante. Morbi elementum elementum dignissim. Nulla venenatis est et velit pharetra eleifend. Nunc eu eros et augue convallis laoreet feugiat nec purus.\n\n Nunc mi justo, tempus sed aliquet ac, vulputate non sem. Phasellus vel massa aliquam, dapibus neque vitae, convallis odio. Duis in massa bibendum, lacinia arcu vitae, varius enim. Aenean posuere hendrerit neque vel rhoncus. Morbi rutrum nunc vitae fringilla luctus. Phasellus sapien risus, tincidunt in finibus non, mattis ut est. Fusce vehicula efficitur nisi a ultricies. Mauris cursus ut sem vitae fringilla.", - "assets": [ - "https://www.kektus.fr/img/DSC00684.jpg", - "https://www.kektus.fr/img/DSC00723.jpg", - "https://www.kektus.fr/img/DSC00739.jpg" - ] -}, - { - "id": 7, - "date": "2022-07-01T22:20:43.000Z", - "location": { - "lat": 48.93071193154141, - "lon": 2.1544736306563346, - "city": "Sartrouville", - "country": "France" - }, - "description": "je suis en train de me prendre en photo dans la rue", - "assets": [ - "https://www.kektus.fr/img/DSC09764.jpg" - ] - }, - { - "id": 8, - "date": "2023-12-28T23:18:43.511Z", - "location": { - "lat": 45.8307086344589862, - "lon": -1.107245822424634, - "city": "Marennes-Hiers-Brouage", - "country": "France" - }, - "description": "ce mec est très dangereux", - "assets": [ - "https://www.kektus.fr/img/DSC00671.jpg" - ] - }, - { - "id": 9, - "date": "2024-07-21T18:25:43.511Z", - "location": { - "lat": 45.98963904301394, - "lon": -1.3010006132332887, - "city": "Saint-Georges-d'Oléron", - "country": "France" - }, - "description": "ceci est une **plage** avec un très long texte.\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque et viverra lacus, vitae ultrices urna. Nunc purus nulla, iaculis at turpis ac, pretium vestibulum odio. Nullam posuere, magna nec ornare interdum, purus sem malesuada lectus, eget mattis lacus turpis et diam. Quisque orci sapien, elementum vitae pretium a, varius vitae ante. Morbi elementum elementum dignissim. Nulla venenatis est et velit pharetra eleifend. Nunc eu eros et augue convallis laoreet feugiat nec purus.\n\n Nunc mi justo, tempus sed aliquet ac, vulputate non sem. Phasellus vel massa aliquam, dapibus neque vitae, convallis odio. Duis in massa bibendum, lacinia arcu vitae, varius enim. Aenean posuere hendrerit neque vel rhoncus. Morbi rutrum nunc vitae fringilla luctus. Phasellus sapien risus, tincidunt in finibus non, mattis ut est. Fusce vehicula efficitur nisi a ultricies. Mauris cursus ut sem vitae fringilla.", - "assets": [ - "https://www.kektus.fr/img/DSC00684.jpg", - "https://www.kektus.fr/img/DSC00723.jpg", - "https://www.kektus.fr/img/DSC00739.jpg" - ] - }, - { - "id": 10, - "date": "2022-07-01T22:20:43.000Z", - "location": { - "lat": 48.93071193154141, - "lon": 2.1544736306563346, - "city": "Sartrouville", - "country": "France" - }, - "description": "je suis en train de me prendre en photo dans la rue", - "assets": [ - "https://www.kektus.fr/img/DSC09764.jpg" - ] - }, - { - "id": 11, - "date": "2023-12-28T23:18:43.511Z", - "location": { - "lat": 45.8307086344589862, - "lon": -1.107245822424634, - "city": "Marennes-Hiers-Brouage", - "country": "France" - }, - "description": "ce mec est très dangereux", - "assets": [ - "https://www.kektus.fr/img/DSC00671.jpg" - ] - }, - { - "id": 12, - "date": "2024-07-21T18:25:43.511Z", - "location": { - "lat": 45.98963904301394, - "lon": -1.3010006132332887, - "city": "Saint-Georges-d'Oléron", - "country": "France" - }, - "description": "ceci est une **plage** avec un très long texte.\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque et viverra lacus, vitae ultrices urna. Nunc purus nulla, iaculis at turpis ac, pretium vestibulum odio. Nullam posuere, magna nec ornare interdum, purus sem malesuada lectus, eget mattis lacus turpis et diam. Quisque orci sapien, elementum vitae pretium a, varius vitae ante. Morbi elementum elementum dignissim. Nulla venenatis est et velit pharetra eleifend. Nunc eu eros et augue convallis laoreet feugiat nec purus.\n\n Nunc mi justo, tempus sed aliquet ac, vulputate non sem. Phasellus vel massa aliquam, dapibus neque vitae, convallis odio. Duis in massa bibendum, lacinia arcu vitae, varius enim. Aenean posuere hendrerit neque vel rhoncus. Morbi rutrum nunc vitae fringilla luctus. Phasellus sapien risus, tincidunt in finibus non, mattis ut est. Fusce vehicula efficitur nisi a ultricies. Mauris cursus ut sem vitae fringilla.", - "assets": [ - "https://www.kektus.fr/img/DSC00684.jpg", - "https://www.kektus.fr/img/DSC00723.jpg", - "https://www.kektus.fr/img/DSC00739.jpg" - ] - } -] diff --git a/summer2024-frontend/src/App.vue b/summer2024-frontend/src/App.vue index 663d6ed..b7949cd 100644 --- a/summer2024-frontend/src/App.vue +++ b/summer2024-frontend/src/App.vue @@ -9,12 +9,16 @@ const appVersion = ref(import.meta.env.VITE_APP_VERSION) diff --git a/summer2024-frontend/src/assets/main.css b/summer2024-frontend/src/assets/main.css index 066995b..91a8eaf 100644 --- a/summer2024-frontend/src/assets/main.css +++ b/summer2024-frontend/src/assets/main.css @@ -2,20 +2,20 @@ @import url('https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100..900;1,100..900&display=swap'); body { - font-family: 'Raleway', sans-serif; + font-family: 'Raleway', sans-serif; } #kektus { - font-family: 'Montserrat', sans-serif; + font-family: 'Montserrat', sans-serif; } .ol-zoom { - top: 120px !important; - left: .5em; + top: 120px !important; + left: 0.5em; } @media screen and (min-width: 500px) { - .ol-zoom { - top: 70px !important; - } -} \ No newline at end of file + .ol-zoom { + top: 70px !important; + } +} diff --git a/summer2024-frontend/src/components/Countdown.vue b/summer2024-frontend/src/components/Countdown.vue index aaf0304..a6a053e 100644 --- a/summer2024-frontend/src/components/Countdown.vue +++ b/summer2024-frontend/src/components/Countdown.vue @@ -10,7 +10,7 @@ const countdownInterval = setInterval(() => { const now = new Date().getTime() const distance = countdownDate - now if (distance < 0) { - countdownDisplay.value = 'c\'est parti !' + countdownDisplay.value = "c'est parti !" clearInterval(countdownInterval) return } @@ -20,18 +20,20 @@ const countdownInterval = setInterval(() => { const minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60)) const seconds = Math.floor((distance % (1000 * 60)) / 1000) - countdownDisplay.value = `${days} jour` + (days > 1 ? 's' : '') + - ` ${hours} heure` + (hours > 1 ? 's' : '') + - ` ${minutes} minute` + (minutes > 1 ? 's' : '') + - ` ${seconds} seconde` + (seconds > 1 ? 's' : '') + countdownDisplay.value = + `${days} jour` + + (days > 1 ? 's' : '') + + ` ${hours} heure` + + (hours > 1 ? 's' : '') + + ` ${minutes} minute` + + (minutes > 1 ? 's' : '') + + ` ${seconds} seconde` + + (seconds > 1 ? 's' : '') }, 1000) - - \ No newline at end of file + diff --git a/summer2024-frontend/src/components/PostComponent.vue b/summer2024-frontend/src/components/PostComponent.vue index 7882589..186cb14 100644 --- a/summer2024-frontend/src/components/PostComponent.vue +++ b/summer2024-frontend/src/components/PostComponent.vue @@ -14,42 +14,42 @@ const postActionBtn = ref(null) function postDataToggle() { if (postDataVisible.value) { for (const data of postData.value) { - data.classList.remove('backdrop-blur-sm'); - data.classList.remove('bg-gray-400/10'); - data.classList.add('bg-gray-400/0'); + data.classList.remove('backdrop-blur-sm') + data.classList.remove('bg-gray-400/10') + data.classList.add('bg-gray-400/0') } for (const title of postDataTitle.value) { - title.classList.add("opacity-0"); + title.classList.add('opacity-0') } for (const desc of postDataDescription.value) { - desc.classList.add("opacity-0"); - desc.classList.remove("scrollable-element"); + desc.classList.add('opacity-0') + desc.classList.remove('scrollable-element') } for (const btn of postActionBtn.value) { - btn.classList.remove("top-0"); - btn.classList.remove("right-0"); - btn.classList.add("left-0"); - btn.classList.add("bottom-0"); + btn.classList.remove('top-0') + btn.classList.remove('right-0') + btn.classList.add('left-0') + btn.classList.add('bottom-0') } postDataVisible.value = false } else { for (const data of postData.value) { - data.classList.add('backdrop-blur-sm'); - data.classList.add('bg-gray-400/10'); - data.classList.remove('bg-gray-400/0'); + data.classList.add('backdrop-blur-sm') + data.classList.add('bg-gray-400/10') + data.classList.remove('bg-gray-400/0') } for (const title of postDataTitle.value) { - title.classList.remove("opacity-0"); + title.classList.remove('opacity-0') } for (const desc of postDataDescription.value) { - desc.classList.remove("opacity-0"); - desc.classList.add("scrollable-element"); + desc.classList.remove('opacity-0') + desc.classList.add('scrollable-element') } for (const btn of postActionBtn.value) { - btn.classList.add("top-0"); - btn.classList.add("right-0"); - btn.classList.remove("left-0"); - btn.classList.remove("bottom-0"); + btn.classList.add('top-0') + btn.classList.add('right-0') + btn.classList.remove('left-0') + btn.classList.remove('bottom-0') } postDataVisible.value = true } @@ -83,5 +83,4 @@ function postDataToggle() { - + diff --git a/summer2024-frontend/src/components/ui/alert/Alert.vue b/summer2024-frontend/src/components/ui/alert/Alert.vue index 3ac2f85..f889172 100644 --- a/summer2024-frontend/src/components/ui/alert/Alert.vue +++ b/summer2024-frontend/src/components/ui/alert/Alert.vue @@ -1,11 +1,11 @@