Skip to content

Commit

Permalink
Changes in folder Components
Browse files Browse the repository at this point in the history
  • Loading branch information
WOWmasterJulia committed Oct 29, 2023
1 parent 7de9684 commit b4cc5a9
Show file tree
Hide file tree
Showing 15 changed files with 4 additions and 194 deletions.
36 changes: 0 additions & 36 deletions src/components/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import { RestrictedRoute } from './RestrictedRoute';
import { PrivateRoute } from './PrivateRoute';
import { Container } from './Container/Container';

// import css from './App.module.css'

const Register = lazy(() => import('../pages/Register'));
const Home = lazy(() => import('../pages/Home'));
const Login = lazy(() => import('../pages/Login'));
Expand Down Expand Up @@ -50,43 +48,9 @@ export const App = () => {
path="contacts"
element={<PrivateRoute redirectTo="/" component={<Phonebook />} />}
/>
{/* <Route path="profile" element={<PrivateRoute redirectTo="/" component={<ProfileView />} />}/>
<Route path="profile/edit" element={<PrivateRoute redirectTo="/" component={<EditProfileView />} />}/> */}
<Route path="*" element={<NotFound />} />
</Route>
</Routes>
</Container>
);
};


// import { ContactForm } from './ContactForm/ContactForm';
// import { ContactList } from './ContactList/ContactList';
// import { ContactFind } from './ContactFind/ContactFind';
// import { useDispatch, useSelector } from 'react-redux';
// import { useEffect } from 'react';
// import { fetchAllContacts } from 'redux/operations';
// import { selectIsLoading, selectError } from 'redux/selectors';
// import css from './App.module.css'

// export const App = () => {
// const dispatch = useDispatch();
// // Получаем части состояния
// const isLoading = useSelector(selectIsLoading);
// const error = useSelector(selectError);
// // Вызываем операцию
// useEffect(() => {
// dispatch(fetchAllContacts());
// }, [dispatch]);

// return (
// <div>
// <h1 className={css.h1}>Phonebook</h1>
// <ContactForm />
// <h2 className={css.h2}>Contacts</h2>
// <ContactFind />
// {isLoading && !error && <b>Request in progress...</b>}
// <ContactList />
// </div>
// );
// }
7 changes: 0 additions & 7 deletions src/components/App.module.css

This file was deleted.

1 change: 0 additions & 1 deletion src/components/AuthNav/AuthNav.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@
}

.link:hover {
/* box-shadow: 3px 3px 13px 9px rgba(44, 90, 247, 0.68); */
border: 3px #21d4fd solid;
}
11 changes: 2 additions & 9 deletions src/components/ContactFind/ContactFind.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@
color: white;
align-items: center;
display: flex;
flex-direction: column;

flex-direction: column;
}
.wrap_find {
align-items: center;
display: flex;
flex-direction: column;

flex-direction: column;
}
.find_input {
min-width: 250px;
Expand All @@ -26,8 +24,3 @@
padding: 5px 10px;

}

/* .find_input:hover,
.find_input:focus {
box-shadow: 3px 3px 13px 9px rgba(44, 90, 247, 0.68);
} */
32 changes: 1 addition & 31 deletions src/components/ContactForm/ContactForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,34 +91,4 @@ export const ContactForm = () => {
);
};

// return (
// <form className={css.contactForm} onSubmit={handleSubmit}>
// <label htmlFor={nameInputId} className={css.labelForm}>Name</label>
// <input
// id={nameInputId}
// className={css.labelInput}
// type="text"
// name="name"
// value={name}
// placeholder="Enter name"
// pattern="^[a-zA-Zа-яА-Я]+(([' -][a-zA-Zа-яА-Я ])?[a-zA-Zа-яА-Я]*)*$"
// title="Name may contain only letters, apostrophe, dash and spaces. For example Adrian, Jacob Mercer, Charles de Batz de Castelmore d'Artagnan"
// required
// onChange={handleChange}
// />
// <label htmlFor={numberInputId} className={css.labelForm}>Number</label>
// <input
// id={numberInputId}
// className={css.labelInput}
// type="tel"
// name="number"
// value={number}
// placeholder="Enter phone number"
// pattern="\+?\d{1,4}?[-.\s]?\(?\d{1,3}?\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,9}"
// title="Phone number must be digits and can contain spaces, dashes, parentheses and can start with +"
// required
// onChange={handleChange}
// />
// <button className={css.btnForm} type="submit">Add contact</button>
// </form>
// );

14 changes: 0 additions & 14 deletions src/components/ContactForm/ContactForm.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@
margin-bottom: 15px;
padding: 5px 10px;
}

/* .labelInput:hover,
.labelInput:focus {
box-shadow: 3px 3px 13px 9px rgba(44, 90, 247, 0.68);
} */


.btnForm {
padding: 5px 10px;
display: flex;
Expand All @@ -50,14 +43,7 @@
}

.btnForm:hover {
/* box-shadow: 0px 1px 6px rgba(46, 47, 66, 0.08),
0px 1px 1px rgba(46, 47, 66, 0.16),
0px 2px 1px rgba(46, 47, 66, 0.08);
background-color: #404bbf;
fill: #ffffff; */
background-color: #21d4fd;
/* background-image: linear-gradient(19deg, #21d4fd 0%, #b721ff 100%); */
/* background: #64e8ff; */
}

