Merge pull request #5 from iranpsc/develop2

Develop2

Author: warchief98

package.json

@@ -3,7 +3,7 @@
   "version": "2.0.2",
   "private": true,
   "scripts": {
-    "dev": "next dev -p 5175",
+    "dev": "next dev -p 5176",
     "build": "next build",
     "start": "next start -p 5175",
     "lint": "next lint",

public/svg/level/development.svg

@@ -29,8 +29,8 @@ export default async function citizenSinglePage({
   }
 
   const profileData = await getUserData();
-
-  console.log('profileDat1111a',profileData);
+  console.log('profileData123',profileData.data);
+  
 
 
 
@@ -76,8 +76,13 @@ export default async function citizenSinglePage({
 
   //to make description less than 200 character
   async function makeLessCharacter(){
-    let temp = profileData.data.customs.about
-    temp = temp.slice(0,200)
+    let temp;
+    if(profileData.data?.customs?.about){
+      temp = profileData.data.customs.about
+      temp = temp.slice(0,200)
+    }else(
+      temp = ""
+    )
     return temp
   }
 
@@ -89,7 +94,7 @@ export default async function citizenSinglePage({
       return item.url
     }),
     "url": `http://rgb.irpsc.com/fa/citizen/${params.id}`,
-    "jobTitle": `${profileData.data.customs.occupation}`,
+    "jobTitle": `${profileData.data?.customs?.occupation}`,
     "description": `${await makeLessCharacter()}`,
     "birthDate": `${profileData.data.kyc.birth_date}`,
     "email": `${profileData.data.kyc.email}`,
@@ -224,8 +229,13 @@ export async function generateMetadata({ params }) {
 
   //to make description less than 200 character
   async function makeLessCharacter(){
-    let temp = profileData.data.customs.about
-    temp = temp.slice(0,200)
+    let temp;
+    if(profileData.data?.customs?.about){
+      temp = profileData.data.customs.about
+      temp = temp.slice(0,200)
+    }else(
+      temp = ""
+    )
     return temp
   }
 
@@ -235,11 +245,10 @@ export async function generateMetadata({ params }) {
     openGraph: {
       // site_name:'',
       type: 'profile',
-      // url: `https://yourwebsite.com/posts/${params.id}`,
       title: `${profileData.data.name}`,
       description: `${await makeLessCharacter()}`,
       locale: params.code == 'fa'? 'fa_IR' : 'en_US',
-      url: `http://rgb.irpsc.com/fa/citizen/${params.id}`,
+      url: `https://rgb.irpsc.com/${params.lang}/citizen/${params.id}`,
       profile: {
         first_name: `${profileData.data.name}`, // optional: user's first name
       },

public/svg/level/income.svg

@@ -13,45 +13,45 @@ export default async function CitizensLayout({
   params,
 }: {
   children: React.ReactNode;
-  params: { lang: "en" | "fa" };
+  params: any;
 }) {
   const defaultTheme = useServerDarkMode();
 
   //
   const langData = await getTranslation(params.lang);
   const mainData = await getMainFile(langData);
   const langArray = await getLangArray();
-  // const centralPageModal = await findByModalName(mainData, "central-page");
-  // const tabsMenu = await findByTabName(centralPageModal, "before-login");
+  const centralPageModal = await findByModalName(mainData, "central-page");
+  const tabsMenu = await findByTabName(centralPageModal, "before-login");
   const citizenshipProfileModal = await findByModalName(
     mainData,
     "Citizenship-profile"
   );
-  const tabsMenu = await findByTabName(citizenshipProfileModal, "menu");
+  // const tabsMenu = await findByTabName(citizenshipProfileModal, "menu");
 
   const staticMenuToShow = [
-    { name: "home", url: `/`, order: "-1" },
-    { name: "citizens", url: "/citizen", order: "-1" },
-    // { name: "list of levels", url: "/levels/citizen", order: "-1" },
-    { name: "property", url: "" },
-    { name: "real estate", url: "" },
-    { name: "structures", url: "" },
-    { name: "belongings", url: "" },
-    { name: "permissions", url: "" },
-    { name: "invitations", url: "" },
-    { name: "transaction", url: "" },
-    { name: "reward", url: "" },
-    { name: "dynasty", url: "" },
-    { name: "connections", url: "" },
-    { name: "crimes", url: "" },
-    { name: "news", url: "" },
-    { name: "articles", url: "" },
-    { name: "trainings", url: "" },
-    { name: "about", url: "" },
-    { name: "contact", url: "" },
-    { name: "version", url: "" },
-    { name: "calendar", url: "" },
-    { name: "overview", url: "" },
+    { name: "home", url: ``, order: "-1" },
+    { name: "citizens", url: "citizens", order: "-1" },
+    { name: "list of levels", url: "levels/citizen", order: "-1" },
+    { name: "property" },
+    { name: "real estate" },
+    { name: "structures" },
+    { name: "belongings" },
+    { name: "permissions" },
+    { name: "invitations" },
+    { name: "transaction" },
+    { name: "reward" },
+    { name: "dynasty" },
+    { name: "connections" },
+    { name: "crimes" },
+    { name: "news" },
+    { name: "articles" },
+    { name: "trainings" },
+    { name: "about" },
+    { name: "contact" },
+    { name: "version" },
+    { name: "calendar" },
+    { name: "overview" },
   ];
 
   // add staticMenuToShow values to siblings tabsMenu values
@@ -63,6 +63,7 @@ export default async function CitizensLayout({
       tab.toShow = true;
     }
   });
+  console.log("params4", params);
 
   return (
     <main className="flex h-screen dark:bg-black" dir={langData.direction}>

public/svg/level/orders.svg

@@ -44,13 +44,13 @@ export async function generateMetadata({ params }) {
     title: await localFind("citizens of the metaverse"),
     description: await makeLessCharacter(),
     openGraph: {
-      // type: 'article',
+      type: 'website',
       // url: `https://yourwebsite.com/posts/${params.id}`,
       title: await localFind("citizens of the metaverse"),
       description: await makeLessCharacter(),
       locale: params.code == "fa" ? "fa_IR" : "en_US",
       // site_name: متاورس رنگ,
-      url: "",
+      url: `https://rgb.irpsc.com/${params.lang}/citizen`,
       images: [
         {
           url: "/logo.png",
@@ -131,12 +131,14 @@ export default async function CitizensPage({ params }) {
       />
 
       {/* Breadcrumb */}
-      <BreadCrumb params={params} />
-      <div className="xl:px-32 lg:px-32 md:px-5 sm:px-5 xs:px-1">
+      <div className="px-12">
+          <BreadCrumb params={params} />
+        </div>
+      <div className="mt-[60px] lg:mt-[40px] xl:px-32 lg:px-32 md:px-5 sm:px-5 xs:px-1">
         <h2 className="font-rokh font-bold text-[24px] sm:text-[26px] md:text-[28px] lg:text-[30px] xl:text-[32px] text-center dark:text-white mt-[64px] mb-[16px]">
           {localFind("citizens of the metaverse")}
         </h2>
-        <p className="text-lightGrey dark:text-lightGray font-azarMehr font-normal text-[16px] sm:text-[18px] md:text-[20px] lg:text-[22px] xl:text-[24px] text-center text-justify">
+        <p className="text-lightGrey dark:text-darkGray font-azarMehr font-normal text-[16px] sm:text-[18px] md:text-[20px] lg:text-[22px] xl:text-[24px] text-center text-justify">
           {localFind("description citizen list")}
         </p>
         <div className="flex justify-center w-full">

public/svg/level/update.svg

@@ -13,7 +13,7 @@ export default async function CitizensLayout({
   params,
 }: {
   children: React.ReactNode;
-  params: { lang: "en" | "fa" };
+  params: any;
 }) {
   const defaultTheme = useServerDarkMode();