{/*
*/}
diff --git a/src/app/add-listing/FormItem.tsx b/src/app/[locale]/add-listing/FormItem.tsx
similarity index 100%
rename from src/app/add-listing/FormItem.tsx
rename to src/app/[locale]/add-listing/FormItem.tsx
diff --git a/src/app/add-listing/[[...stepIndex]]/PageAddListing1.tsx b/src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing1.tsx
similarity index 99%
rename from src/app/add-listing/[[...stepIndex]]/PageAddListing1.tsx
rename to src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing1.tsx
index ee9df59..1c85156 100644
--- a/src/app/add-listing/[[...stepIndex]]/PageAddListing1.tsx
+++ b/src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing1.tsx
@@ -4,7 +4,7 @@ import Input from "@/shared/Input";
import FormItem from "../FormItem";
import { IoPersonAddOutline } from "react-icons/io5";
import getImageURL from "@/components/api/getImageURL";
-import ConfirmModal from "../../../shared/popUp";
+import ConfirmModal from "@/shared/popUp";
import axiosInstance from "@/components/api/axios";
import { useUserContext } from "@/components/contexts/userContext";
import { useRouter } from "next/navigation";
diff --git a/src/app/add-listing/[[...stepIndex]]/PageAddListing10.tsx b/src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing10.tsx
similarity index 100%
rename from src/app/add-listing/[[...stepIndex]]/PageAddListing10.tsx
rename to src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing10.tsx
diff --git a/src/app/add-listing/[[...stepIndex]]/PageAddListing2.tsx b/src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing2.tsx
similarity index 100%
rename from src/app/add-listing/[[...stepIndex]]/PageAddListing2.tsx
rename to src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing2.tsx
diff --git a/src/app/add-listing/[[...stepIndex]]/PageAddListing3.tsx b/src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing3.tsx
similarity index 100%
rename from src/app/add-listing/[[...stepIndex]]/PageAddListing3.tsx
rename to src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing3.tsx
diff --git a/src/app/add-listing/[[...stepIndex]]/PageAddListing4.tsx b/src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing4.tsx
similarity index 100%
rename from src/app/add-listing/[[...stepIndex]]/PageAddListing4.tsx
rename to src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing4.tsx
diff --git a/src/app/add-listing/[[...stepIndex]]/PageAddListing5.tsx b/src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing5.tsx
similarity index 100%
rename from src/app/add-listing/[[...stepIndex]]/PageAddListing5.tsx
rename to src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing5.tsx
diff --git a/src/app/add-listing/[[...stepIndex]]/PageAddListing6.tsx b/src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing6.tsx
similarity index 100%
rename from src/app/add-listing/[[...stepIndex]]/PageAddListing6.tsx
rename to src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing6.tsx
diff --git a/src/app/add-listing/[[...stepIndex]]/PageAddListing7.tsx b/src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing7.tsx
similarity index 100%
rename from src/app/add-listing/[[...stepIndex]]/PageAddListing7.tsx
rename to src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing7.tsx
diff --git a/src/app/add-listing/[[...stepIndex]]/PageAddListing8.tsx b/src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing8.tsx
similarity index 100%
rename from src/app/add-listing/[[...stepIndex]]/PageAddListing8.tsx
rename to src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing8.tsx
diff --git a/src/app/add-listing/[[...stepIndex]]/PageAddListing9.tsx b/src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing9.tsx
similarity index 100%
rename from src/app/add-listing/[[...stepIndex]]/PageAddListing9.tsx
rename to src/app/[locale]/add-listing/[[...stepIndex]]/PageAddListing9.tsx
diff --git a/src/app/add-listing/[[...stepIndex]]/page.tsx b/src/app/[locale]/add-listing/[[...stepIndex]]/page.tsx
similarity index 100%
rename from src/app/add-listing/[[...stepIndex]]/page.tsx
rename to src/app/[locale]/add-listing/[[...stepIndex]]/page.tsx
diff --git a/src/app/add-new-passenger/page.tsx b/src/app/[locale]/add-new-passenger/page.tsx
similarity index 100%
rename from src/app/add-new-passenger/page.tsx
rename to src/app/[locale]/add-new-passenger/page.tsx
diff --git a/src/app/author/page.tsx b/src/app/[locale]/author/page.tsx
similarity index 100%
rename from src/app/author/page.tsx
rename to src/app/[locale]/author/page.tsx
diff --git a/src/app/blog/Card12.tsx b/src/app/[locale]/blog/Card12.tsx
similarity index 100%
rename from src/app/blog/Card12.tsx
rename to src/app/[locale]/blog/Card12.tsx
diff --git a/src/app/blog/Card13.tsx b/src/app/[locale]/blog/Card13.tsx
similarity index 100%
rename from src/app/blog/Card13.tsx
rename to src/app/[locale]/blog/Card13.tsx
diff --git a/src/app/blog/Card3.tsx b/src/app/[locale]/blog/Card3.tsx
similarity index 100%
rename from src/app/blog/Card3.tsx
rename to src/app/[locale]/blog/Card3.tsx
diff --git a/src/app/blog/Card3Small.tsx b/src/app/[locale]/blog/Card3Small.tsx
similarity index 100%
rename from src/app/blog/Card3Small.tsx
rename to src/app/[locale]/blog/Card3Small.tsx
diff --git a/src/app/blog/SectionAds.tsx b/src/app/[locale]/blog/SectionAds.tsx
similarity index 100%
rename from src/app/blog/SectionAds.tsx
rename to src/app/[locale]/blog/SectionAds.tsx
diff --git a/src/app/blog/SectionLatestPosts.tsx b/src/app/[locale]/blog/SectionLatestPosts.tsx
similarity index 100%
rename from src/app/blog/SectionLatestPosts.tsx
rename to src/app/[locale]/blog/SectionLatestPosts.tsx
diff --git a/src/app/blog/SectionMagazine5.tsx b/src/app/[locale]/blog/SectionMagazine5.tsx
similarity index 100%
rename from src/app/blog/SectionMagazine5.tsx
rename to src/app/[locale]/blog/SectionMagazine5.tsx
diff --git a/src/app/blog/WidgetCategories.tsx b/src/app/[locale]/blog/WidgetCategories.tsx
similarity index 100%
rename from src/app/blog/WidgetCategories.tsx
rename to src/app/[locale]/blog/WidgetCategories.tsx
diff --git a/src/app/blog/WidgetHeading1.tsx b/src/app/[locale]/blog/WidgetHeading1.tsx
similarity index 100%
rename from src/app/blog/WidgetHeading1.tsx
rename to src/app/[locale]/blog/WidgetHeading1.tsx
diff --git a/src/app/blog/WidgetPosts.tsx b/src/app/[locale]/blog/WidgetPosts.tsx
similarity index 100%
rename from src/app/blog/WidgetPosts.tsx
rename to src/app/[locale]/blog/WidgetPosts.tsx
diff --git a/src/app/blog/WidgetTags.tsx b/src/app/[locale]/blog/WidgetTags.tsx
similarity index 100%
rename from src/app/blog/WidgetTags.tsx
rename to src/app/[locale]/blog/WidgetTags.tsx
diff --git a/src/app/blog/[...slug]/Survey.tsx b/src/app/[locale]/blog/[...slug]/Survey.tsx
similarity index 100%
rename from src/app/blog/[...slug]/Survey.tsx
rename to src/app/[locale]/blog/[...slug]/Survey.tsx
diff --git a/src/app/blog/[...slug]/layout.tsx b/src/app/[locale]/blog/[...slug]/layout.tsx
similarity index 100%
rename from src/app/blog/[...slug]/layout.tsx
rename to src/app/[locale]/blog/[...slug]/layout.tsx
diff --git a/src/app/blog/[...slug]/page.tsx b/src/app/[locale]/blog/[...slug]/page.tsx
similarity index 68%
rename from src/app/blog/[...slug]/page.tsx
rename to src/app/[locale]/blog/[...slug]/page.tsx
index 0dfa701..6939db1 100644
--- a/src/app/blog/[...slug]/page.tsx
+++ b/src/app/[locale]/blog/[...slug]/page.tsx
@@ -17,6 +17,7 @@ import { Route } from "@/routers/types";
import { BiLike, BiDislike } from "react-icons/bi";
import Survey from "./Survey";
import axiosInstance from "@/components/api/axios";
+import { useTranslation } from "react-i18next"; // Import useTranslation
const Page = ({
params,
@@ -25,6 +26,7 @@ const Page = ({
params: { stepIndex: string };
searchParams?: { [key: string]: string | string[] | undefined };
}) => {
+ const { t } = useTranslation("common"); // Initialize useTranslation with the "common" namespace
const [blog, setBlog] = useState();
const [posts, setPosts] = useState([]);
@@ -39,51 +41,22 @@ const Page = ({
axiosInstance.get(`/api/blogs/${params.slug[0]}/`).then((response) => {
setBlog(response.data);
});
- }, []);
+ }, [params.slug]);
+
const renderHeader = () => {
return (
@@ -102,14 +75,12 @@ const Page = ({
};
const renderTags = () => {
- console.log(blog?.tags[0].name);
-
return (
);
};
- console.log(posts);
const renderPostRelated = (post: PostDataType) => {
return (
@@ -183,12 +153,7 @@ const Page = ({
{post.title}
-
- {/*
- {post.author.displayName}
-
-
· */}
{post.created_at.split("T")[0]}
@@ -202,29 +167,25 @@ const Page = ({
return (
{renderHeader()}
-
- {/* */}
-
-
+
{renderContent()}
{renderTags()}
+ {/* Uncomment to render comments */}
{/* {renderCommentForm()} */}
{/* {renderCommentLists()} */}
-
Related posts
+
{t("relatedPosts")}
{/* Translate related posts */}
- {console.log(params.slug[0], posts)}
{posts
.filter((_, i) => {
return _?.slug !== params.slug[0];
})
.map((item, i) => i < 4 && renderPostRelated(item))}
- {/* */}
diff --git a/src/app/blog/layout.tsx b/src/app/[locale]/blog/layout.tsx
similarity index 100%
rename from src/app/blog/layout.tsx
rename to src/app/[locale]/blog/layout.tsx
diff --git a/src/app/blog/page.tsx b/src/app/[locale]/blog/page.tsx
similarity index 100%
rename from src/app/blog/page.tsx
rename to src/app/[locale]/blog/page.tsx
diff --git a/src/app/checkout/PageMain.tsx b/src/app/[locale]/checkout/PageMain.tsx
similarity index 100%
rename from src/app/checkout/PageMain.tsx
rename to src/app/[locale]/checkout/PageMain.tsx
diff --git a/src/app/checkout/page.tsx b/src/app/[locale]/checkout/page.tsx
similarity index 100%
rename from src/app/checkout/page.tsx
rename to src/app/[locale]/checkout/page.tsx
diff --git a/src/app/contact/page.tsx b/src/app/[locale]/contact/page.tsx
similarity index 100%
rename from src/app/contact/page.tsx
rename to src/app/[locale]/contact/page.tsx
diff --git a/src/app/custom-history/page.tsx b/src/app/[locale]/custom-history/page.tsx
similarity index 100%
rename from src/app/custom-history/page.tsx
rename to src/app/[locale]/custom-history/page.tsx
diff --git a/src/app/custom-trip/page.tsx b/src/app/[locale]/custom-trip/page.tsx
similarity index 74%
rename from src/app/custom-trip/page.tsx
rename to src/app/[locale]/custom-trip/page.tsx
index 90b0aae..78ada83 100644
--- a/src/app/custom-trip/page.tsx
+++ b/src/app/[locale]/custom-trip/page.tsx
@@ -10,6 +10,7 @@ import { useRouter } from "next/navigation";
import { useUserContext } from "@/components/contexts/userContext";
import { toast } from "react-toastify";
import NcInputNumber from "@/components/NcInputNumber";
+import { useTranslation } from "react-i18next"; // Import useTranslation
interface City {
name: string;
@@ -26,6 +27,7 @@ interface CommonLayoutProps {}
const CommonLayout: FC
= () => {
const { user } = useUserContext();
const router = useRouter();
+ const { t } = useTranslation("common"); // Initialize useTranslation with the "common" namespace
const [countries, setCountries] = useState([]);
const [startCity, setStartCity] = useState("");
@@ -51,38 +53,16 @@ const CommonLayout: FC = () => {
const [isFormValid, setIsFormValid] = useState(false);
const [isContinueValid, setIsContinueValid] = useState(false);
+ // Number conversion arrays for display
const special = [
- "Zeroth",
- "First",
- "Second",
- "Third",
- "Fourth",
- "Fifth",
- "Sixth",
- "Seventh",
- "Eighth",
- "Ninth",
- "Tenth",
- "Eleventh",
- "Twelfth",
- "Thirteenth",
- "Fourteenth",
- "Fifteenth",
- "Sixteenth",
- "Seventeenth",
- "Eighteenth",
- "Nineteenth",
+ "Zeroth", "First", "Second", "Third", "Fourth", "Fifth",
+ "Sixth", "Seventh", "Eighth", "Ninth", "Tenth", "Eleventh",
+ "Twelfth", "Thirteenth", "Fourteenth", "Fifteenth", "Sixteenth",
+ "Seventeenth", "Eighteenth", "Nineteenth",
];
const deca = [
- "Twent",
- "Thirt",
- "Fort",
- "Fift",
- "Sixt",
- "Sevent",
- "Eight",
- "Ninet",
+ "Twent", "Thirt", "Fort", "Fift", "Sixt", "Sevent", "Eight", "Ninet",
];
function stringifyNumber(n: number) {
@@ -240,7 +220,7 @@ const CommonLayout: FC = () => {
const submitTour = async () => {
const formData = {
- destinations: destinations.map((destination, index) => ({
+ destinations: destinations.map((destination) => ({
name: `${destination.endCity.split("/")[0].trim()}-${destination.endCity
.split("/")[1]
.trim()} `,
@@ -248,7 +228,7 @@ const CommonLayout: FC = () => {
price_estimate: JSON.stringify(estimatedCost),
detail: JSON.stringify({
"1": {
- title: "Begin Trip",
+ title: t("beginTrip"), // Translate title
city: `${startCity.split("/")[0].trim()}-${startCity
.split("/")[1]
.trim()} `,
@@ -258,13 +238,13 @@ const CommonLayout: FC = () => {
...destinations.reduce<{ [key: number]: any }>(
(acc, destination, index) => {
acc[index + 2] = {
- title: `${stringifyNumber(index + 1)} Destination`,
+ title: `${stringifyNumber(index + 1)} ${t("destination")}`, // Translate destination title
city: `${destination.endCity
.split("/")[0]
.trim()}-${destination.endCity.split("/")[1].trim()} `,
transportation: destination.transport,
hotel: destination.hotel,
- duration: `${destination.duration} day`,
+ duration: `${destination.duration} ${t("days")}`, // Translate days
finish_date: destination.finishDate.replace(/-/g, "/"),
start_date: startDate.replace(/-/g, "/"),
};
@@ -274,9 +254,9 @@ const CommonLayout: FC = () => {
),
summary: {
cost_estimate: estimatedCost.toString(),
- journery_schedule: `${startDate.replace(/-/g, "/")} To ${
+ journery_schedule: `${startDate.replace(/-/g, "/")} ${t("to")} ${
destinations[destinations.length - 1]?.finishDate.replace(/-/g, "/")
- } Day ${destinations.length}`,
+ } ${t("days")} ${destinations.length}`, // Translate to and days
},
}),
};
@@ -287,7 +267,7 @@ const CommonLayout: FC = () => {
"Content-Type": "application/json",
},
});
- toast.success("Successfully Registered");
+ toast.success(t("successMessage")); // Translate success message
router.push("/custom-history");
} catch (error) {
console.error("Error sending trip details:", error);
@@ -299,25 +279,21 @@ const CommonLayout: FC = () => {