From b422f7f9d255b91a31a71d165351fa1b7677faaa Mon Sep 17 00:00:00 2001 From: maifeeulasad Date: Wed, 1 Jul 2020 13:47:55 +0600 Subject: [PATCH 01/14] npx create-react-app --- .gitignore | 23 + .idea/inspectionProfiles/Project_Default.xml | 6 + .idea/misc.xml | 6 + .idea/modules.xml | 8 + .idea/reactjs-beginner.iml | 13 + .idea/vcs.xml | 6 + .idea/workspace.xml | 132 + README.md | 70 +- README.old.md | 2 + package.json | 34 + public/favicon.ico | Bin 0 -> 3150 bytes public/index.html | 43 + public/logo192.png | Bin 0 -> 5347 bytes public/logo512.png | Bin 0 -> 9664 bytes public/manifest.json | 25 + public/robots.txt | 3 + src/App.css | 38 + src/App.js | 26 + src/App.test.js | 9 + src/index.css | 13 + src/index.js | 17 + src/logo.svg | 7 + src/serviceWorker.js | 141 + src/setupTests.js | 5 + yarn.lock | 10951 +++++++++++++++++ 25 files changed, 11576 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/reactjs-beginner.iml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 README.old.md create mode 100644 package.json create mode 100644 public/favicon.ico create mode 100644 public/index.html create mode 100644 public/logo192.png create mode 100644 public/logo512.png create mode 100644 public/manifest.json create mode 100644 public/robots.txt create mode 100644 src/App.css create mode 100644 src/App.js create mode 100644 src/App.test.js create mode 100644 src/index.css create mode 100644 src/index.js create mode 100644 src/logo.svg create mode 100644 src/serviceWorker.js create mode 100644 src/setupTests.js create mode 100644 yarn.lock diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4d29575 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.js + +# testing +/coverage + +# production +/build + +# misc +.DS_Store +.env.local +.env.development.local +.env.test.local +.env.production.local + +npm-debug.log* +yarn-debug.log* +yarn-error.log* diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..03d9549 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..24eb271 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c450e16 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/reactjs-beginner.iml b/.idea/reactjs-beginner.iml new file mode 100644 index 0000000..2bfa945 --- /dev/null +++ b/.idea/reactjs-beginner.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..90d2c6c --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -47,6 +106,7 @@ + @@ -96,15 +156,16 @@ - + @@ -129,4 +190,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/App.css b/src/App.css deleted file mode 100644 index 74b5e05..0000000 --- a/src/App.css +++ /dev/null @@ -1,38 +0,0 @@ -.App { - text-align: center; -} - -.App-logo { - height: 40vmin; - pointer-events: none; -} - -@media (prefers-reduced-motion: no-preference) { - .App-logo { - animation: App-logo-spin infinite 20s linear; - } -} - -.App-header { - background-color: #282c34; - min-height: 100vh; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - font-size: calc(10px + 2vmin); - color: white; -} - -.App-link { - color: #61dafb; -} - -@keyframes App-logo-spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} diff --git a/src/App.js b/src/App.js deleted file mode 100644 index ce9cbd2..0000000 --- a/src/App.js +++ /dev/null @@ -1,26 +0,0 @@ -import React from 'react'; -import logo from './logo.svg'; -import './App.css'; - -function App() { - return ( -
-
- logo -

- Edit src/App.js and save to reload. -

