From e1176aa901b32a52113a202a529ff2457a075db3 Mon Sep 17 00:00:00 2001 From: sofiatsebenko Date: Tue, 25 Aug 2026 16:26:26 +0300 Subject: [PATCH 1/3] done --- package-lock.json | 9 +++++---- package.json | 2 +- src/App.jsx | 13 ++++++------- src/components/Sum/Sum.jsx | 6 +++++- 4 files changed, 17 insertions(+), 13 deletions(-) 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..5a2d5c416 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,14 +1,13 @@ import React from 'react'; import './App.scss'; +import { Sum } from './components/Sum/Sum'; 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/Sum.jsx b/src/components/Sum/Sum.jsx index 381aa0422..f06972209 100644 --- a/src/components/Sum/Sum.jsx +++ b/src/components/Sum/Sum.jsx @@ -1 +1,5 @@ -// export const Sum = () => (); +export const Sum = ({ a = 0, b = 0 }) => ( +

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

+); From 296e3fac151326af8c14305164dba6d455d23551 Mon Sep 17 00:00:00 2001 From: sofiatsebenko Date: Tue, 25 Aug 2026 16:37:59 +0300 Subject: [PATCH 2/3] done 2 --- src/App.jsx | 6 +++--- src/components/Sum/Sum.jsx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index 5a2d5c416..708add0a8 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -6,8 +6,8 @@ export const App = () => ( <> - - - + + + ); diff --git a/src/components/Sum/Sum.jsx b/src/components/Sum/Sum.jsx index f06972209..8f1766f57 100644 --- a/src/components/Sum/Sum.jsx +++ b/src/components/Sum/Sum.jsx @@ -1,5 +1,5 @@ export const Sum = ({ a = 0, b = 0 }) => (

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

); From 1cf28dcd49a29d34599ce28db0726f77a07284bd Mon Sep 17 00:00:00 2001 From: sofiatsebenko Date: Tue, 25 Aug 2026 16:42:30 +0300 Subject: [PATCH 3/3] done 2 --- src/components/Sum/Sum.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/Sum/Sum.jsx b/src/components/Sum/Sum.jsx index 8f1766f57..ba3ca8cdd 100644 --- a/src/components/Sum/Sum.jsx +++ b/src/components/Sum/Sum.jsx @@ -1,5 +1,3 @@ export const Sum = ({ a = 0, b = 0 }) => ( -

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

+

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

);