Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
fab6f1b
feat: typescript integration (3/4)
rociomonaco May 24, 2025
d09bc67
fix mocks
rociomonaco May 24, 2025
39f9ae5
translate
rociomonaco May 24, 2025
161aa11
ajustes logo, se agrego una seccion mas
NicoPiedrabuena May 25, 2025
1147f62
avance landing
NicoPiedrabuena May 26, 2025
5a80db9
jest config, recipe service test
rociomonaco May 27, 2025
13a2ed7
fix landing img
NicoPiedrabuena May 27, 2025
92ef36f
refactor typescript
rociomonaco May 27, 2025
7390ff9
avances mock login
NicoPiedrabuena May 27, 2025
46fbeae
(landing) responsive mobile + fix SVG
rociomonaco May 28, 2025
55fbcd9
action button component
rociomonaco May 28, 2025
267ebc8
avances perfil
NicoPiedrabuena May 28, 2025
b56f9f4
add backdrop modal, subscription modal, mock handler
rociomonaco May 28, 2025
2d9bede
clean subscription modal
rociomonaco May 28, 2025
2fdaa33
Merge pull request #17 from adigio/typescript-integration
rociomonaco May 29, 2025
30b9ea7
feat(PC-98): fix styles singin signup
rociomonaco May 30, 2025
5bf37e2
avance mealprep, se agregaron algunas restricciones por premium y fre…
NicoPiedrabuena May 31, 2025
44ca754
fix preferences styles, and componetization
rociomonaco May 31, 2025
881f25b
add custom checkbox
rociomonaco May 31, 2025
64506e9
fix folder structures, etc.
rociomonaco May 31, 2025
c8213db
skeleton loader
rociomonaco Jun 1, 2025
cc98471
add refresh and favourite modals
rociomonaco Jun 1, 2025
ff88434
add delete button to ingredients list, and images uploaded
rociomonaco Jun 1, 2025
9debc42
Merge branch 'PC-97/Front-end-mealpreap' into feature/PC-98
rociomonaco Jun 2, 2025
b6501bc
some fixes
rociomonaco Jun 3, 2025
f55ae22
primeros cambios
NicoPiedrabuena Jun 3, 2025
3255918
fix(PC-103): Fix build error for deployment in dev.cuoco.com.ar
Jun 4, 2025
ba91455
fix styles and components from recipe view
rociomonaco Jun 4, 2025
be79c4c
calendar mock
rociomonaco Jun 4, 2025
40d20bc
fixes
rociomonaco Jun 5, 2025
92a30a2
fix typescript errors to build (dev)
rociomonaco Jun 5, 2025
d0d3599
fixes
rociomonaco Jun 5, 2025
340e6e0
Merge remote-tracking branch 'origin/feature/PC-98' into feature/PC-25
rociomonaco Jun 5, 2025
08e07a9
fix styles and build dev
rociomonaco Jun 5, 2025
07c9209
ajustes
NicoPiedrabuena Jun 5, 2025
940ce39
Merge branch 'feature/PC-98' into feature/PC-25
rociomonaco Jun 5, 2025
384a9f0
fix recipe card
rociomonaco Jun 5, 2025
b204a57
Merge branch 'feature/PC-98' into PC-103/FastRecipe
rociomonaco Jun 5, 2025
eed457c
Merge pull request #18 from adigio/feature/PC-98
rociomonaco Jun 6, 2025
c46ef26
Merge pull request #20 from adigio/main
adigio Jun 6, 2025
c0bd7f4
ci: Fix nextjs build node_env
adigio Jun 6, 2025
a8a5d8f
fix: Added new envvar for mocking init
Jun 6, 2025
c87378c
ci: Changed envvar from USE to ENABLE
Jun 6, 2025
4720d44
images calendar
NicoPiedrabuena Jun 7, 2025
3c9f127
resposive nav home
NicoPiedrabuena Jun 7, 2025
503b58d
mealprep images
rociomonaco Jun 7, 2025
cc95ad4
Merge branch 'PC-103/FastRecipe' into feature/PC-98
NicoPiedrabuena Jun 7, 2025
bf9c3eb
Merge branch 'feature/PC-98' into feature/PC-25
rociomonaco Jun 7, 2025
f90d58a
add modals
NicoPiedrabuena Jun 7, 2025
f50e906
add calendar skeleton, and favorites modal selector
rociomonaco Jun 7, 2025
638e001
fix nav mobile menu
NicoPiedrabuena Jun 7, 2025
219f316
Merge branch 'feature/PC-105' into feature/PC-98
rociomonaco Jun 7, 2025
b5495c2
fix isPremium
NicoPiedrabuena Jun 7, 2025
1343c96
fixes
NicoPiedrabuena Jun 7, 2025
b688023
link
rociomonaco Jun 8, 2025
b9c51ef
fix margin top page
rociomonaco Jun 8, 2025
500b74d
rename services
NicoPiedrabuena Jun 8, 2025
0ec29e8
rename test core
rociomonaco Jun 8, 2025
812af99
avance test
NicoPiedrabuena Jun 8, 2025
0340499
test
NicoPiedrabuena Jun 9, 2025
467bc25
test2
NicoPiedrabuena Jun 9, 2025
83e23e3
add favorites and refresh modals at recipe and mealpreps
rociomonaco Jun 9, 2025
56e7c52
Merge branch 'PC-98' into feature/PC-98
rociomonaco Jun 9, 2025
6f372b0
tests
NicoPiedrabuena Jun 9, 2025
1722131
fix test
NicoPiedrabuena Jun 9, 2025
bc9005d
Merge branch 'PC-86' into feature/PC-98
rociomonaco Jun 9, 2025
d643757
Merge pull request #21 from adigio/feature/PC-98
rociomonaco Jun 9, 2025
ae99ff4
mocks, images, fixes
rociomonaco Jun 11, 2025
6899263
fixes and mock
NicoPiedrabuena Jun 11, 2025
d1e5d00
fix day
rociomonaco Jun 11, 2025
8293cf1
Merge pull request #22 from adigio/feature/PC-98
VillafaneNicolas Jun 11, 2025
00f249c
fix calendar mocks, navbar styles,etc
rociomonaco Jun 11, 2025
771147d
fixes
rociomonaco Jun 11, 2025
17029d7
Merge pull request #23 from adigio/feature/PC-98
rociomonaco Jun 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ jobs:
if [[ "${{ github.base_ref }}" == "main" ]]; then
NODE_ENV=production npm run build
else
NODE_ENV=development npm run build
NEXT_PUBLIC_ENABLE_MSW=true npm run build
fi
3 changes: 2 additions & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ jobs:
run: npm ci

