diff --git a/1Application-frontend/package-lock.json b/1Application-frontend/package-lock.json index 6f21b98a6..c2c9e061d 100644 --- a/1Application-frontend/package-lock.json +++ b/1Application-frontend/package-lock.json @@ -4818,7 +4818,8 @@ "@emotion/use-insertion-effect-with-fallbacks": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz", - "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==" + "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==", + "requires": {} }, "@emotion/utils": { "version": "1.2.1", @@ -5217,7 +5218,8 @@ "@mui/types": { "version": "7.2.6", "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.6.tgz", - "integrity": "sha512-7sjLQrUmBwufm/M7jw/quNiPK/oor2+pGUQP2CULRcFCArYTq78oJ3D5esTaL0UMkXKJvDqXn6Ike69yAOBQng==" + "integrity": "sha512-7sjLQrUmBwufm/M7jw/quNiPK/oor2+pGUQP2CULRcFCArYTq78oJ3D5esTaL0UMkXKJvDqXn6Ike69yAOBQng==", + "requires": {} }, "@mui/utils": { "version": "5.14.13", @@ -5379,7 +5381,8 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true + "dev": true, + "requires": {} }, "ajv": { "version": "6.12.6", @@ -6002,13 +6005,15 @@ "version": "4.6.0", "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", - "dev": true + "dev": true, + "requires": {} }, "eslint-plugin-react-refresh": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.3.tgz", "integrity": "sha512-Hh0wv8bUNY877+sI0BlCUlsS0TYYQqvzEwJsJJPM2WF4RnTStSnSR3zdJYa2nPOJgg3UghXi54lVyMSmpCalzA==", - "dev": true + "dev": true, + "requires": {} }, "eslint-scope": { "version": "7.2.2", diff --git a/1Application-frontend/src/components/Cards.jsx b/1Application-frontend/src/components/Cards.jsx index c1634d09d..be99ef383 100644 --- a/1Application-frontend/src/components/Cards.jsx +++ b/1Application-frontend/src/components/Cards.jsx @@ -1,23 +1,26 @@ -import React from 'react' +import React from 'react'; import { red } from '@mui/material/colors'; -import { Avatar, Card, CardActions, CardContent, CardHeader, CardMedia, IconButton, Typography } from '@mui/material'; +import { Avatar, Card, CardActions, CardContent, CardMedia, Typography } from '@mui/material'; +export default function Cards({ projectName = 'NA', imageUrl, altname = 'Project Image', description = 'No description available' }) { + // Safely handle the match and join logic + const projectCodeArray = projectName ? projectName.match(/[0-9 A-Z]/g) : null; + const projectCode = projectCodeArray ? projectCodeArray.join('').slice(0, 2) : 'NA'; // Default if match is null -export default function Cards( {projectName, imageUrl, altname, description} ) { - return ( - - - - {projectName.match(/[0-9 A-Z]/g).join('').slice(0,2)} - + return ( + + + + {projectCode} + - {projectName} + {projectName} @@ -28,5 +31,5 @@ export default function Cards( {projectName, imageUrl, altname, description} ) { - ) + ); } diff --git a/1Application-frontend/src/components/Footer.jsx b/1Application-frontend/src/components/Footer.jsx index ddfc1620d..e9109e123 100644 --- a/1Application-frontend/src/components/Footer.jsx +++ b/1Application-frontend/src/components/Footer.jsx @@ -31,9 +31,9 @@ const Footer = () => {

About Us

- Our github - Github stars - Repositories +

Our github

+

Github stars

+

Repositories

diff --git a/1Application-frontend/src/css/Home.css b/1Application-frontend/src/css/Home.css index 2c6fc5f20..5f09c4098 100644 --- a/1Application-frontend/src/css/Home.css +++ b/1Application-frontend/src/css/Home.css @@ -5,6 +5,57 @@ background: linear-gradient(to left, var(--color-4), var(--color-5)); padding: 6rem 3.5rem; display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + color: #fff; + overflow: hidden; + text-align: center; background-color: rgb(4, 150, 164); - max-height:200vh; +} + +.home-container h1 { + font-size: 5rem; + font-weight: bold; + margin-bottom: 20px; + opacity: 0; + transform: translateY(-20px); + animation: fadeInUp 1s forwards 0.3s; +} + +.home-container p { + font-size: 1.5rem; + line-height: 1.8; + opacity: 0; + transform: translateY(20px); + animation: fadeInUp 1s forwards 0.6s; +} + +.see-projects-button { + display: inline-block; + padding: 10px 20px; + margin-top: 20px; + font-size: 1.2rem; + color: #fff; + background-color: #007bff; + border: none; + border-radius: 5px; + text-decoration: none; + transition: background-color 0.3s ease; +} + +.see-projects-button:hover { + background-color: #0056b3; +} + +@keyframes fadeInUp { + to { + opacity: 1; + transform: translateY(0); + } +} + +.home-container p:hover { + color: #ffcc00; + transition: color 0.3s ease; } \ No newline at end of file diff --git a/1Application-frontend/src/css/Navbar.css b/1Application-frontend/src/css/Navbar.css index 5f04955d2..f8de5996f 100644 --- a/1Application-frontend/src/css/Navbar.css +++ b/1Application-frontend/src/css/Navbar.css @@ -39,7 +39,7 @@ .head-main h3 { display: inline-flex; color: white; - font-size: 2rem; + font-size: 1.7rem; /* text-shadow: 1px 1px 1px #919191; */ /* font-family: var(--font-1); */ font-family: 'Courier New', Courier, monospace; diff --git a/1Application-frontend/src/pages/Home.jsx b/1Application-frontend/src/pages/Home.jsx index 963b73124..6e1652668 100644 --- a/1Application-frontend/src/pages/Home.jsx +++ b/1Application-frontend/src/pages/Home.jsx @@ -1,14 +1,20 @@ -import { Fragment } from "react" -import "../css/Home.css" +import { Fragment } from "react"; +import { Link } from "react-router-dom"; // Import Link from react-router-dom +import "../css/Home.css"; const Home = () => { return (
- +

Welcome to Thinks Well Javascript Projects

+

Explore the projects and learn more about the team

+ {/* Button to navigate to /projects */} + + See Projects +
- ) -} + ); +}; -export default Home +export default Home; diff --git a/1Application-frontend/src/pages/Projects.jsx b/1Application-frontend/src/pages/Projects.jsx index 806ca3eb4..1b9a089ce 100644 --- a/1Application-frontend/src/pages/Projects.jsx +++ b/1Application-frontend/src/pages/Projects.jsx @@ -26,7 +26,7 @@ const Projects = () => { - + {names.map((name) => (