Skip to content

Fix to match design file #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix to match design file #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3e7bb6
update html text to match design file
Antashma May 24, 2022
dae7954
update image comment placement
Antashma May 24, 2022
1438095
update tests to match new text values
Antashma May 24, 2022
02ddaee
update external stylesheet test
Antashma May 24, 2022
f690f2b
update h2 test
Antashma May 24, 2022
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
18 changes: 9 additions & 9 deletions codegrade_mvp.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('index.html', () => {
});

it('renders with an external stylesheet', () => {
const cssLinkTag = dom.window.document.head.querySelector('link[rel="stylesheet"]');
const cssLinkTag = dom.window.document.head.querySelector('link[href="index.css"]');
expect(cssLinkTag).toBeInTheDocument();
});

Expand All @@ -40,7 +40,7 @@ describe('index.html', () => {

expect(headerNavLinks[0].innerHTML).toMatch(/About/i);
expect(headerNavLinks[1].innerHTML).toMatch(/Cookies/i);
expect(headerNavLinks[2].innerHTML).toMatch(/Celebrations/i);
expect(headerNavLinks[2].innerHTML).toMatch(/Weddings/i);
expect(headerNavLinks[3].innerHTML).toMatch(/Catering/i);
expect(headerNavLinks[4].innerHTML).toMatch(/Contact/i);
});
Expand All @@ -50,7 +50,7 @@ describe('index.html', () => {

expect(headerNavLinks[0].href.includes('#about')).toEqual(true);
expect(headerNavLinks[1].href.includes('#cookies')).toEqual(true);
expect(headerNavLinks[2].href.includes('#celebrations')).toEqual(true);
expect(headerNavLinks[2].href.includes('#weddings')).toEqual(true);
expect(headerNavLinks[3].href.includes('#catering')).toEqual(true);
expect(headerNavLinks[4].href.includes('#contact')).toEqual(true);
});
Expand All @@ -60,17 +60,17 @@ describe('index.html', () => {
expect(h2Arr.length).toBe(5);

expect(getByText(h2Arr[0], /About Sweet Eats Bakery/i)).toBeInTheDocument();
expect(getByText(h2Arr[1], /Cookies/i)).toBeInTheDocument();
expect(getByText(h2Arr[2], /Celebrations/i)).toBeInTheDocument();
expect(getByText(h2Arr[3], /Catering/i)).toBeInTheDocument();
expect(getByText(h2Arr[1], /Cupcakes/i)).toBeInTheDocument();
expect(getByText(h2Arr[2], /Cookies/i)).toBeInTheDocument();
expect(getByText(h2Arr[3], /Celebrations/i)).toBeInTheDocument();
expect(getByText(h2Arr[4], /Contact Us/i)).toBeInTheDocument();
});

it('renders the correct four images in body', () => {
const expectedImgSrcsArr = [
"https://tk-assets.lambdaschool.com/bcf76f62-2431-4c22-b466-2e711f3da2b9_ui-i-bakery-main-header.png",
"https://tk-assets.lambdaschool.com/7393a8fd-c8e5-4003-921f-79e0d546d02c_ui-i-bakery-cookies.png",
"https://tk-assets.lambdaschool.com/297378d6-9c89-430f-9d2e-46ae3d5edce8_ui-i-bakery-cupcake-i.png",
"https://tk-assets.lambdaschool.com/7393a8fd-c8e5-4003-921f-79e0d546d02c_ui-i-bakery-cookies.png",
"https://tk-assets.lambdaschool.com/ab0cb095-5900-476c-b042-aea065d3dbbf_ui-i-bakery-celebrate.png"
];
const allImages = Array.from(container.querySelectorAll('img'));
Expand Down Expand Up @@ -106,7 +106,7 @@ describe('index.html', () => {

expect(footerNavLinks[0].innerHTML).toMatch(/About/i);
expect(footerNavLinks[1].innerHTML).toMatch(/Cookies/i);
expect(footerNavLinks[2].innerHTML).toMatch(/Celebrations/i);
expect(footerNavLinks[2].innerHTML).toMatch(/Weddings/i);
expect(footerNavLinks[3].innerHTML).toMatch(/Catering/i);
expect(footerNavLinks[4].innerHTML).toMatch(/Contact/i);
});
Expand All @@ -116,7 +116,7 @@ describe('index.html', () => {

expect(footerNavLinks[0].href.includes('#about')).toEqual(true);
expect(footerNavLinks[1].href.includes('#cookies')).toEqual(true);
expect(footerNavLinks[2].href.includes('#celebrations')).toEqual(true);
expect(footerNavLinks[2].href.includes('#weddings')).toEqual(true);
expect(footerNavLinks[3].href.includes('#catering')).toEqual(true);
expect(footerNavLinks[4].href.includes('#contact')).toEqual(true);
});
Expand Down
14 changes: 7 additions & 7 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<!-- Navigation -->
About
Cookies
Celebrations
Weddings
Catering
Contact

Expand All @@ -31,21 +31,21 @@

<!-- content -->

<!-- Image https://tk-assets.lambdaschool.com/7393a8fd-c8e5-4003-921f-79e0d546d02c_ui-i-bakery-cookies.png -->
Cookies
<!-- Image https://tk-assets.lambdaschool.com/297378d6-9c89-430f-9d2e-46ae3d5edce8_ui-i-bakery-cupcake-i.png -->
Cupcakes

Cookie soufflé dessert carrot cake fruitcake halvah pudding cake. Marzipan topping bear claw soufflé gingerbread
biscuit. Tiramisu gummi bears chocolate bar sugar plum icing muffin cake jelly-o icing.

<!-- Image https://tk-assets.lambdaschool.com/297378d6-9c89-430f-9d2e-46ae3d5edce8_ui-i-bakery-cupcake-i.png -->
Celebrations
<!-- Image https://tk-assets.lambdaschool.com/7393a8fd-c8e5-4003-921f-79e0d546d02c_ui-i-bakery-cookies.png -->
Cookies

Candy apple pie lemon drops sweet roll danish. Tiramisu candy canes jelly-o jelly beans cotton candy pastry pudding
tootsie roll carrot cake. Dessert sesame snaps brownie lemon drops cookie donut dragée. Toffee pie fruitcake powder
gingerbread pudding.

<!-- Image https://tk-assets.lambdaschool.com/ab0cb095-5900-476c-b042-aea065d3dbbf_ui-i-bakery-celebrate.png -->
Catering
Celebrations

Sweet jelly-o apple pie powder jelly beans. Pastry sweet roll cake jujubes halvah soufflé brownie. Toffee cookie
lemondrops jelly beans chocolate bar. Wafer muffin jujubes danish tart danish chocolate wafer.
Expand All @@ -62,7 +62,7 @@

About
Cookies
Celebrations
Weddings
Catering
Contact

Expand Down