- name: Build Next.js app
run: npm run build
run: |
NEXT_PUBLIC_ENABLE_MSW=true npm run build

- name: Prepare deployment folder
run: |
Expand Down
37 changes: 37 additions & 0 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import type { Config } from 'jest'
import nextJest from 'next/jest'

const createJestConfig = nextJest({
dir: './',
})

const config: Config = {
testEnvironment: 'jest-environment-jsdom',
setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/src/$1',
},
// <-- Reemplazamos el testMatch por uno más genérico:
testMatch: [
'<rootDir>/src/test/**/*.{spec,test}.{ts,tsx}'
],
collectCoverage: true,
coverageDirectory: 'coverage',
coverageReporters: ['text', 'lcov', 'html'],
moduleDirectories: ['node_modules', '<rootDir>'],
testPathIgnorePatterns: [
'<rootDir>/node_modules/',
'<rootDir>/.next/'
],
transform: {
'^.+\\.(ts|tsx)$': ['ts-jest', {
tsconfig: '<rootDir>/tsconfig.json'
}]
},
transformIgnorePatterns: [
'/node_modules/',
'^.+\\.module\\.(css|sass|scss)$',
],
}

export default createJestConfig(config)
28 changes: 28 additions & 0 deletions jest.setup.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import '@testing-library/jest-dom';

// Mock del servicio de recetas
jest.mock('@/services/recipe.service', () => {
const originalModule = jest.requireActual('@/services/recipe.service');
return {
...originalModule,
generateRecipes: jest.fn().mockImplementation(async (...args: any[]) => {
const response = await originalModule.generateRecipes.call(null, ...args);
return response;
}),
getRecipeById: jest.fn().mockImplementation(async (...args: any[]) => {
const response = await originalModule.getRecipeById.call(null, ...args);
return response;
})
};
});

// Configuración global para tests
beforeAll(() => {
// Configurar variables de entorno para tests
process.env.NEXT_PUBLIC_API_URL = 'http://localhost:3000';
});

// Limpiar todos los mocks después de cada test
afterEach(() => {
jest.clearAllMocks();
});
13 changes: 12 additions & 1 deletion next.config.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
/** @type {import('next').NextConfig} */
const nextConfig = {};
const nextConfig = {
images: {
remotePatterns: [
{
protocol: 'https',
hostname: '**',
},
],
dangerouslyAllowSVG: true,
domains: ['localhost'],
},
};

export default nextConfig;
Loading