edited

Mirzayevsky · Apr 10, 2024 · 6a9eb12 · 6a9eb12
1 parent d580612
commit 6a9eb12
Show file tree

Hide file tree

Showing 27 changed files with 236 additions and 73 deletions.
diff --git a/public/index.html b/public/index.html
@@ -33,6 +33,10 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Comfortaa:[email protected]&family=Marck+Script&family=Roboto+Mono:ital,wght@0,100..700;1,100..700&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
+<!-- Font Open Sans -->
     <link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet">
     <title>Adigmo</title>
   </head>

diff --git a/src/Constants/api.js b/src/Constants/api.js
@@ -1,3 +1,3 @@
 export const BASE_URL = `https://api.telegram.org/bot6402829230:AAHLtsSBT4yK5ATJtwmdYcJ5M7CFjpBqpjg/sendMessage`
-export const TELEGRAM_API = `https://api.telegram.org/bot6402829230:AAHLtsSBT4yK5ATJtwmdYcJ5M7CFjpBqpjg/sendMessage`;
+export const TELEGRAM_API = `https://api.telegram.org/bot7055531716:AAGKWCR5mMwsCMxTusCFI4HxNqTRhVfPkjQ/sendMessage`;
 export const chatIds = [6090223711,3415343];
diff --git a/src/Constants/serviceType.js b/src/Constants/serviceType.js
@@ -1,14 +1,14 @@
 export const serviceData = [
     {
       id:0,
-      name:"Лендинг",
+      name:"UZUM MARKET",
     },
     {
       id:1,
-      name:"Бизнес сайт",
+      name:"WILDBERRIES",
     },
     {
       id:2,
-      name:"Интернет магазин",
+      name:"AMAZON",
     },
   ]
