Merge pull request eclipse-sw360#167 from eclipse-sw360/heliocastro/m…

…etadata feat(metadata): Add root layout metadata
toshiba · Oct 31, 2023 · b0a0bb2 · b0a0bb2
2 parents e19fdb9 + 9f2eb5c
commit b0a0bb2
Show file tree

Hide file tree

Showing 11 changed files with 114 additions and 78 deletions.
diff --git a/src/app/[locale]/admin/page.tsx b/src/app/[locale]/admin/page.tsx
@@ -14,7 +14,7 @@ export const metadata: Metadata = {
     title: 'Admin',
 }
 
-const Admin = async () => {
+async function Admin() {
     return <AdminMainPage />
 }
 

diff --git a/src/app/[locale]/components/page.tsx b/src/app/[locale]/components/page.tsx
@@ -16,6 +16,8 @@ export const metadata: Metadata = {
     title: 'Components',
 }
 
-export default async function ComponentIndexPage() {
+async function ComponentIndexPage() {
     return <ComponentIndex />
 }
+
+export default ComponentIndexPage
diff --git a/src/app/[locale]/home/HomePage.tsx b/src/app/[locale]/home/HomePage.tsx
@@ -0,0 +1,77 @@
+// Copyright (C) TOSHIBA CORPORATION, 2023. Part of the SW360 Frontend Project.
+// Copyright (C) Toshiba Software Development (Vietnam) Co., Ltd., 2023. Part of the SW360 Frontend Project.
+// Copyright (C) Siemens AG, 2023. Part of the SW360 Frontend Project.
+// Copyright (C) Helio Chissini de Castro, 2023. Part of the SW360 Frontend Project.
+
+// This program and the accompanying materials are made
+// available under the terms of the Eclipse Public License 2.0
+// which is available at https://www.eclipse.org/legal/epl-2.0/
+
+// SPDX-License-Identifier: EPL-2.0
+// License-Filename: LICENSE
+
+'use client'
+
+import { signOut, useSession } from 'next-auth/react'
+
+import { PageSpinner } from 'next-sw360'
+
+import MyComponentsWidget from './components/MyComponentsWidget'
+import MyProjectsWidget from './components/MyProjectsWidget'
+import MySubscriptionsWidget from './components/MySubscriptionsWidget'
+import MyTaskAssignmentsWidget from './components/MyTaskAssignmentsWidget'
+import MyTaskSubmissionsWidget from './components/MyTaskSubmissionsWidget'
+import RecentComponentsWidget from './components/RecentComponentsWidget'
+import RecentReleasesWidget from './components/RecentReleasesWidget'
+
+function HomePage() {
+    const { status } = useSession()
+
+    if (status === 'unauthenticated') {
+        signOut()
+    }
+
+    return (
+        <>
+            <div className='content-container container-fluid homePage'>
+                {status == 'loading' ? (
+                    <PageSpinner />
+                ) : (
+                    <div className='row'>
+                        <div className='col col-md-10'>
+                            <div className='row'>
+                                <div className='col-sm' id='sw360_table_col'>
+                                    <MyProjectsWidget />
+                                </div>
+                                <div className='col-sm' id='sw360_table_col'>
+                                    <MyComponentsWidget />
+                                </div>
+                            </div>
+                            <div className='row'>
+                                <div className='col-sm' id='sw360_table_col'>
+                                    <MyTaskAssignmentsWidget />
+                                </div>
+                                <div className='col-sm' id='sw360_table_col'>
+                                    <MyTaskSubmissionsWidget />
+                                </div>
+                            </div>
+                        </div>
+                        <div className='col col-md-2'>
+                            <div className='col-sm' id='sw360_table_col'>
+                                <MySubscriptionsWidget />
+                            </div>
+                            <div className='col-sm' id='sw360_table_col'>
+                                <RecentComponentsWidget />
+                            </div>
+                            <div className='col-sm' id='sw360_table_col'>
+                                <RecentReleasesWidget />
+                            </div>
+                        </div>
+                    </div>
+                )}
+            </div>
+        </>
+    )
+}
+
+export default HomePage
diff --git a/src/app/[locale]/home/page.tsx b/src/app/[locale]/home/page.tsx
@@ -10,71 +10,16 @@
 // SPDX-License-Identifier: EPL-2.0
 // License-Filename: LICENSE
 
-'use client'
+import { Metadata } from 'next'
 
-import { useSession } from 'next-auth/react'
+import HomePage from './HomePage'
 
-import { PageSpinner } from 'next-sw360'
-
-import MyComponentsWidget from './components/MyComponentsWidget'
-import MyProjectsWidget from './components/MyProjectsWidget'
-import MySubscriptionsWidget from './components/MySubscriptionsWidget'
-import MyTaskAssignmentsWidget from './components/MyTaskAssignmentsWidget'
-import MyTaskSubmissionsWidget from './components/MyTaskSubmissionsWidget'
-import RecentComponentsWidget from './components/RecentComponentsWidget'
-import RecentReleasesWidget from './components/RecentReleasesWidget'
-
-function HomePage() {
-    const { status } = useSession()
-
-    if (status === 'unauthenticated') {
-        return {
-            redirect: {
-                destination: '/',
-                permanent: false,
-            },
-        }
-    }
+export const metadata: Metadata = {
+    title: 'Home',
+}
 
-    return (
-        <div className='content-container container-fluid homePage'>
-            {status == 'loading' ? (
-                <PageSpinner />
-            ) : (
-                <div className='row'>
-                    <div className='col col-md-10'>
-                        <div className='row'>
-                            <div className='col-sm' id='sw360_table_col'>
-                                <MyProjectsWidget />
-                            </div>
-                            <div className='col-sm' id='sw360_table_col'>
-                                <MyComponentsWidget />
-                            </div>
-                        </div>
-                        <div className='row'>
-                            <div className='col-sm' id='sw360_table_col'>
-                                <MyTaskAssignmentsWidget />
-                            </div>
-                            <div className='col-sm' id='sw360_table_col'>
-                                <MyTaskSubmissionsWidget />
-                            </div>
-                        </div>
-                    </div>
-                    <div className='col col-md-2'>
-                        <div className='col-sm' id='sw360_table_col'>
-                            <MySubscriptionsWidget />
-                        </div>
-                        <div className='col-sm' id='sw360_table_col'>
-                            <RecentComponentsWidget />
-                        </div>
-                        <div className='col-sm' id='sw360_table_col'>
-                            <RecentReleasesWidget />
-                        </div>
-                    </div>
-                </div>
-            )}
-        </div>
-    )
+async function Home() {
+    return <HomePage />
 }
 
-export default HomePage
+export default Home
diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx
@@ -8,17 +8,27 @@
 // SPDX-License-Identifier: EPL-2.0
 // License-Filename: LICENSE
 
-import 'bootstrap/dist/css/bootstrap.min.css'
-import '@/styles/globals.css'
 import '@/styles/auth.css'
+import '@/styles/globals.css'
 import '@/styles/gridjs/sw360.css'
+import 'bootstrap/dist/css/bootstrap.min.css'
+import { ReactNode } from 'react'
 import { Providers } from '../provider'
-import React, { ReactNode } from 'react'
 
+import { Metadata } from 'next'
 import { NextIntlClientProvider } from 'next-intl'
 import { notFound } from 'next/navigation'
 
-import { Header, Footer } from 'next-sw360'
+import { Footer, Header } from 'next-sw360'
+
+export const metadata: Metadata = {
+    title: {
+        template: '%s | SW360 Frontend',
+        default: 'SW360 Frontend',
+    },
+    description: 'SW360 Compliance Management System Graphical Interface.',
+    metadataBase: new URL('https://eclipse.org/sw360/'),
+}
 
 export function generateStaticParams() {
     return [{ locale: 'en' }, { locale: 'ja' }, { locale: 'vi' }, { locale: 'zh' }, { locale: 'pt-BR' }]

diff --git a/src/app/[locale]/licenses/LicenseIndex.tsx → src/app/[locale]/licenses/LicensePage.tsx b/src/app/[locale]/licenses/LicenseIndex.tsx → src/app/[locale]/licenses/LicensePage.tsx
diff --git a/src/app/[locale]/licenses/page.tsx b/src/app/[locale]/licenses/page.tsx
@@ -8,14 +8,14 @@
 // License-Filename: LICENSE
 
 import { Metadata } from 'next'
-import LicenseIndex from './LicenseIndex'
+import LicensePage from './LicensePage'
 
 export const metadata: Metadata = {
     title: 'Licenses',
 }
 
-async function LicensesPage() {
-    return <LicenseIndex />
+async function Licenses() {
+    return <LicensePage />
 }
 
-export default LicensesPage
+export default Licenses
diff --git a/src/app/[locale]/page.tsx b/src/app/[locale]/page.tsx
@@ -16,6 +16,8 @@ export const metadata: Metadata = {
     title: 'Welcome - SW360',
 }
 
-export default async function AuthPage() {
+async function AuthPage() {
     return <AuthScreen />
 }
+
+export default AuthPage
diff --git a/src/app/[locale]/projects/page.tsx b/src/app/[locale]/projects/page.tsx
@@ -16,7 +16,7 @@ export const metadata: Metadata = {
     title: 'Projects',
 }
 
-const ProjectsList = async () => {
+async function ProjectsList() {
     return <Projects />
 }
 

diff --git a/src/app/[locale]/search/page.tsx b/src/app/[locale]/search/page.tsx
@@ -14,8 +14,8 @@ export const metadata: Metadata = {
     title: 'Search',
 }
 
-const Vulnerability = async () => {
+async function Search() {
     return <SearchPage />
 }
 
-export default Vulnerability
+export default Search
diff --git a/src/app/[locale]/vulnerabilities/page.tsx b/src/app/[locale]/vulnerabilities/page.tsx
@@ -15,7 +15,7 @@ export const metadata: Metadata = {
     title: 'Vulnerabilites',
 }
 
-const Vulnerability = async () => {
+async function Vulnerability() {
     return <Vulnerabilities />
 }