Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fw16 612 day 3 #23

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,31 @@ This section has moved here: [https://facebook.github.io/create-react-app/docs/d
### `npm run build` fails to minify

This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)




Smart Electronics
Smart Watches
Smart Watch Phone
Smart Wristband
Smart Watch Accessories
Sport Watch
Smart Health Watch
Security & Protection
Access Control
Alarm Systems
Door Intercom
IP Cameras
Smart Doorbells
Surveillance Camera System

Headphones & Earphones
Bluetooth Headphones
Earbud Headphones
Gaming Headphones
On-Ear & Over-Ear Headphones
Sports & Fitness Headphones
Headphone Accessories
Xiaomi Ecosystem Products
Xiaomi
94 changes: 94 additions & 0 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
"@chakra-ui/react": "^2.3.7",
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@fortawesome/fontawesome-free": "^6.2.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"axios": "^1.1.3",
"bootstrap": "^5.2.2",
"framer-motion": "^6.5.1",
"mdb-react-ui-kit": "^5.0.0",
"react": "^18.2.0",
"react-bootstrap": "^2.6.0",
"react-dom": "^18.2.0",
Expand Down
1 change: 1 addition & 0 deletions frontend/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
name="description"
content="Web site created using create-react-app"
/>
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ import AllRoutes from "./Router/AllRoutes";
import 'bootstrap/dist/css/bootstrap.min.css';



function App() {
return (
<div className="App">

<Navbar />
<AllRoutes />
<AllRoutes />
<Footer />

</div>
);
}
Expand Down
104 changes: 71 additions & 33 deletions frontend/src/Components/Footer/Footer.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
}

.newslter {
height: 70px;
height: 70px;
/* border: 1px solid red; */
display: flex;
justify-content: space-between;
Expand Down Expand Up @@ -93,43 +93,81 @@
padding: 3px 27px;
}


.newslter > div:last-child {
/* border: 1px solid rgb(8, 165, 68); */
width: 36%;
height: 50px;
margin-top: -0.8%;
display: flex;
justify-content: space-between;

}
/* border: 1px solid rgb(8, 165, 68); */
width: 36%;
height: 50px;
margin-top: -0.8%;
display: flex;
justify-content: space-between;
}

.qualitySection{
width: 95%;
padding-top: 2%;
.qualitySection {
width: 95%;
padding-top: 2%;

height: 170px;
margin: auto;
display: flex;
justify-content: space-around;
margin-Top: 5%;
margin-bottom: 5%;
background-color: white;
height: 170px;
margin: auto;
display: flex;
justify-content: space-around;
margin-top: 5%;
margin-bottom: 5%;
background-color: white;
/* border: 1px solid red; */
}

.qualitySection > div:first-child > img {
width: 150px;
height: 50px;
margin-top: 7%;
}

.qualitySection > div:first-child > p {
font-weight: bold;
font-size: 14px;
}

.qualitySection > div:first-child ~ img {
width: 680px;
height: 110px;
}
/* <--------------------------------mid screen--------------------------> */
@media screen and (max-width: 800px) {
.containerFooter {
display: block;
padding-left: 2%;
}
.newslter{
margin-top: -22%;
}
.newslter > div:last-child {
display: none;
}
.newslter > div:first-child {
width: 95%;
/* border: 1px solid red; */
margin: auto;
font-size: 13px;
padding-left: -20%;
}

.qualitySection>div:first-child>img{
width: 150px;
height: 50px;
margin-top: 7%;
.newslter > div:first-child > input {
width: 45%;
height: 35px;
}

.qualitySection>div:first-child>p{
font-weight: bold;
font-size: 14px;
}

.qualitySection>div:first-child~img{
width: 680px;
height: 110px;
}
.newslter > div:first-child>input ~ button {
width: 33%;
height: 35px;
}
.qualitySection > div:first-child ~ img {
display: none;
}
.qualitySection > div:first-child > img {
display: none;
}

.qualitySection > div:first-child > p {
display: none;
}
}
Loading