Skip to content

final changes #30

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 16, 2023
Merged

final changes #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "frontend",
"name": "fintrack",
"version": "0.1.0",
"private": true,
"dependencies": {
Expand Down Expand Up @@ -52,4 +52,4 @@
"last 1 safari version"
]
}
}
}
17 changes: 15 additions & 2 deletions src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,22 @@
min-height: 70vh;
/* text-align: center; */
}
.groupCardHover:hover{
.groupCardHover:hover {
transform: scale(1.2);
}
.team-card:hover {
transform: translateY(-8px);
box-shadow: 0 10px 10px -10px;
}
.remove-effect {
margin: 0;
background: inherit;
width: inherit;
}
.remove-effect:hover {
transform: scaleY(0.2);
box-shadow: none;
}

/* .App-logo {
height: 40vmin;
Expand Down Expand Up @@ -64,7 +77,7 @@ footer {
bottom: 0;
background-color: rgba(59, 59, 59, 0.5);
text-align: center;
font-weight: 600;
font-weight: 500;
height: 10vh;
width: auto;
margin: auto;
Expand Down
3 changes: 2 additions & 1 deletion src/components/Footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import React from "react";
import { Link } from "react-router-dom";

function Footer() {
let currentYear = new Date().getFullYear();
return (
<footer>
<p>Copyright © {currentYear} FinTrack</p>
<p>Copyright © {currentYear} <Link style={{ color: '#0e0ee9', fontWeight: '700' }} to={'/team'}>FinTrack</Link> </p>
<p>Made with 💖 in India</p>
</footer>
);
Expand Down
101 changes: 51 additions & 50 deletions src/pages/Team/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,61 @@
import React from 'react'
import { Container } from 'react-bootstrap'
import { Card, Container } from 'react-bootstrap'
import { UserCard } from 'react-ui-cards'
import nrj from '../../assets/images/nrj.jpg'
import ekta from '../../assets/images/ekta.jpeg'

import LinkedInIcon from '@mui/icons-material/LinkedIn';
import GitHubIcon from '@mui/icons-material/GitHub';
import EmailIcon from '@mui/icons-material/Email';
import { Heading } from '@chakra-ui/react'
const Team = () => {
return (
<React.Fragment>
<Container style={{ display: 'flex', flexDirection: 'row' }}>

<UserCard
float
href='https://github.com/nandcoder'
header='https://i.imgur.com/p5yXGQk.jpg'
avatar={nrj}
name='Nand Raj'
positionName='Full Stack Developer'
stats={[
{
name: 'commits',
value: 365
},
{
name: 'stars',
value: 110
},
{
name: 'repositories',
value: 54
}
]}
/>
<UserCard
float
href='https://github.com/ekkri'
header='https://i.imgur.com/p5yXGQk.jpg'
avatar={ekta}
name='Ekta Kumari'
positionName='UI/UX Developer'
stats={[
{
name: 'commits',
value: 365
},
{
name: 'stars',
value: 110
},
{
name: 'repositories',
value: 54
}
]}
/>
<Container fluid style={{ textAlign: 'center' }}>
<Heading>Team Members</Heading>
<br />
<br />
<Container style={{ display: 'flex', flexDirection: 'row', background: 'inherit', justifyContent: 'space-around' }}>
<Card className="text-center team-card" style={{
maxWidth: '100%',
width: '250px',
background: 'inherit'
}}>
<UserCard
float
href='https://github.com/nandcoder'
header='https://i.imgur.com/p5yXGQk.jpg'
avatar={nrj}
name='Nand Raj'
positionName='Full Stack Developer'
className='remove-effect'
/>
<Card.Footer style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between' }}>
<Card.Link href="https://www.linkedin.com/in/nand-raj/"><LinkedInIcon /> LinkedIn</Card.Link>
<Card.Link href="https://github.com/nandcoder"><GitHubIcon /> Github</Card.Link>
<Card.Link href="mailto:[email protected]"><EmailIcon /> Email</Card.Link>
</Card.Footer>
</Card>
<Card className="text-center team-card" style={{
maxWidth: '100%',
width: '250px',
background: 'inherit'
}}>
<UserCard
float
href='https://github.com/ekkri'
header='https://i.imgur.com/p5yXGQk.jpg'
avatar={ekta}
name='Ekta Kumari'
positionName='UI/UX Developer'
className='remove-effect'
/>
<Card.Footer style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between' }}>
<Card.Link href="https://www.linkedin.com/in/ekta-kumari-405084215/"><LinkedInIcon /> LinkedIn</Card.Link>
<Card.Link href="https://github.com/ekkri"><GitHubIcon /> Github</Card.Link>
<Card.Link href="mailto:[email protected]@gmail.com"><EmailIcon /> Email</Card.Link>
</Card.Footer>
</Card>
</Container>
</React.Fragment>
</Container>
)
}
export default Team