Skip to content

Commit 8b216f3

Browse files
warchief98warchief98
authored
Merge pull request #6 from iranpsc/develop2
fix:single level svg menu fixed with new structure of translate
2 parents ee5cd41 + aff5931 commit 8b216f3

13 files changed

Lines changed: 129 additions & 125 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"scripts": {
66
"dev": "next dev -p 5176",
77
"build": "next build",
8-
"start": "next start -p 5175",
8+
"start": "next start",
99
"lint": "next lint",
1010
"release": "standard-version"
1111
},

‎src/app/[lang]/citizens/[id]/page.jsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export default async function citizenSinglePage({
2929
}
3030

3131
const profileData = await getUserData();
32-
console.log('profileData123',profileData.data);
3332

3433

3534

‎src/app/[lang]/citizens/layout.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ export default async function CitizensLayout({
6363
tab.toShow = true;
6464
}
6565
});
66-
console.log("params4", params);
6766

6867
return (
6968
<main className="flex h-screen dark:bg-black" dir={langData.direction}>

‎src/app/[lang]/levels/citizen/[levelName]/[tabs]/page.jsx‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ export default async function lavelSingelPage({ params }) {
8989
});
9090
return await res.json();
9191
}
92-
console.log('tessssssssssssssssst', await singleLeveldefaultInfo());
9392

9493

9594
const level = await getSingleLevel(levelId);
95+
console.log('level111',level)
9696

9797
const levelTabs = await getLevelTabs(params, levelId);
9898

@@ -115,7 +115,15 @@ export default async function lavelSingelPage({ params }) {
115115
// "description": await makeLessCharacter(),
116116
"alternateName": "MetaRGB"
117117
}
118+
function localFind2(_slug) {
119+
// HIN not good
120+
//item.name and _slug have fa/en number string
121+
//convert
118122

123+
return allLevelArrayContent.find(
124+
(item) => Number(item.name) == Number(_slug)
125+
)?.translation;
126+
}
119127
return (
120128
<>
121129
{/* SCHEMA** */}

‎src/app/[lang]/levels/citizen/page.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,6 @@ export default async function LevelsPage({ params }: any) {
167167
item.slug = convertPersianToEnglishNumber(item.slug);
168168
});
169169

170-
console.log("arraraaaaaa", levelArray);
171-
172170
const footerTabs = await getFooterData(params);
173171

174172
const langArray = await getLangArray();

