diff --git a/2-copy-of-code/lesson-18/data/cart.js b/2-copy-of-code/lesson-18/data/cart.js index 6222435..55a609e 100644 --- a/2-copy-of-code/lesson-18/data/cart.js +++ b/2-copy-of-code/lesson-18/data/cart.js @@ -82,4 +82,11 @@ export function loadCart(fun) { xhr.open('GET', 'https://supersimplebackend.dev/cart'); xhr.send(); +} + +export async function loadCartFetch() { + const response = await fetch('https://supersimplebackend.dev/cart'); + const text = await response.text(); + console.log(text); + return text; } \ No newline at end of file diff --git a/2-copy-of-code/lesson-18/lesson18.html b/2-copy-of-code/lesson-18/lesson18.html new file mode 100644 index 0000000..368e57f --- /dev/null +++ b/2-copy-of-code/lesson-18/lesson18.html @@ -0,0 +1,94 @@ + + + + + \ No newline at end of file diff --git a/2-copy-of-code/lesson-18/scripts/checkout.js b/2-copy-of-code/lesson-18/scripts/checkout.js index e743580..b157b4c 100644 --- a/2-copy-of-code/lesson-18/scripts/checkout.js +++ b/2-copy-of-code/lesson-18/scripts/checkout.js @@ -1,7 +1,7 @@ import {renderOrderSummary} from './checkout/orderSummary.js'; import {renderPaymentSummary} from './checkout/paymentSummary.js'; import {loadProducts, loadProductsFetch} from '../data/products.js'; -import {loadCart} from '../data/cart.js'; +import {loadCart, loadCartFetch} from '../data/cart.js'; // import '../data/cart-class.js'; // import '../data/backend-practice.js'; @@ -9,15 +9,10 @@ async function loadPage() { try { // throw 'error1'; - await loadProductsFetch(); - - const value = await new Promise((resolve, reject) => { - // throw 'error2'; - loadCart(() => { - // reject('error3'); - resolve('value3'); - }); - }); + await Promise.all([ + loadProductsFetch(), + loadCartFetch() + ]); } catch (error) { console.log('Unexpected error. Please try again later.'); diff --git a/2-copy-of-code/lesson-18/tests/checkout/orderSummaryTest.js b/2-copy-of-code/lesson-18/tests/checkout/orderSummaryTest.js index 293b6e2..06c6c1b 100644 --- a/2-copy-of-code/lesson-18/tests/checkout/orderSummaryTest.js +++ b/2-copy-of-code/lesson-18/tests/checkout/orderSummaryTest.js @@ -6,10 +6,8 @@ describe('test suite: renderOrderSummary', () => { const productId1 = 'e43638ce-6aa0-4b85-b27f-e1d07eb678c6'; const productId2 = '15b6fc6f-327a-4ec4-896f-486349e85a3d'; - beforeAll((done) => { - loadProductsFetch().then(() => { - done(); - }); + beforeAll(async () => { + await loadProductsFetch(); }); beforeEach(() => {