Skip to content

Commit

Permalink
Merge pull request #374 from Leo-Corporation/vNext
Browse files Browse the repository at this point in the history
Version 1.7.0.2404
  • Loading branch information
lpeyr authored Apr 15, 2024
2 parents 820e36e + b5cb1cf commit 0abfd99
Show file tree
Hide file tree
Showing 13 changed files with 853 additions and 555 deletions.
2 changes: 1 addition & 1 deletion components/ui/command.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ const CommandItem = React.forwardRef<
<CommandPrimitive.Item
ref={ref}
className={cn(
"relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none aria-selected:bg-accent aria-selected:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
"relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none aria-selected:bg-accent aria-selected:text-accent-foreground data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50",
className,
)}
{...props}
Expand Down
2 changes: 1 addition & 1 deletion components/ui/input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
<input
type={type}
className={cn(
"flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
"flex h-10 w-full rounded-md border border-slate-300 bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-slate-600 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-600 dark:placeholder:text-slate-300",
className,
)}
ref={ref}
Expand Down
47 changes: 47 additions & 0 deletions components/ui/radio-group.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
"use client";

import * as React from "react";
import * as RadioGroupPrimitive from "@radix-ui/react-radio-group";

import { cn } from "@/lib/utils";
import { Circle16Filled } from "@fluentui/react-icons";

const RadioGroup = React.forwardRef<
React.ElementRef<typeof RadioGroupPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Root>
>(({ className, ...props }, ref) => {
return (
<RadioGroupPrimitive.Root
className={cn("grid gap-2", className)}
{...props}
ref={ref}
/>
);
});
RadioGroup.displayName = RadioGroupPrimitive.Root.displayName;

const RadioGroupItem = React.forwardRef<
React.ElementRef<typeof RadioGroupPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Item>
>(({ className, ...props }, ref) => {
return (
<RadioGroupPrimitive.Item
ref={ref}
className={cn(
"aspect-square h-4 w-4 rounded-full border border-accent-color text-current ring-offset-background focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
className,
)}
{...props}
>
<RadioGroupPrimitive.Indicator className="flex items-center justify-center">
<Circle16Filled
fill="#8B2DF0"
className="h-2.5 w-2.5 fill-accent-color text-accent-color"
/>
</RadioGroupPrimitive.Indicator>
</RadioGroupPrimitive.Item>
);
});
RadioGroupItem.displayName = RadioGroupPrimitive.Item.displayName;

export { RadioGroup, RadioGroupItem };
24 changes: 24 additions & 0 deletions components/ui/textarea.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import * as React from "react";

import { cn } from "@/lib/utils";

export interface TextareaProps
extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}

const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
({ className, ...props }, ref) => {
return (
<textarea
className={cn(
"flex min-h-[80px] w-full rounded-md border border-slate-300 bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-slate-600 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-600 dark:placeholder:text-slate-300",
className,
)}
ref={ref}
{...props}
/>
);
},
);
Textarea.displayName = "Textarea";

export { Textarea };
19 changes: 19 additions & 0 deletions lib/contact.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export interface ContactInfo {
firstName: string;
lastName: string;
mobile: string;
phone: string;
fax: string;
email: string;
company: string;
job: string;
address: ContactAddress;
website: string;
}
export interface ContactAddress {
street: string;
city: string;
zip: string;
state: string;
country: string;
}
34 changes: 33 additions & 1 deletion locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,37 @@
"font-size": "Font size",
"alt-text": "Alt text",
"show-text": "Show text",
"preview": "Preview"
"preview": "Preview",
"text": "Text",
"email": "Email",
"email-placeholder": "Enter your email address here.",
"subject": "Subject",
"message": "Message",
"message-placeholder": "Enter your message here.",
"phone": "Phone number",
"phone-placeholder": "Enter your phone number here.",
"sms": "SMS",
"wifi": "WiFi",
"ssid": "SSID",
"network-name": "Network Name",
"password": "Password",
"encryption": "Encryption",
"none": "None",
"wpa": "WPA/WPA",
"wep": "WEP",
"mobile": "Mobile phone",
"phone-n": "Phone",
"fax": "Fax",
"company": "Company",
"job": "Job",
"street": "Street",
"city": "City",
"zip": "ZIP",
"state": "State",
"country": "Country",
"website": "Website",
"firstname": "First name",
"lastname": "Last name",
"name": "Name",
"contact": "Contact"
}
34 changes: 33 additions & 1 deletion locales/fr/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,37 @@
"font-size": "Taille de la police",
"alt-text": "Texte alternatif",
"show-text": "Afficher le texte",
"preview": "Aperçu"
"preview": "Aperçu",
"text": "Texte",
"email": "Email",
"email-placeholder": "Entrez votre addrese mail ici.",
"subject": "Objet",
"message": "Message",
"message-placeholder": "Entrez votre message ici.",
"phone": "Numéro de téléphone",
"phone-placeholder": "Entrez votre numéro de téléphone ici.",
"sms": "SMS",
"wifi": "WiFi",
"ssid": "SSID",
"network-name": "Nom du réseau",
"password": "Mot de passe",
"encryption": "Cryptage",
"none": "Aucun",
"wpa": "WPA/WPA",
"wep": "WEP",
"mobile": "Téléphone portable",
"phone-n": "Téléphone fixe",
"fax": "Fax",
"company": "Entreprise",
"job": "Profession",
"street": "Rue",
"city": "Ville",
"zip": "Code Postal",
"state": "Région/Etat",
"country": "Pays",
"website": "Site web",
"firstname": "Prénom",
"lastname": "Nom de famille",
"name": "Nom",
"contact": "Contact"
}
Loading

0 comments on commit 0abfd99

Please sign in to comment.