/* .errorMessage {
Expand Down
12 changes: 1 addition & 11 deletions src/components/ContactItem/ContactItem.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
column-gap: 30px;
color: white;
margin-bottom: 10px;
/* padding-left: 120px;
padding-right: 120px; */
}

.delete_btn {
Expand All @@ -15,8 +13,7 @@
font-size: 16px;

margin: 0;
margin-left: auto;

margin-left: auto;

background-color: white;
border: 2px #21d4fd solid;
Expand All @@ -27,12 +24,5 @@
}

.delete_btn:hover {
/* box-shadow: 0px 1px 6px rgba(46, 47, 66, 0.08),
0px 1px 1px rgba(46, 47, 66, 0.16),
0px 2px 1px rgba(46, 47, 66, 0.08);
background-color: #404bbf;
fill: #ffffff; */
/* background-color: #21d4fd;
background-image: linear-gradient(19deg, #21d4fd 0%, #b721ff 100%); */
background-color: #21d4fd;
}
3 changes: 0 additions & 3 deletions src/components/ContactList/ContactList.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,4 @@
align-items: center;
flex-direction: column;
justify-content: center;
/* row-gap: 15px;
padding-left: 0; */

}
6 changes: 0 additions & 6 deletions src/components/Container/Container.module.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
.container {
width: 100%;
max-width: 1200px;


/* min-height: calc(100vh - 50px); */
/* display: flex;
align-items: center;
justify-content: center; */
};
8 changes: 0 additions & 8 deletions src/components/LoginForm/LoginForm.module.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
.form {
width: 320px;
/* background: rgb(204, 100, 254);
background: linear-gradient(
-135deg,
rgba(204, 100, 254, 1) 0%,
rgba(255, 100, 124, 1) 100%
); */
/* background: rgb(204,100,254);
background: linear-gradient(45deg, rgba(204,100,254,1) 0%, rgba(100,224,255,1) 100%); */
background: rgb(204,100,254);
background: linear-gradient(45deg, rgba(204,100,254,1) 0%, rgba(33,212,253,1) 100%);
margin: 50px auto 0;
Expand Down
4 changes: 0 additions & 4 deletions src/components/Navigation/Navigation.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
margin-right: 10px;
font-weight: 600;
color: #2a363b;
/* border-radius: 5px; */
}

.link.active {
color: #e84a5f;
}

.link:hover {
/* box-shadow: 3px 3px 13px 9px rgba(44, 90, 247, 0.68); */
/* border: 3px #21d4fd solid; */
/* border-bottom: 3px solid #21d4fd;*/
color:#21d4fd;
}
9 changes: 0 additions & 9 deletions src/components/RegisterForm/RegisterForm.module.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/* .form {
width: 320px;
} */

.label {
display: flex;
Expand Down Expand Up @@ -43,12 +40,6 @@

.form {
width: 320px;
/* background: rgb(204, 100, 254);
background: linear-gradient(
-135deg,
rgba(204, 100, 254, 1) 0%,
rgba(255, 100, 124, 1) 100%
); */
background: rgb(204,100,254);
background: linear-gradient(45deg, rgba(204,100,254,1) 18%, rgba(253,193,33,1) 100%);
margin: 50px auto 0;
Expand Down
20 changes: 0 additions & 20 deletions src/components/UserMenu/UserMenu.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@
}

.btnLogout {
/* border: 1px solid black;
border-radius: 5px;*/
font-weight: 500;
/* font-size: 16px; */
/* width: 100px; */
padding: 5px 10px;
min-width: 80px;
font-family: inherit;
Expand All @@ -45,19 +41,3 @@
fill: #ffffff;
}

/* .delete_btn {
padding: 5px 10px;
min-width: 80px;
font-family: inherit;
font-size: 16px;
margin: 0;
margin-left: auto;
background-color: white;
border: 2px #21d4fd solid;
border-radius: 5px;
font-size: 16px;
font-family: inherit;
} */
27 changes: 0 additions & 27 deletions src/pages/Home.jsx
Original file line number Diff line number Diff line change
@@ -1,31 +1,4 @@
// import { Container } from 'components/Container/Container';
import css from './Home.module.css'
// const styles = {
// container: {
// minHeight: 'calc(100vh - 50px)',
// display: 'flex',
// alignItems: 'center',
// justifyContent: 'center',
// },
// title: {
// fontWeight: 500,
// fontSize: 28,
// textAlign: 'center',
// },
// };

// export default function Home() {
// return (
// <div style={styles.container}>
// <h1 style={styles.title}>
// Phonebook welcome page{' '}
// <span role="img" aria-label="Greeting icon">
// 💁‍♀️
// </span>
// </h1>
// </div>
// );
//

export default function Home() {
return (
Expand Down
8 changes: 0 additions & 8 deletions src/pages/Phonebook.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,3 @@ export default function Phonebook() {
</div>
);
};
// const styles = {
// container: {
// minHeight: 'calc(100vh - 50px)',
// display: 'flex',
// alignItems: 'center',
// justifyContent: 'center',
// }
// };

0 comments on commit b4cc5a9

Please sign in to comment.