diff --git a/src/frontend/apps/desk/next.config.js b/src/frontend/apps/desk/next.config.js index f7946eb..d8ac8ba 100644 --- a/src/frontend/apps/desk/next.config.js +++ b/src/frontend/apps/desk/next.config.js @@ -1,6 +1,13 @@ /** @type {import('next').NextConfig} */ const nextConfig = { output: 'export', + images: { + unoptimized: true, + }, + compiler: { + // Enables the styled-components SWC transform + styledComponents: true, + }, webpack(config) { // Grab the existing rule that handles SVG imports const fileLoaderRule = config.module.rules.find((rule) => diff --git a/src/frontend/apps/desk/src/app/favicon.ico b/src/frontend/apps/desk/public/favicon.ico similarity index 100% rename from src/frontend/apps/desk/src/app/favicon.ico rename to src/frontend/apps/desk/public/favicon.ico diff --git a/src/frontend/apps/desk/src/app/__tests__/page.test.tsx b/src/frontend/apps/desk/src/__tests__/pages.test.tsx similarity index 93% rename from src/frontend/apps/desk/src/app/__tests__/page.test.tsx rename to src/frontend/apps/desk/src/__tests__/pages.test.tsx index ee91d1f..1daa77a 100644 --- a/src/frontend/apps/desk/src/app/__tests__/page.test.tsx +++ b/src/frontend/apps/desk/src/__tests__/pages.test.tsx @@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/react'; import { AppWrapper } from '@/tests/utils'; -import Page from '../page'; +import Page from '../pages'; describe('Page', () => { it('checks Page rendering', () => { diff --git a/src/frontend/apps/desk/src/app/contacts/page.tsx b/src/frontend/apps/desk/src/app/contacts/page.tsx deleted file mode 100644 index 9717564..0000000 --- a/src/frontend/apps/desk/src/app/contacts/page.tsx +++ /dev/null @@ -1,7 +0,0 @@ -'use client'; - -import { Box } from '@/components'; - -export default function Contacts() { - return Contacts; -} diff --git a/src/frontend/apps/desk/src/app/favorite/page.tsx b/src/frontend/apps/desk/src/app/favorite/page.tsx deleted file mode 100644 index 1949c2b..0000000 --- a/src/frontend/apps/desk/src/app/favorite/page.tsx +++ /dev/null @@ -1,7 +0,0 @@ -'use client'; - -import { Box } from '@/components'; - -export default function Favorite() { - return Favorite; -} diff --git a/src/frontend/apps/desk/src/app/groups/page.tsx b/src/frontend/apps/desk/src/app/groups/page.tsx deleted file mode 100644 index 79620d1..0000000 --- a/src/frontend/apps/desk/src/app/groups/page.tsx +++ /dev/null @@ -1,7 +0,0 @@ -'use client'; - -import { Box } from '@/components'; - -export default function Groups() { - return Groups; -} diff --git a/src/frontend/apps/desk/src/app/help/page.tsx b/src/frontend/apps/desk/src/app/help/page.tsx deleted file mode 100644 index 0fc13f7..0000000 --- a/src/frontend/apps/desk/src/app/help/page.tsx +++ /dev/null @@ -1,7 +0,0 @@ -'use client'; - -import { Box } from '@/components'; - -export default function Help() { - return Help; -} diff --git a/src/frontend/apps/desk/src/app/layout.tsx b/src/frontend/apps/desk/src/app/layout.tsx deleted file mode 100644 index 891a778..0000000 --- a/src/frontend/apps/desk/src/app/layout.tsx +++ /dev/null @@ -1,37 +0,0 @@ -'use client'; - -import { CunninghamProvider } from '@openfun/cunningham-react'; -import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; -import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; - -import { useCunninghamTheme } from '@/cunningham'; -import { Auth } from '@/features/auth/Auth'; -import '@/i18n/initI18n'; - -import InnerLayout from './InnerLayout'; -import './globals.css'; - -const queryClient = new QueryClient(); - -export default function RootLayout({ - children, -}: { - children: React.ReactNode; -}) { - const { theme } = useCunninghamTheme(); - - return ( - - - - - - - {children} - - - - - - ); -} diff --git a/src/frontend/apps/desk/src/app/page.tsx b/src/frontend/apps/desk/src/app/page.tsx deleted file mode 100644 index 7e0470d..0000000 --- a/src/frontend/apps/desk/src/app/page.tsx +++ /dev/null @@ -1,35 +0,0 @@ -'use client'; - -import { Button } from '@openfun/cunningham-react'; -import { useTranslation } from 'react-i18next'; -import styled from 'styled-components'; - -import { Box, StyledLink } from '@/components'; -import { useCunninghamTheme } from '@/cunningham'; -import { Panel } from '@/features/teams'; - -const StyledButton = styled(Button)` - width: fit-content; -`; - -export default function Home() { - const { t } = useTranslation(); - const { colorsTokens } = useCunninghamTheme(); - - return ( - - - - - {t('Create a new team')} - - - - ); -} diff --git a/src/frontend/apps/desk/src/app/recent/page.tsx b/src/frontend/apps/desk/src/app/recent/page.tsx deleted file mode 100644 index fbddbcc..0000000 --- a/src/frontend/apps/desk/src/app/recent/page.tsx +++ /dev/null @@ -1,7 +0,0 @@ -'use client'; - -import { Box } from '@/components'; - -export default function Recent() { - return Recent; -} diff --git a/src/frontend/apps/desk/src/app/teams/layout.tsx b/src/frontend/apps/desk/src/app/teams/layout.tsx deleted file mode 100644 index b556169..0000000 --- a/src/frontend/apps/desk/src/app/teams/layout.tsx +++ /dev/null @@ -1,27 +0,0 @@ -'use client'; - -import { PropsWithChildren } from 'react'; - -import { Box } from '@/components'; -import { useCunninghamTheme } from '@/cunningham'; -import { Panel } from '@/features/teams'; - -export default function Layout({ children }: PropsWithChildren) { - const { colorsTokens } = useCunninghamTheme(); - - return ( - - - - {children} - - - ); -} diff --git a/src/frontend/apps/desk/src/features/header/Header.tsx b/src/frontend/apps/desk/src/features/header/Header.tsx index 0c84049..6c40f5c 100644 --- a/src/frontend/apps/desk/src/features/header/Header.tsx +++ b/src/frontend/apps/desk/src/features/header/Header.tsx @@ -95,7 +95,6 @@ export const Header = () => { priority src={IconMyAccount} alt={t(`Profile picture`)} - unoptimized /> ); -} +}; + +Page.getLayout = function getLayout(page: ReactElement) { + return {page}; +}; + +export default Page; diff --git a/src/frontend/apps/desk/src/types/next.ts b/src/frontend/apps/desk/src/types/next.ts new file mode 100644 index 0000000..1a85844 --- /dev/null +++ b/src/frontend/apps/desk/src/types/next.ts @@ -0,0 +1,5 @@ +import type { NextPage } from 'next'; + +export type NextPageWithLayout = NextPage & { + getLayout?: (page: React.ReactElement) => React.ReactNode; +};