Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2b5f14c
Require Hello World in the document
acbart Jan 31, 2022
a7dee05
Rename text.Test.tsx to text.test.tsx
acbart Jan 31, 2022
3e381f3
Include the task info
acbart Jan 31, 2022
fee03d3
Merge branch 'task-first-branch' of https://github.com/UD-CISC275-S22…
acbart Jan 31, 2022
e6b1dab
Allow one or more instances of the Hello World text
acbart Feb 3, 2022
7a20734
Include json test command here
acbart Aug 24, 2024
7fe9ca3
Require Hello World in the document
acbart Jan 31, 2022
b8b8878
Include the task info
acbart Jan 31, 2022
fbdebde
Rename text.Test.tsx to text.test.tsx
acbart Jan 31, 2022
2f0146c
Allow one or more instances of the Hello World text
acbart Feb 3, 2022
a6acb43
Merge branch 'task-first-branch' of https://github.com/frontend-fun/t…
acbart Aug 24, 2024
ac36b32
First set of tests
acbart Jan 30, 2022
d04739d
Some logging tests
acbart Jan 30, 2022
b26100f
More html tests
acbart Jan 30, 2022
3bf4550
Fix the image test
acbart Jan 30, 2022
8dff2b6
Updated CSS tests, left a note about additional tests
acbart Jan 31, 2022
b66d4de
See previous commit message
acbart Jan 31, 2022
0a24364
Add in new css test
acbart Aug 24, 2024
4d43d7a
Add in points
acbart Aug 24, 2024
bdf24b5
Update deploy.yml
tahamou1 Aug 27, 2025
21c91c1
Added name to App
mtm0 Aug 27, 2025
84cc176
Merge remote-tracking branch 'upstream/task-first-branch' into solved…
tahamou1 Sep 4, 2025
688aaee
Added new Branch + new file
tahamou1 Sep 4, 2025
216b000
Merge pull request #2 from tahamou1/solved-first-branch
tahamou1 Sep 4, 2025
a4d9794
Merge remote-tracking branch 'upstream/task-html-css' into solved-htm…
tahamou1 Sep 6, 2025
42f8e4c
Merge branch 'main' into solved-html-css
tahamou1 Sep 6, 2025
377d72f
Merge pull request #3 from tahamou1/solved-html-css
tahamou1 Sep 6, 2025
cda5ee5
Add HTML/CSS edits
tahamou1 Sep 6, 2025
ff5e69f
Resolve conflict in App.tsx and keep HTML/CSS edits
tahamou1 Sep 6, 2025
30c5c37
Merge branch 'main' into solved-html-css
tahamou1 Sep 6, 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
1 change: 1 addition & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ jobs:
echo "<html><head>\
<meta http-equiv='refresh' content='0; URL=${{github.server_url}}/${{github.repository}}' />\
</head><body>Redirecting to repository</body></html>" > ./dist/repo.html

mkdir -p docs
cp README.md docs/index.md
echo "# Quick Links" > docs/quick-links.md
Expand Down
Empty file added git
Empty file.
123 changes: 57 additions & 66 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"build": "react-scripts build",
"test": "react-scripts test",
"test:cov": "react-scripts test --coverage --watchAll",
"test:json": "react-scripts test --json --watchAll=false --outputFile jest-output.json --coverage",
"eject": "react-scripts eject",
"lint": "eslint ./src --ext .tsx --ext .ts --max-warnings 0",
"eslint-output": "eslint-output ./src --ext .tsx --ext .ts --max-warnings 0",
Expand Down
5 changes: 5 additions & 0 deletions public/tasks/task-first-branch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Task - First Branch

Version: 0.0.1

Pass a short test to have certain text on the page.
5 changes: 5 additions & 0 deletions public/tasks/task-html-css.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Task - HTML/CSS

Version: 0.0.1

Add in some HTML and CSS, including a fancy looking button.
83 changes: 83 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from "react";
import "./App.css";
import { Button, Col, Container, Row } from "react-bootstrap";

