Skip to content

Commit

Permalink
hero-section navbar-section about-page immplimented (#28)
Browse files Browse the repository at this point in the history
* hero-section navbar-section about-page immplimented

* fix slick issue

* add translation in hero section

* fix conflict

* PTAL

* PTLA 2
  • Loading branch information
AbduallahBarmu authored Sep 1, 2021
1 parent 111f903 commit 2d4aa43
Show file tree
Hide file tree
Showing 33 changed files with 1,244 additions and 58 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"react-bootstrap": "^2.0.0-beta.4",
"react-dom": "^16.14.0",
"react-i18next": "^11.11.4",
"react-icons": "^4.2.0",
"react-redux": "^7.2.4",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.3",
Expand Down
54 changes: 34 additions & 20 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,25 +1,37 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--

<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using create-react-app" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />


<!-- bootstrap scripts -->
<script src="https://unpkg.com/react/umd/react.production.min.js" crossorigin></script>

<script src="https://unpkg.com/react-dom/umd/react-dom.production.min.js" crossorigin></script>

<script src="https://unpkg.com/react-bootstrap@next/dist/react-bootstrap.min.js" crossorigin></script>

<script>var Alert = ReactBootstrap.Alert;</script>


<!--
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="stylesheet" type="text/css" charset="UTF-8" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick.min.css" />
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick-theme.min.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Expand All @@ -28,12 +40,13 @@
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`.
-->
<title>Choose Wisely</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
<title>Choose Wisely</title>
</head>

<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
Expand All @@ -43,5 +56,6 @@
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
</body>

</html>
49 changes: 21 additions & 28 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
import React from "react"; // , { useEffect }
// import { useTranslation } from "react-i18next";
import React from "react";

import { Router, Switch, Route } from "react-router-dom";
import history from "./history";
import "./App.scss";

// import pages
import NavBar from "./components/NavBar";

import Home from "./containers/Home";
import About from "./containers/About";
import Contact from "./containers/Contact";
import RessourcesPage from "./containers/RessourcesPage";
import Universities from "./containers/Universities";
import Blog from "./containers/Blog";
import NotFound from "./containers/NotFound";
import Contact from "./containers/Contact";
import Footer from "./components/Footer";
import Preloader from "./components/PreLoad";
import { Route, Switch, Router } from "react-router-dom";
import history from "./history";
import "./App.scss";
import Blog from "./containers/Blog";

import RessourcesPage from "./containers/RessourcesPage";

// const { t, i18n } = useTranslation();
// const { t, i18n } = useTranslation();

// const changeLanguage = (lng) => {
Expand All @@ -24,27 +27,17 @@ function App() {
return (
<Router history={history}>
<Preloader />
<NavBar />

{/* Routing part */}

<Switch>
<Route exact path="/" component={Home}>
{/* <div>
<Button onClick={(e) => changeLanguage("tr")}>
Translate to Turkish
</Button>
<Button
className="btn"
onClick={() => changeLanguage("en")}
>
Translate to English
</Button>
</div> */}
</Route>
<Route exact path="/blog" component={Blog} />
<Route exact path="singlePost/:id" />
<Route exact path="/" component={Home} />
<Route exact path="/about" component={About} />
<Route exact path="/Contact" component={Contact} />
<Route exact path="/ressources" component={RessourcesPage} />
<Route exact path="/universities" component={Universities} />
<Route exact path="/contact" component={Contact} />
<Route exact path="/ressources" component={RessourcesPage} />
<Route exact path="/Universities" component={Universities} />
<Route exact path="/Blog" component={Blog} />
<Route component={NotFound} />
</Switch>
<Footer />
Expand Down
18 changes: 18 additions & 0 deletions src/components/AboutHero/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from "react";

import { Container } from "react-bootstrap";
import "./style.scss";
// image links
import heroAbout from "./../../images/About/heroAbout.svg";

const AboutHero = () => {
return (
<Container>
<div className="hero">
<img src={heroAbout} alt="hero section" />
</div>
</Container>
);
};

export default AboutHero;
17 changes: 17 additions & 0 deletions src/components/AboutHero/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
body {
height: 100%;
}

.hero {
height: 50%;
background-position: center;
background-repeat: no-repeat;
background-size: cover;
position: relative;
background-color: #ffff;
padding-top: 8%;
}

.hero img {
width: 100%;
}
55 changes: 55 additions & 0 deletions src/components/AboutService/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import React from "react";

// import bootstrab
import { Container } from "react-bootstrap";

// import translation
import { useTranslation } from "react-i18next";
import CardsWhoAreWe from "./../CardsWhoAreWe";
import SectionTitle from "./../SectionTitle";
// import icons
import { AiFillTwitterCircle, AiFillInstagram } from "react-icons/ai";
import { FaFacebook } from "react-icons/fa";
import { aboutData } from "./../../data.json";

const AboutService = () => {
const { t } = useTranslation();

const renderElements = () => {
return aboutData.map((element) => {
return (
<div className="card_row about_service">
<CardsWhoAreWe
customClassName={element.id % 2 !== 0 && true}
title={t(element.title)}
description={t(element.description)}
img={element.img}
>
<div className="icons">
<span className="instagram_icon">
<AiFillInstagram />
</span>
<span className="twiter_icon">
<AiFillTwitterCircle />
</span>
<span className="facebook_icon">
<FaFacebook />
</span>
</div>
</CardsWhoAreWe>
</div>
);
});
};

return (
<Container>
<div className="about_section_title">
<SectionTitle title={t("AboutPage.title")} />
</div>
{renderElements()}
</Container>
);
};

export default AboutService;
88 changes: 88 additions & 0 deletions src/components/AboutService/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
@import "./../../style/variables";

@media screen and (min-width: 1200px) {
.serv {
display: flex;
}

.serv .left_col,
.serv .right_col {
width: 50%;
height: 50%;
}

.serv .left_col_2,
.serv .right_co_2l {
width: 50%;
height: 50%;
}
}

.serv {
padding: 6.25rem 0;
}

.serv_row {
display: flex;
flex-wrap: wrap;
}

.text {
float: left;
}

.title {
color: $primary-color;
padding-bottom: 2.5rem;
font-family: Roboto;
font-style: normal;
font-weight: 300;
font-size: 3rem;
line-height: 2.875rem;
letter-spacing: -0.006rem;
}

.left_col {
flex-basis: 50%;
}

.left_col img {
width: 100%;
}

.right_col {
flex-basis: 50%;
}

.right_col_2 {
flex-basis: 50%;
}

.right_col_2 img {
width: 100%;
}
.left_col_2 {
flex-basis: 50%;
}
.text {
.icons {
color: #d43a3a;
padding-top: 3rem;
size: 100%;
}
}
.instagram_icon,
.twiter_icon,
.facebook_icon {
padding-right: 0.5rem;
}

.about_service {
.row {
.col-lg {
img {
width: 100%;
}
}
}
}
Loading

0 comments on commit 2d4aa43

Please sign in to comment.