From d7d8f4d7cf4c51d19dbdf774bd945b5294da956e Mon Sep 17 00:00:00 2001 From: "Alejandro E. Rendon" Date: Fri, 29 Dec 2023 06:24:11 -0500 Subject: [PATCH] Crear estructura base para Ponentes y Charlas --- src/app/[lang]/dictionaries.js | 4 +- src/app/[lang]/not-found.js | 5 ++ src/app/[lang]/page.js | 2 +- src/app/[lang]/speakers/[uniquepage]/page.js | 82 +++++++++++++++++++ src/app/[lang]/speakers/images/avatar.jpeg | Bin 0 -> 5303 bytes src/app/[lang]/speakers/page.js | 34 ++++++++ src/app/[lang]/talks/[uniquepage]/page.js | 55 +++++++++++++ src/app/[lang]/talks/page.js | 24 ++++++ src/data/speakers.json | 34 ++++++++ src/data/talks.json | 35 ++++++++ src/middleware.js | 2 - 11 files changed, 272 insertions(+), 5 deletions(-) create mode 100644 src/app/[lang]/not-found.js create mode 100644 src/app/[lang]/speakers/[uniquepage]/page.js create mode 100644 src/app/[lang]/speakers/images/avatar.jpeg create mode 100644 src/app/[lang]/speakers/page.js create mode 100644 src/app/[lang]/talks/[uniquepage]/page.js create mode 100644 src/app/[lang]/talks/page.js create mode 100644 src/data/speakers.json create mode 100644 src/data/talks.json diff --git a/src/app/[lang]/dictionaries.js b/src/app/[lang]/dictionaries.js index 69c8c55..7fc7850 100644 --- a/src/app/[lang]/dictionaries.js +++ b/src/app/[lang]/dictionaries.js @@ -1,8 +1,8 @@ import 'server-only'; const dictionaries = { - en: () => import('./dictionaries/en.json').then((module) => module.default), - es: () => import('./dictionaries/es.json').then((module) => module.default) + en: () => import('@/app/[lang]/dictionaries/en.json').then((module) => module.default), + es: () => import('@/app/[lang]/dictionaries/es.json').then((module) => module.default) }; export const getDictionary = async (locale) => { diff --git a/src/app/[lang]/not-found.js b/src/app/[lang]/not-found.js new file mode 100644 index 0000000..45b276d --- /dev/null +++ b/src/app/[lang]/not-found.js @@ -0,0 +1,5 @@ +import React from 'react'; + +export default function NotFound() { + return

404 Not Found custom

; +} diff --git a/src/app/[lang]/page.js b/src/app/[lang]/page.js index 2f3897e..3baaa7c 100644 --- a/src/app/[lang]/page.js +++ b/src/app/[lang]/page.js @@ -1,5 +1,5 @@ import React from 'react'; -import { getDictionary } from './dictionaries'; +import { getDictionary } from '@/app/[lang]/dictionaries'; export default async function Page({ params: { lang } }) { const dict = await getDictionary(lang); diff --git a/src/app/[lang]/speakers/[uniquepage]/page.js b/src/app/[lang]/speakers/[uniquepage]/page.js new file mode 100644 index 0000000..658837b --- /dev/null +++ b/src/app/[lang]/speakers/[uniquepage]/page.js @@ -0,0 +1,82 @@ +import React from 'react'; +import propTypes from 'prop-types'; +import { notFound } from 'next/navigation'; +import Image from 'next/image'; +import Link from 'next/link'; +import speakerslist from '@/data/speakers.json'; +import talksList from '@/data/talks.json'; +import Avatar from '@/app/[lang]/speakers/images/avatar.jpeg'; + +export async function generateStaticParams() { + return speakerslist.map((p) => ({ + uniquepage: p.id.toString() + })); +} + +const Speaker = ({ params: { uniquepage, lang } }) => { + const speaker = speakerslist.find((p) => p.id.toString() === uniquepage); + let talks = []; + + if (!speaker) { + console.info('speaker not found'); + notFound(); + } else { + talks = talksList.filter((talk) => talk.speakers.includes(speaker.id)); + } + + return ( + <> + Picture of the author +

+ {speaker.first_name} {speaker.last_name} +

+

{speaker.affiliation}

+

{speaker.country_residence}

+ +

{speaker.biography}

+ +

Talks

+ + {talks.map((talk) => ( + +

{talk.title}

+ + ))} + + ); +}; + +Speaker.propTypes = { + params: propTypes.shape({ + uniquepage: propTypes.string, + lang: propTypes.string + }) +}; + +export default Speaker; diff --git a/src/app/[lang]/speakers/images/avatar.jpeg b/src/app/[lang]/speakers/images/avatar.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..00f7cda6e8d7c0a497d615c3474a03f603b8e6d9 GIT binary patch literal 5303 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 My%W^k literal 0 HcmV?d00001 diff --git a/src/app/[lang]/speakers/page.js b/src/app/[lang]/speakers/page.js new file mode 100644 index 0000000..353e35a --- /dev/null +++ b/src/app/[lang]/speakers/page.js @@ -0,0 +1,34 @@ +'use client'; + +import React from 'react'; +import propTypes from 'prop-types'; +import Link from 'next/link'; +import speakerslist from '@/data/speakers.json'; + +const Speakers = ({ params: { lang } }) => { + return ( +
+ {speakerslist.map((speaker) => ( +
+ +

+ {speaker.first_name} {speaker.last_name} +

+

{speaker.affiliation}

+ + + {speaker.twitter} + +
+ ))} +
+ ); +}; + +Speakers.propTypes = { + params: propTypes.shape({ + lang: propTypes.string.isRequired + }).isRequired +}; + +export default Speakers; diff --git a/src/app/[lang]/talks/[uniquepage]/page.js b/src/app/[lang]/talks/[uniquepage]/page.js new file mode 100644 index 0000000..187ecf5 --- /dev/null +++ b/src/app/[lang]/talks/[uniquepage]/page.js @@ -0,0 +1,55 @@ +import React from 'react'; +import propTypes from 'prop-types'; +import talksList from '@/data/talks.json'; +import { notFound } from 'next/navigation'; + +export async function generateStaticParams() { + return talksList.map((p) => ({ + uniquepage: p.id.toString() + })); +} + +const UniquePage = ({ params: { uniquepage } }) => { + const talk = talksList.find((p) => p.id.toString() === uniquepage); + + if (!talk) { + console.log('talk not found'); + notFound(); + } + + return ( + <> +

{talk.title}

+ + +
+ + {talk.speakers.map((speaker) => ( +

{speaker}

+ ))} +

Authors

+
    + {talk.tags.map((tag) => ( +
  • {tag}
    • + ))} +
+ +

{talk.description}

+ +

Summary

+

{talk.summary}

+ + ); +}; + +UniquePage.propTypes = { + params: propTypes.shape({ + uniquepage: propTypes.string.isRequired + }).isRequired +}; + +export default UniquePage; diff --git a/src/app/[lang]/talks/page.js b/src/app/[lang]/talks/page.js new file mode 100644 index 0000000..b357fda --- /dev/null +++ b/src/app/[lang]/talks/page.js @@ -0,0 +1,24 @@ +import React from 'react'; +import propTypes from 'prop-types'; +import talksList from '@/data/talks.json'; +import Link from 'next/link'; + +const Talks = ({ params: { lang } }) => { + return ( +
+ {talksList.map((talk) => ( + +

{talk.title}

+ + ))} +
+ ); +}; + +Talks.propTypes = { + params: propTypes.shape({ + lang: propTypes.string.isRequired + }).isRequired +}; + +export default Talks; diff --git a/src/data/speakers.json b/src/data/speakers.json new file mode 100644 index 0000000..3cd8f4c --- /dev/null +++ b/src/data/speakers.json @@ -0,0 +1,34 @@ +[ + { + "id": "john-doe", + "first_name": "John", + "last_name": "Doe", + "email": "bYQJ9@example.com", + "photo": "https://i.pravatar.cc/300", + "biography": "I am John Doe. I am an amazing speaker.", + "affiliation": "Acme Inc.", + "facebook": "https://www.facebook.com/johndoe", + "twitter": "@johndoe", + "linkedin": "https://www.linkedin.com/in/johndoe", + "github": "https://github.com/johndoe", + "website": "https://johndoe.com", + "country_origin": "USA", + "country_residence": "USA" + }, + { + "id": "jane-doe", + "first_name": "Jane", + "last_name": "Doe", + "email": "bYQJ9@example.com", + "photo": "https://i.pravatar.cc/300", + "biography": "I am Jane Doe. I am an amazing speaker.", + "affiliation": "Acme Inc.", + "facebook": "https://www.facebook.com/johndoe", + "twitter": "@johndoe", + "linkedin": "https://www.linkedin.com/in/johndoe", + "github": "https://github.com/janedenoe", + "website": "https://janedenoe.com", + "country_origin": "Colombia", + "country_residence": "Canada" + } +] diff --git a/src/data/talks.json b/src/data/talks.json new file mode 100644 index 0000000..88e1fa7 --- /dev/null +++ b/src/data/talks.json @@ -0,0 +1,35 @@ +[ + { + "id": 1, + "title": "This is the title", + "speakers": [ + "john-doe" + ], + "written_language": "English", + "spoken_language": "English", + "submission": "Talk", + "description": "This is the description", + "summary": "This is the summary", + "tags": [ + "tag1", + "tag2" + ], + "video_url": "https://www.youtube.com/watch?v=123" + }, + { + "id": 2, + "title": "This is the title", + "speakers": [ + "john-doe", + "jane-doe" + ], + "written_language": "English", + "spoken_language": "Spanish", + "submission": "Workshop", + "description": "This is the description", + "summary": "This is the summary", + "tags": [ + "tag1" + ] + } +] diff --git a/src/middleware.js b/src/middleware.js index 4853dc3..fb3dd0a 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -5,8 +5,6 @@ export function middleware(request) { // Check if there is any supported locale in the pathname const { pathname } = request.nextUrl; - console.log('pathname', pathname); - const pathnameHasLocale = locales.some( (locale) => pathname.startsWith(`/${locale}/`) || pathname === `/${locale}` );