‎src/components/module/levelComponent/LevelCard.tsx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ export default function LevelCard({
1111
allLevelArrayContent: any;
1212
params: any;
1313
}) {
14-
console.log("item333", item);
15-
16-
// console.log("allLevelArrayContent11333", allLevelArrayContent);
1714
function localFind(_name: any) {
1815
return allLevelArrayContent.find((item: any) => item.name == _name)
1916
?.translation;

‎src/components/module/sidebar/AllSideTab.jsx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,15 @@ export default function SideBarContent({
6565
tabsMenu.forEach((item)=>{
6666
// convert url to match pathName
6767
let urlThemp = `/${params.lang}${item.url?"/"+item.url:''}`
68-
69-
// console.log('urlThemp',urlThemp);
70-
7168

7269
// home has url but its "empty", not "undefined"
7370
if(item.url != undefined && urlThemp && pathName.endsWith(urlThemp)){
7471
item.active = true;
75-
console.log('urlThemp',urlThemp);
76-
console.log('pathName',pathName);
7772
}
7873
})
7974

75+
76+
8077
return (
8178
<>
8279
{/* ${
@@ -114,7 +111,7 @@ export default function SideBarContent({
114111
>
115112
<div style={{order:item.order}}>
116113
{ item.toShow &&
117-
<li onClick={() => onTabClick(item, i)} data-tooltip-id={item.name}>
114+
<li onClick={() => onTabClick(item, i)}>
118115
{/* (i == 0) for hiding first element of array"متاورس" */}
119116

120117
<div

‎src/components/module/sidebar/LevelSideTab.jsx‎

Lines changed: 76 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
"use client";
22

3-
import { MenuDataItem } from "@/types/listMenu";
3+
// import { MenuDataItem } from "@/types/listMenu";
44
import Tooltip from '@mui/material/Tooltip';
5-
6-
75
import ListMenuSvgModule from "./list/ListMenuSvgModule";
86
import ListMenuTitleModule from "./list/ListMenuTitleModule";
9-
107
import ListMenuArrow from "./list/ListMenuArrow";
11-
12-
import { Modals_fa, Modals_en } from "@/components/utils/modals-content";
138
import { useState } from "react";
14-
import Modal from "@/components/templates/modal";
15-
import ListMenuActiveIconModule from "./list/ListMenuActiveIconModule";
16-
import Image from "next/image";
9+
1710
import Link from "next/link";
1811

1912
export default function SideBarContent({
@@ -25,19 +18,32 @@ export default function SideBarContent({
2518

2619
const [activeNav, setActiveNav] = useState(params.levelName);
2720
const staticRouteNames = [
28-
{ name: 'citizen', route_name: "citizen-baguette" },
29-
{ name: 'journalist', route_name: "reporter-baguette" },
21+
{ name: '1', route_name: "citizen-baguette" },
22+
{ name: '2', route_name: "reporter-baguette" },
3023
{ name: 'participant', route_name: "participation-baguette" },
31-
{ name: 'developer', route_name: "developer-baguette" },
32-
{ name: 'inspector', route_name: "inspector-baguette" },
24+
{ name: '4', route_name: "developer-baguette" },
25+
{ name: '5', route_name: "inspector-baguette" },
3326
{ name: 'businessman', route_name: "businessman-baguette" },
34-
{ name: 'lawyer', route_name: "lawyer-baguette" },
27+
{ name: '7', route_name: "lawyer-baguette" },
3528
{ name: 'city council', route_name: "city-council-baguette" },
3629
{ name: 'the mayor', route_name: "the-mayor-baguette" },
37-
{ name: 'governor', route_name: "governor-baguette" },
38-
{ name: 'minister', route_name: "minister-baguette" },
39-
{ name: 'judge', route_name: "judge-baguette" },
40-
{ name: 'legislator', route_name: "legislator-baguette" },
30+
{ name: '10', route_name: "governor-baguette" },
31+
{ name: '11', route_name: "minister-baguette" },
32+
{ name: '12', route_name: "judge-baguette" },
33+
{ name: '13', route_name: "legislator-baguette" },
34+
// { name: 'citizen', route_name: "citizen-baguette" },
35+
// { name: 'journalist', route_name: "reporter-baguette" },
36+
// { name: 'participant', route_name: "participation-baguette" },
37+
// { name: 'developer', route_name: "developer-baguette" },
38+
// { name: 'inspector', route_name: "inspector-baguette" },
39+
// { name: 'businessman', route_name: "businessman-baguette" },
40+
// { name: 'lawyer', route_name: "lawyer-baguette" },
41+
// { name: 'city council', route_name: "city-council-baguette" },
42+
// { name: 'the mayor', route_name: "the-mayor-baguette" },
43+
// { name: 'governor', route_name: "governor-baguette" },
44+
// { name: 'minister', route_name: "minister-baguette" },
45+
// { name: 'judge', route_name: "judge-baguette" },
46+
// { name: 'legislator', route_name: "legislator-baguette" },
4147
];
4248
tabsMenu.forEach((el1) => {
4349
staticRouteNames.forEach((el2) => {
@@ -51,8 +57,6 @@ tabsMenu.forEach((el1) => {
5157
setActiveNav(tabNumber);
5258
}
5359

54-
console.log('hereeeeee122', tabsMenu);
55-
5660

5761
return (
5862
<>
@@ -85,59 +89,59 @@ console.log('hereeeeee122', tabsMenu);
8589
},
8690
],
8791
}}
88-
>
89-
<li onClick={() => onTabClick(item, i)} data-tooltip-id={item.name}>
90-
{item.route_name ?
91-
<Link
92-
className={`px-2 flex flex-col items-center box-border menu-transition`}
93-
href={`/${langData.code}/levels/citizen/${item?.route_name}/general-info`}
94-
>
95-
<div
96-
className={`${activeNav == item?.route_name ? "bg-grayLight dark:bg-black":''} w-full flex flex-row items-center group py-2
97-
${isClosed ? "justify-center" : "justify-start"} rounded-[10px] menu-transition border border-transparent hover:border-[#0066FF] dark:hover:bg-[#1A1A18] dark:hover:border-[#FFC700]`}
98-
>
99-
<span className="">
100-
<ListMenuSvgModule item={item} i={i} activeNav={activeNav} />
101-
</span>
102-
<ListMenuTitleModule
103-
isClosed={isClosed}
104-
item={item}
105-
i={i}
106-
activeNav={activeNav}
107-
/>
108-
<ListMenuArrow item={item} />
109-
</div>
110-
</Link>
111-
:
112-
<Link
113-
className={`px-2 flex flex-col items-center box-border`}
114-
href={`/${langData.code}`}
115-
>
116-
<div
117-
className={`w-full flex flex-row items-center group py-[5px]
118-
${isClosed ? "justify-center" : "justify-start"} rounded-[10px] border border-transparent hover:border-[#0066FF] dark:hover:bg-[#1A1A18] dark:hover:border-[#FFC700]`}
11992
>
120-
<span className="">
121-
<ListMenuSvgModule item={item} i={i} activeNav={activeNav} />
122-
</span>
123-
{!isClosed && (
124-
<ListMenuTitleModule
125-
item={item}
126-
i={i}
127-
activeNav={activeNav}
128-
/>
129-
)}
130-
<ListMenuArrow item={item} />
131-
</div>
132-
</Link>
133-
}
134-
</li>
135-
{/* <ReactTooltip
136-
id={item.name}
137-
className="tooltip-bg-color"
138-
content={item.translation}
139-
/> */}
140-
</Tooltip>
93+
<li onClick={() => onTabClick(item, i)}>
94+
{item.route_name ?
95+
<Link
96+
className={`px-2 flex flex-col items-center box-border menu-transition`}
97+
href={`/${langData.code}/levels/citizen/${item?.route_name}/general-info`}
98+
>
99+
<div
100+
className={`${activeNav == item?.route_name ? "bg-grayLight dark:bg-black":''} w-full flex flex-row items-center group py-2
101+
${isClosed ? "justify-center" : "justify-start"} rounded-[10px] menu-transition border border-transparent hover:border-[#0066FF] dark:hover:bg-[#1A1A18] dark:hover:border-[#FFC700]`}
102+
>
103+
<span className="">
104+
<ListMenuSvgModule item={item} i={i} activeNav={activeNav} />
105+
</span>
106+
<ListMenuTitleModule
107+
isClosed={isClosed}
108+
item={item}
109+
i={i}
110+
activeNav={activeNav}
111+
/>
112+
<ListMenuArrow item={item} />
113+
</div>
114+
</Link>
115+
:
116+
<Link
117+
className={`px-2 flex flex-col items-center box-border`}
118+
href={`/${langData.code}`}
119+
>
120+
<div
121+
className={`w-full flex flex-row items-center group py-[5px]
122+
${isClosed ? "justify-center" : "justify-start"} rounded-[10px] border border-transparent hover:border-[#0066FF] dark:hover:bg-[#1A1A18] dark:hover:border-[#FFC700]`}
123+
>
124+
<span className="">
125+
<ListMenuSvgModule item={item} i={i} activeNav={activeNav} />
126+
</span>
127+
{!isClosed && (
128+
<ListMenuTitleModule
129+
item={item}
130+
i={i}
131+
activeNav={activeNav}
132+
/>
133+
)}
134+
<ListMenuArrow item={item} />
135+
</div>
136+
</Link>
137+
}
138+
</li>
139+
{/* <ReactTooltip
140+
id={item.name}
141+
className="tooltip-bg-color"
142+
content={item.translation}
143+
/> */}
144+
</Tooltip>
141145
</div>
142146
))}
143147
</ul>

‎src/components/module/sidebar/LoginMenuModule.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,11 @@ export default function LoginMenuModule({ isClosed, tabsMenu, params }: any) {
223223
text-white dark:text-dark-background font-azarMehr font-medium text-center text-[15px] m-auto`}
224224
onClick={handleLogin}
225225
>
226-
{localFind("login")}
226+
{localFind("login") == ""
227+
? ""
228+
: params.lang == "fa"
229+
? "ورود"
230+
: "Login"}
227231
</button>
228232
)}
229233
</>

‎src/components/module/sidebar/SideBar.jsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export default function SideBar({
2121
const toggleSide = useCallback(() => {
2222
setisClosed((prev) => !prev);
2323
}, []);
24-
console.log('params3', params);
2524

2625
return (
2726
<>

0 commit comments

Comments
 (0)