Delete on autoredeploy

NTNU-SmallSatLab · Apr 10, 2024 · dcb7fb4 · dcb7fb4
2 parents 1e6b5e8 + a329df7
commit dcb7fb4
Show file tree

Hide file tree

Showing 37 changed files with 563 additions and 289 deletions.
diff --git a/backend/src/api/article/content-types/article/schema.json b/backend/src/api/article/content-types/article/schema.json
@@ -12,19 +12,15 @@
   },
   "pluginOptions": {},
   "attributes": {
-    "title": {
+    "previewCardTitle": {
       "type": "string",
       "required": true,
       "unique": true
     },
     "slug": {
       "type": "uid",
-      "targetField": "title",
       "required": true
     },
-    "subtitle": {
-      "type": "string"
-    },
     "datePublished": {
       "type": "date",
       "required": true

diff --git a/backend/types/generated/contentTypes.d.ts b/backend/types/generated/contentTypes.d.ts
@@ -800,9 +800,8 @@ export interface ApiArticleArticle extends Schema.CollectionType {
     draftAndPublish: true;
   };
   attributes: {
-    title: Attribute.String & Attribute.Required & Attribute.Unique;
-    slug: Attribute.UID<'api::article.article', 'title'> & Attribute.Required;
-    subtitle: Attribute.String;
+    previewCardTitle: Attribute.String & Attribute.Required & Attribute.Unique;
+    slug: Attribute.UID & Attribute.Required;
     datePublished: Attribute.Date & Attribute.Required;
     coverImage: Attribute.Media;
     body: Attribute.Blocks & Attribute.Required;

diff --git a/frontend/.env.development b/frontend/.env.development
@@ -1,4 +1,2 @@
 # Database url for outside requests
-OUTSIDE_STRAPI_URL=http://localhost:1337
-
-INTERNAL_STRAPI_URL=http://localhost:1337
+STRAPI_URL=http://localhost:1337
diff --git a/frontend/.env.production b/frontend/.env.production
@@ -1,5 +1,3 @@
 # Database url for outside requests, set in github repo variables
-OUTSIDE_STRAPI_URL=http://web.hypso.ies.ntnu.no:1337
+STRAPI_URL=http://web.hypso.ies.ntnu.no:1337
 
-# Database url for internal requests between the docker containers, set in github repo variables
-INTERNAL_STRAPI_URL=http://backend:1337
diff --git a/frontend/next.config.mjs b/frontend/next.config.mjs
@@ -15,6 +15,10 @@ const nextConfig = {
                 hostname: "web.hypso.ies.ntnu.no",
                 port: '1337'
             },
+            {
+                protocol: "http",
+                hostname: "backend",
+            },
         ],
     },
 };

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -40,12 +40,14 @@
         "class-variance-authority": "^0.7.0",
         "clsx": "^2.1.0",
         "cmdk": "0.2.0",
+        "country-emoji": "^1.5.6",
         "framer-motion": "^11.0.24",
         "globe.gl": "^2.32.2",
         "gsap": "^3.12.5",
         "lucide-react": "^0.314.0",
         "luxon": "^3.4.4",
         "next": "14.1.0",
+        "next-share": "^0.27.0",
         "next-themes": "^0.2.1",
         "node-geometry-library": "^1.2.6",
         "ol": "^8.2.0",

diff --git a/frontend/src/__generated__/gql.ts b/frontend/src/__generated__/gql.ts
diff --git a/frontend/src/__generated__/graphql.ts b/frontend/src/__generated__/graphql.ts
diff --git a/frontend/src/app/blog/[articleSlug]/page.tsx b/frontend/src/app/blog/[articleSlug]/page.tsx
@@ -1,16 +1,19 @@
-export const runtime = "edge";
-import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import { Avatar, AvatarFallback } from "@/components/ui/avatar";
 
 import { BlocksContent } from "@strapi/blocks-react-renderer";
 import BlockRendererClient from "@/components/BlockRendererClient";
 import { gql } from "@/__generated__/gql";
 import { getClient } from "@/lib/ApolloClient";
-const OUTSIDE_STRAPI_URL = process.env.OUTSIDE_STRAPI_URL;
+import { AvatarImageFix } from "@/components/AvatarImageFix";
+import ShareButtons from "@/components/ShareButtons";
+
+const STRAPI_URL = process.env.STRAPI_URL;
 
 const GET_ARTICLE_BY_SLUG = gql(
     `query ArticleWithSlug($articlesFilters: ArticleFiltersInput) {
     articles(filters: $articlesFilters) {
       data {
+        id
         attributes {
           author {
             data {
@@ -35,8 +38,7 @@ const GET_ARTICLE_BY_SLUG = gql(
             }
           }
           datePublished
-          subtitle
-          title
+          previewCardTitle
         }
       }
     }
@@ -71,8 +73,8 @@ export default async function Page({
         graphqlData.data.articles?.data[0]?.attributes?.author?.data?.attributes
             ?.avatar?.data?.attributes?.url;
 
-    if (OUTSIDE_STRAPI_URL && avatarURL != undefined) {
-        avatarURL = OUTSIDE_STRAPI_URL + avatarURL;
+    if (STRAPI_URL && avatarURL != undefined) {
+        avatarURL = STRAPI_URL + avatarURL;
     }
 
     const article = graphqlData.data.articles?.data[0];
@@ -82,15 +84,15 @@ export default async function Page({
     const content: BlocksContent = article?.attributes?.body ?? [];
 
     return (
-        <>
-            <div className="flex flex-col items-center gap-4">
-                <h1 className="text-4xl font-extrabold">
-                    {article?.attributes?.title}
-                </h1>
-                <div className="flex flex-row items-center justify-center gap-1">
+        <div className="flex flex-col items-center gap-4">
+            <div className="w-1/2">
+                <BlockRendererClient content={content} />
+            </div>
+            <div className="flex w-1/2 flex-row items-center gap-1">
+                <div className="flex flex-1 justify-start gap-1">
                     {avatarURL && (
                         <Avatar className="">
-                            <AvatarImage src={avatarURL} />
+                            <AvatarImageFix src={avatarURL} />
                             <AvatarFallback>
                                 {// Get initials from author name
                                 authorName
@@ -105,13 +107,10 @@ export default async function Page({
                         <p>{datePublished}</p>
                     </div>
                 </div>
-                <p className="text-sm text-muted-foreground">
-                    {article?.attributes?.subtitle}{" "}
-                </p>
-                <div className="w-1/2">
-                    <BlockRendererClient content={content} />
+                <div className="flex flex-1 justify-end gap-1">
+                    <ShareButtons slug={params.articleSlug} />
                 </div>
             </div>
-        </>
+        </div>
     );
 }
diff --git a/frontend/src/app/blog/blogDataCards.tsx b/frontend/src/app/blog/blogDataCards.tsx
@@ -1,7 +1,7 @@
-export const runtime = "edge";
 import FullBlogCard from "@/components/fullBlogCard";
 import BlogpageButtons from "@/components/BlogpageButtons";
 import { BlogPost } from "./page";
+import React from "react";
 
 export default async function BlogDataCards({
     articles,
@@ -17,34 +17,34 @@ export default async function BlogDataCards({
     }
 
     return (
-        <div className="flex w-3/4 flex-row flex-wrap items-center justify-center self-center">
-            {articles.map((article: any) => {
-                return (
-                    <div
-                        key={article.id}
-                        className={
-                            article.firstArticle
-                                ? "flex w-full flex-col items-center justify-center"
-                                : "flex w-1/3 flex-col items-center justify-center"
-                        }
-                    >
-                        <FullBlogCard
-                            key={article.id}
-                            firstArticle={article.firstArticle}
-                            content={article.content}
-                            coverImage={article.coverImage}
-                            datePublished={article.datePublished}
-                            tag={article.tag}
-                            HOST_URL={article.HOST_URL}
-                            authorName={article.authorName}
-                            avatarURL={article.avatarURL}
-                            slug={article.slug}
-                            title={article.title}
-                        />{" "}
-                        {article.firstArticle ? <BlogpageButtons /> : null}
-                    </div>
-                );
-            })}
-        </div>
+        <>
+            <div className="grid grid-cols-1 gap-8 sm:grid-cols-2 lg:grid-cols-3">
+                <BlogpageButtons className="col-span-full" />
+                {/* Only map fist article */}
+                {articles.map((article: BlogPost) => {
+                    if (article.firstArticle) {
+                        return (
+                            <React.Fragment key={article.key}>
+                                <FullBlogCard
+                                    className="col-span-full"
+                                    article={article}
+                                />
+                            </React.Fragment>
+                        );
+                    }
+                })}
+
+                {articles.map((article: BlogPost) => {
+                    if (article.firstArticle) {
+                        return;
+                    }
+                    return (
+                        <React.Fragment key={article.key}>
+                            <FullBlogCard article={article} />
+                        </React.Fragment>
+                    );
+                })}
+            </div>
+        </>
     );
 }
diff --git a/frontend/src/app/blog/layout.tsx b/frontend/src/app/blog/layout.tsx
@@ -0,0 +1,5 @@
+import { PagePadding } from "@/components/PagePadding";
+import React from "react";
+export default function Layout({ children }: { children: React.ReactNode }) {
+    return <PagePadding>{children}</PagePadding>;
+}
diff --git a/frontend/src/app/blog/page.tsx b/frontend/src/app/blog/page.tsx
@@ -3,6 +3,11 @@ import BlogDataCards from "./blogDataCards";
 import { BlocksContent } from "@strapi/blocks-react-renderer";
 import { Enum_Article_Tag } from "@/__generated__/graphql";
 import fetchArticlePages from "@/lib/data/fetchArticleInfo";
+import {
+    PageHeaderAndSubtitle,
+    PageSubtitle,
+    PageHeader,
+} from "@/components/PageHeader";
 
 export interface BlogPost {
     key: string | null | undefined;
@@ -41,10 +46,19 @@ export default async function BlogPage({
     const { articleList, totalArticles } = result;
 
     return (
-        <div className="just flex flex-col content-center justify-center">
-            {/* <BlogDataCards articles={articleCache[currentPage]} /> */}
-            <BlogDataCards articles={articleList} />
-            <BlogPaginator totalArticles={totalArticles} />
-        </div>
+        <>
+            <PageHeaderAndSubtitle>
+                <PageHeader>Blog</PageHeader>
+                <PageSubtitle>
+                    Welcome to the blog! Here you can find all of the articles
+                    we have written.
+                </PageSubtitle>
+            </PageHeaderAndSubtitle>
+            <div className="flex flex-col justify-center">
+                {/* <BlogDataCards articles={articleCache[currentPage]} /> */}
+                <BlogDataCards articles={articleList} />
+                <BlogPaginator totalArticles={totalArticles} />
+            </div>
+        </>
     );
 }
diff --git a/frontend/src/app/projects/[projectSlug]/page.tsx b/frontend/src/app/projects/[projectSlug]/page.tsx
@@ -1,11 +1,10 @@
-export const runtime = "edge";
 import { gql } from "@/__generated__/gql";
 import BlockRendererClient from "@/components/BlockRendererClient";
 import { getClient } from "@/lib/ApolloClient";
 import { BlocksContent } from "@strapi/blocks-react-renderer";
 import RelatedProjectsAndSatellites from "@/components/RelatedProjectsAndSatellites";
 import { ProjectOrSatellite } from "@/app/satellites/[satelliteSlug]/page";
-const OUTSIDE_STRAPI_URL = process.env.OUTSIDE_STRAPI_URL;
+const STRAPI_URL = process.env.STRAPI_URL;
 
 const GET_PROJECT_BY_SLUG = gql(`
 query Projects($projectFilters: ProjectFiltersInput) {
@@ -70,8 +69,8 @@ export default async function Page({
 
     let projectTitle = projects?.attributes?.slug;
 
-    if (OUTSIDE_STRAPI_URL && projectTitle != undefined) {
-        projectTitle = OUTSIDE_STRAPI_URL + projectTitle;
+    if (STRAPI_URL && projectTitle != undefined) {
+        projectTitle = STRAPI_URL + projectTitle;
     }
     return (
         <div className="flex flex-col items-center gap-4">

diff --git a/frontend/src/app/projects/layout.tsx b/frontend/src/app/projects/layout.tsx
@@ -0,0 +1,5 @@
+import { PagePadding } from "@/components/PagePadding";
+import React from "react";
+export default function Layout({ children }: { children: React.ReactNode }) {
+    return <PagePadding>{children}</PagePadding>;
+}