diff --git a/src/assets/main/red-icon.svg b/src/assets/main/red-icon.svg
diff --git a/src/assets/svg/CloseIcon.jsx b/src/assets/svg/CloseIcon.jsx
@@ -3,7 +3,7 @@ import * as React from "react";
 function SvgComponent(props) {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" width={23.335} height={23.335} {...props}>
-      <g data-name="Group 99" fill="#000">
+      <g data-name="Group 99" fill="red">
         <path data-name="Rectangle 58" d="M21.213 0l2.121 2.121L2.121 23.335 0 21.213z" />
         <path data-name="Rectangle 59" d="M23.334 21.213l-2.121 2.121L-.001 2.121 2.121 0z" />
       </g>

diff --git a/src/components/Card/style.js b/src/components/Card/style.js
@@ -13,10 +13,12 @@ export const Wrapper = styled.div`
   border-radius: 0.25rem;
   padding: 1.5rem;
   border-radius: 16px;
-  box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px;
+ box-shadow: rgba(50, 50, 93, 0.25) 0px 50px 100px -20px, rgba(0, 0, 0, 0.3) 0px 30px 60px -30px, rgba(10, 37, 64, 0.35) 0px -2px 6px 0px inset;
+
   position: relative;
   @media screen and (max-width: 600px) {
     width: 100%;
+    margin: 30px 0;
   }
   
 

diff --git a/src/components/Footer/style.js b/src/components/Footer/style.js
@@ -5,9 +5,9 @@ export const  Wrapper = styled.div`
   font-family: Mozerati, sans-serif !important;
 
   .footer {
-    background: #000046;  /* fallback for old browsers */
-background: -webkit-linear-gradient(to right, #1CB5E0, #000046);  /* Chrome 10-25, Safari 5.1-6 */
-background: linear-gradient(to right, #1CB5E0, #000046); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
+    background: #2980b9;  /* fallback for old browsers */
+background: -webkit-linear-gradient(to left, #2c3e50, #2980b9);  /* Chrome 10-25, Safari 5.1-6 */
+background: linear-gradient(to left, #2c3e50, #2980b9); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
 
 	background-size: 400% 400%;
 	animation: gradient 15s ease infinite;

diff --git a/src/components/Nav/Navbar.jsx b/src/components/Nav/Navbar.jsx
@@ -57,11 +57,11 @@ const  Navbar = () => {
               </Link>
             </li>
 
-            <li className="semiBold font15 pointer">
+            {/* <li className="semiBold font15 pointer">
               <Link activeClass="active" style={{ padding: "10px 0px" }} to="pricing" spy={true} smooth={true} offset={-80}>
                 Цены
               </Link>
-            </li>
+            </li> */}
 
             <li className="semiBold font15 pointer">
               <Link activeClass="active" style={{ padding: "10px 0px" }} to="projects" spy={true} smooth={true} offset={-80}>

diff --git a/src/components/ProjectBox/ProjectBox.jsx b/src/components/ProjectBox/ProjectBox.jsx
@@ -4,9 +4,11 @@ import styled from "styled-components";
 export default function ProjectBox({ img, title, text, action,link}) {
   return (
     <Wrapper>
-      <ImgBtn href={link}  target="_blank"  className="aniamte pointer" >
-      <img className="radius8" src={img}  alt="Portfolio Item"/>
-      </ImgBtn>
+      <div className="cover">
+        <ImgBtn href={link}  target="_blank"  className="aniamte pointer" >
+        <img className="radius8" src={img}  alt="Portfolio Item"/>
+        </ImgBtn>
+      </div>
       <h3 className="font20 extraBold" >{title}</h3>
       <p className="font13">{text}</p>
     </Wrapper>
@@ -19,35 +21,52 @@ const Wrapper = styled.div`
   h3 {
     margin-top: 20px;
     margin-bottom: 5px;
+    font-family: "Open Sans";
+    font-weight: 700!important;
   }
   p{
     color: #000;
     font-size: 15px;
     font-weight: 500;
+    text-align:justify;
+    width:90%;
+    margin:auto;
+
     @media screen and (max-width:600px){
       width: 100%;
       font-size: 15px;
       font-weight: 600;
     }
   }
-`;
-const ImgBtn = styled.a`
-  background-color: transparent;
+  .cover{
+  height: 320px;
+   width: 360px;
   border: 0px;
   outline: none;
   padding: 0;
   margin: 20px 0;
   overflow: hidden;
-  @media only screen and (max-width: 1100px) {
+  border-radius: 30px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #bdc3c7;  /* fallback for old browsers */
+background: -webkit-linear-gradient(to right, #2c3e50, #bdc3c7);  /* Chrome 10-25, Safari 5.1-6 */
+background: linear-gradient(to right, #2c3e50, #bdc3c7); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
+box-shadow: rgba(50, 50, 93, 0.25) 0px 50px 100px -20px, rgba(0, 0, 0, 0.3) 0px 30px 60px -30px, rgba(10, 37, 64, 0.35) 0px -2px 6px 0px inset;
+@media only screen and (max-width: 1400px) {
     height: fit-content;
+    width: fit-content;
   }
+  }
+`;
+const ImgBtn = styled.a`
+
+
+ 
   img{
     height: 100%;
     width: 100%;
-    -webkit-box-shadow: -2px 0px 38px -3px rgba(71, 71, 71, 0.37);
--moz-box-shadow: -2px 0px 38px -3px rgba(71, 71, 71, 0.37);
-box-shadow: -2px 0px 38px -3px rgba(71, 71, 71, 0.37);
- 
   }
   &:hover > img {
     opacity: 0.5;

diff --git a/src/components/Sections/Home/AboutUs/index.jsx b/src/components/Sections/Home/AboutUs/index.jsx
@@ -20,7 +20,8 @@ const AboutUs = () => {
                 </Title>
                 <Row>
                     <Box>
-                        <SvgContainer>
+                       <div>
+                       <SvgContainer>
                             <TechSvg/>
                         </SvgContainer>
                         <p className={"box-title"}>
@@ -31,8 +32,10 @@ const AboutUs = () => {
                             для быстрой и безопасной
                             работы ваших сайтов
                         </div>
+                       </div>
                     </Box>
                     <Box>
+                        <div>
                         <SvgContainer>
                             <AdoptionSvg/>
                         </SvgContainer>
@@ -44,8 +47,10 @@ const AboutUs = () => {
                             сайта на любом экране и
                             устройстве
                         </p>
+                        </div>
                     </Box>
                     <Box>
+                        <div>
                         <SvgContainer>
                             <DesignSvg/>
                         </SvgContainer>
@@ -57,13 +62,15 @@ const AboutUs = () => {
                             решения, направленные на
                             привлечение клиентов
                         </p>
+                        </div>
                     </Box>
 
                 </Row>
 
                 <Row>
                     <Box>
-                        <SvgContainer>
+                     <div>
+                     <SvgContainer>
                             <SettingSvg/>
                         </SvgContainer>
                         <p className={"box-title"}>
@@ -74,8 +81,10 @@ const AboutUs = () => {
                             содержание и обновления для
                             вашего сайта
                         </div>
+                     </div>
                     </Box>
                     <Box>
+                        <div>
                         <SvgContainer>
                             <LoopSvg/>
                         </SvgContainer>
@@ -87,9 +96,11 @@ const AboutUs = () => {
                             и мы уделяем внимание
                             деталям
                         </p>
+                        </div>
                     </Box>
                     <Box>
-                        <SvgContainer>
+                       <div>
+                       <SvgContainer>
                             <BoxSvg/>
                         </SvgContainer>
                         <p className={"box-title"}>
@@ -100,6 +111,7 @@ const AboutUs = () => {
                             функции, чтобы ваш сайт
                             стоял в авангарде рынка
                         </p>
+                       </div>
                     </Box>
 
                 </Row>

diff --git a/src/components/Sections/Home/AboutUs/style.js b/src/components/Sections/Home/AboutUs/style.js
@@ -12,11 +12,12 @@ export const Wrapper = styled.div`
   
 `;
 export const  Container= styled.div`
-  width: 80%;
+  width: 1200px;
   margin: auto;
-  @media screen and (min-width: 1600px){
-    width: 75%;
+  @media screen and (max-width: 1200px){
+    width: 90%;
   }
+ 
   @media screen and (max-width: 800px){
     width: 90%;
   }
@@ -59,6 +60,17 @@ export const  Row= styled.div`
 
 export const  Box= styled.div`
 text-align: center;
+width: 30%;
+height: 320px;
+display: flex;
+align-items: center;
+justify-content: center;
+border-radius: 30px;
+ box-shadow: rgba(50, 50, 93, 0.25) 0px 50px 100px -20px, rgba(0, 0, 0, 0.3) 0px 30px 60px -30px, rgba(10, 37, 64, 0.35) 0px -2px 6px 0px inset;
+ @media screen and (max-width: 700px){
+    width: 100%;
+    margin: 30px 0;
+  }
     .box-title{
       margin: 10px auto;
       font-weight: 700;

diff --git a/src/components/Sections/Home/Clients/styles.js b/src/components/Sections/Home/Clients/styles.js
@@ -3,6 +3,7 @@ import styled from "styled-components";
 export const ClientsWrapper = styled.div`
 width: 100%;
 position: relative;
+
 `;
 export const Container = styled.div`
 width: 70%;

diff --git a/src/components/Sections/Home/OurOffer/index.js b/src/components/Sections/Home/OurOffer/index.js
@@ -0,0 +1,10 @@
+import React from "react";
+import { OurOfferWrapper } from "./style";
+ const OurOffer = () =>{
+    return(
+        <OurOfferWrapper>
+
+        </OurOfferWrapper>
+    )
+}
+export default OurOffer
diff --git a/src/components/Sections/Home/OurOffer/style.js b/src/components/Sections/Home/OurOffer/style.js
@@ -0,0 +1,13 @@
+import styled from "styled-components"
+export const OurOfferWrapper  = styled.div`
+  height: 100vh;
+`;
+export const Container  = styled.div`
+  height: 100vh;
+`;
+export const Title  = styled.div`
+  height: 100vh;
+`;
+export const Text  = styled.div`
+  height: 100vh;
+`;
diff --git a/src/components/Sections/Home/OurPrice/OurPrice.js b/src/components/Sections/Home/OurPrice/OurPrice.js
@@ -0,0 +1,16 @@
+import React from "react";
+import { Container, OurPriceWrapper, PriceCard, PriceWrapper, Subtitle, Title } from "./styles";
+const OurPrice = () => {
+    return(
+        <OurPriceWrapper>
+            <Container>
+                <Title></Title>
+                <Subtitle></Subtitle>
+                <PriceWrapper>
+                    <PriceCard>card one</PriceCard>
+                </PriceWrapper>
+            </Container>
+        </OurPriceWrapper>
+    )
+}
+export default OurPrice
diff --git a/src/components/Sections/Home/OurPrice/styles.js b/src/components/Sections/Home/OurPrice/styles.js
@@ -0,0 +1,21 @@
+import styled from "styled-components"
+export const OurPriceWrapper = styled.div`
+height: 50vh;
+width: 100%;
+background-color: rebeccapurple;
+`;
+export const Container = styled.div`
+width: 1200px;
+margin: auto;
+`;
+export const Title = styled.div`
+
+`;
+export const Subtitle = styled.div`
+
+`;
+export const PriceWrapper = styled.div`
+
+`;
+export const PriceCard = styled.div`
+`;
diff --git a/...ponents/Sections/Home/Pricing/Pricing.jsx → ...s/Sections/Home/ServiceSecond/Pricing.jsx b/...ponents/Sections/Home/Pricing/Pricing.jsx → ...s/Sections/Home/ServiceSecond/Pricing.jsx
diff --git a/...omponents/Sections/Home/Pricing/styles.js → ...nts/Sections/Home/ServiceSecond/styles.js b/...omponents/Sections/Home/Pricing/styles.js → ...nts/Sections/Home/ServiceSecond/styles.js
@@ -103,16 +103,16 @@ export const TableBox = styled.div`
 `;
 export const Btn = styled.div `
 padding: 14px 40px;
-border-radius: 40px;
+border-radius: 30px;
 font-size: 18px;
 font-weight: 500;
-color: #fff;
+color: #222;
 width: fit-content;
 cursor: pointer;
 z-index: 1;
 position: relative;
 overflow: hidden;
-background-color: #222;
+background-color: #fff;
 transition: all 0.5s;
 &:before {
     content: "";

diff --git a/src/components/Sections/Home/header/index.jsx b/src/components/Sections/Home/header/index.jsx
@@ -84,7 +84,7 @@ const Header = () => {
             <img className="img-right" src={heroImg} alt="" />
 
       <VerticalImgWrapper>
-        <img src={verticalImg} alt="Vertical IMG"/>
+        {/* <img src={verticalImg} alt="Vertical IMG"/> */}
       </VerticalImgWrapper>
 
       <Container>