Merge branch 'main' into main

thundersquared · Jan 9, 2024 · 12f524c · 12f524c
2 parents e1d7ae7 + c6501e8
commit 12f524c
Show file tree

Hide file tree

Showing 9 changed files with 3,142 additions and 1,327 deletions.
diff --git a/.env.example b/.env.example
@@ -7,8 +7,8 @@ SUPABASE_URL="https://{YOUR_INSTANCE_NAME}.supabase.co"
 SERVER_URL="http://localhost:3000"
 
 SMTP_PWD="super-safe-passw0rd"
-SMTP_HOST="mail.shelf.nu"
-SMTP_USER="[email protected]"
+SMTP_HOST="mail.example.com"
+SMTP_USER="[email protected]"
 
 MAPTILER_TOKEN="maptiler-token"
 MICROSOFT_CLARITY_ID="microsoft-clarity-id"

diff --git a/app/components/assets/custom-fields-inputs.tsx b/app/components/assets/custom-fields-inputs.tsx
@@ -142,11 +142,8 @@ export default function AssetCustomFields({
             defaultValue={val ? val : field.required ? field.options[0] : ""}
             disabled={disabled}
           >
-            <SelectTrigger
-              className="px-3.5 py-3"
-              placeholder={`Choose ${field.name}`}
-            >
-              <SelectValue />
+            <SelectTrigger className="px-3.5 py-3">
+              <SelectValue placeholder={`Choose ${field.name}`} />
             </SelectTrigger>
             <SelectContent
               position="popper"

diff --git a/app/components/custom-fields/form.tsx b/app/components/custom-fields/form.tsx
@@ -135,12 +135,8 @@ export const CustomFieldForm = ({
             disabled={disabled}
             onValueChange={(val: CustomFieldType) => setSelectedType(val)}
           >
-            <SelectTrigger
-              disabled={isEdit}
-              className="px-3.5 py-3"
-              placeholder="Choose a field type"
-            >
-              <SelectValue />
+            <SelectTrigger disabled={isEdit} className="px-3.5 py-3">
+              <SelectValue placeholder="Choose a field type" />
             </SelectTrigger>
             <SelectContent
               position="popper"

diff --git a/app/components/workspace/form.tsx b/app/components/workspace/form.tsx
@@ -93,11 +93,8 @@ export const WorkspaceForm = ({ name, currency }: Props) => {
             disabled={disabled}
             name={zo.fields.currency()}
           >
-            <SelectTrigger
-              className="px-3.5 py-3"
-              placeholder="Choose a field type"
-            >
-              <SelectValue />
+            <SelectTrigger className="px-3.5 py-3">
+              <SelectValue placeholder="Choose a field type" />
             </SelectTrigger>
             <SelectContent
               position="popper"

diff --git a/app/routes/_layout+/assets.$assetId.tsx b/app/routes/_layout+/assets.$assetId.tsx
@@ -73,14 +73,20 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
 
   const notes = asset.notes.map((note) => ({
     ...note,
-    dateDisplay: getDateTimeFormat(request).format(note.createdAt),
+    dateDisplay: getDateTimeFormat(request, {
+      dateStyle: "short",
+      timeStyle: "short",
+    }).format(note.createdAt),
     content: parseMarkdownToReact(note.content),
   }));
 
   let custody = null;
   if (asset.custody) {
     const date = new Date(asset.custody.createdAt);
-    const dateDisplay = getDateTimeFormat(request).format(date);
+    const dateDisplay = getDateTimeFormat(request, {
+      dateStyle: "short",
+      timeStyle: "short",
+    }).format(date);
 
     custody = {
       ...asset.custody,

diff --git a/app/routes/_layout+/settings.general.tsx b/app/routes/_layout+/settings.general.tsx
@@ -293,11 +293,8 @@ export default function GeneralPage() {
               disabled={disabled}
               name={zo.fields.currency()}
             >
-              <SelectTrigger
-                className="px-3.5 py-3"
-                placeholder="Choose a field type"
-              >
-                <SelectValue />
+              <SelectTrigger className="px-3.5 py-3">
+                <SelectValue placeholder="Choose a field type" />
               </SelectTrigger>
               <SelectContent
                 position="popper"

diff --git a/app/utils/client-hints.tsx b/app/utils/client-hints.tsx
@@ -138,8 +138,7 @@ export function getDateTimeFormat(
   };
 
   options = {
-    ...defaultOptions,
-    ...options,
+    ...(options || defaultOptions),
     timeZone: options?.timeZone ?? getHints(request).timeZone,
   };
   return new Intl.DateTimeFormat(locale, options);

diff --git a/app/utils/mail.server.ts b/app/utils/mail.server.ts
@@ -40,7 +40,7 @@ export const sendEmail = async ({
 
   // send mail with defined transport object
   await transporter.sendMail({
-    from: '"Shelf.nu" <[email protected]>', // sender address
+    from: `"Shelf" <${SMTP_USER}>`, // sender address
     to, // list of receivers
     subject, // Subject line
     text, // plain text body