+
-
-
Navigation
- @@ -35,22 +35,22 @@ const Footer = (): JSX.Element => {
+
diff --git a/src/pages/Home/components/FeaturedProjects.tsx b/src/pages/Home/components/FeaturedProjects.tsx
index 7aec455..e9c53b8 100644
--- a/src/pages/Home/components/FeaturedProjects.tsx
+++ b/src/pages/Home/components/FeaturedProjects.tsx
@@ -9,6 +9,7 @@ class FeaturedProjects extends React.Component {
static contextType = ProjectContext;
render() {
+ // @ts-ignore
const { featuredProjects, getProjectElements, loading } = this.context;
return (
diff --git a/src/pages/Home/components/HomeHeader.tsx b/src/pages/Home/components/HomeHeader.tsx
index bbc7bfe..752ffc0 100644
--- a/src/pages/Home/components/HomeHeader.tsx
+++ b/src/pages/Home/components/HomeHeader.tsx
@@ -24,7 +24,6 @@ const HomeHeader = (): JSX.Element => {
base[3].style.backgroundPositionY = offset * 0.3 + "px";
- console.log(base);
} catch (e) {
console.warn("Tet");
}
diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts
deleted file mode 100644
index 6431bc5..0000000
--- a/src/react-app-env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-///
-
Connect with me
-
- +
- Github -{" "} https://github.com/alandsilva26 -
- +
- Linkedin -{" "} https://www.linkedin.com/in/alan-dsilva-289b77170/ -
- +
- Email -{" "} { alandsilva2001@gmail.com -
- +
- Codechef -{" "} https://www.codechef.com/users/deathbringer26 @@ -71,7 +71,7 @@ const Footer = (): JSX.Element => {
- © 2020 Copyright:
+ © 2024 Copyright:
Alan Dsilva
{" "}
diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx
index 0e91b11..961fbec 100644
--- a/src/components/Navbar/Navbar.tsx
+++ b/src/components/Navbar/Navbar.tsx
@@ -1,11 +1,10 @@
-import React from "react";
import { Link } from "react-router-dom";
import NavbarItem from "./navbar-item";
import routes from "../../config/routes";
import { HiMenu } from "react-icons/hi";
//assets
-const logo = require("../../images/favicon-32x32.png");
+import logo from "../../images/favicon-32x32.png";
const Navbar = (): JSX.Element => {
const navbarItems = routes.map((route, index) => {
diff --git a/src/config/firebaseConfig.ts b/src/config/firebaseConfig.ts
index 07120a1..d6b7066 100644
--- a/src/config/firebaseConfig.ts
+++ b/src/config/firebaseConfig.ts
@@ -1,11 +1,9 @@
-import firebase from "firebase/app";
-import "firebase/analytics";
-import "firebase/database";
-import "firebase/storage";
-import "firebase/auth";
+import firebase from 'firebase/compat/app';
+import 'firebase/compat/database';
+import 'firebase/compat/analytics';
const firebaseConfig = {
- apiKey: process.env.REACT_APP_API_KEY,
+ apiKey: import.meta.env.VITE_APP_API_KEY,
authDomain: "portfolio-9dbc4.firebaseapp.com",
databaseURL: "https://portfolio-9dbc4.firebaseio.com",
projectId: "portfolio-9dbc4",
@@ -19,6 +17,4 @@ firebase.initializeApp(firebaseConfig);
firebase.analytics();
export const db = firebase.database();
-export const st = firebase.storage();
-export const auth = firebase.auth();
export default firebase;
diff --git a/src/config/routes.ts b/src/config/routes.ts
index b3eb427..deda401 100644
--- a/src/config/routes.ts
+++ b/src/config/routes.ts
@@ -1,32 +1,18 @@
-import HomePage from "../pages/Home/HomePage";
-import Projects from "../pages/Projects/projects";
-import AboutPage from "../pages/About/AboutPage";
-import TestPage from "../pages/TestPage";
-import NoMatch from "../pages/Errors/404";
-
const routes = [
{
path: "/",
name: "Home",
- component: HomePage,
},
{
path: "/projects",
name: "Projects",
- component: Projects,
},
{
path: "/about",
name: "About",
- component: AboutPage,
- },
- {
- path: "/testpage",
- component: TestPage,
},
{
- path: "*",
- component: NoMatch,
+ path: "*"
},
];
diff --git a/src/config/scroll-to-top.js b/src/config/scroll-to-top.js
index 5defc2d..1657fcd 100644
--- a/src/config/scroll-to-top.js
+++ b/src/config/scroll-to-top.js
@@ -13,4 +13,4 @@ class ScrollToTop extends React.Component {
}
}
-export default withRouter(ScrollToTop);
+// export default withRouter(ScrollToTop);
diff --git a/src/config/scroll-to-top.tsx b/src/config/scroll-to-top.tsx
new file mode 100644
index 0000000..f4d1b55
--- /dev/null
+++ b/src/config/scroll-to-top.tsx
@@ -0,0 +1,19 @@
+// import React from 'react';
+// import { withRouter } from 'react-router-dom';
+
+// class ScrollToTop extends React.Component {
+// // @ts-ignore
+// componentDidUpdate(prevProps) {
+// // @ts-ignore
+// if (this.props.location !== prevProps.location) {
+// window.scrollTo(0, 0);
+// }
+// }
+
+// render() {
+// return {
],
};
- if (process.env.REACT_APP_MODE === "production") {
- if (typeof process.env.REACT_APP_WEBHOOK_URL !== undefined) {
+ if (import.meta.env.REACT_APP_MODE === "production") {
+ if (typeof import.meta.env.REACT_APP_WEBHOOK_URL !== undefined) {
axios
- .post(process.env.REACT_APP_WEBHOOK_URL!, article)
+ .post(import.meta.env.REACT_APP_WEBHOOK_URL!, article)
.then((response) => {
console.log("Sent");
});
diff --git a/src/data/my-data.ts b/src/data/my-data.ts
new file mode 100644
index 0000000..02f34f1
--- /dev/null
+++ b/src/data/my-data.ts
@@ -0,0 +1,82 @@
+const myData = {
+ name: "Alan Anand Dsilva",
+ description:
+ "👋 Hi I am Alan - a computer science engineer currently pursuing my bachelors degree at St. Francis Institute of Technology. I code for fun and professional reasons. I create software for android and web platforms. In my free time I like to play videogames🎮. Occasionally I watch anime.",
+ avatarUrl:
+ "https://firebasestorage.googleapis.com/v0/b/portfolio-9dbc4.appspot.com/o/alan.jpg?alt=media&token=9deb4003-91df-4250-88ae-b2c326b4652c",
+ location: "Mumbai, India",
+ github: "alandsilva26",
+ linkedin: "https://www.linkedin.com/in/alan-dsilva-289b77170/",
+ codechef: "deathbringer26",
+ hackerrank: "alandsilva2001",
+ steam: "deathbringer269",
+ email: "alandsilva2001@gmail.com",
+ technical: [
+ {
+ name: "Programming Languages",
+ content: [
+ "C",
+ "Java",
+ "Python",
+ "JavaScript",
+ "HTML",
+ "CSS",
+ "Dart",
+ "Sass",
+ "PHP",
+ "SQL",
+ "C++",
+ "Markdown",
+ "Shell",
+ ],
+ },
+ {
+ name: "Frameworks",
+ content: [
+ "ReactJs",
+ "Flutter",
+ "Django",
+ "Django Rest Framework",
+ "Bootstrap",
+ "Material-UI",
+ ],
+ },
+ {
+ name: "Libraries",
+ content: ["Jquery", "JavaFX"],
+ },
+
+ {
+ name: "Technologies",
+ content: [
+ "Github",
+ "Github Actions",
+ "Firebase",
+ "netlify",
+ "Heroku",
+ "Github Pages",
+ ],
+ },
+ { name: "Tools", content: ["Git", "XAMPP", "Android Studio", "ngrok"] },
+ ],
+};
+
+export default myData;
+
+// project data schema
+// {
+// name: "Name of the project",
+// shortDescription: "Short description less than 200 characters",
+// description: "Long description",
+// github: "Github url",
+// slug: "Unique slug to identify",
+// featured: ,
+// websiteLink: "Website or any external link",
+// images: [],
+// tags: [],
+// primaryLanguage: {
+// name: "language name eg. JavaScript",
+// color: "Color to identify (taken from colors.json)",
+// },
+// languages: [],
+// },
diff --git a/src/global.d.ts b/src/global.d.ts
deleted file mode 100644
index 81ed67b..0000000
--- a/src/global.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare module "*.png" {
- const value: any;
- export = value;
-}
diff --git a/public/media/alan.jpg b/src/images/alan.jpg
similarity index 100%
rename from public/media/alan.jpg
rename to src/images/alan.jpg
diff --git a/src/index.tsx b/src/index.tsx
deleted file mode 100644
index 7abb69d..0000000
--- a/src/index.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from "react";
-import ReactDOM from "react-dom";
-import App from "./App";
-import "bootstrap"; //3rd party
-import "./styles/main.scss";
-
-ReactDOM.render(
+
+);
diff --git a/src/navigation/RouterConfig.tsx b/src/navigation/RouterConfig.tsx
index 0385333..4291011 100644
--- a/src/navigation/RouterConfig.tsx
+++ b/src/navigation/RouterConfig.tsx
@@ -1,5 +1,4 @@
-import React from "react";
-import { Switch, Route } from "react-router-dom";
+import { Routes, Route } from "react-router-dom";
// components
import Home from "../pages/Home/HomePage";
@@ -9,13 +8,14 @@ import NoMatch from "../pages/Errors/404";
const RouterConfig = (): JSX.Element => {
return (
-
-
+
+
);
};
export default RouterConfig;
+
diff --git a/src/pages/About/AboutPage.tsx b/src/pages/About/AboutPage.tsx
index 0e203c4..5e76851 100644
--- a/src/pages/About/AboutPage.tsx
+++ b/src/pages/About/AboutPage.tsx
@@ -10,7 +10,7 @@ class AboutPage extends React.Component {
static contextType = ProjectContext;
render() {
- const { steamProfile } = this.context;
+ const { steamProfile } = this.context as any;
return (
<>
@@ -45,7 +45,7 @@ function Profile({ steam }: ISteam) {
diff --git a/src/pages/About/components/PersonalData.tsx b/src/pages/About/components/PersonalData.tsx
index aae9b5a..33a55db 100644
--- a/src/pages/About/components/PersonalData.tsx
+++ b/src/pages/About/components/PersonalData.tsx
@@ -1,5 +1,3 @@
-import React from "react";
-
//icons
import { MdLocationOn } from "react-icons/md";
import { HiOutlineMail } from "react-icons/hi";
diff --git a/src/pages/Home/HomePage.tsx b/src/pages/Home/HomePage.tsx
index 776a9b1..029991e 100644
--- a/src/pages/Home/HomePage.tsx
+++ b/src/pages/Home/HomePage.tsx
@@ -1,4 +1,3 @@
-import React from "react";
import FeaturedProjects from "./components/FeaturedProjects";
import ProjectSfit from "./components/ProjectSfit";
import HomeHeader from "./components/HomeHeader";
@@ -8,36 +7,6 @@ const HomePage = (): JSX.Element => {
return (
<>
-
-
-
-
-
- Lorem ipsum dolor sit amet consectetur, adipisicing elit. Est
- alias recusandae repellat, molestiae suscipit iste neque excepturi
- hic quas aperiam ipsa ab voluptas esse error et fugiat voluptates
- temporibus cum.
-
-
- 
- 
- 
-
-
-
-
-