feat: Replace eslint => oxlint + oxfmt
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
@import "tailwindcss" theme(static) source("../../..");
|
||||
@import "tailwindcss" theme(static) source("../../..");
|
||||
@import "@nuxt/ui";
|
||||
|
||||
@import "./a11y.css";
|
||||
|
||||
@@ -8,13 +8,27 @@
|
||||
}
|
||||
|
||||
/* Container sizes */
|
||||
@utility container { @apply mx-auto px-container max-w-(--breakpoint-2xl); }
|
||||
@utility container-xl { @apply container max-w-(--breakpoint-xl); }
|
||||
@utility container-lg { @apply container max-w-(--breakpoint-lg); }
|
||||
@utility container-md { @apply container max-w-(--breakpoint-md); }
|
||||
@utility container-sm { @apply container max-w-(--breakpoint-sm); }
|
||||
@utility container-fluid { @apply container max-w-screen; }
|
||||
@utility container-none { @apply w-full max-w-screen; }
|
||||
@utility container {
|
||||
@apply mx-auto px-container max-w-(--breakpoint-2xl);
|
||||
}
|
||||
@utility container-xl {
|
||||
@apply container max-w-(--breakpoint-xl);
|
||||
}
|
||||
@utility container-lg {
|
||||
@apply container max-w-(--breakpoint-lg);
|
||||
}
|
||||
@utility container-md {
|
||||
@apply container max-w-(--breakpoint-md);
|
||||
}
|
||||
@utility container-sm {
|
||||
@apply container max-w-(--breakpoint-sm);
|
||||
}
|
||||
@utility container-fluid {
|
||||
@apply container max-w-screen;
|
||||
}
|
||||
@utility container-none {
|
||||
@apply w-full max-w-screen;
|
||||
}
|
||||
|
||||
/* Split containers */
|
||||
:root {
|
||||
@@ -42,6 +56,12 @@
|
||||
}
|
||||
}
|
||||
|
||||
@utility container-left { @apply ml-(--container-outside-margin) px-container;}
|
||||
@utility container-right { @apply mr-(--container-outside-margin) px-container;}
|
||||
@utility container-half { width: calc(var(--container-width) / 2);}
|
||||
@utility container-left {
|
||||
@apply ml-(--container-outside-margin) px-container;
|
||||
}
|
||||
@utility container-right {
|
||||
@apply mr-(--container-outside-margin) px-container;
|
||||
}
|
||||
@utility container-half {
|
||||
width: calc(var(--container-width) / 2);
|
||||
}
|
||||
|
||||
@@ -2,6 +2,12 @@
|
||||
@custom-variant links (& a:not([class*='link-']):not([class*='button-']));
|
||||
|
||||
/* Link styles */
|
||||
@utility link-base { @apply cursor-pointer disabled-default transition; }
|
||||
@utility link-underline { @apply link-base underline hover:decoration-primary; }
|
||||
@utility link-opacity { @apply link-base hover:opacity-80; }
|
||||
@utility link-base {
|
||||
@apply cursor-pointer disabled-default transition;
|
||||
}
|
||||
@utility link-underline {
|
||||
@apply link-base underline hover:decoration-primary;
|
||||
}
|
||||
@utility link-opacity {
|
||||
@apply link-base hover:opacity-80;
|
||||
}
|
||||
|
||||
@@ -1,15 +1,25 @@
|
||||
@utility prose {
|
||||
/* Headings (allow class overrides) */
|
||||
h1:not([class*="heading-"]) { @apply heading-1; }
|
||||
h2:not([class*="heading-"]) { @apply heading-2; }
|
||||
h3:not([class*="heading-"]) { @apply heading-3; }
|
||||
h4:not([class*="heading-"]) { @apply heading-4; }
|
||||
h1:not([class*="heading-"]) {
|
||||
@apply heading-1;
|
||||
}
|
||||
h2:not([class*="heading-"]) {
|
||||
@apply heading-2;
|
||||
}
|
||||
h3:not([class*="heading-"]) {
|
||||
@apply heading-3;
|
||||
}
|
||||
h4:not([class*="heading-"]) {
|
||||
@apply heading-4;
|
||||
}
|
||||
|
||||
/* Links */
|
||||
@apply links:link-underline;
|
||||
|
||||
/* Paragraphs */
|
||||
p:not([class*="paragraph-"]) { @apply paragraph-base; }
|
||||
p:not([class*="paragraph-"]) {
|
||||
@apply paragraph-base;
|
||||
}
|
||||
|
||||
/* Spacing */
|
||||
@apply space-y-2;
|
||||
|
||||
@@ -1,10 +1,24 @@
|
||||
/* Heading styles */
|
||||
@utility heading-base { @apply font-bold tracking-tight };
|
||||
@utility heading-1 { @apply heading-base text-4xl; }
|
||||
@utility heading-2 { @apply heading-base text-3xl; }
|
||||
@utility heading-3 { @apply heading-base text-2xl; }
|
||||
@utility heading-4 { @apply heading-base text-xl; }
|
||||
@utility heading-base {
|
||||
@apply font-bold tracking-tight;
|
||||
}
|
||||
@utility heading-1 {
|
||||
@apply heading-base text-4xl;
|
||||
}
|
||||
@utility heading-2 {
|
||||
@apply heading-base text-3xl;
|
||||
}
|
||||
@utility heading-3 {
|
||||
@apply heading-base text-2xl;
|
||||
}
|
||||
@utility heading-4 {
|
||||
@apply heading-base text-xl;
|
||||
}
|
||||
|
||||
/* Paragraph styles */
|
||||
@utility paragraph-base { @apply font-sans; }
|
||||
@utility paragraph-lead { @apply paragraph-base text-2xl; }
|
||||
@utility paragraph-base {
|
||||
@apply font-sans;
|
||||
}
|
||||
@utility paragraph-lead {
|
||||
@apply paragraph-base text-2xl;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import type { AcfLinkFragment } from "#graphql/operations";
|
||||
import type { ButtonProps } from "@nuxt/ui";
|
||||
|
||||
type AcfLinkButtonProps = & Omit<ButtonProps, "to" | "target" | "href"> & {
|
||||
type AcfLinkButtonProps = Omit<ButtonProps, "to" | "target" | "href"> & {
|
||||
link?: AcfLinkFragment;
|
||||
showLabel?: boolean;
|
||||
};
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
fragment AcfMedia on GroupAbstractMedia_Fields {
|
||||
image { node { ... AcfImage } }
|
||||
image {
|
||||
node {
|
||||
...AcfImage
|
||||
}
|
||||
}
|
||||
aspectRatio
|
||||
objectFit
|
||||
}
|
||||
|
||||
@@ -4,7 +4,14 @@ defineProps<{ social?: AcfSocialOutput }>();
|
||||
|
||||
<template>
|
||||
<div v-if="social?.profiles" class="flex gap-1.5">
|
||||
<a v-for="({ url, icon }, key) in social.profiles" :key="key" :href="url" target="_blank" rel="noopener noreferrer" class="flex">
|
||||
<a
|
||||
v-for="({ url, icon }, key) in social.profiles"
|
||||
:key="key"
|
||||
:href="url"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
class="flex"
|
||||
>
|
||||
<UIcon :name="icon" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@@ -7,7 +7,8 @@ const fields = [
|
||||
label: "Courriel",
|
||||
placeholder: "Entrez votre courriel",
|
||||
required: true,
|
||||
}, {
|
||||
},
|
||||
{
|
||||
name: "password",
|
||||
label: "Mot de passe",
|
||||
type: "password" as const,
|
||||
|
||||
@@ -5,12 +5,8 @@ const { logout } = useAuthConnexion();
|
||||
<template>
|
||||
<div class="w-full space-y-6">
|
||||
<div class="flex flex-col text-center">
|
||||
<div class="text-xl text-pretty font-semibold text-highlighted">
|
||||
Déconnexion
|
||||
</div>
|
||||
<div class="mt-1 text-base text-pretty text-muted">
|
||||
Veuillez confirmer la déconnexion.
|
||||
</div>
|
||||
<div class="text-xl font-semibold text-pretty text-highlighted">Déconnexion</div>
|
||||
<div class="mt-1 text-base text-pretty text-muted">Veuillez confirmer la déconnexion.</div>
|
||||
</div>
|
||||
<UButton
|
||||
icon="i-lucide-log-out"
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
<template>
|
||||
<div class="w-full space-y-6">
|
||||
<div class="flex flex-col text-center">
|
||||
<div class="text-xl text-pretty font-semibold text-highlighted">
|
||||
Redirection en cours
|
||||
</div>
|
||||
<div class="mt-1 text-base text-pretty text-muted">
|
||||
Veuillez patienter...
|
||||
</div>
|
||||
<div class="text-xl font-semibold text-pretty text-highlighted">Redirection en cours</div>
|
||||
<div class="mt-1 text-base text-pretty text-muted">Veuillez patienter...</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
fragment BuilderSections on GroupAbstractBuilder_Fields {
|
||||
sections {
|
||||
__typename
|
||||
... on GroupAbstractBuilderSectionsHeroSplitLayout { ... SectionHeroSplit }
|
||||
... on GroupAbstractBuilderSectionsTextBlockLayout { ... SectionTextBlock }
|
||||
... on GroupAbstractBuilderSectionsHeroSplitLayout {
|
||||
...SectionHeroSplit
|
||||
}
|
||||
... on GroupAbstractBuilderSectionsTextBlockLayout {
|
||||
...SectionTextBlock
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,6 @@ fragment NodePage on Page {
|
||||
title
|
||||
isFrontPage
|
||||
groupPostPage {
|
||||
... BuilderSections
|
||||
...BuilderSections
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ defineProps<NodePageFragment>();
|
||||
|
||||
<template>
|
||||
<div id="node-page">
|
||||
<h1 v-if="!isFrontPage" class="font-bold text-4xl">
|
||||
<h1 v-if="!isFrontPage" class="text-4xl font-bold">
|
||||
{{ title }}
|
||||
</h1>
|
||||
<BuilderSections :sections="groupPostPage?.sections || []" />
|
||||
|
||||
@@ -3,4 +3,3 @@ fragment SectionHeroSplit on GroupAbstractBuilderSectionsHeroSplitLayout {
|
||||
reverse
|
||||
...AcfMedia
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ const { data: siteOptions } = await useSiteOptions();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<footer class="bg-accented links:link-prose">
|
||||
<footer class="links:link-prose bg-accented">
|
||||
<div class="container py-6">
|
||||
<AcfSocial :social="parseAcfSocial(siteOptions)" />
|
||||
</div>
|
||||
|
||||
@@ -3,8 +3,8 @@ const { connexionButton } = useAuthConnexion();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="bg-inverted text-inverted py-1.5">
|
||||
<div class="container flex flex-col sm:flex-row items-center gap-3">
|
||||
<div class="bg-inverted py-1.5 text-inverted">
|
||||
<div class="container flex flex-col items-center gap-3 sm:flex-row">
|
||||
<SiteFooterCopyright class="sm:mr-auto" />
|
||||
<UButton v-bind="connexionButton" color="neutral" variant="link" />
|
||||
<SiteFooterCredits />
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
<template>
|
||||
<div class="flex items-center gap-1">
|
||||
Fait avec <UIcon name="i-lucide-heart" /> par
|
||||
<ULink href="https://websimple.com" target="_blank" external title="Site web développé par Websimple">Websimple</ULink>
|
||||
<ULink
|
||||
href="https://websimple.com"
|
||||
target="_blank"
|
||||
external
|
||||
title="Site web développé par Websimple"
|
||||
>Websimple</ULink
|
||||
>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
<script setup lang="ts">
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<UHeader mode="slideover">
|
||||
<template #left>
|
||||
|
||||
@@ -6,7 +6,7 @@ export function useAuthConnexion() {
|
||||
const { isLoggedIn } = useAuth();
|
||||
const toast = useToast();
|
||||
const { fetch: refreshUserSession } = useUserSession();
|
||||
const routeRedirect = useRoute().query.redirect as string || undefined;
|
||||
const routeRedirect = (useRoute().query.redirect as string) || undefined;
|
||||
|
||||
// Helper: Redirect after login / logout
|
||||
async function redirectTo(to: string | undefined) {
|
||||
@@ -30,13 +30,13 @@ export function useAuthConnexion() {
|
||||
duration: 3000,
|
||||
});
|
||||
await redirectTo(redirect);
|
||||
}
|
||||
catch (error) {
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
toast.add({
|
||||
title: "Erreur de connexion",
|
||||
color: "error",
|
||||
description: error instanceof Error ? error.message : "Une erreur est survenue lors de la connexion.",
|
||||
description:
|
||||
error instanceof Error ? error.message : "Une erreur est survenue lors de la connexion.",
|
||||
duration: 5000,
|
||||
});
|
||||
}
|
||||
@@ -56,13 +56,15 @@ export function useAuthConnexion() {
|
||||
duration: 3000,
|
||||
});
|
||||
await redirectTo(redirect);
|
||||
}
|
||||
catch (error) {
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
toast.add({
|
||||
title: "Erreur de déconnexion",
|
||||
color: "error",
|
||||
description: error instanceof Error ? error.message : "Une erreur est survenue lors de la déconnexion.",
|
||||
description:
|
||||
error instanceof Error
|
||||
? error.message
|
||||
: "Une erreur est survenue lors de la déconnexion.",
|
||||
duration: 5000,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
export const useGeneralSettings = () => useAsyncGraphQLQuery("GeneralSettings", {}, {
|
||||
transform: ({ generalSettings }) => generalSettings,
|
||||
});
|
||||
export const useGeneralSettings = () =>
|
||||
useAsyncGraphQLQuery(
|
||||
"GeneralSettings",
|
||||
{},
|
||||
{
|
||||
transform: ({ generalSettings }) => generalSettings,
|
||||
}
|
||||
);
|
||||
|
||||
@@ -11,8 +11,7 @@ export function useProseLinks(refContent: Ref<HTMLElement | null>) {
|
||||
try {
|
||||
const hrefUrl = new URL(href);
|
||||
return hrefUrl.hostname === siteUrl.hostname;
|
||||
}
|
||||
catch {
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
@@ -25,8 +24,7 @@ export function useProseLinks(refContent: Ref<HTMLElement | null>) {
|
||||
if (hrefUrl.hostname === siteUrl.hostname) {
|
||||
return hrefUrl.pathname + hrefUrl.search + hrefUrl.hash;
|
||||
}
|
||||
}
|
||||
catch {
|
||||
} catch {
|
||||
// Invalid URL
|
||||
}
|
||||
return href;
|
||||
@@ -39,7 +37,14 @@ export function useProseLinks(refContent: Ref<HTMLElement | null>) {
|
||||
if (!link) return;
|
||||
const href = link.getAttribute("href");
|
||||
if (!href) return;
|
||||
if (e.metaKey || e.ctrlKey || e.shiftKey || e.altKey || link.target === "_blank" || link.hasAttribute("download")) {
|
||||
if (
|
||||
e.metaKey ||
|
||||
e.ctrlKey ||
|
||||
e.shiftKey ||
|
||||
e.altKey ||
|
||||
link.target === "_blank" ||
|
||||
link.hasAttribute("download")
|
||||
) {
|
||||
return;
|
||||
}
|
||||
if (isInternal(href)) {
|
||||
|
||||
@@ -2,7 +2,9 @@ import { breakpointsTailwind, useBreakpoints } from "@vueuse/core";
|
||||
|
||||
export function useResponsive() {
|
||||
const { isMobileOrTablet } = useDevice();
|
||||
const breakpoints = useBreakpoints(breakpointsTailwind, { ssrWidth: isMobileOrTablet ? 375 : 1024 });
|
||||
const breakpoints = useBreakpoints(breakpointsTailwind, {
|
||||
ssrWidth: isMobileOrTablet ? 375 : 1024,
|
||||
});
|
||||
const isDesktop = breakpoints.greaterOrEqual("lg");
|
||||
|
||||
return { breakpoints, isDesktop };
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
export const useSiteOptions = () => useAsyncGraphQLQuery("SiteOptions", {}, {
|
||||
transform: ({ siteOptions }) => siteOptions?.groupSiteOptions,
|
||||
});
|
||||
export const useSiteOptions = () =>
|
||||
useAsyncGraphQLQuery(
|
||||
"SiteOptions",
|
||||
{},
|
||||
{
|
||||
transform: ({ siteOptions }) => siteOptions?.groupSiteOptions,
|
||||
}
|
||||
);
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
fragment AuthUser on User {
|
||||
id
|
||||
email
|
||||
roles {
|
||||
nodes {
|
||||
name
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mutation AuthLogin($username: String!, $password: String!) {
|
||||
login( input: { provider: PASSWORD, credentials: { username: $username, password: $password }}) {
|
||||
authToken
|
||||
refreshToken
|
||||
user {
|
||||
... AuthUser
|
||||
id
|
||||
email
|
||||
roles {
|
||||
nodes {
|
||||
name
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mutation AuthLogin($username: String!, $password: String!) {
|
||||
login(input: { provider: PASSWORD, credentials: { username: $username, password: $password } }) {
|
||||
authToken
|
||||
refreshToken
|
||||
user {
|
||||
...AuthUser
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
mutation AuthRefreshToken($refreshToken: String!) {
|
||||
refreshToken( input: { refreshToken: $refreshToken }) {
|
||||
authToken
|
||||
}
|
||||
}
|
||||
refreshToken(input: { refreshToken: $refreshToken }) {
|
||||
authToken
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,6 @@ fragment GeneralSettings on GeneralSettings {
|
||||
|
||||
query GeneralSettings {
|
||||
generalSettings {
|
||||
... GeneralSettings
|
||||
...GeneralSettings
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,10 +18,10 @@ query NodeByUri($uri: String!) {
|
||||
nodeByUri(uri: $uri) {
|
||||
__typename
|
||||
... on Page {
|
||||
... NodePage
|
||||
...NodePage
|
||||
}
|
||||
... on NodeWithRankMathSeo {
|
||||
... NodeSeo
|
||||
...NodeSeo
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +1,20 @@
|
||||
fragment SiteOptions on GroupSiteOptions {
|
||||
email
|
||||
phoneNumber { ... AcfPhone }
|
||||
phoneNumber {
|
||||
...AcfPhone
|
||||
}
|
||||
...AcfSocial
|
||||
links {
|
||||
contact { ... AcfLink}
|
||||
contact {
|
||||
...AcfLink
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
query SiteOptions {
|
||||
siteOptions {
|
||||
groupSiteOptions {
|
||||
... SiteOptions
|
||||
...SiteOptions
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,13 +4,21 @@ const { path: uri } = useRoute();
|
||||
const { data, error } = await useAsyncGraphQLQuery("NodeByUri", { uri });
|
||||
if (!data.value?.nodeByUri) {
|
||||
console.error("NodeByUri query error:", error.value);
|
||||
throw createError({ statusCode: 404, message: `La page demandée est introuvable: ${uri}`, fatal: true });
|
||||
throw createError({
|
||||
statusCode: 404,
|
||||
message: `La page demandée est introuvable: ${uri}`,
|
||||
fatal: true,
|
||||
});
|
||||
}
|
||||
|
||||
// Dynamically resolve component based on node type
|
||||
const componentName = `Node${data.value.nodeByUri.__typename}`;
|
||||
if (!useNuxtApp().vueApp.component(componentName)) {
|
||||
throw createError({ statusCode: 404, message: `La page demandée ne peut pas être affichée correctement: ${componentName}`, fatal: true });
|
||||
throw createError({
|
||||
statusCode: 404,
|
||||
message: `La page demandée ne peut pas être affichée correctement: ${componentName}`,
|
||||
fatal: true,
|
||||
});
|
||||
}
|
||||
|
||||
useNodeSeo(data.value.nodeByUri);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import * as z from "zod";
|
||||
import type { AcfLinkFragment } from "#graphql/operations";
|
||||
import * as z from "zod";
|
||||
|
||||
const acfLinkSchema = z.object({
|
||||
title: z.string(),
|
||||
@@ -11,8 +11,7 @@ export type AcfLinkOutput = z.infer<typeof acfLinkSchema>;
|
||||
export function parseAcfLink(data?: Partial<AcfLinkFragment>) {
|
||||
try {
|
||||
return acfLinkSchema.parse(data);
|
||||
}
|
||||
catch {
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,8 +22,7 @@ export const acfMediaSchema = z.object({
|
||||
export function parseAcfMedia(data?: Partial<AcfMediaFragment>) {
|
||||
try {
|
||||
return acfMediaSchema.parse(data);
|
||||
}
|
||||
catch {
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
import * as z from "zod";
|
||||
import type { AcfSocialFragment } from "#graphql/operations";
|
||||
import * as z from "zod";
|
||||
|
||||
const socialProfile = z.object({ url: z.url() }).transform(({ url }) => ({ url, icon: getSocialIcon(url) }));
|
||||
const socialProfile = z
|
||||
.object({ url: z.url() })
|
||||
.transform(({ url }) => ({ url, icon: getSocialIcon(url) }));
|
||||
const acfSocialSchema = z.object({
|
||||
profiles: z.array(socialProfile),
|
||||
});
|
||||
@@ -10,8 +12,7 @@ export type AcfSocialOutput = z.infer<typeof acfSocialSchema>;
|
||||
export function parseAcfSocial(data?: AcfSocialFragment) {
|
||||
try {
|
||||
return acfSocialSchema.parse(data);
|
||||
}
|
||||
catch {
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user