feat: enhancements and fixes (#810)

StaticJsCMS · May 18, 2023 · 6d1ce60 · 6d1ce60
1 parent f64f202
commit 6d1ce60
Show file tree

Hide file tree

Showing 46 changed files with 352 additions and 237 deletions.
diff --git a/packages/core/dev-test/config.yml b/packages/core/dev-test/config.yml
@@ -82,6 +82,7 @@ collections:
     create: true
     editor:
       frame: false
+      size: half
     fields:
       - label: Question
         name: title

diff --git a/packages/core/src/backend.ts b/packages/core/src/backend.ts
@@ -18,7 +18,7 @@ import {
   hasI18n,
 } from './lib/i18n';
 import { getBackend, invokeEvent } from './lib/registry';
-import { sanitizeChar } from './lib/urlHelper';
+import { joinUrlPath, sanitizeChar } from './lib/urlHelper';
 import {
   CURSOR_COMPATIBILITY_SYMBOL,
   Cursor,
@@ -39,7 +39,11 @@ import {
   selectInferredField,
   selectMediaFolders,
 } from './lib/util/collection.util';
-import { selectMediaFilePath, selectMediaFilePublicPath } from './lib/util/media.util';
+import {
+  DRAFT_MEDIA_FILES,
+  selectMediaFilePath,
+  selectMediaFilePublicPath,
+} from './lib/util/media.util';
 import { selectCustomPath, slugFromCustomPath } from './lib/util/nested.util';
 import { set } from './lib/util/object.util';
 import { dateParsers, expandPath, extractTemplateVars } from './lib/widgets/stringTemplate';
@@ -84,7 +88,19 @@ function updateAssetProxies(
     // update media files path based on entry path
     const oldPath = asset.path;
     entryDraft.entry.path = path;
-    const newPath = selectMediaFilePath(config, collection, entryDraft.entry, oldPath, asset.field);
+
+    const folderPath = joinUrlPath(
+      collection && 'folder' in collection ? collection.folder : '',
+      DRAFT_MEDIA_FILES,
+    );
+
+    const newPath = selectMediaFilePath(
+      config,
+      collection,
+      entryDraft.entry,
+      oldPath.replace(folderPath, ''),
+      asset.field,
+    );
     asset.path = newPath;
   });
 }

