some bugs fixed

This commit is contained in:
parsa aghaei committed 2024-11-03 16:02:05 +03:30
1 parent 80016bc39a
commit 3af28d9eec
3 files changed
+153 -76

No files matched your search

@@ -1,6 +1,12 @@
"use client";
import { Project, ProjectCategory } from "@/app/types/types";
import {
CategoryResponse,
Project,
ProjectCategory,
ProjectResponse,
} from "@/app/types/types";
import { getCookie } from "cookies-next";
import React, { useEffect, useState, useMemo } from "react";
import Skeleton from "react-loading-skeleton";
import "react-loading-skeleton/dist/skeleton.css";
@@ -24,42 +30,69 @@ const MAX_CATEGORIES = 5;
export default function Projects({ dict }: MyProjectsProps) {
const [categories, setCategories] = useState<ProjectCategory[]>([]);
const [projects, setProjects] = useState<Project[]>([]);
const [selectedCategory, setSelectedCategory] = useState<string>("Newest");
const [selectedCategory, setSelectedCategory] = useState<string>(
getCookie("selectedLocale") === "fa" || getCookie("defaultLocale") === "fa"
? "جدیدترین‌ها"
: "Newest",
);
const locale = getCookie("selectedLocale") || getCookie("defaultLocale");
useEffect(() => {
setSelectedCategory(
getCookie("selectedLocale") === "fa" ||
getCookie("defaultLocale") === "fa"
? "جدیدترین‌ها"
: "Newest",
);
const fetchProjects = async () => {
const res = await fetch("/api/website/projects?sort=desc&per_page=20");
const res = await fetch(
`${process.env.NEXT_PUBLIC_API_URL}/website/projects/translation/${locale}?sort=desc&per_page=40`,
);
const data = await res.json();
const resProjects = data.projects.data || []; // Use default value if undefined
const resCategories = data.categories || []; // Use default value if undefined
const resProjects: Project[] =
(data.projects as ProjectResponse).data || [];
const resCategories: CategoryResponse[] = data.categories || [];
// Convert JSON string to array
const updatedData = resProjects.map((project: { images: string }) => ({
...project,
images: JSON.parse(project.images),
}));
// Set projects for display
setProjects(resProjects);
setProjects(updatedData);
// Extract unique categories
// Set categories including "Newest" as the first item
const uniqueCategories: ProjectCategory[] = [
{ label: "Newest", active: false },
...resCategories.slice(0, MAX_CATEGORIES).map((category: string) => ({
label: category,
active: false,
})),
{
label: locale === "fa" ? "جدیدترین‌ها" : "Newest",
active: true,
},
...resCategories
.slice(0, MAX_CATEGORIES)
.map((category: CategoryResponse) => ({
label: category.title,
active: false,
})),
];
setCategories(uniqueCategories);
};
fetchProjects();
}, []);
}, [locale]);
// Group projects by category
// const groupProjectsByCategory = (projects: Project[]) => {
// return projects.reduce<Record<string, Project[]>>((acc, project) => {
// const category =
// project.category ||
// (locale === "fa" ? "بدون دسته‌بندی" : "Uncategorized");
// if (!acc[category]) {
// acc[category] = [];
// }
// acc[category].push(project);
// return acc;
// }, {});
// };
const groupProjectsByCategory = (projects: Project[]) => {
return projects.reduce<Record<string, Project[]>>((acc, project) => {
const category = project.category || "Uncategorized"; // Default category
const category = project.category || (locale === "fa" ? "بدون دسته‌بندی" : "Uncategorized");
if (!acc[category]) {
acc[category] = [];
}
@@ -74,11 +107,19 @@ export default function Projects({ dict }: MyProjectsProps) {
);
// Filter projects by selected category
// const filteredProjects: Project[] = useMemo(() => {
// if (selectedCategory === (locale === "fa" ? "جدیدترین‌ها" : "Newest")) {
// return projects.slice(0, MAX_PROJECTS);
// }
// return groupedProjects[selectedCategory]?.slice(0, MAX_PROJECTS) || [];
// }, [selectedCategory, projects, groupedProjects, locale]);
const filteredProjects: Project[] = useMemo(() => {
return selectedCategory === "Newest"
? projects.slice(0, MAX_PROJECTS)
: groupedProjects[selectedCategory]?.slice(0, MAX_PROJECTS) || [];
}, [selectedCategory, projects, groupedProjects]);
if (selectedCategory === (locale === "fa" ? "جدیدترین‌ها" : "Newest")) {
return projects.slice(0, MAX_PROJECTS);
}
return groupedProjects[selectedCategory]?.slice(0, MAX_PROJECTS) || [];
}, [selectedCategory, projects, groupedProjects, locale]);
const renderSkeletons = (count: number) => (
<div className="flex w-full flex-wrap justify-center gap-5">
@@ -104,49 +145,45 @@ export default function Projects({ dict }: MyProjectsProps) {
{dict.website.homePage.projects.description}
</p>
<ul className="mb-10 mt-20 flex w-full flex-wrap items-center justify-center gap-2">
{
categories.length > 0
? categories.map((category, index) => (
<li
key={index}
onClick={() => setSelectedCategory(category.label)}
className={`select-none whitespace-nowrap rounded-md bg-[#F8F8F8] p-2 text-[14px] font-[600] capitalize hover:cursor-pointer hover:border-[#FD6F00] md:text-[18px] ${
selectedCategory === category.label
? "bg-[#FD6F00] text-[#FFFFFF]"
: "text-[#000]"
}`}
>
{category.label}
</li>
))
: renderSkeletons(4) // Adjust the count as needed
}
{categories.length > 0
? categories.map((category, index) => (
<li
key={index}
onClick={() => setSelectedCategory(category.label)}
className={`select-none whitespace-nowrap rounded-md bg-[#F8F8F8] p-2 text-[14px] font-[600] capitalize hover:cursor-pointer hover:border-[#FD6F00] md:text-[18px] ${
selectedCategory === category.label
? "bg-[#FD6F00] text-[#FFFFFF]"
: "text-[#000]"
}`}
>
{category.label}
</li>
))
: renderSkeletons(4)}
</ul>
<div className="flex w-full flex-wrap items-start justify-center gap-8 lg:gap-20">
{
filteredProjects.length > 0
? filteredProjects.map((project, index) => (
<div key={index} className="project flex w-[45%] flex-wrap">
<div className="relative my-5 h-[200px] w-full overflow-hidden bg-[#FFEBDB] md:h-[250px] lg:h-[300px]">
{project.images.map((image, idx) => (
<img
key={idx}
src={image.src}
alt="UI/UX Vector"
className={`absolute ${idx === 0 ? "bottom-0 start-0" : "end-0 top-0"} z-${image.zIndex} project-image w-[85%] max-w-[350px]`}
/>
))}
</div>
<h5 className="w-full text-[15px] font-[600] text-[#FD6F00] lg:text-[20px]">
{project.category}
</h5>
<p className="text-[18px] font-[800] text-black hover:cursor-pointer lg:text-[22px]">
{project.title}
</p>
{filteredProjects.length > 0
? filteredProjects.map((project, index) => (
<div key={index} className="project flex w-[45%] flex-wrap">
<div className="relative my-5 h-[200px] w-full overflow-hidden bg-[#FFEBDB] md:h-[250px] lg:h-[300px]">
{project.images.map((image, idx) => (
<img
key={idx}
src={image.src}
alt={`Image for ${project.title}`}
className={`absolute ${idx === 0 ? "bottom-0 start-0" : "end-0 top-0"} z-${image.zIndex} project-image w-[85%] max-w-[350px]`}
/>
))}
</div>
))
: renderSkeletons(3) // Adjust the count as needed
}
<h5 className="w-full text-[15px] font-[600] text-[#FD6F00] lg:text-[20px]">
{project.category}
</h5>
<p className="text-[18px] font-[800] text-black hover:cursor-pointer lg:text-[22px]">
{project.title}
</p>
</div>
))
: renderSkeletons(3)}
</div>
</div>
);
@@ -22,7 +22,7 @@ interface ServicesProps {
export default function Services({ dict }: ServicesProps) {
const [services, setServices] = useState<Service[]>([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
// const [error, setError] = useState<string | null>(null);
useEffect(() => {
@@ -68,7 +68,7 @@ export default function Services({ dict }: ServicesProps) {
</div>
);
if (error) return <p>Error: {error}</p>;
// if (error) return <p>Error: {error}</p>;
return (
<div
+50 -10
View File
@@ -246,19 +246,59 @@ export type Service = {
altText: string;
};
export type ProjectCategory = {
label: string;
active: boolean;
};
// export type ProjectCategory = {
// label: string;
// active: boolean;
// };
export type Project = {
id: number;
export interface Image {
src: string;
zIndex: number;
}
export interface Project {
title: string;
category: string;
images: { src: string; position: string; zIndex: number }[];
created_at: string;
updated_at: string;
};
images: Image[];
}
export interface ProjectCategory {
label: string;
active: boolean;
}
// API response structure for projects
export interface ProjectResponse {
data: Project[];
}
// API response structure for categories
export interface CategoryResponse {
title: string;
}
// Props for localization support
export interface MyProjectsProps {
dict: {
website: {
homePage: {
projects: {
title: string;
description: string;
};
};
};
};
}
// export type Project = {
// id: number;
// title: string;
// category: string;
// images: { src: string; position: string; zIndex: number }[];
// created_at: string;
// updated_at: string;
// };
export type Testimonial = {
name: string;