Merge pull request #4 from zapal-tech/feature/update-collections

Update collections
zapal-tech · Oct 26, 2023 · d91f400 · d91f400
2 parents 25a8133 + 1317c54
commit d91f400
Show file tree

Hide file tree

Showing 19 changed files with 550 additions and 254 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -10,6 +10,7 @@
     "^(^types$)|(^types/(.*)$)$",
     "^(^assets$)|(^assets/(.*)$)$",
     "^(^locales$)|(^locales/(.*)$)$",
+    "^i18n$",
     "^(^components$)|(^components/(.*)$)$",
     "^(^collections$)|(^collections/(.*)$)$",
     "^(^globals$)|(^globals/(.*)$)$",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@zapal/website-cms",
   "description": "Zapal's website CMS",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "main": "dist/server.js",
   "license": "MIT",
   "scripts": {

diff --git a/src/collections/Projects.ts b/src/collections/Projects.ts
@@ -1,9 +1,10 @@
+import payload from 'payload';
 import { CollectionConfig } from 'payload/types';
 
 import { orderField } from 'fields/order';
 import { slugField } from 'fields/slug';
 
-import { generalGroup } from 'utils/groups';
+import { projectsGroup } from 'utils/groups';
 
 import ProjectImages from './media/ProjectImages';
 
@@ -22,14 +23,31 @@ const Projects: CollectionConfig = {
   admin: {
     useAsTitle: 'preview.name',
     defaultColumns: ['order', 'preview.name'],
-    group: generalGroup,
+    group: projectsGroup,
   },
   versions: {
     drafts: {
       autosave: true,
     },
     maxPerDoc: 5,
   },
+  endpoints: [
+    {
+      path: '/slug/:slug',
+      method: 'get',
+      handler: async (req, res) => {
+        const data = await payload.find({
+          collection: 'projects',
+          where: { slug: { equals: req.params.slug } },
+          limit: 1,
+        });
+
+        if (data.docs.length) return res.status(200).send(data.docs[0]);
+
+        res.status(404).send({ error: 'Not found' });
+      },
+    },
+  ],
   fields: [
     {
       type: 'tabs',

diff --git a/src/collections/blog/Blog.ts b/src/collections/blog/Blog.ts
@@ -1,5 +1,8 @@
+import payload from 'payload';
 import { CollectionConfig } from 'payload/types';
 
+import BlogCoverImages from 'collections/media/BlogCoverImages';
+
 import { richTextField } from 'fields/richText';
 import { slugField } from 'fields/slug';
 
@@ -24,6 +27,29 @@ const Blog: CollectionConfig = {
     useAsTitle: 'content.title',
     group: blogGroup,
   },
+  versions: {
+    drafts: {
+      autosave: true,
+    },
+    maxPerDoc: 5,
+  },
+  endpoints: [
+    {
+      path: '/slug/:slug',
+      method: 'get',
+      handler: async (req, res) => {
+        const data = await payload.find({
+          collection: 'blog-posts',
+          where: { slug: { equals: req.params.slug } },
+          limit: 1,
+        });
+
+        if (data.docs.length) return res.status(200).send(data.docs[0]);
+
+        res.status(404).send({ error: 'Not found' });
+      },
+    },
+  ],
   fields: [
     {
       type: 'tabs',
@@ -42,32 +68,77 @@ const Blog: CollectionConfig = {
                 en: 'Title',
                 ua: 'Заголовок',
               },
+              required: true,
             },
             {
-              name: 'tags',
+              type: 'textarea',
+              name: 'description',
               label: {
-                en: 'Tags',
-                ua: 'Теги',
+                en: 'Description',
+                ua: 'Опис',
               },
-              type: 'relationship',
-              relationTo: Tags.slug,
-              hasMany: true,
               required: true,
             },
             {
-              name: 'author',
+              type: 'row',
+              fields: [
+                {
+                  name: 'tags',
+                  label: {
+                    en: 'Tags',
+                    ua: 'Теги',
+                  },
+                  type: 'relationship',
+                  relationTo: Tags.slug,
+                  hasMany: true,
+                  required: true,
+                },
+                {
+                  name: 'author',
+                  label: {
+                    en: 'Author',
+                    ua: 'Автор',
+                  },
+                  type: 'relationship',
+                  relationTo: Authors.slug,
+                  hasMany: false,
+                  required: true,
+                },
+              ],
+            },
+            {
+              type: 'upload',
+              name: 'landscape',
+              relationTo: BlogCoverImages.slug,
               label: {
-                en: 'Author',
-                ua: 'Автор',
-              },
-              admin: {
-                position: 'sidebar',
+                en: 'Cover (shown on devices with landscape orientation)',
+                ua: 'Обкладинка (відображається на пристроях з альбомною орієнтацією)',
               },
-              type: 'relationship',
-              relationTo: Authors.slug,
-              hasMany: false,
-              required: true,
             },
+            // {
+            //   type: 'group',
+            //   name: 'cover',
+            //   fields: [
+            //     {
+            //       type: 'upload',
+            //       name: 'landscape',
+            //       relationTo: BlogCoverImages.slug,
+            //       label: {
+            //         en: 'Cover (shown on devices with landscape orientation)',
+            //         ua: 'Обкладинка (відображається на пристроях з альбомною орієнтацією)',
+            //       },
+            //     },
+            //     {
+            //       type: 'upload',
+            //       name: 'portrait',
+            //       relationTo: BlogCoverImages.slug,
+            //       label: {
+            //         en: 'Cover (shown on devices with portrait orientation)',
+            //         ua: 'Обкладинка (відображається на пристроях з портретною орієнтацією)',
+            //       },
+            //     },
+            //   ],
+            // },
             richTextField({ name: 'content' }),
           ],
         },

diff --git a/src/collections/media/BlogAssets.ts b/src/collections/media/BlogAssets.ts
@@ -0,0 +1,22 @@
+import { CollectionConfig } from 'payload/types';
+
+import { publicUploadCollectionWithoutApiAccess } from 'utils/access';
+import { blogGroup } from 'utils/groups';
+
+const BlogAssets: CollectionConfig = {
+  slug: 'blog-assets',
+  labels: {
+    singular: { en: 'Blog asset', ua: 'Файл блогу' },
+    plural: { en: 'Blog assets', ua: 'Файли блогу' },
+  },
+  upload: true,
+  access: {
+    read: publicUploadCollectionWithoutApiAccess,
+  },
+  admin: {
+    group: blogGroup,
+  },
+  fields: [],
+};
+
+export default BlogAssets;
diff --git a/src/collections/media/BlogCoverImages.ts b/src/collections/media/BlogCoverImages.ts
@@ -0,0 +1,50 @@
+import { CollectionConfig } from 'payload/types';
+
+import { altField } from 'fields/alt';
+
+import { publicUploadCollectionWithoutApiAccess } from 'utils/access';
+import { blogGroup } from 'utils/groups';
+import { defaultPhotoMimeTypes } from 'utils/mimeTypes';
+
+const BlogCoverImages: CollectionConfig = {
+  slug: 'blog-cover-images',
+  labels: {
+    singular: { en: 'Blog cover image', ua: 'Мета фото (блог)' },
+    plural: { en: 'Blog cover images', ua: 'Мета фото (блог)' },
+  },
+  upload: {
+    formatOptions: { format: 'webp', options: { lossless: true } },
+    mimeTypes: defaultPhotoMimeTypes,
+    imageSizes: [
+      {
+        name: '700',
+        width: 700,
+        formatOptions: { format: 'webp', options: { quality: 85 } },
+      },
+      {
+        name: '800',
+        width: 800,
+        formatOptions: { format: 'webp', options: { quality: 85 } },
+      },
+      {
+        name: '1200',
+        width: 1200,
+        formatOptions: { format: 'webp', options: { quality: 85 } },
+      },
+      {
+        name: '1600',
+        width: 1600,
+        formatOptions: { format: 'webp', options: { quality: 85 } },
+      },
+    ],
+  },
+  access: {
+    read: publicUploadCollectionWithoutApiAccess,
+  },
+  admin: {
+    group: blogGroup,
+  },
+  fields: [altField()],
+};
+
+export default BlogCoverImages;
diff --git a/src/collections/media/BlogMetaImages.ts b/src/collections/media/BlogMetaImages.ts
diff --git a/src/collections/media/OpenGraphImages.ts b/src/collections/media/OpenGraphImages.ts
@@ -0,0 +1,32 @@
+import { CollectionConfig } from 'payload/types';
+
+import { publicUploadCollectionWithoutApiAccess } from 'utils/access';
+import { mediaGroup } from 'utils/groups';
+
+const OpenGraphImages: CollectionConfig = {
+  slug: 'open-graph-images',
+  labels: {
+    singular: { en: 'Open Graph image', ua: 'Open Graph зображення' },
+    plural: { en: 'Open Graph images', ua: 'Open Graph зображення' },
+  },
+  upload: {
+    resizeOptions: {
+      width: 1200,
+    },
+    formatOptions: { format: 'webp', options: { quality: 80 } },
+    mimeTypes: ['image/webp', 'image/jpeg', 'image/png', 'image/svg+xml'],
+  },
+  access: {
+    read: publicUploadCollectionWithoutApiAccess,
+  },
+  admin: {
+    description: {
+      en: '1200x630 preview image for the link',
+      ua: '1200x630 зображення попереднього перегляду посилання',
+    },
+    group: mediaGroup,
+  },
+  fields: [],
+};
+
+export default OpenGraphImages;
diff --git a/src/collections/media/ProjectAssets.ts b/src/collections/media/ProjectAssets.ts
@@ -3,22 +3,20 @@ import { CollectionConfig } from 'payload/types';
 import { altField } from 'fields/alt';
 
 import { publicUploadCollectionWithoutApiAccess } from 'utils/access';
-import { mediaGroup } from 'utils/groups';
+import { projectsGroup } from 'utils/groups';
 
 const ProjectAssets: CollectionConfig = {
   slug: 'project-assets',
   labels: {
-    singular: { en: 'Project Asset', ua: 'Дані проєкту' },
-    plural: { en: 'Project Assets', ua: 'Дані проєкту' },
-  },
-  upload: {
-    mimeTypes: ['image/webp', 'image/jpeg', 'image/png', 'image/svg+xml'],
+    singular: { en: 'Project Asset', ua: 'Файл проєкту' },
+    plural: { en: 'Project Assets', ua: 'Файли проєктів' },
   },
+  upload: true,
   access: {
     read: publicUploadCollectionWithoutApiAccess,
   },
   admin: {
-    group: mediaGroup,
+    group: projectsGroup,
   },
   fields: [altField()],
 };

diff --git a/src/collections/media/ProjectImages.ts b/src/collections/media/ProjectImages.ts
@@ -3,7 +3,7 @@ import { CollectionConfig } from 'payload/types';
 import { altField } from 'fields/alt';
 
 import { publicUploadCollectionWithoutApiAccess } from 'utils/access';
-import { mediaGroup } from 'utils/groups';
+import { projectsGroup } from 'utils/groups';
 import { defaultPhotoMimeTypes } from 'utils/mimeTypes';
 
 const ProjectImages: CollectionConfig = {
@@ -50,7 +50,7 @@ const ProjectImages: CollectionConfig = {
     read: publicUploadCollectionWithoutApiAccess,
   },
   admin: {
-    group: mediaGroup,
+    group: projectsGroup,
     description: {
       en: 'All project images need to be 5:4 aspect ratio',
       ua: 'Всі зображення повинні бути у співвідношенні сторін 5:4',

diff --git a/src/fields/url.ts b/src/fields/url.ts
@@ -10,5 +10,6 @@ export const urlField = (data?: Partial<Omit<TextField, 'type'>>): TextField =>
     ua: 'Посилання',
   },
   validate: validateUrl,
+  required: false,
   ...data,
 });