function App(): React.JSX.Element {
return (
Expand All @@ -11,6 +12,88 @@ function App(): React.JSX.Element {
Edit <code>src/App.tsx</code> and save. This page will
automatically reload.
</p>

<h1>
This is{" "}
<span style={{ color: "red" }}>colored header text</span>.
</h1>
<div>
<Button
onClick={() => {
console.log("Hello World!");
}}
>
Log Hello World
</Button>
</div>
<div>
<Container>
<Row>
<Col>
<div
style={{
display: "inline-block",
width: "9px",
height: "12px",
backgroundColor: "red",
margin: "13px",
}}
></div>
</Col>
<Col>
<div
style={{
display: "inline-block",
width: "30px",
height: "80px",
backgroundColor: "red",
margin: "13px",
}}
></div>
</Col>
<Col>
<div
style={{
display: "inline-block",
width: "80px",
height: "220px",
backgroundColor: "red",
margin: "13px",
}}
></div>
</Col>
</Row>
</Container>
</div>
<p>Paragraph Example</p>
<p>Mohamed Mouhoud</p>
<p>Hello World</p>

<div style={{ border: "45px solid #3c6ed1", padding: "2px" }}>
<p>How are you?</p>
</div>
<div>
<ol>
<li>Item</li>
<li>Item2</li>
<li>Item3</li>
</ol>
</div>
<div></div>
<div>
<Container>
<Row>
<Col>First column.</Col>
<Col>
Second column.
<img
src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRW7an8OUx1gtjGpdEzwn3SMCDWFIGR9sdcXw&s"
alt="An image"
/>
</Col>
</Row>
</Container>
</div>
</div>
);
}
Expand Down
83 changes: 83 additions & 0 deletions src/HtmlCss.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
import React from "react";
import { render, screen } from "@testing-library/react";
import App from "./App";
import userEvent from "@testing-library/user-event";

describe("Some HTML Elements are added.", () => {
test("(2 pts) There is a header", () => {
render(<App />);
const header = screen.getByRole("heading");
expect(header).toBeInTheDocument();
});

test("(2 pts) There is an image with alt text", () => {
render(<App />);
const image = screen.getByRole("img");
expect(image).toBeInTheDocument();
expect(image).toHaveAttribute("alt");
});

test("(2 pts) There is a list with at least three elements", () => {
render(<App />);
const list = screen.getByRole("list");
expect(list).toBeInTheDocument();
expect(list.children.length).toBeGreaterThanOrEqual(3);
});
});

describe("(2 pts) Some basic CSS is added.", () => {
test("The background color of the header area is different", () => {
render(<App />);
const banner = screen.getByRole("banner");
expect(banner).not.toHaveStyle({
"background-color": "rgb(40, 44, 52)",
});
});
});

describe("(2 pts) Some Bootstrap Elements are added", () => {
test("There is one bootstrap button with the text 'Log Hello World'", () => {
render(<App />);
const button = screen.getByRole("button", { name: /Log Hello World/i });
expect(button).toBeInTheDocument();
expect(button).toHaveClass("btn");
expect(button).toHaveClass("btn-primary");
});

test("(2 pts) Not clicking the bootstrap button does not logs 'Hello World!'", () => {
const consoleSpy = jest.spyOn(console, "log");
render(<App />);
expect(consoleSpy).not.toHaveBeenCalledWith("Hello World!");
});

test("(2 pts) Clicking the bootstrap button logs 'Hello World!'", () => {
const consoleSpy = jest.spyOn(console, "log");
render(<App />);
const button = screen.getByRole("button", { name: /Log Hello World/i });
userEvent.click(button);
expect(consoleSpy).toHaveBeenCalledWith("Hello World!");
});
});

describe("Some additional CSS was added", () => {
test("(2 pts) checks if any element has a background color of red", () => {
const { container } = render(<App />);
// Get all elements in the rendered container
const elements = container.querySelectorAll("*");

// Check if any element has a background color of red
let foundRedBackground = false;

elements.forEach((element) => {
const style = getComputedStyle(element);
if (
style.backgroundColor === "red" ||
style.backgroundColor === "rgb(255, 0, 0)"
) {
foundRedBackground = true;
}
});

expect(foundRedBackground).toBe(true);
});
});
9 changes: 9 additions & 0 deletions src/text.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import React from "react";
import { render, screen } from "@testing-library/react";
import App from "./App";

test("renders the text 'Hello World' somewhere", () => {
render(<App />);
const texts = screen.getAllByText(/Hello World/);
expect(texts.length).toBeGreaterThanOrEqual(1);
});