diff --git a/README.md b/README.md index 03eb3e57a..16d775ba6 100644 --- a/README.md +++ b/README.md @@ -18,4 +18,4 @@ The `App` should contain the next `Sum` components: - Install Prettier Extention and use this [VSCode settings](https://mate-academy.github.io/fe-program/tools/vscode/settings.json) to enable format on save. - Implement a solution following the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline). - Open one more terminal and run tests with `npm test` to ensure your solution is correct. -- Replace `` with your Github username in the [DEMO LINK](https://.github.io/react_sum/) and add it to the PR description. +- Replace `` with your Github username in the [DEMO LINK](https://anastasiiadns.github.io/react_sum/) and add it to the PR description. diff --git a/package-lock.json b/package-lock.json index ffe91f1e2..53b982878 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ }, "devDependencies": { "@cypress/react18": "^2.0.1", - "@mate-academy/scripts": "^1.8.5", + "@mate-academy/scripts": "^2.1.3", "@mate-academy/stylelint-config": "*", "@vitejs/plugin-react": "^4.3.1", "cypress": "^13.13.0", @@ -763,10 +763,11 @@ } }, "node_modules/@mate-academy/scripts": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.8.5.tgz", - "integrity": "sha512-mHRY2FkuoYCf5U0ahIukkaRo5LSZsxrTSgMJheFoyf3VXsTvfM9OfWcZIDIDB521kdPrScHHnRp+JRNjCfUO5A==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-2.1.3.tgz", + "integrity": "sha512-a07wHTj/1QUK2Aac5zHad+sGw4rIvcNl5lJmJpAD7OxeSbnCdyI6RXUHwXhjF5MaVo9YHrJ0xVahyERS2IIyBQ==", "dev": true, + "license": "MIT", "dependencies": { "@octokit/rest": "^17.11.2", "@types/get-port": "^4.2.0", diff --git a/package.json b/package.json index 863c49669..f41ce178d 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "devDependencies": { "@cypress/react18": "^2.0.1", - "@mate-academy/scripts": "^1.8.5", + "@mate-academy/scripts": "^2.1.3", "@mate-academy/stylelint-config": "*", "@vitejs/plugin-react": "^4.3.1", "cypress": "^13.13.0", diff --git a/src/App.jsx b/src/App.jsx index dc51f769d..65e75cf72 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,14 +1,14 @@ import React from 'react'; +import { Sum } from './components/Sum'; + import './App.scss'; export const App = () => ( <> -

Sum of 2 and 3 is 5

-

Sum of -5 and 5 is 0

-

Sum of 10 and 0 is 10

-

Sum of 0 and 5 is 5

-

Sum of 0 and 0 is 0

- {/* Replace paragraphs with Sum componets */} - {/* And remove commented lines :) */} + + + + + ); diff --git a/src/components/Sum.jsx b/src/components/Sum.jsx new file mode 100644 index 000000000..ba3ca8cdd --- /dev/null +++ b/src/components/Sum.jsx @@ -0,0 +1,3 @@ +export const Sum = ({ a = 0, b = 0 }) => ( +

{`Sum of ${a} and ${b} is ${a + b}`}

+); diff --git a/src/components/Sum/Sum.jsx b/src/components/Sum/Sum.jsx deleted file mode 100644 index 381aa0422..000000000 --- a/src/components/Sum/Sum.jsx +++ /dev/null @@ -1 +0,0 @@ -// export const Sum = () => (); diff --git a/src/components/Sum/Sum.spec.jsx b/src/components/Sum/Sum.spec.jsx deleted file mode 100644 index 3b445c47d..000000000 --- a/src/components/Sum/Sum.spec.jsx +++ /dev/null @@ -1,41 +0,0 @@ -import React from 'react'; -import { mount } from '@cypress/react18'; -import { Sum } from './Sum'; - -describe('Sum', () => { - it('should sum positive numbers', () => { - mount(); - - cy.get('p').should('have.text', 'Sum of 7 and 10 is 17'); - }); - - it('should sum positive and negative numbers', () => { - mount(); - - cy.get('p').should('have.text', `Sum of 6 and -4 is 2`); - }); - - it('should sum negative numbers', () => { - mount(); - - cy.get('p').should('have.text', `Sum of -40 and -2 is -42`); - }); - - it('should sum "a" with 0 if "b" is not given', () => { - mount(); - - cy.get('p').should('have.text', `Sum of 6 and 0 is 6`); - }); - - it('should sum 0 with "b" if "a" is not given', () => { - mount(); - - cy.get('p').should('have.text', `Sum of 0 and 12 is 12`); - }); - - it('should sum 0 with 0 if "a" and "b" are not given', () => { - mount(); - - cy.get('p').should('have.text', `Sum of 0 and 0 is 0`); - }); -});