Skip to content

Commit

Permalink
style: moved the our team section to a new page + added it to the nav…
Browse files Browse the repository at this point in the history 
…bar & footer
  • Loading branch information
@Keen91
Keen91 committed Aug 27, 2022
1 parent a034126 commit d51136c
Show file tree
Hide file tree
Showing 21 changed files with 1,108 additions and 530 deletions.
9 changes: 9 additions & 0 deletions bash.exe.stackdump
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Stack trace:
Frame Function Args
000FFFFA310 0018006286E (0018028EC28, 0018026DE3E, 000FFFFA310, 000FFFF9210)
000FFFFA310 0018004846A (00000000000, 00000000000, 00000000000, 001004E2F5F)
000FFFFA310 001800484A2 (0018028ECD9, 000FFFFA1C8, 000FFFFA310, 00000000000)
000FFFFA310 001800CC6BE (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFA310 001800CC7E5 (000FFFFA320, 00000000000, 00000000000, 00000000000)
00000000000 001800CDDA5 (000FFFFA320, 00000000000, 00000000000, 00000000000)
End of stack trace
3 changes: 2 additions & 1 deletion src/App.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import AllEvents from "./containers/AllEvents";
import SignIn from "./components/SignIn/SignIn";
import NgoProfilePage from "./containers/NgoProfilePage";
import Register from "./components/Register/Register";

import OurTeam from "./containers/OurTeam";
import VolunteerProfile from "./containers/VolunteerProfile/VolunteerProfile";

function App() {
Expand All @@ -27,6 +27,7 @@ function App() {
<Route path='/ngo-profile' element={<NgoProfilePage />} />
<Route path='/register' element={<Register />} />
<Route path='/' element={<Home />} />
<Route path='/our-team' element={<OurTeam />} />
</Routes>
</div>
);
Expand Down
Binary file added src/assets/berkImg.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/dilaraImg.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/hafizImg.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/muslimImg.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/sobhanImg.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/yamanImg.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 16 additions & 8 deletions src/components/HeroSection/__snapshots__/HeroSection.test.jsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,28 @@

exports[`renders correctly 1`] = `
<section
className="my-3 grid grid-cols-1 bg-white p-4 py-8 sm:grid-cols-2 md:px-12 md:pt-0 md:my-4 lg:px-36 lg:py-28"
className="my-3 mx-auto grid w-11/12 grid-cols-1 bg-white py-8 sm:grid-cols-2 md:my-4 md:w-9/12 md:pt-0 lg:py-28"
>
<main
className="row md:mt-20 lg:mt-20"
>
<h1
className="text-center my-4 mb-6 font-quicksand text-5xl font-semibold text-blue-dark md:text-start"
className="my-4 mb-6 text-center font-quicksand text-5xl font-semibold text-blue-dark md:text-start"
>
Reach
home.hero.title
</h1>
<p
className="text-center text-xl my-6 mb-4 font-SourceSansPro leading-5 text-blue-dark md:text-start"
className="my-6 mb-4 text-center font-SourceSansPro text-xl leading-5 text-blue-dark md:text-start"
>
home.hero.description
<span>
home.hero.description
</span>
<br />
<span
className="pt-6 text-sm"
>
home.hero.description2
</span>
</p>
<div
className="h-18 my-3 flex items-center justify-center gap-2 py-2 text-center font-SourceSansPro text-sm sm:justify-start"
Expand All @@ -25,7 +33,7 @@ exports[`renders correctly 1`] = `
onClick={[Function]}
>
<button
className="mw-40 w-32 rounded-md border-2 border-blue-light bg-blue-light px-2 py-2 text-white duration-300 ease-linear font-semibold hover:border-blue-dark hover:bg-white hover:text-blue-dark hover:shadow"
className="mw-40 w-32 rounded-md border-2 border-blue-light bg-blue-light px-2 py-2 font-semibold text-white duration-300 ease-linear hover:border-blue-dark hover:bg-white hover:text-blue-dark hover:shadow"
href=""
>
home.hero.btn1
Expand All @@ -36,7 +44,7 @@ exports[`renders correctly 1`] = `
onClick={[Function]}
>
<button
className="w-32 rounded-md border-2 border-blue-light bg-white py-2 px-2 text-blue-light font-semibold duration-300 ease-linear hover:border-2 hover:bg-blue-light hover:text-white hover:shadow "
className="w-32 rounded-md border-2 border-blue-light bg-white py-2 px-2 font-semibold text-blue-light duration-300 ease-linear hover:border-2 hover:bg-blue-light hover:text-white hover:shadow "
href=""
>
home.hero.btn2
Expand All @@ -45,7 +53,7 @@ exports[`renders correctly 1`] = `
</div>
</main>
<div
className="flex h-96 justify-center p-2 md:mt-5 md:h-96 md:place-items-end"
className="flex h-96 justify-center p-2 md:mt-5 md:h-96 md:place-items-end md:justify-end"
>
<img
alt=""
Expand Down
117 changes: 58 additions & 59 deletions src/components/OurBackendTeam/OurBackendTeam.jsx
View file

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions src/components/OurBackendTeam/OurBackendTeam.test.jsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from "react";
import renderer from "react-test-renderer";
import OurBackendTeam from "./OurBackendTeam";
import { MemoryRouter } from "react-router-dom";

it("renders correctly", () => {
const test = renderer
.create(
<MemoryRouter>
<OurBackendTeam />
</MemoryRouter>
)
.toJSON();
expect(test).toMatchSnapshot();
});
462 changes: 462 additions & 0 deletions src/components/OurBackendTeam/__snapshots__/OurBackendTeam.test.jsx.snap
View file

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions ...ponents/OurBackendTeam/OurBackendTeam.css → ...nents/OurFrontendTeam/OurFrontendTeam.css
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
.diagonal-box {
/* background-image: linear-gradient(45deg, #6303B1, #ff0099); */
transform: skewY(-2deg);
}
.content {
/* max-width: 100%; */
margin: 0 0;
transform: skewY(2deg);
}
}

36 changes: 20 additions & 16 deletions src/components/OurFrontendTeam/OurFrontendTeam.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,21 @@ import ayaImg from "../../assets/ayaImg.jpg";
import ramaImg from "../../assets/ramaImg.jpg";
import mustafaImg from "../../assets/mustafaImg.jpg";
import mohammadImg from "../../assets/mohammadImg.jpg";
import "./OurFrontendTeam.css";

function OurFrontendTeam() {
return (
<>
<section className='dark:bg-gray-900 bg-white'>
<div className='container mx-auto px-6 py-10'>
<h1 className='text-blue-dark text-center text-5xl font-quicksand capitalize dark:text-white lg:text-5xl'>
<div className='absolute w-full bg-gray pb-12'>
<p className='text-lg text-gray'>1</p>
</div>
<section className='diagonal-box relative z-50 my-10 flex justify-center dark:bg-gray-900 bg-gray'>
<div className='content container mx-auto px-6 py-10'>
<h1 className='text-center font-quicksand text-5xl capitalize text-blue-dark dark:text-white lg:text-5xl'>
Our Frontend Team
</h1>

<p className='text-blue-dark dark:text-gray-300 mx-auto my-6 max-w-2xl text-center font-SourceSansPro'>
<p className='dark:text-gray-300 mx-auto my-6 max-w-2xl text-center font-SourceSansPro text-blue-dark'>
Lorem ipsum dolor sit amet consectetur adipisicing elit.
Illo incidunt ex placeat modi magni quia error alias,
adipisci rem similique, at omnis eligendi optio eos
Expand All @@ -29,11 +33,11 @@ function OurFrontendTeam() {
alt='Hiba Machfej Profile'
/>

<h1 className='text-gray-700 mt-4 text-2xl font-quicksand capitalize group-hover:text-white dark:text-white'>
<h1 className='text-gray-700 mt-4 font-quicksand text-2xl capitalize group-hover:text-white dark:text-white'>
Hiba Machfej
</h1>

<p className='text-gray-500 dark:text-gray-300 group-hover:text-gray-300 mt-2 capitalize font-SourceSansPro'>
<p className='text-gray-500 dark:text-gray-300 group-hover:text-gray-300 mt-2 font-SourceSansPro capitalize'>
Lead Engineer
</p>

Expand Down Expand Up @@ -95,11 +99,11 @@ function OurFrontendTeam() {
alt='Aya Midani Profile'
/>

<h1 className='text-gray-700 mt-4 text-2xl font-quicksand capitalize group-hover:text-white dark:text-white'>
<h1 className='text-gray-700 mt-4 font-quicksand text-2xl capitalize group-hover:text-white dark:text-white'>
Aya Midani
</h1>

<p className='text-gray-500 dark:text-gray-300 group-hover:text-gray-300 mt-2 capitalize font-SourceSansPro'>
<p className='text-gray-500 dark:text-gray-300 group-hover:text-gray-300 mt-2 font-SourceSansPro capitalize'>
Junior Engineer
</p>

Expand Down Expand Up @@ -162,11 +166,11 @@ function OurFrontendTeam() {
alt='Rama Al Dakkak Profile'
/>

<h1 className='text-gray-700 mt-4 text-2xl font-quicksand capitalize group-hover:text-white dark:text-white'>
<h1 className='text-gray-700 mt-4 font-quicksand text-2xl capitalize group-hover:text-white dark:text-white'>
Rama Al Dakkak
</h1>

<p className='text-gray-500 dark:text-gray-300 group-hover:text-gray-300 mt-2 capitalize font-SourceSansPro'>
<p className='text-gray-500 dark:text-gray-300 group-hover:text-gray-300 mt-2 font-SourceSansPro capitalize'>
Junior Engineer
</p>

Expand Down Expand Up @@ -229,11 +233,11 @@ function OurFrontendTeam() {
alt='Kinan Hatahet Profile'
/>

<h1 className='text-gray-700 mt-4 text-2xl font-quicksand capitalize group-hover:text-white dark:text-white'>
<h1 className='text-gray-700 mt-4 font-quicksand text-2xl capitalize group-hover:text-white dark:text-white'>
Kinan Hatahet
</h1>

<p className='text-gray-500 dark:text-gray-300 group-hover:text-gray-300 mt-2 capitalize font-SourceSansPro'>
<p className='text-gray-500 dark:text-gray-300 group-hover:text-gray-300 mt-2 font-SourceSansPro capitalize'>
Junior Engineer
</p>

Expand Down Expand Up @@ -296,11 +300,11 @@ function OurFrontendTeam() {
alt='Mustafa Arslan Profile'
/>

<h1 className='text-gray-700 mt-4 text-2xl font-quicksand capitalize group-hover:text-white dark:text-white'>
<h1 className='text-gray-700 mt-4 font-quicksand text-2xl capitalize group-hover:text-white dark:text-white'>
Mustafa Arslan
</h1>

<p className='text-gray-500 dark:text-gray-300 group-hover:text-gray-300 mt-2 capitalize font-SourceSansPro'>
<p className='text-gray-500 dark:text-gray-300 group-hover:text-gray-300 mt-2 font-SourceSansPro capitalize'>
Junior Engineer
</p>

Expand Down Expand Up @@ -363,11 +367,11 @@ function OurFrontendTeam() {
alt='Mohammad Al Saleh Profile'
/>

<h1 className='text-gray-700 mt-4 text-2xl font-quicksand capitalize group-hover:text-white dark:text-white'>
<h1 className='text-gray-700 mt-4 font-quicksand text-2xl capitalize group-hover:text-white dark:text-white'>
Mohammad Al Saleh
</h1>

<p className='text-gray-500 dark:text-gray-300 group-hover:text-gray-300 mt-2 capitalize font-SourceSansPro'>
<p className='text-gray-500 dark:text-gray-300 group-hover:text-gray-300 mt-2 font-SourceSansPro capitalize'>
Junior Engineer
</p>

Expand Down
Loading

0 comments on commit d51136c

Please sign in to comment.