Skip to content

Commit f30e521

Browse files
NitkarshChourasiaNitkarshChourasia
authored
Merge branch 'master' into Cat-Game
2 parents dcdcc6c + 6600243 commit f30e521

File tree

672 files changed

+113378
-210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

672 files changed

+113378
-210
lines changed

‎.replit

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
modules = ["nodejs-18:v3-20230608-f4cd419"]
2+
hidden = [".config", "package-lock.json"]
3+
run = "npm run start"
4+
entrypoint = "index.js"
5+
6+
[nix]
7+
channel = "stable-23_05"
8+
9+
[deployment]
10+
run = ["sh", "-c", "npm run start"]
11+
deploymentTarget = "cloudrun"
12+
ignorePorts = false

‎.vs/VSWorkspaceState.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"ExpandedNodes": [
3+
""
4+
],
5+
"SelectedNode": "\\D:\\DotNet\\Git jui-2211\\javascript-mini-project",
6+
"PreviewInSolutionExplorer": false
7+
}

‎.vs/javascript-mini-project/v17/.wsuo

11 KB
Binary file not shown.

‎1Application-frontend/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8" />
55
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Vite + React</title>
7+
<title>Thinkswell-JMP</title>
88
</head>
99
<body>
1010
<div id="root"></div>

‎1Application-frontend/package-lock.json

+5-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎1Application-frontend/src/App.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Fragment } from "react";
22
import { Routes, Route } from "react-router-dom";
3-
import Navbar from "./Component/Navbar";
4-
import Footer from "./Component/Footer";
3+
import Navbar from "./components/Navbar.jsx";
4+
import Footer from "./components/Footer.jsx";
55
import Home from "./pages/Home";
66
import About from "./pages/About";
77
import Contact from "./pages/Contact";

‎1Application-frontend/src/Css/Footer.css

-96
This file was deleted.

‎1Application-frontend/src/components/Cards.jsx

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import React from 'react'
2+
import { red } from '@mui/material/colors';
3+
import { Avatar, Card, CardActions, CardContent, CardHeader, CardMedia, IconButton, Typography } from '@mui/material';
4+
5+
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>
13+
<Typography color="text.secondary" variant="h5">
14+
{projectName}
15+
</Typography>
16+
</CardContent>
17+
<CardMedia
18+
component="img"
19+
height="200"
20+
image={imageUrl}
21+
alt={altname}
22+
/>
23+
<CardContent>
24+
<Typography color="text.secondary" variant="subtitle1">
25+
{description}
26+
</Typography>
27+
</CardContent>
28+
<CardActions disableSpacing>
29+
</CardActions>
30+
</Card>
31+
)
32+
}

‎1Application-frontend/src/Component/Footer.jsx renamed to ‎1Application-frontend/src/components/Footer.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Fragment } from "react";
2-
import '../CSS/Footer.css';
2+
import "../css/Footer.css";
33
import { Facebook, Twitter, Instagram, LinkedIn} from '@mui/icons-material'; // Import the shoes icon
44

55
const Footer = () => {

‎1Application-frontend/src/Component/Navbar.jsx renamed to ‎1Application-frontend/src/components/Navbar.jsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Fragment, useState } from "react";
22
import { NavLink } from "react-router-dom";
3-
import "../CSS/Navbar.css";
3+
import "../css/Navbar.css";
44
import AccountBoxIcon from "@mui/icons-material/AccountBox";
55
import MenuIcon from "@mui/icons-material/Menu";
66
import CloseIcon from "@mui/icons-material/Close";
@@ -17,10 +17,11 @@ const Navbar = () => {
1717
<nav>
1818
<div className={`main-component ${menuOpen ? "menu-open show" : ""}`}>
1919
<div className="head-main">
20-
<h3 style={{ marginTop: "1rem" }}>
20+
<h3 className="row" style={{ marginTop: "0.8rem" }}>
2121
Thinks Well
22-
<br />
23-
<span>JAVASCRIPT PROJECTS</span>
22+
</h3>
23+
<h3 className="row">
24+
JAVASCRIPT PROJECTS
2425
</h3>
2526
</div>
2627
<div className="routes">

0 commit comments

Comments
 (0)