Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
isarojdahal committed Nov 30, 2024
2 parents 7031e72 + adb29e0 commit f722dfc
Show file tree
Hide file tree
Showing 16 changed files with 234 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Netlify
# VITE_ASSET_BASE_URL=https://assetseverydaykarmaa.netlify.app/
VITE_ASSET_BASE_URL_NETLIFY=https://assetseverydaykarmaa.netlify.app/

# GitHub
VITE_ASSET_BASE_URL=https://raw.githubusercontent.com/isarojdahal/everydaykarmaa.com-assets/refs/heads/main
VITE_ASSET_BASE_URL=https://raw.githubusercontent.com/ashmin-bhujel/everydaykarmaa.com-assets/refs/heads/main
1 change: 1 addition & 0 deletions src/assets/hero-logos/css.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const Css = (props: React.SVGProps<SVGSVGElement>) => {
className="group ~size-12/28 cursor-pointer"
{...props}
>
<title>CSS</title>
<g>
<path
display="inline"
Expand Down
1 change: 1 addition & 0 deletions src/assets/hero-logos/docker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const Docker = (props: React.SVGProps<SVGSVGElement>) => {
{...props}
className="group cursor-pointer ~size-14/32"
>
<title>Docker</title>
<circle
cx={16}
cy={16}
Expand Down
1 change: 1 addition & 0 deletions src/assets/hero-logos/sql.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const Sql = (props: React.SVGProps<SVGSVGElement>) => {
className="group cursor-pointer ~size-12/28"
{...props}
>
<title>SQL</title>
<g>
<g>
<path
Expand Down
7 changes: 4 additions & 3 deletions src/constants/assets.constants.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
// for slides and resources page.
export class AssetsConstants {
private static readonly ASSET_BASE_URL = import.meta.env.VITE_ASSET_BASE_URL;
private static readonly ASSET_BASE_URL_NETLIFY = import.meta.env
.VITE_ASSET_BASE_URL_NETLIFY;

public static readonly SESSIONS = {
2025: {},
2024: {
ALMLRoadmap: {
slideURL: `${this.ASSET_BASE_URL}/session-resources/AIMLRoadmap_JyotiPokhrel/Slides.pdf`,
resourcesURL: `${this.ASSET_BASE_URL}/session-resources/AIMLRoadmap_JyotiPokhrel/Resources.docx`,
slideURL: `${this.ASSET_BASE_URL_NETLIFY}/session-resources/AIMLRoadmap_JyotiPokhrel/Slides.pdf`,
resourcesURL: `${this.ASSET_BASE_URL_NETLIFY}/session-resources/AIMLRoadmap_JyotiPokhrel/Resources.docx`,
},
},
};
Expand Down
8 changes: 8 additions & 0 deletions src/constants/data/feedback.data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@ const feedbacks = [
src: ImageConstants.FEEDBACKS[18],
alt: "feed-back image-18",
},
{
src: ImageConstants.FEEDBACKS[19],
alt: "feed-back image-19",
},
{
src: ImageConstants.FEEDBACKS[20],
alt: "feed-back image-20",
},
];

export default shuffleArray([...feedbacks]); // Use spread to avoid mutating the original array
45 changes: 45 additions & 0 deletions src/constants/data/projects.data.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import { ProjectCardPropType } from "@/ui/molecules/ProjectCard";

const projects: ProjectCardPropType[] = [
{
title: "EverydayKarma Website",
link: "https://everydaykarmaa.com/",
repoLink: "https://github.com/isarojdahal/everydaykarmaa.com",
description: "EverydayKarma Official Website",
contributorsGraph:
"https://github.com/isarojdahal/everydaykarmaa.com/graphs/contributors",
contributors:
"https://contrib.rocks/image?repo=isarojdahal/everydaykarmaa.com",
},
{
title: "Learn EverydayKarma Website",
link: "https://learn.everydaykarmaa.com/",
repoLink: "https://github.com/isarojdahal/learn.everydaykarmaa.com",
description: "Learning Notes and Videos along with Blogs",
contributorsGraph:
"https://github.com/isarojdahal/learn.everydaykarmaa.com/graphs/contributors",
contributors:
"https://contrib.rocks/image?repo=isarojdahal/learn.everydaykarmaa.com",
},
{
title: "BackupDBee",
link: "https://28softwares.github.io/BackupDBee/",
repoLink: "https://github.com/28softwares/BackupDBee",
description: "Automatic CLI Based Advance DB Backup System",
contributorsGraph:
"https://github.com/28softwares/BackupDBee/graphs/contributors",
contributors: "https://contrib.rocks/image?repo=28softwares/BackupDBee",
},
{
title: "DocumentProject",
repoLink: "https://github.com/28softwares/DocumentProject",
description:
"Repo for Documenting Project (Diagrams, .env, changes and soon)- Built using Docusaurus",
contributorsGraph:
"https://github.com/28softwares/DocumentProject/graphs/contributors",
contributors:
"https://contrib.rocks/image?repo=28softwares/DocumentProject",
},
];

export default projects;
11 changes: 10 additions & 1 deletion src/constants/data/sessions.data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export default [
},
{
title: "Exploring Rust",
instructor: "Nirjal Dhakal",
instructor: "Abhiyan Dhakal",
date: "2024 Nov 1",
time: "7pm onwards",
flyer: ImageConstants.SESSIONS["2024"].ExploringRust,
Expand Down Expand Up @@ -106,6 +106,15 @@ export default [
videoURL: "https://www.youtube.com/@EverydayKarma",
isUpcoming,
},
{
title: "Internship Experience at Apple",
instructor: "Biraj Dahal",
date: "2024 Nov 29",
time: "7pm onwards",
flyer: ImageConstants.SESSIONS["2024"].INTERNSHIP_APPLE,
videoURL: "https://www.youtube.com/@EverydayKarma",
isUpcoming,
},

// Upcoming sessions
{
Expand Down
3 changes: 3 additions & 0 deletions src/constants/image.constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export class ImageConstants {
public static readonly SESSIONS = {
2025: {},
2024: {
INTERNSHIP_APPLE: `${this.ASSET_BASE_URL}/images/sessions/flyers/Internship_Experience_Apple.png`,
CTF: `${this.ASSET_BASE_URL}/images/sessions/flyers/Capture_The_Flag.png`,
WebSecurity: `${this.ASSET_BASE_URL}/images/sessions/flyers/Web_App_Security.png`,
LearnLaravel: `${this.ASSET_BASE_URL}/images/sessions/flyers/Learn_Laravel.png`,
Expand Down Expand Up @@ -47,6 +48,8 @@ export class ImageConstants {
16: `${this.ASSET_BASE_URL}/images/feedbacks/feedback-16.png`,
17: `${this.ASSET_BASE_URL}/images/feedbacks/feedback-17.png`,
18: `${this.ASSET_BASE_URL}/images/feedbacks/feedback-18.png`,
19: `${this.ASSET_BASE_URL}/images/feedbacks/feedback-19.png`,
20: `${this.ASSET_BASE_URL}/images/feedbacks/feedback-20.png`,
};

public static readonly PARTNERS = {
Expand Down
29 changes: 26 additions & 3 deletions src/routeTree.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { Route as rootRoute } from "./routes/__root";
// Create Virtual Routes

const SessionsLazyImport = createFileRoute("/sessions")();
const OpensourceLazyImport = createFileRoute("/opensource")();
const FeedbackLazyImport = createFileRoute("/feedback")();
const IndexLazyImport = createFileRoute("/")();

Expand All @@ -28,6 +29,12 @@ const SessionsLazyRoute = SessionsLazyImport.update({
getParentRoute: () => rootRoute,
} as any).lazy(() => import("./routes/sessions.lazy").then((d) => d.Route));

const OpensourceLazyRoute = OpensourceLazyImport.update({
id: "/opensource",
path: "/opensource",
getParentRoute: () => rootRoute,
} as any).lazy(() => import("./routes/opensource.lazy").then((d) => d.Route));

const FeedbackLazyRoute = FeedbackLazyImport.update({
id: "/feedback",
path: "/feedback",
Expand Down Expand Up @@ -58,6 +65,13 @@ declare module "@tanstack/react-router" {
preLoaderRoute: typeof FeedbackLazyImport;
parentRoute: typeof rootRoute;
};
"/opensource": {
id: "/opensource";
path: "/opensource";
fullPath: "/opensource";
preLoaderRoute: typeof OpensourceLazyImport;
parentRoute: typeof rootRoute;
};
"/sessions": {
id: "/sessions";
path: "/sessions";
Expand All @@ -73,40 +87,45 @@ declare module "@tanstack/react-router" {
export interface FileRoutesByFullPath {
"/": typeof IndexLazyRoute;
"/feedback": typeof FeedbackLazyRoute;
"/opensource": typeof OpensourceLazyRoute;
"/sessions": typeof SessionsLazyRoute;
}

export interface FileRoutesByTo {
"/": typeof IndexLazyRoute;
"/feedback": typeof FeedbackLazyRoute;
"/opensource": typeof OpensourceLazyRoute;
"/sessions": typeof SessionsLazyRoute;
}

export interface FileRoutesById {
__root__: typeof rootRoute;
"/": typeof IndexLazyRoute;
"/feedback": typeof FeedbackLazyRoute;
"/opensource": typeof OpensourceLazyRoute;
"/sessions": typeof SessionsLazyRoute;
}

export interface FileRouteTypes {
fileRoutesByFullPath: FileRoutesByFullPath;
fullPaths: "/" | "/feedback" | "/sessions";
fullPaths: "/" | "/feedback" | "/opensource" | "/sessions";
fileRoutesByTo: FileRoutesByTo;
to: "/" | "/feedback" | "/sessions";
id: "__root__" | "/" | "/feedback" | "/sessions";
to: "/" | "/feedback" | "/opensource" | "/sessions";
id: "__root__" | "/" | "/feedback" | "/opensource" | "/sessions";
fileRoutesById: FileRoutesById;
}

export interface RootRouteChildren {
IndexLazyRoute: typeof IndexLazyRoute;
FeedbackLazyRoute: typeof FeedbackLazyRoute;
OpensourceLazyRoute: typeof OpensourceLazyRoute;
SessionsLazyRoute: typeof SessionsLazyRoute;
}

const rootRouteChildren: RootRouteChildren = {
IndexLazyRoute: IndexLazyRoute,
FeedbackLazyRoute: FeedbackLazyRoute,
OpensourceLazyRoute: OpensourceLazyRoute,
SessionsLazyRoute: SessionsLazyRoute,
};

Expand All @@ -122,6 +141,7 @@ export const routeTree = rootRoute
"children": [
"/",
"/feedback",
"/opensource",
"/sessions"
]
},
Expand All @@ -131,6 +151,9 @@ export const routeTree = rootRoute
"/feedback": {
"filePath": "feedback.lazy.tsx"
},
"/opensource": {
"filePath": "opensource.lazy.tsx"
},
"/sessions": {
"filePath": "sessions.lazy.tsx"
}
Expand Down
6 changes: 6 additions & 0 deletions src/routes/opensource.lazy.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import OpenSource from "@/ui/pages/opensource";
import { createLazyFileRoute } from "@tanstack/react-router";

export const Route = createLazyFileRoute("/opensource")({
component: () => <OpenSource />,
});
70 changes: 70 additions & 0 deletions src/ui/molecules/ProjectCard.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
import { FaGithub, FaGlobe } from "react-icons/fa6";

export interface ProjectCardPropType {
title: string;
description: string;
link?: string;
repoLink: string;
contributorsGraph: string;
contributors: string;
}

export default function ProjectCard({
project,
}: {
project: ProjectCardPropType;
}) {
return (
<div className="flex max-lg:flex-col gap-6 items-center justify-between p-8 border border-gray-300 rounded-lg">
<div className="flex flex-col gap-1">
<p className="text-3xl font-bold">{project.title}</p>
<p className="text-lg text-gray-600">{project.description}</p>

{/* Links */}
<div className="flex flex-wrap items-center max-lg:gap-2 gap-4">
{project.link && (
<a
href={project.link}
target="_blank"
className="inline-block max-lg:w-full w-fit bg-blue-700 hover:bg-blue-600 active:bg-blue-800 text-white font-semibold px-4 py-2 mt-2 rounded-full"
>
<p className="flex items-center gap-2 justify-center">
<FaGlobe />
Live Website
</p>
</a>
)}

<a
href={project.repoLink}
target="_blank"
className="inline-block max-lg:w-full w-fit bg-blue-700 hover:bg-blue-600 active:bg-blue-800 text-white font-semibold px-4 py-2 mt-2 rounded-full"
>
<p className="flex items-center gap-2 justify-center">
<FaGithub />
Contribute
</p>
</a>
</div>
</div>

{/* Contributors */}
<div className="flex flex-col gap-2">
<p className="text-gray-600 text-lg max-lg:text-center text-right">
Contributors
</p>
<a
href={project.contributorsGraph}
target="_blank"
title={`${project.title} Contributors`}
className="flex items-center justify-center"
>
<img
src={project.contributors}
alt={`${project.title} Contributors`}
/>
</a>
</div>
</div>
);
}
5 changes: 5 additions & 0 deletions src/ui/organisms/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ export default function Header() {
title: "Sessions",
current,
},
{
to: "/opensource",
title: "Open Source",
current,
},
];

navLinks.forEach((navLinks) => {
Expand Down
4 changes: 2 additions & 2 deletions src/ui/organisms/Hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ export default function Hero() {
<div className="container mx-auto px-4 absolute inset-0 z-10">
<div className="w-full h-full flex flex-col ~gap-6/14 items-center justify-center">
<div className="flex flex-wrap ~gap-4/14 items-center justify-center">
{logosArray.map((Logo: any) => {
return <div>{Logo}</div>;
{logosArray.map((Logo, index) => {
return <div key={index}>{Logo}</div>;
})}
</div>
<h1 className="text-gray-300 ~text-3xl/7xl text-center font-bold">
Expand Down
Loading

0 comments on commit f722dfc

Please sign in to comment.