From 40a91b72040938f0392ec22fb6d27e8191384324 Mon Sep 17 00:00:00 2001
From: Andres <andres99.dev@gmail.com>
Date: Mon, 11 Jul 2022 20:01:52 +0200
Subject: [PATCH] remove <hr/> from hw 1-4

---
 src/s1-main/App.module.css                | 17 +++++------------
 src/s2-homeworks/hw01/HW1.tsx             |  8 ++++----
 src/s2-homeworks/hw02/Affairs.module.css  |  4 ----
 src/s2-homeworks/hw02/Affairs.tsx         |  2 +-
 src/s2-homeworks/hw02/HW2.tsx             | 21 +++++++++++----------
 src/s2-homeworks/hw03/Greeting.module.css |  1 -
 src/s2-homeworks/hw03/HW3.tsx             | 21 ++++++++++++---------
 src/s2-homeworks/hw04/HW4.tsx             | 10 +++++-----
 src/s2-homeworks/hw05/pages/Junior.tsx    |  1 -
 src/s2-homeworks/hw06/HW6.tsx             |  4 ++--
 10 files changed, 40 insertions(+), 49 deletions(-)

diff --git a/src/s1-main/App.module.css b/src/s1-main/App.module.css
index d64c0de..b5e2833 100644
--- a/src/s1-main/App.module.css
+++ b/src/s1-main/App.module.css
@@ -3,6 +3,10 @@
 }
 
 .hw {
+    border: 1px solid #d9d9d9;
+    border-left: none;
+    border-right: none;
+    padding: 32px 70px;
 }
 
 .hwTitle {
@@ -11,18 +15,7 @@
     font-size: 22px;
     line-height: 27px;
     margin-bottom: 10px;
-    margin-left: 70px;
+    padding-left: 70px;
     margin-top: 47px;
 }
 