- - Learn React - -
-
- ); -} - -export default App; diff --git a/src/App.test.js b/src/App.test.js deleted file mode 100644 index 4db7ebc..0000000 --- a/src/App.test.js +++ /dev/null @@ -1,9 +0,0 @@ -import React from 'react'; -import { render } from '@testing-library/react'; -import App from './App'; - -test('renders learn react link', () => { - const { getByText } = render(); - const linkElement = getByText(/learn react/i); - expect(linkElement).toBeInTheDocument(); -}); diff --git a/src/component/App.js b/src/component/App.js new file mode 100644 index 0000000..31da6e8 --- /dev/null +++ b/src/component/App.js @@ -0,0 +1,15 @@ +import React from 'react'; + +class App extends React.Component{ + + render() { + return( +
+ +
+ ) + } + +} + +export default App; diff --git a/src/index.css b/src/index.css deleted file mode 100644 index ec2585e..0000000 --- a/src/index.css +++ /dev/null @@ -1,13 +0,0 @@ -body { - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -code { - font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', - monospace; -} diff --git a/src/index.js b/src/index.js index f5185c1..c100de4 100644 --- a/src/index.js +++ b/src/index.js @@ -1,8 +1,6 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import './index.css'; -import App from './App'; -import * as serviceWorker from './serviceWorker'; +import App from './component/App' ReactDOM.render( @@ -10,8 +8,3 @@ ReactDOM.render( , document.getElementById('root') ); - -// If you want your app to work offline and load faster, you can change -// unregister() to register() below. Note this comes with some pitfalls. -// Learn more about service workers: https://bit.ly/CRA-PWA -serviceWorker.unregister(); diff --git a/src/logo.svg b/src/logo.svg deleted file mode 100644 index 6b60c10..0000000 --- a/src/logo.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/serviceWorker.js b/src/serviceWorker.js deleted file mode 100644 index b04b771..0000000 --- a/src/serviceWorker.js +++ /dev/null @@ -1,141 +0,0 @@ -// This optional code is used to register a service worker. -// register() is not called by default. - -// This lets the app load faster on subsequent visits in production, and gives -// it offline capabilities. However, it also means that developers (and users) -// will only see deployed updates on subsequent visits to a page, after all the -// existing tabs open on the page have been closed, since previously cached -// resources are updated in the background. - -// To learn more about the benefits of this model and instructions on how to -// opt-in, read https://bit.ly/CRA-PWA - -const isLocalhost = Boolean( - window.location.hostname === 'localhost' || - // [::1] is the IPv6 localhost address. - window.location.hostname === '[::1]' || - // 127.0.0.0/8 are considered localhost for IPv4. - window.location.hostname.match( - /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ - ) -); - -export function register(config) { - if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { - // The URL constructor is available in all browsers that support SW. - const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href); - if (publicUrl.origin !== window.location.origin) { - // Our service worker won't work if PUBLIC_URL is on a different origin - // from what our page is served on. This might happen if a CDN is used to - // serve assets; see https://github.com/facebook/create-react-app/issues/2374 - return; - } - - window.addEventListener('load', () => { - const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; - - if (isLocalhost) { - // This is running on localhost. Let's check if a service worker still exists or not. - checkValidServiceWorker(swUrl, config); - - // Add some additional logging to localhost, pointing developers to the - // service worker/PWA documentation. - navigator.serviceWorker.ready.then(() => { - console.log( - 'This web app is being served cache-first by a service ' + - 'worker. To learn more, visit https://bit.ly/CRA-PWA' - ); - }); - } else { - // Is not localhost. Just register service worker - registerValidSW(swUrl, config); - } - }); - } -} - -function registerValidSW(swUrl, config) { - navigator.serviceWorker - .register(swUrl) - .then(registration => { - registration.onupdatefound = () => { - const installingWorker = registration.installing; - if (installingWorker == null) { - return; - } - installingWorker.onstatechange = () => { - if (installingWorker.state === 'installed') { - if (navigator.serviceWorker.controller) { - // At this point, the updated precached content has been fetched, - // but the previous service worker will still serve the older - // content until all client tabs are closed. - console.log( - 'New content is available and will be used when all ' + - 'tabs for this page are closed. See https://bit.ly/CRA-PWA.' - ); - - // Execute callback - if (config && config.onUpdate) { - config.onUpdate(registration); - } - } else { - // At this point, everything has been precached. - // It's the perfect time to display a - // "Content is cached for offline use." message. - console.log('Content is cached for offline use.'); - - // Execute callback - if (config && config.onSuccess) { - config.onSuccess(registration); - } - } - } - }; - }; - }) - .catch(error => { - console.error('Error during service worker registration:', error); - }); -} - -function checkValidServiceWorker(swUrl, config) { - // Check if the service worker can be found. If it can't reload the page. - fetch(swUrl, { - headers: { 'Service-Worker': 'script' }, - }) - .then(response => { - // Ensure service worker exists, and that we really are getting a JS file. - const contentType = response.headers.get('content-type'); - if ( - response.status === 404 || - (contentType != null && contentType.indexOf('javascript') === -1) - ) { - // No service worker found. Probably a different app. Reload the page. - navigator.serviceWorker.ready.then(registration => { - registration.unregister().then(() => { - window.location.reload(); - }); - }); - } else { - // Service worker found. Proceed as normal. - registerValidSW(swUrl, config); - } - }) - .catch(() => { - console.log( - 'No internet connection found. App is running in offline mode.' - ); - }); -} - -export function unregister() { - if ('serviceWorker' in navigator) { - navigator.serviceWorker.ready - .then(registration => { - registration.unregister(); - }) - .catch(error => { - console.error(error.message); - }); - } -} diff --git a/src/setupTests.js b/src/setupTests.js deleted file mode 100644 index 74b1a27..0000000 --- a/src/setupTests.js +++ /dev/null @@ -1,5 +0,0 @@ -// jest-dom adds custom jest matchers for asserting on DOM nodes. -// allows you to do things like: -// expect(element).toHaveTextContent(/react/i) -// learn more: https://github.com/testing-library/jest-dom -import '@testing-library/jest-dom/extend-expect'; From 45dfac568b010dfc80ae9840ece00e81fffd0cd7 Mon Sep 17 00:00:00 2001 From: maifeeulasad Date: Thu, 2 Jul 2020 00:40:56 +0600 Subject: [PATCH 03/14] declare states --- .idea/workspace.xml | 22 +++++++--------------- src/component/App.js | 5 +++++ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 515fc8a..81414eb 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,16 +2,8 @@ - - - - - - - - - + @@ -39,8 +31,8 @@ - - + + @@ -156,12 +148,12 @@ - @@ -210,8 +202,8 @@ - - + + diff --git a/src/component/App.js b/src/component/App.js index 31da6e8..fe56def 100644 --- a/src/component/App.js +++ b/src/component/App.js @@ -2,6 +2,11 @@ import React from 'react'; class App extends React.Component{ + state={ + name:"Maifee Ul Aasad", + age:2305, + }; + render() { return(
From 4294d6b345fcd84172481cd19b4e2e25c5383575 Mon Sep 17 00:00:00 2001 From: maifeeulasad Date: Thu, 2 Jul 2020 00:41:49 +0600 Subject: [PATCH 04/14] accessing states --- .idea/workspace.xml | 13 ++++++------- src/component/App.js | 3 ++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 81414eb..5f4a8f0 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,6 @@ - @@ -31,8 +30,8 @@ - - + + @@ -148,12 +147,12 @@ - @@ -202,8 +201,8 @@ - - + + diff --git a/src/component/App.js b/src/component/App.js index fe56def..c205c37 100644 --- a/src/component/App.js +++ b/src/component/App.js @@ -10,7 +10,8 @@ class App extends React.Component{ render() { return(
- + My name is : {this.state.name} + My age is : {this.state.age}
) } From 9a8f610a8f11efe7a05e82d9064b659c3f23aae7 Mon Sep 17 00:00:00 2001 From: maifeeulasad Date: Thu, 2 Jul 2020 00:43:28 +0600 Subject: [PATCH 05/14] div is the open secret in react --- .idea/workspace.xml | 12 ++++++------ src/component/App.js | 8 ++++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5f4a8f0..49b7fb5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -30,8 +30,8 @@ - - + + @@ -147,12 +147,12 @@ - @@ -201,8 +201,8 @@ - - + + diff --git a/src/component/App.js b/src/component/App.js index c205c37..df3e727 100644 --- a/src/component/App.js +++ b/src/component/App.js @@ -10,8 +10,12 @@ class App extends React.Component{ render() { return(
- My name is : {this.state.name} - My age is : {this.state.age} +
+ My name is : {this.state.name} +
+
+ My age is : {this.state.age} +
) } From e0fb97bfe4b62f14c47d3c7a222c3be17edff74d Mon Sep 17 00:00:00 2001 From: maifeeulasad Date: Thu, 2 Jul 2020 00:48:00 +0600 Subject: [PATCH 06/14] rendering different class splitted App is two now App contains only name BoroApp contains age ---------------And rendering BoroApp------------ --- .idea/workspace.xml | 56 +++++++++++++++++++++++++++------------- src/component/App.js | 8 +----- src/component/BoroApp.js | 19 ++++++++++++++ src/index.js | 3 ++- 4 files changed, 60 insertions(+), 26 deletions(-) create mode 100644 src/component/BoroApp.js diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 49b7fb5..31bb4e7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,10 @@ + + + @@ -15,11 +18,11 @@ - + - - + + @@ -27,11 +30,20 @@ - + - - + + + + + + + + + + + @@ -52,8 +64,9 @@ @@ -147,12 +160,12 @@ - @@ -189,20 +202,27 @@ - + - - - - - + + - + - - + + + + + + + + + + + + diff --git a/src/component/App.js b/src/component/App.js index df3e727..19afdb7 100644 --- a/src/component/App.js +++ b/src/component/App.js @@ -4,18 +4,12 @@ class App extends React.Component{ state={ name:"Maifee Ul Aasad", - age:2305, }; render() { return(
-
- My name is : {this.state.name} -
-
- My age is : {this.state.age} -
+ My name is : {this.state.name}
) } diff --git a/src/component/BoroApp.js b/src/component/BoroApp.js new file mode 100644 index 0000000..759a1b0 --- /dev/null +++ b/src/component/BoroApp.js @@ -0,0 +1,19 @@ +import React from 'react'; + +class BoroApp extends React.Component{ + + state={ + age:2305, + }; + + render() { + return( +
+ My age is : {this.state.age} +
+ ) + } + +} + +export default BoroApp; diff --git a/src/index.js b/src/index.js index c100de4..b7a88ce 100644 --- a/src/index.js +++ b/src/index.js @@ -1,10 +1,11 @@ import React from 'react'; import ReactDOM from 'react-dom'; import App from './component/App' +import BoroApp from './component/BoroApp' ReactDOM.render( - + , document.getElementById('root') ); From 94e2efe426a68146125ceeab542812db8a9ae2e5 Mon Sep 17 00:00:00 2001 From: maifeeulasad Date: Thu, 2 Jul 2020 00:50:01 +0600 Subject: [PATCH 07/14] rendering multiple component together --- .idea/workspace.xml | 11 ++++------- src/index.js | 1 + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 31bb4e7..4210184 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,6 @@ - - - @@ -22,7 +19,7 @@ - + @@ -160,12 +157,12 @@ - @@ -219,7 +216,7 @@ - + diff --git a/src/index.js b/src/index.js index b7a88ce..9a5e571 100644 --- a/src/index.js +++ b/src/index.js @@ -5,6 +5,7 @@ import BoroApp from './component/BoroApp' ReactDOM.render( + , document.getElementById('root') From bc6ab3c3812d057003ecb2a705828172c21ef415 Mon Sep 17 00:00:00 2001 From: maifeeulasad Date: Thu, 2 Jul 2020 00:54:01 +0600 Subject: [PATCH 08/14] passing and accessing props --- .idea/workspace.xml | 61 +++++++++++++++++++++++++++++++++----------- src/component/App.js | 7 ++++- src/index.js | 4 +-- 3 files changed, 54 insertions(+), 18 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4210184..96f2677 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,6 +2,8 @@ + + @@ -19,7 +21,7 @@ - + @@ -30,8 +32,8 @@ - - + + @@ -157,12 +159,12 @@ - @@ -170,15 +172,15 @@ - + - + - + @@ -191,6 +193,35 @@ + + + + + @@ -199,24 +230,24 @@ - + - - + + - + - - + + - + diff --git a/src/component/App.js b/src/component/App.js index 19afdb7..0c47f88 100644 --- a/src/component/App.js +++ b/src/component/App.js @@ -9,7 +9,12 @@ class App extends React.Component{ render() { return(
- My name is : {this.state.name} +
+ My name is : {this.state.name} +
+
+ And everybody calls me : {this.props.name} +
) } diff --git a/src/index.js b/src/index.js index 9a5e571..ea572fd 100644 --- a/src/index.js +++ b/src/index.js @@ -5,8 +5,8 @@ import BoroApp from './component/BoroApp' ReactDOM.render( - - + + , document.getElementById('root') ); From ef17e1547049b45209554a16e8741d3fdd5c7f5c Mon Sep 17 00:00:00 2001 From: maifeeulasad Date: Thu, 2 Jul 2020 00:54:49 +0600 Subject: [PATCH 09/14] playing with props tried what happens when props is accessed but not passed --- .idea/workspace.xml | 14 +++++--------- src/index.js | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 96f2677..0c49b7c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,11 +1,7 @@ - - - - - + @@ -21,7 +17,7 @@ - + @@ -159,12 +155,12 @@ - @@ -247,7 +243,7 @@ - + diff --git a/src/index.js b/src/index.js index ea572fd..ac0bf31 100644 --- a/src/index.js +++ b/src/index.js @@ -5,7 +5,7 @@ import BoroApp from './component/BoroApp' ReactDOM.render( - + , document.getElementById('root') From 59a19b228b75970e4873adbf0307cb7b6834671f Mon Sep 17 00:00:00 2001 From: maifeeulasad Date: Thu, 2 Jul 2020 01:01:31 +0600 Subject: [PATCH 10/14] basic family structure --- .idea/workspace.xml | 101 +++++++++++++++++++++++++++++---------- src/component/App.js | 24 ---------- src/component/Babu.js | 13 +++++ src/component/BoroApp.js | 19 -------- src/component/Family.js | 13 +++++ src/component/Father.js | 13 +++++ src/component/Mother.js | 13 +++++ src/index.js | 6 +-- 8 files changed, 131 insertions(+), 71 deletions(-) delete mode 100644 src/component/App.js create mode 100644 src/component/Babu.js delete mode 100644 src/component/BoroApp.js create mode 100644 src/component/Family.js create mode 100644 src/component/Father.js create mode 100644 src/component/Mother.js diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0c49b7c..7e3daf7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,15 @@ - + + + + + + + + + @@ -16,8 +24,8 @@ - - + + @@ -26,19 +34,37 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + @@ -61,14 +87,19 @@ - @@ -92,12 +123,6 @@ - - - - - - @@ -179,12 +191,12 @@ - @@ -192,10 +204,10 @@ - + - + @@ -264,6 +276,13 @@ + + + + + + + @@ -276,8 +295,8 @@ - - + + @@ -286,8 +305,8 @@ - - + + @@ -298,12 +317,5 @@ - - - - - - - \ No newline at end of file diff --git a/src/component/Family.js b/src/component/Family.js index bfe6a69..ae41700 100644 --- a/src/component/Family.js +++ b/src/component/Family.js @@ -6,13 +6,19 @@ import Babu from "./Babu"; class Family extends React.Component{ state={ - address:"Home" + address:"Home", + earn:0, + }; + + earningChange = (earn) =>{ + this.setState({earn:earn}); }; render() { return(
- + Family income : {this.state.earn} +
diff --git a/src/component/Father.js b/src/component/Father.js index 10cb824..de69991 100644 --- a/src/component/Father.js +++ b/src/component/Father.js @@ -1,11 +1,21 @@ import React from 'react'; class Father extends React.Component{ + + state={ + earning:40, + }; + + componentDidMount() { + this.props.earningChange(this.state.earning); + } + render() { return(
I'm the father My address {this.props.address} + My earning is {this.state.earning}
) } From 0689eb65bb67b10102cac3f91c2f21ea8165dd22 Mon Sep 17 00:00:00 2001 From: maifeeulasad Date: Thu, 2 Jul 2020 01:25:13 +0600 Subject: [PATCH 14/14] child to child communication aka. : siblings communication --- .idea/workspace.xml | 36 +++++++++++++++++------------------- src/component/Family.js | 2 +- src/component/Mother.js | 1 + 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f28c073..671faca 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,7 @@ - - @@ -30,11 +28,11 @@ - + - - + + @@ -51,11 +49,11 @@ - + - + @@ -96,8 +94,8 @@ @@ -191,12 +189,12 @@