diff --git a/README.md b/README.md index f0daa9a..875bbd3 100644 --- a/README.md +++ b/README.md @@ -1 +1,102 @@ -# s17-12-t-node-react \ No newline at end of file +# 馃寪OhMyTrip + +
+ +![Global Link](globallink.jpg) + +## Descripci贸n + +

OhMyTrip es una red social que se enfoca en destinos atipicos

+ +### Plan de negocio + +[Abrir](./plan-de-negocios.md) + +## Tecnolog铆as Utilizadas + +### Front End + +[![Skills](https://skillicons.dev/icons?i=tailwind,next)](https://skillicons.dev) + +### Back End + +[![Skills](https://skillicons.dev/icons?i=nest,mongodb)](https://skillicons.dev) + +### Dise帽o + +[![Skills](https://skillicons.dev/icons?i=figma)](https://skillicons.dev) + +### Gestion de Proyecto + +

Para poder comunicarnos utilizamos las herramientas de Jira, Meet, Slack, Whatsapp y Discord.

+ +
+ +## Colaboradores + +
+ +| Integrantes | Roles | Linkedin | Github | +| ------------------------ | ---------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ | +| Xochitl Far铆as | Scrum Master | [![Linkedin](https://img.shields.io/badge/LinkedIn-0077B5?style=for-the-badge&logo=linkedin&logoColor=white)](https://www.linkedin.com/in/xfarias-scrum-master/) | [![Github](https://img.shields.io/badge/GitHub-100000?style=for-the-badge&logo=github&logoColor=white)](https://github.com/xochfa) | +| John William Sanchez | Frontend | [![Linkedin](https://img.shields.io/badge/LinkedIn-0077B5?style=for-the-badge&logo=linkedin&logoColor=white)](https://www.linkedin.com/in/lazaro-vega-sanchez) | [![Github](https://img.shields.io/badge/GitHub-100000?style=for-the-badge&logo=github&logoColor=white)](https://github.com/jwilliam96) | +| Gaspar Castillo Catrifol | Backend | [![Linkedin](https://img.shields.io/badge/LinkedIn-0077B5?style=for-the-badge&logo=linkedin&logoColor=white)](https://www.linkedin.com/in/isakidev/) | [![Github](https://img.shields.io/badge/GitHub-100000?style=for-the-badge&logo=github&logoColor=white)](https://github.com/isakiDev) | +| Lazaro Vega Sanchez | Frontend | [![Linkedin](https://img.shields.io/badge/LinkedIn-0077B5?style=for-the-badge&logo=linkedin&logoColor=white)](https://www.linkedin.com/in/lazaro-vega-sanchez) | [![Github](https://img.shields.io/badge/GitHub-100000?style=for-the-badge&logo=github&logoColor=white)](https://github.com/lazaronazareno) | +| Maximiliano | Backend | [![Linkedin](https://img.shields.io/badge/LinkedIn-0077B5?style=for-the-badge&logo=linkedin&logoColor=white)]() | [![Github](https://img.shields.io/badge/GitHub-100000?style=for-the-badge&logo=github&logoColor=white)](https://github.com/mingeniero) | +| Andr茅 | Frontend/Backend | [![Linkedin](https://img.shields.io/badge/LinkedIn-0077B5?style=for-the-badge&logo=linkedin&logoColor=white)](https://www.linkedin.com/in/ae95caba) | [![Github](https://img.shields.io/badge/GitHub-100000?style=for-the-badge&logo=github&logoColor=white)](https://github.com/ae95caba) | +| Silvia Romano | UX/UI | [![Linkedin](https://img.shields.io/badge/LinkedIn-0077B5?style=for-the-badge&logo=linkedin&logoColor=white)](http://www.linkedin.com/in/sil-romano-811560286) | [![Github](https://img.shields.io/badge/GitHub-100000?style=for-the-badge&logo=github&logoColor=white)](http://github.com/soysil) | +| Alberto G贸mez Juan | Backend | [![Linkedin](https://img.shields.io/badge/LinkedIn-0077B5?style=for-the-badge&logo=linkedin&logoColor=white)](https://www.linkedin.com/in/agomezjuan/) | [![Github](https://img.shields.io/badge/GitHub-100000?style=for-the-badge&logo=github&logoColor=white)](https://github.com/agomezjuan) | + +
+ +## Instrucciones para ejecutar el proyecto + +Este proyecto est谩 organizado como un monorepo con dos carpetas principales: `frontend` y `backend`. Para ejecutar el proyecto, sigue estos pasos desde la ra铆z del repositorio. + +### Configuraci贸n de variables de entorno + +Primero, aseg煤rate de crear los archivos `.env` en las carpetas de `backend` y `frontend` bas谩ndote en los archivos `.env-example` disponibles en cada carpeta. + +### Instalaci贸n de dependencias + +Instala las dependencias para ambos proyectos (backend y frontend) ejecutando los siguientes comandos: + +```sh +# Para el backend +cd backend +npm i +# Para el frontend +cd frontend +npm i + +``` + +## Para rellenar la base de datos con datos falsos y poder ver contenido: + +```sh +#poner comandos aca +``` + +## Ejecuci贸n del Backend + +Para iniciar el servidor del backend en modo de desarrollo: + +```sh +cd backend +npm run start:dev +``` + +## Ejecuci贸n del Frontend + +Para iniciar el servidor del frontend en modo de desarrollo: + +```sh +cd frontend +npm run dev +``` + +## Enlaces del proyecto + +| Figma | Jira | Frontend deploy | Backend deploy | Repositorio | +| ------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| [![Figma](https://skillicons.dev/icons?i=figma)](https://www.figma.com/design/hUG1EOkKXqpRinerOEdKTM/team-no-country-17-12?node-id=0-1&t=CBa1crfmRYe7RGdW-0) | [![Jira](https://img.shields.io/badge/Jira-0052CC?style=for-the-badge&logo=jira&logoColor=white)](https://xoch-scrum.atlassian.net/jira/software/projects/S1TNR/boards/14/timeline?shared=&atlOrigin=eyJpIjoiODcyYWZiMzVjZDM1NDE5MWIzZDUyZmY2MzMyZDIxOGMiLCJwIjoiaiJ9) | [![Link al deploy del frontend](https://img.shields.io/badge/live-demo-00C4CC?style=for-the-badge)](https://frontend-nu-five-59.vercel.app/feed) | [![Link al deploy del backend](https://img.shields.io/badge/LIVE-DEMO-00C4CC?style=for-the-badge)](https://ohmytrip-backend-production.up.railway.app/api/v1) | [![Github](https://img.shields.io/badge/Github-black?style=for-the-badge&logo=github&logoColor=white)](https://github.com/No-Country-simulation/s17-12-t-node-react) | diff --git a/frontend/src/components/Cards/CardFeed.tsx b/frontend/src/components/Cards/CardFeed.tsx index 93577ac..d9dac56 100644 --- a/frontend/src/components/Cards/CardFeed.tsx +++ b/frontend/src/components/Cards/CardFeed.tsx @@ -42,7 +42,6 @@ export async function CardFeed({ album }: { album: AlbumFromFetch }) { -

{album.description}

{album.userId}: { diff --git a/frontend/src/components/icons/Icons.tsx b/frontend/src/components/icons/Icons.tsx index 3590ec5..c121de4 100644 --- a/frontend/src/components/icons/Icons.tsx +++ b/frontend/src/components/icons/Icons.tsx @@ -22,7 +22,7 @@ export const IconImage = ({ className, size = 30 }: IconProps) => { export const IconUser = ({ className, size = 30 }: IconProps) => { return } -export const IconPlusCircle = ({ className, size = 30 }: IconProps) => { +export const IconPlusCircle = ({ className, size = 60 }: IconProps) => { return } export const IconBook = ({ className, size = 30 }: IconProps) => { diff --git a/frontend/src/ui/user/Footer.tsx b/frontend/src/ui/user/Footer.tsx index 72d2e6e..ac7823c 100644 --- a/frontend/src/ui/user/Footer.tsx +++ b/frontend/src/ui/user/Footer.tsx @@ -40,7 +40,7 @@ const AUTH_ROUTES = [ { url: '/album/create', icon: , - label: 'Crear 谩lbum', + label: '', }, { url: '/perfil', @@ -70,36 +70,17 @@ export function Footer() { const routes = isAuthenticated ? AUTH_ROUTES : DEFAULT_ROUTES - const createAlbumIconStyles = 'flex flex-col items-center rounded-full size-[70px] justify-center relative -top-10 bg-FondoPrimary ss:size-24' + const createAlbumIconStyles = 'flex flex-col items-center rounded-full size-24 justify-center relative -top-10 bg-FondoPrimary ss:size-24' const perfilUrl = '/perfil/' + userId return ( -