-.hwContainer {
-    padding: 0 70px 32px;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-}
-
-hr {
-    border-top: 1px solid #d9d9d9;
-    margin: 0;
-}
diff --git a/src/s2-homeworks/hw01/HW1.tsx b/src/s2-homeworks/hw01/HW1.tsx
index 0e073e0..1edbc60 100644
--- a/src/s2-homeworks/hw01/HW1.tsx
+++ b/src/s2-homeworks/hw01/HW1.tsx
@@ -34,13 +34,13 @@ export const friendMessage0: MessageType = {
 
 const HW1 = () => {
     return (
-        <div id={'hw1'} className={s2.hw}>
+        <div id={'hw1'}>
             {/*<hr/>*/}
             {/*можно убрать этот тег*/}
 
             <div className={s2.hwTitle}>Homework #1</div>
-            <hr />
-            <div className={s2.hwContainer}>
+            {/*<hr />*/}
+            <div className={s2.hw}>
                 {/*проверка отображения (не менять)*/}
                 <div>
                     <Message message={message0} />
@@ -55,7 +55,7 @@ const HW1 = () => {
 
             {/*<hr/>*/}
             {/*можно убрать этот тег*/}
-            <hr />
+            {/*<hr />*/}
             {/*можно убрать этот тег*/}
         </div>
     )
diff --git a/src/s2-homeworks/hw02/Affairs.module.css b/src/s2-homeworks/hw02/Affairs.module.css
index 263cc59..7f37c83 100644
--- a/src/s2-homeworks/hw02/Affairs.module.css
+++ b/src/s2-homeworks/hw02/Affairs.module.css
@@ -61,10 +61,6 @@
     align-items: center;
 }
 
-.container {
-    padding: 32px 0 73px 70px;
-}
-
 .buttonContainer {
     display: flex;
     gap: 24px;
diff --git a/src/s2-homeworks/hw02/Affairs.tsx b/src/s2-homeworks/hw02/Affairs.tsx
index 20dcedc..1368961 100644
--- a/src/s2-homeworks/hw02/Affairs.tsx
+++ b/src/s2-homeworks/hw02/Affairs.tsx
@@ -58,7 +58,7 @@ function Affairs(props: AffairsPropsType) {
     // }
 
     return (
-        <div className={s.container}>
+        <div>
             <div className={s.buttonContainer}>
                 <button
                     id={'hw2-button-all'}
diff --git a/src/s2-homeworks/hw02/HW2.tsx b/src/s2-homeworks/hw02/HW2.tsx
index 29180a8..791d1c8 100644
--- a/src/s2-homeworks/hw02/HW2.tsx
+++ b/src/s2-homeworks/hw02/HW2.tsx
@@ -48,24 +48,25 @@ function HW2() {
         setAffairs(deleteAffair(affairs, _id)) // need to fix any // number
 
     return (
-        <div id={'hw2'} className={s2.hw} style={{ marginTop: '39px' }}>
+        <div id={'hw2'}>
             {/*<hr/>*/}
             {/*можно убрать этот тег*/}
 
             <div className={s2.hwTitle}>Homework #2</div>
-            <hr />
-
+            {/*<hr />*/}
+            <div className={s2.hw}>
+                <Affairs
+                    data={filteredAffairs}
+                    setFilter={setFilter}
+                    deleteAffairCallback={deleteAffairCallback}
+                    filter={filter}
+                />
+            </div>
             {/*не менять*/}
-            <Affairs
-                data={filteredAffairs}
-                setFilter={setFilter}
-                deleteAffairCallback={deleteAffairCallback}
-                filter={filter}
-            />
 
             {/*<hr/>*/}
             {/*можно убрать этот тег*/}
-            <hr />
+            {/*<hr/>*/}
             {/*можно убрать этот тег*/}
         </div>
     )
diff --git a/src/s2-homeworks/hw03/Greeting.module.css b/src/s2-homeworks/hw03/Greeting.module.css
index 6a4a549..d6bd5ea 100644
--- a/src/s2-homeworks/hw03/Greeting.module.css
+++ b/src/s2-homeworks/hw03/Greeting.module.css
@@ -1,7 +1,6 @@
 .greetingForm {
     display: flex;
     flex-direction: column;
-    padding: 31px 0 0 70px;
     height: 336px;
 }
 
diff --git a/src/s2-homeworks/hw03/HW3.tsx b/src/s2-homeworks/hw03/HW3.tsx
index 60f4ea7..81d87c3 100644
--- a/src/s2-homeworks/hw03/HW3.tsx
+++ b/src/s2-homeworks/hw03/HW3.tsx
@@ -1,5 +1,5 @@
-import React, { useState } from 'react'
-import { v1 } from 'uuid'
+import React, {useState} from 'react'
+import {v1} from 'uuid'
 import s from './Greeting.module.css'
 import s2 from '../../s1-main/App.module.css'
 import GreetingContainer from './GreetingContainer'
@@ -23,7 +23,7 @@ const HW3 = () => {
     }
 
     return (
-        <div id={'hw3'} className={s2.hw}>
+        <div id={'hw3'}>
             {/*<hr/>*/}
             {/*можно убрать этот тег*/}
 
@@ -31,13 +31,16 @@ const HW3 = () => {
 
             {/*для автоматической проверки дз (не менять)*/}
 
-            <hr />
+            {/*<hr />*/}
             {/*можно убрать этот тег*/}
-            <GreetingContainer
-                users={users}
-                addUserCallback={addUserCallback}
-            />
-            <hr />
+            <div className={s2.hw}>
+                <GreetingContainer
+                    users={users}
+                    addUserCallback={addUserCallback}
+                />
+            </div>
+
+            {/*<hr />*/}
             {/*можно убрать этот тег*/}
         </div>
     )
diff --git a/src/s2-homeworks/hw04/HW4.tsx b/src/s2-homeworks/hw04/HW4.tsx
index a71abc9..f6d929d 100644
--- a/src/s2-homeworks/hw04/HW4.tsx
+++ b/src/s2-homeworks/hw04/HW4.tsx
@@ -4,14 +4,14 @@ import Stand from './Stand'
 
 const HW4 = () => {
     return (
-        <div id={'hw4'} className={s2.hw}>
-            {/*можно убрать этот тег*/}
-
+        <div id={'hw4'}>
             <div className={s2.hwTitle}>Homework #4</div>
-            <hr />
+            {/*<hr />*/}
             {/*проверка отображения*/}
             {/*демонстрация возможностей компонент:*/}
-            <Stand />
+            <div className={s2.hw}>
+                <Stand />
+            </div>
 
             <hr />
             {/*можно убрать этот тег*/}
diff --git a/src/s2-homeworks/hw05/pages/Junior.tsx b/src/s2-homeworks/hw05/pages/Junior.tsx
index b891fc5..55d5563 100644
--- a/src/s2-homeworks/hw05/pages/Junior.tsx
+++ b/src/s2-homeworks/hw05/pages/Junior.tsx
@@ -7,7 +7,6 @@ import HW9 from '../../hw09/HW9'
 function Junior() {
     return (
         <div id={'hw5-page-junior'}>
-            junior page
             <HW6 />
             <HW7 />
             <HW8 />
diff --git a/src/s2-homeworks/hw06/HW6.tsx b/src/s2-homeworks/hw06/HW6.tsx
index 81d1343..77695da 100644
--- a/src/s2-homeworks/hw06/HW6.tsx
+++ b/src/s2-homeworks/hw06/HW6.tsx
@@ -17,10 +17,10 @@ const HW6 = () => {
 
     return (
         <div id={'hw6'} className={s2.hw}>
-            <hr />
+            {/*<hr />*/}
             {/*можно убрать этот тег*/}
 
-            <div className={s2.hwTitle}>homeworks 6</div>
+            <div className={s2.hwTitle}>Homeworks #6</div>
 
             {/*should work (должно работать)*/}
             <div>