Skip to content

Commit 84ac88e

Browse files
Merge pull request #1161 from DebdipWritesCode/master
fixed directory name that was causing errors during cloning
2 parents bfc42ac + bcdfdbf commit 84ac88e

File tree

20 files changed

+94
-29
lines changed

20 files changed

+94
-29
lines changed

1Application-frontend/package-lock.json

+10-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
+15-12
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
1-
import React from 'react'
1+
import React from 'react';
22
import { red } from '@mui/material/colors';
3-
import { Avatar, Card, CardActions, CardContent, CardHeader, CardMedia, IconButton, Typography } from '@mui/material';
3+
import { Avatar, Card, CardActions, CardContent, CardMedia, Typography } from '@mui/material';
44

5+
export default function Cards({ projectName = 'NA', imageUrl, altname = 'Project Image', description = 'No description available' }) {
6+
// Safely handle the match and join logic
7+
const projectCodeArray = projectName ? projectName.match(/[0-9 A-Z]/g) : null;
8+
const projectCode = projectCodeArray ? projectCodeArray.join('').slice(0, 2) : 'NA'; // Default if match is null
59

6-
export default function Cards( {projectName, imageUrl, altname, description} ) {
7-
return (
8-
<Card sx={{ maxWidth: 345 }}>
9-
<CardContent sx={{display: 'flex', justifyContent:'start'}}>
10-
<Avatar sx={{ bgcolor: red[500], mr: 2}} aria-label="leter">
11-
{projectName.match(/[0-9 A-Z]/g).join('').slice(0,2)}
12-
</Avatar>
10+
return (
11+
<Card sx={{ maxWidth: 345 }}>
12+
<CardContent sx={{ display: 'flex', justifyContent: 'start' }}>
13+
<Avatar sx={{ bgcolor: red[500], mr: 2 }} aria-label="letter">
14+
{projectCode}
15+
</Avatar>
1316
<Typography color="text.secondary" variant="h5">
14-
{projectName}
17+
{projectName}
1518
</Typography>
1619
</CardContent>
1720
<CardMedia
1821
component="img"
1922
height="200"
20-
image={imageUrl}
23+
image={imageUrl || 'defaultImageUrl.jpg'}
2124
alt={altname}
2225
/>
2326
<CardContent>
@@ -28,5 +31,5 @@ export default function Cards( {projectName, imageUrl, altname, description} ) {
2831
<CardActions disableSpacing>
2932
</CardActions>
3033
</Card>
31-
)
34+
);
3235
}

1Application-frontend/src/components/Footer.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ const Footer = () => {
3131

3232
<div className="section">
3333
<h2>About Us</h2>
34-
<z>Our github</z>
35-
<z>Github stars</z>
36-
<z>Repositories</z>
34+
<p>Our github</p>
35+
<p>Github stars</p>
36+
<p>Repositories</p>
3737
</div>
3838

3939
<div className="section">

1Application-frontend/src/css/Home.css

+52-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,57 @@
55
background: linear-gradient(to left, var(--color-4), var(--color-5));
66
padding: 6rem 3.5rem;
77
display: flex;
8+
flex-direction: column;
9+
align-items: center;
10+
justify-content: center;
11+
color: #fff;
12+
overflow: hidden;
13+
text-align: center;
814
background-color: rgb(4, 150, 164);
9-
max-height:200vh;
15+
}
16+
17+
.home-container h1 {
18+
font-size: 5rem;
19+
font-weight: bold;
20+
margin-bottom: 20px;
21+
opacity: 0;
22+
transform: translateY(-20px);
23+
animation: fadeInUp 1s forwards 0.3s;
24+
}
25+
26+
.home-container p {
27+
font-size: 1.5rem;
28+
line-height: 1.8;
29+
opacity: 0;
30+
transform: translateY(20px);
31+
animation: fadeInUp 1s forwards 0.6s;
32+
}
33+
34+
.see-projects-button {
35+
display: inline-block;
36+
padding: 10px 20px;
37+
margin-top: 20px;
38+
font-size: 1.2rem;
39+
color: #fff;
40+
background-color: #007bff;
41+
border: none;
42+
border-radius: 5px;
43+
text-decoration: none;
44+
transition: background-color 0.3s ease;
45+
}
46+
47+
.see-projects-button:hover {
48+
background-color: #0056b3;
49+
}
50+
51+
@keyframes fadeInUp {
52+
to {
53+
opacity: 1;
54+
transform: translateY(0);
55+
}
56+
}
57+
58+
.home-container p:hover {
59+
color: #ffcc00;
60+
transition: color 0.3s ease;
1061
}

1Application-frontend/src/css/Navbar.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
.head-main h3 {
4040
display: inline-flex;
4141
color: white;
42-
font-size: 2rem;
42+
font-size: 1.7rem;
4343
/* text-shadow: 1px 1px 1px #919191; */
4444
/* font-family: var(--font-1); */
4545
font-family: 'Courier New', Courier, monospace;
+12-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
1-
import { Fragment } from "react"
2-
import "../css/Home.css"
1+
import { Fragment } from "react";
2+
import { Link } from "react-router-dom"; // Import Link from react-router-dom
3+
import "../css/Home.css";
34

45
const Home = () => {
56
return (
67
<Fragment>
78
<div className="home-container">
8-
9+
<h1>Welcome to Thinks Well Javascript Projects</h1>
10+
<p>Explore the projects and learn more about the team</p>
11+
{/* Button to navigate to /projects */}
12+
<Link to="/projects" className="see-projects-button">
13+
See Projects
14+
</Link>
915
</div>
1016
</Fragment>
11-
)
12-
}
17+
);
18+
};
1319

14-
export default Home
20+
export default Home;

1Application-frontend/src/pages/Projects.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const Projects = () => {
2626
<Navbar />
2727

2828
<Container size="sm" sx={{ mt: "7rem", mb: 4 }}>
29-
<Grid container spacing={2} gutterBottom>
29+
<Grid container spacing={2}>
3030
{names.map((name) => (
3131
<Grid item xs={12} sm={6} md={4} key={name}>
3232
<Cards

0 commit comments

Comments
 (0)