diff --git a/.prettierrc b/.prettierrc index 49b905d69..b8b790153 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,11 +1,16 @@ { - "arrowParens": "avoid", - "singleQuote": true, - "tabWidth": 2, - "trailingComma": "all", - "jsxSingleQuote": false, - "printWidth": 80, - "semi": true, - "bracketSpacing": true, - "bracketSameLine": false + "files.autoSave": "afterDelay", + "files.autoSaveDelay": 500, + "editor.fontSize": 15, + "editor.tabSize": 2, + "editor.renderWhitespace": "boundary", + "editor.detectIndentation": false, + + "editor.codeActionsOnSave": { + "source.fixAll": "always", + "source.fixAll.eslint": "always" + }, + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnType": true, + "editor.formatOnSave": true } 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..859f6da2d 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,14 +1,13 @@ -import React from 'react'; -import './App.scss'; +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 :) */} +{`Sum of ${a} and ${b} is ${a + b}`}
; +};