diff --git a/frontend/cypress/e2e/FilterSearch.cy.js b/frontend/cypress/e2e/FilterSearch.cy.js index ed601a3..dc04280 100644 --- a/frontend/cypress/e2e/FilterSearch.cy.js +++ b/frontend/cypress/e2e/FilterSearch.cy.js @@ -6,7 +6,7 @@ describe('Filter and search for a kebab', () => { cy.get('input[placeholder="Adres E-mail"]').type('admin@admin.pl'); cy.get('input[placeholder="Hasło"]').type('admin'); cy.get('button[type="submit"]').click(); - cy.wait(2000); + cy.wait(3000); cy.url().should('include', '/map'); @@ -15,20 +15,19 @@ describe('Filter and search for a kebab', () => { cy.get('.grid > :nth-child(1) > .justify-between > .fa-arrow-down > path').click(); cy.contains('Godziny otwarcia:').should('be.visible'); - cy.contains('Poniedziałek: 11:00-23:00').should('be.visible'); + cy.contains('Poniedziałek: 11:30-20:00').should('exist'); cy.contains('Mięsa:').should('exist'); - cy.contains('kurczak, wołowina, mieszane, falafel').should('exist'); + cy.contains('kurczak, baran, mieszane').should('exist'); cy.contains('Sosy:').should('exist'); - cy.contains('łagodny, ostry, mieszany, czosnek, ziołowy').should('exist'); + cy.contains('łagodny, czosnkowy, miętowy, ostry, mieszany, musztardowy').should('exist'); cy.contains('Status:').should('exist'); cy.contains('Istnieje').should('exist'); - cy.contains('Rzemieślniczy: Nie').should('exist'); - cy.contains('Na miejscu: Tak').should('exist'); + cy.contains('Rzemieślniczy: Tak').should('exist'); + cy.contains('Na miejscu: Nie').should('exist'); cy.contains('Sieciówka: Nie').should('exist'); cy.contains('Opcje zamówień:').should('exist'); cy.contains('na miejscu').should('exist'); cy.contains('na wynos').should('exist'); - cy.contains('dostawa').should('exist'); }); }); \ No newline at end of file diff --git a/frontend/cypress/e2e/Navigation.cy.js b/frontend/cypress/e2e/Navigation.cy.js index 29bd2f4..98fa482 100644 --- a/frontend/cypress/e2e/Navigation.cy.js +++ b/frontend/cypress/e2e/Navigation.cy.js @@ -8,7 +8,7 @@ describe('Navigate between Home and Map', () => { cy.contains('MAPA').click(); - cy.url().should('include', '/map'); + cy.url().should('include', '/map-clone'); cy.contains('Powrót').should('be.visible'); cy.contains('Powrót').click(); diff --git a/frontend/src/pages/AdminPanel.js b/frontend/src/pages/AdminPanel.js index 075b1f0..00037ea 100644 --- a/frontend/src/pages/AdminPanel.js +++ b/frontend/src/pages/AdminPanel.js @@ -176,7 +176,7 @@ export default function AdminPanel() { ? kebab.ordering_options : [], sauces: Array.isArray(kebab.sauces) ? kebab.sauces : [], - pages: kebab.pages || {}, + page: Array.isArray(kebab.page) ? kebab.page : [], }); setInitialKebab({ @@ -186,7 +186,7 @@ export default function AdminPanel() { ? kebab.ordering_options : [], sauces: Array.isArray(kebab.sauces) ? kebab.sauces : [], - pages: kebab.pages || {}, + page: Array.isArray(kebab.page) ? kebab.page : [], }); setLocalSauces(Array.isArray(kebab.sauces) ? kebab.sauces : []); @@ -195,7 +195,7 @@ export default function AdminPanel() { setLocalOpeningHours(kebab.opening_hours || {}); setLocalLogo(null); setLocalOrderingOptions(Array.isArray(kebab.ordering_options) ? kebab.ordering_options : []); - setLocalPages(kebab.pages || {}); + setLocalPages(Array.isArray(kebab.page) ? kebab.page : []); setIsKebabModalOpen(true); }; @@ -394,8 +394,8 @@ export default function AdminPanel() { }); } - if (JSON.stringify(localPages) !== JSON.stringify(initialKebab.pages)) { - const pagesToAdd = localPages.filter((page) => !initialKebab.pages?.includes(page)); + if (JSON.stringify(localPages) !== JSON.stringify(initialKebab.page)) { + const pagesToAdd = localPages.filter((page) => !initialKebab.page?.includes(page)); const pagesToRemove = initialKebab.pages?.filter((page) => !localPages.includes(page)); pagesToAdd.forEach((new_page) => { @@ -957,7 +957,7 @@ export default function AdminPanel() { - {/* Godziny otwarcia */} + {/* Godziny otwarcia