diff --git a/packages/core/src/components/collections/CollectionSearch.tsx b/packages/core/src/components/collections/CollectionSearch.tsx
@@ -146,25 +146,25 @@ const CollectionSearch = ({
           type="text"
           id="first_name"
           className="
-          block
-          w-full
-          p-1.5
-          pl-10
-          text-sm
-          text-gray-900
-          border
-          border-gray-300
-          rounded-lg
-          bg-gray-50
-          focus-visible:outline-none
-          focus:ring-4
-          focus:ring-gray-200
-          dark:bg-gray-700
-          dark:border-gray-600
-          dark:placeholder-gray-400
-          dark:text-white
-          dark:focus:ring-slate-700
-        "
+            block
+            w-full
+            p-1.5
+            pl-10
+            text-sm
+            text-gray-800
+            border
+            border-gray-300
+            rounded-lg
+            bg-gray-50
+            focus-visible:outline-none
+            focus:ring-4
+            focus:ring-gray-200
+            dark:bg-gray-700
+            dark:border-gray-600
+            dark:placeholder-gray-400
+            dark:text-white
+            dark:focus:ring-slate-700
+          "
           placeholder={t('collection.sidebar.searchAll')}
           onKeyDown={handleKeyDown}
           onBlur={handleBlur}
@@ -185,14 +185,15 @@ const CollectionSearch = ({
           rounded-md
           bg-white
           text-base
-          shadow-lg
+          shadow-md
           ring-1
           ring-black
           ring-opacity-5
           focus:outline-none
           sm:text-sm
           z-40
           dark:bg-slate-700
+          dark:shadow-lg
         "
       >
         <div

diff --git a/packages/core/src/components/collections/FilterControl.tsx b/packages/core/src/components/collections/FilterControl.tsx
@@ -52,7 +52,7 @@ const FilterControl = ({
               />
               <label
                 htmlFor={labelId}
-                className="ml-2 text-sm font-medium text-gray-900 dark:text-gray-300"
+                className="ml-2 text-sm font-medium text-gray-800 dark:text-gray-300"
               >
                 {viewFilter.label}
               </label>

diff --git a/packages/core/src/components/collections/entries/EntryListingCardGrid.tsx b/packages/core/src/components/collections/entries/EntryListingCardGrid.tsx
@@ -106,13 +106,6 @@ const EntryListingCardGrid: FC<EntryListingCardGridProps> = ({
   }, []);
 
   const getDefaultHeight = useCallback((data?: CollectionEntryData) => {
-    console.log(
-      'DEFAULT HEIGHT',
-      data,
-      isNotNullish(data?.imageFieldName)
-        ? COLLECTION_CARD_HEIGHT
-        : COLLECTION_CARD_HEIGHT_WITHOUT_IMAGE,
-    );
     return isNotNullish(data?.imageFieldName)
       ? COLLECTION_CARD_HEIGHT
       : COLLECTION_CARD_HEIGHT_WITHOUT_IMAGE;
@@ -187,22 +180,13 @@ const EntryListingCardGrid: FC<EntryListingCardGridProps> = ({
 
                     if (cardHeights[i] > rowHeight && cardHeights[i]) {
                       rowHeight = cardHeights[i] + COLLECTION_CARD_MARGIN;
-
-                      console.log(
-                        'HEIGHT @index',
-                        i,
-                        cardHeights[i],
-                        cardHeights[i] + COLLECTION_CARD_MARGIN,
-                      );
                     }
                   }
 
                   if (rowHeight === 0) {
                     rowHeight = getDefaultHeight() + COLLECTION_CARD_MARGIN;
                   }
 
-                  console.log('HEIGHT', index, rowHeight);
-
                   return rowHeight;
                 }}
                 width={width}

diff --git a/packages/core/src/components/collections/entries/EntryListingTable.tsx b/packages/core/src/components/collections/entries/EntryListingTable.tsx
@@ -77,7 +77,12 @@ const EntryListingTable: FC<EntryListingTableProps> = ({
         overflow-hidden
         p-1.5
         bg-white
+        shadow-sm
+        border
+        border-gray-100
         dark:bg-slate-800
+        dark:border-gray-700/40
+        dark:shadow-md
         rounded-xl
       "
     >

diff --git a/packages/core/src/components/common/autocomplete/Autocomplete.tsx b/packages/core/src/components/common/autocomplete/Autocomplete.tsx
@@ -70,7 +70,7 @@ const Autocomplete = function <T>(
               min-h-8
               p-0
               w-full
-              text-gray-900
+              text-gray-800
               dark:text-gray-100
             "
             data-testid="autocomplete-input-wrapper"
@@ -99,7 +99,7 @@ const Autocomplete = function <T>(
                       dark:text-gray-500
                     `
                   : `
-                      text-gray-900
+                      text-gray-800
                       dark:text-gray-100
                     `,
               )}
@@ -144,18 +144,19 @@ const Autocomplete = function <T>(
                 bg-white
                 py-1
                 text-base
-                shadow-lg
+                shadow-md
                 ring-1
                 ring-black
                 ring-opacity-5
                 focus:outline-none
                 sm:text-sm
                 z-30
                 dark:bg-slate-700
+                dark:shadow-lg
               `}
             >
               {options.length === 0 ? (
-                <div className="relative cursor-default select-none py-2 px-4 text-gray-700">
+                <div className="relative cursor-default select-none py-2 px-4 text-gray-800">
                   Nothing found.
                 </div>
               ) : (
@@ -179,7 +180,7 @@ const Autocomplete = function <T>(
                             pl-10
                             pr-4
                             cursor-pointer
-                            text-gray-900
+                            text-gray-800
                             dark:text-gray-100
                           `,
                           (selected || active) &&

diff --git a/packages/core/src/components/common/card/Card.tsx b/packages/core/src/components/common/card/Card.tsx
@@ -14,12 +14,14 @@ const Card = ({ children, className }: CardProps) => {
     <div
       className={classNames(
         `
-          bg-white border
-          border-gray-200
+          bg-white
+          border
+          border-gray-100
           rounded-lg
-          shadow-md
+          shadow-sm
           dark:bg-slate-800
           dark:border-gray-700/40
+          dark:shadow-md
           flex
           flex-col
           h-full

diff --git a/packages/core/src/components/common/card/CardContent.tsx b/packages/core/src/components/common/card/CardContent.tsx
@@ -7,7 +7,7 @@ interface CardContentProps {
 }
 
 const CardContent = ({ children }: CardContentProps) => {
-  return <p className="w-full p-5 font-normal text-gray-700 dark:text-gray-300">{children}</p>;
+  return <p className="w-full p-5 font-normal text-gray-800 dark:text-gray-300">{children}</p>;
 };
 
 export default CardContent;
diff --git a/packages/core/src/components/common/card/CardHeader.tsx b/packages/core/src/components/common/card/CardHeader.tsx
@@ -8,7 +8,7 @@ interface CardHeaderProps {
 
 const CardHeader = ({ children }: CardHeaderProps) => {
   return (
-    <h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">
+    <h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-800 dark:text-white">
       {children}
     </h5>
   );

diff --git a/packages/core/src/components/common/menu/Menu.tsx b/packages/core/src/components/common/menu/Menu.tsx
@@ -97,14 +97,15 @@ const Menu = ({
                 rounded-md
                 bg-white
                 dark:bg-slate-800
-                shadow-lg
+                shadow-md
                 border
                 border-gray-200
                 focus:outline-none
                 divide-y
                 divide-gray-100
                 dark:border-gray-700
                 dark:divide-gray-600
+                dark:shadow-lg
               `,
               onClick: handleClose,
             },

diff --git a/packages/core/src/components/common/menu/MenuItemButton.tsx b/packages/core/src/components/common/menu/MenuItemButton.tsx
@@ -46,11 +46,11 @@ const MenuItemButton = ({
               items-center
               justify-between
               cursor-pointer
-              dark:disabled:text-gray-700
+              dark:disabled:text-gray-800
             `,
             color === 'default' &&
               `
-                text-gray-700
+                text-gray-800
                 dark:text-gray-300
                 hover:bg-gray-200
                 dark:hover:bg-slate-600

diff --git a/packages/core/src/components/common/menu/MenuItemLink.tsx b/packages/core/src/components/common/menu/MenuItemLink.tsx
@@ -36,7 +36,7 @@ const MenuItemLink = ({
               px-4
               py-2
               text-sm
-              text-gray-700
+              text-gray-800
               dark:text-gray-300
               w-full
               text-left

diff --git a/packages/core/src/components/common/pill/Pill.tsx b/packages/core/src/components/common/pill/Pill.tsx
@@ -45,7 +45,7 @@ const Pill: FC<PillProps> = ({
             `
           : `
               bg-gray-200
-              text-gray-900
+              text-gray-800
               dark:bg-gray-700
               dark:text-gray-100
             `;

diff --git a/packages/core/src/components/common/select/Option.tsx b/packages/core/src/components/common/select/Option.tsx
@@ -40,7 +40,7 @@ const Option = function <T>({
               py-2
               px-4
               cursor-pointer
-              text-gray-900
+              text-gray-800
               hover:bg-blue-500
               dark:text-gray-100
             `,

diff --git a/packages/core/src/components/common/select/Select.tsx b/packages/core/src/components/common/select/Select.tsx
@@ -136,7 +136,7 @@ const Select = forwardRef(
                   px-4
                   py-1.5
                   w-full
-                  text-gray-900
+                  text-gray-800
                   dark:text-gray-100
                 `,
                 disabled &&
@@ -154,14 +154,15 @@ const Select = forwardRef(
                 bg-white
                 py-1
                 text-base
-                shadow-lg
+                shadow-md
                 ring-1
                 ring-black
                 ring-opacity-5
                 focus:outline-none
                 sm:text-sm
                 z-50
                 dark:bg-slate-700
+                dark:shadow-lg
               `,
               style: { width },
               disablePortal: false,

diff --git a/packages/core/src/components/common/switch/Switch.tsx b/packages/core/src/components/common/switch/Switch.tsx
@@ -86,7 +86,7 @@ const Switch = forwardRef<HTMLInputElement | null, SwitchProps>(
               ml-3
               text-sm
               font-medium
-              text-gray-900
+              text-gray-800
               dark:text-gray-300
             "
           >

diff --git a/packages/core/src/components/common/table/Table.tsx b/packages/core/src/components/common/table/Table.tsx
@@ -13,13 +13,12 @@ const TableCell = ({ columns, children }: TableCellProps) => {
   return (
     <div
       className="
-        shadow-md
         z-[2]
       "
     >
       <table className="w-full text-sm text-left text-gray-500 dark:text-gray-300">
         <thead className="text-xs">
-          <tr>
+          <tr className="shadow-sm">
             {columns.map((column, index) => (
               <TableHeaderCell key={index}>{column}</TableHeaderCell>
             ))}

diff --git a/packages/core/src/components/common/table/TableCell.tsx b/packages/core/src/components/common/table/TableCell.tsx
@@ -42,7 +42,7 @@ const TableCell = ({ children, emphasis = false, to, shrink = false }: TableCell
           text-gray-500
           dark:text-gray-300
         `,
-        emphasis && 'font-medium text-gray-900 whitespace-nowrap dark:text-white',
+        emphasis && 'font-medium text-gray-800 whitespace-nowrap dark:text-white',
         shrink && 'w-0',
       )}
     >

diff --git a/packages/core/src/components/common/table/TableHeaderCell.tsx b/packages/core/src/components/common/table/TableHeaderCell.tsx
@@ -27,14 +27,13 @@ const TableHeaderCell = ({ children }: TableHeaderCellProps) => {
         className="
           px-4
           py-3
-          text-gray-900
+          text-gray-800
           border-gray-100
           border-b
           bg-white
           dark:text-white
           dark:border-gray-700
           dark:bg-slate-800
-          shadow-sm
           text-[14px]
         "
       >

diff --git a/packages/core/src/components/common/text-field/TextArea.tsx b/packages/core/src/components/common/text-field/TextArea.tsx
@@ -75,7 +75,7 @@ const TextArea = forwardRef<HTMLInputElement | null, TextAreaProps>(
               outline-none
               text-sm
               font-medium
-              text-gray-900
+              text-gray-800
               dark:text-gray-100
               disabled:text-gray-300
               dark:disabled:text-gray-500