Merge pull request #158 from vevcom/feat/Article

Feat/article-2

src/actions/cms/articleSections/destroy.ts

@@ -0,0 +1,16 @@
+'use server'
+import prisma from '@/prisma'
+import errorHandler from '@/prisma/errorHandler'
+import { ActionReturn } from '@/actions/type'
+import { ArticleSection } from '@prisma/client'
+
+export default async function destroy(name: string) : Promise<ActionReturn<ArticleSection>> {
+    try {
+        const articleSection = await prisma.articleSection.delete({
+            where: { name },
+        })
+        return { success: true, data: articleSection }
+    } catch (error) {
+        return errorHandler(error)
+    }
+}

src/actions/cms/articleSections/update.ts

@@ -1,5 +1,6 @@
 'use server'
 import { maxImageSize, minImageSize } from './ConfigVars'
+import destroy from './destroy'
 import prisma from '@/prisma'
 import errorHandler from '@/prisma/errorHandler'
 import { default as createCmsImage } from '@/actions/cms/images/create'
@@ -130,37 +131,50 @@ export async function removePart(name: string, part: Part) : Promise<ActionRetur
         switch (part) {
             case 'cmsLink':
                 await prisma.cmsLink.delete({ where: { id: articleSection.cmsLink?.id } })
-                return {
-                    success: true,
-                    data: await prisma.articleSection.findUnique({
-                        where: { name },
-                        include: { cmsParagraph: true, cmsImage: true, cmsLink: true }
-                    }) || articleSection
-                }
-
+                break
             case 'cmsParagraph':
                 await prisma.cmsParagraph.delete({ where: { id: articleSection.cmsParagraph?.id } })
-                return {
-                    success: true,
-                    data: await prisma.articleSection.findUnique({
-                        where: { name },
-                        include: { cmsParagraph: true, cmsImage: true, cmsLink: true }
-                    }) || articleSection
-                }
-
+                break
             case 'cmsImage':
                 await prisma.cmsImage.delete({ where: { id: articleSection.cmsImage?.id } })
-                return {
-                    success: true,
-                    data: await prisma.articleSection.findUnique({
-                        where: { name },
-                        include: { cmsParagraph: true, cmsImage: true, cmsLink: true }
-                    }) || articleSection
-                }
+                break
             default:
                 break
         }
-        return { success: false, error: [{ message: 'Invalid part' }] }
+
+
+        // check if all Parts are removed and if so, remove the articleSection,
+        // but only if destroyOnEmpty is true
+        const afterDelete = await prisma.articleSection.findUnique({
+            where: { name },
+            include: { cmsParagraph: true, cmsImage: true, cmsLink: true }
+        })
+        if (!afterDelete) {
+            return {
+                success: false,
+                error: [{ message: 'Noe uventet skjedde etter sletting av del av artclesection' }]
+            }
+        }
+        if (
+            articleSection.destroyOnEmpty &&
+            !afterDelete.cmsImage &&
+            !afterDelete.cmsParagraph &&
+            !afterDelete.cmsImage
+        ) {
+            const destroyRes = await destroy(name)
+            if (!destroyRes.success) {
+                return {
+                    success: false,
+                    error: [{ message: 'Greide ikke slette artikkelseksjonen' }]
+                }
+            }
+            return { success: true, data: destroyRes.data }
+        }
+
+        return {
+            success: true,
+            data: afterDelete
+        }
     } catch (error) {
         return errorHandler(error)
     }

src/actions/cms/articles/ConfigVars.ts

@@ -0,0 +1 @@
+export const maxSections = 10 // Max 10 sections in an article

src/actions/cms/articles/read.ts

@@ -4,11 +4,11 @@ import { ActionReturn } from '@/actions/type'
 import prisma from '@/prisma'
 import errorHandeler from '@/prisma/errorHandler'
 
-export default async function read(name: string): Promise<ActionReturn<ReturnType>> {
+export default async function read(id: number): Promise<ActionReturn<ReturnType>> {
     try {
         const article = await prisma.article.findUnique({
             where: {
-                name
+                id
             },
             include: {
                 articleSections: {

src/actions/cms/articles/update.ts

@@ -1,19 +1,37 @@
 'use server'
+import { maxSections } from './ConfigVars'
 import prisma from '@/prisma'
 import errorHandler from '@/prisma/errorHandler'
 import { ActionReturn } from '@/actions/type'
+import { addPart } from '@/cms/articleSections/update'
+import { ArticleSection } from '@prisma/client'
+import { z } from 'zod'
+import type { Part } from '@/cms/articleSections/update'
 import type { ReturnType } from './ReturnType'
 
-export default async function update(id: number, config: {
-    name?: string,
-}) : Promise<ActionReturn<ReturnType>> {
+export default async function update(id: number, rawData: FormData) : Promise<ActionReturn<ReturnType>> {
+    const schema = z.object({
+        name: z.string().min(2).max(20)
+    })
+    const parse = schema.safeParse({
+        name: rawData.get('name'),
+    })
+
+    if (!parse.success) {
+        return {
+            success: false,
+            error: parse.error.issues
+        }
+    }
+    const data = parse.data
+
     try {
         const article = await prisma.article.update({
             where: {
                 id,
             },
             data: {
-                ...config,
+                ...data,
             },
             include: {
                 coverImage: true,
@@ -31,3 +49,180 @@ export default async function update(id: number, config: {
         return errorHandler(error)
     }
 }
+
+export async function addSectionToArticle(
+    id: number,
+    include: Partial<Record<Part, boolean>>
+) : Promise<ActionReturn<ReturnType>> {
+    try {
+        const article = await prisma.article.findUnique({
+            where: {
+                id,
+            },
+        })
+
+        if (!article) {
+            return {
+                success: false,
+                error: [{
+                    message: 'Artikkel ikke funnet',
+                }],
+            }
+        }
+
+        const highestOrderSection = await prisma.articleSection.findMany({
+            where: {
+                articleId: id,
+            },
+            orderBy: {
+                order: 'desc',
+            },
+            take: 1,
+        })
+
+        // Get the order of the highest order section, or 0 if there are no sections
+        const nextOreder = highestOrderSection.length > 0 ? highestOrderSection[0].order + 1 : 0
+
+
+        const numberOfSections = await prisma.articleSection.count({
+            where: {
+                articleId: id,
+            },
+        })
+        if (numberOfSections >= maxSections) {
+            return {
+                success: false,
+                error: [{
+                    message: `The maximum number of sections is ${maxSections}`,
+                }],
+            }
+        }
+
+        const newSectionName = `${article.name} section ${nextOreder}`
+
+        const updatedArticle = await prisma.article.update({
+            where: {
+                id,
+            },
+            data: {
+                articleSections: {
+                    create: {
+                        name: newSectionName,
+                        order: nextOreder,
+                    },
+                },
+            },
+            include: {
+                coverImage: true,
+                articleSections: {
+                    include: {
+                        cmsImage: true,
+                        cmsParagraph: true,
+                        cmsLink: true,
+                    }
+                }
+            }
+        })
+
+        for (const part of ['cmsParagraph', 'cmsLink', 'cmsImage'] as const) {
+            if (include[part]) {
+                await addPart(newSectionName, part)
+            }
+        }
+
+        return { success: true, data: updatedArticle }
+    } catch (error) {
+        return errorHandler(error)
+    }
+}
+
+export async function moveSectionOrder(
+    id: number,
+    sectionId: number,
+    direction: 'UP' | 'DOWN'
+) : Promise<ActionReturn<ArticleSection>> {
+    try {
+        //get section to move
+        const section = await prisma.articleSection.findUnique({
+            where: {
+                articleId: id,
+                id: sectionId,
+            },
+        })
+        if (!section) {
+            return {
+                success: false,
+                error: [{
+                    message: 'Seksjon ikke funnet',
+                }],
+            }
+        }
+
+        //find the section with the order one higher/lower than the current section
+        const otherSection = await prisma.articleSection.findMany({
+            where: {
+                articleId: id,
+                order: direction === 'UP' ? {
+                    lt: section.order,
+                } : {
+                    gt: section.order,
+                },
+            },
+            orderBy: {
+                order: direction === 'UP' ? 'desc' : 'asc',
+            },
+            take: 1,
+        }).then(sections => sections[0])
+        if (!otherSection) {
+            return {
+                success: false,
+                error: [{
+                    message: 'Seksjon kan ikke  flyttes opp/ned',
+                }],
+            }
+        }
+
+
+        //flip thir order numbers
+        const tempOrder = -1 // Or any other value that won't violate the unique constraint
+
+        // First, set the order of the section to the temporary value
+        await prisma.articleSection.update({
+            where: {
+                articleId: id,
+                id: section.id
+            },
+            data: { order: tempOrder },
+        })
+        const updatedOtherSection = await prisma.articleSection.update({
+            where: {
+                articleId: id,
+                id: otherSection.id
+            },
+            data: { order: section.order },
+        })
+        // Finally, set the order of the section to the otherSection's original order
+        const updatedSection = await prisma.articleSection.update({
+            where: {
+                articleId: id,
+                id: section.id
+            },
+            data: { order: otherSection.order },
+        })
+
+
+        if (!updatedSection || !updatedOtherSection) {
+            return {
+                success: false,
+                error: [{
+                    message: 'Noe uventet skjedde under flytting av seksjonen',
+                }],
+            }
+        }
+
+        return { success: true, data: updatedSection }
+    } catch (error) {
+        console.log(error)
+        return errorHandler(error)
+    }
+}

src/app/(home)/page.tsx

@@ -5,26 +5,19 @@ import SocialIcons from '@/components/SocialIcons/SocialIcons'
 import CmsImage from '@/components/Cms/CmsImage/CmsImage'
 import GoogleMap from '@/components/GoogleMap/GoogleMap'
 import YouTube from '@/components/YouTube/YouTube'
-import { getUser } from '@/auth'
 import { faAngleDown } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Link from 'next/link'
 
 export default async function Home() {
-    const user = await getUser()
-
-    console.log(user)
-
     return (
         <div className={styles.wrapper}>
             <div className={`${styles.part} ${styles.frontImg}`}>
                 <div className={styles.frontInfo}>
                     <div>
                         <CmsImage name="frontpage_logo" width={300}/>
-                        {user === null && <>
-                            <Link href="login">Logg inn</Link>
-                            <Link href="infopages/nystudent">Ny student</Link>
-                        </>}
+                        <Link href="login">Logg inn</Link>
+                        <Link href="infopages/nystudent">Ny student</Link>
                         <div className={styles.socials}>
                             <SocialIcons />
                         </div>

src/app/components/Cms/AddParts.module.scss

@@ -0,0 +1,15 @@
+@use '@/styles/ohma';
+
+
+.AddParts {
+    z-index: 1;
+    display: flex;
+    button {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        &:hover {
+            cursor: pointer;
+        }
+    }
+}