more services added

web_services/client_frontend/src/apicalls/basics.ts

@@ -6,11 +6,20 @@ const formatServiceUrl = (url: string) => {
 const baseUrlAuth = formatServiceUrl(
   process.env.NEXT_PUBLIC_AUTH_SERVICE_URL || "auth_service:8001"
 );
-const baseUrlPeople = formatServiceUrl(
-  process.env.NEXT_PUBLIC_VALIDATION_SERVICE_URL || "identity_service:8002"
+const baseUrlRestriction = formatServiceUrl(
+  process.env.NEXT_PUBLIC_RESTRICTION_SERVICE_URL || "restriction_service:8002"
 );
 const baseUrlApplication = formatServiceUrl(
-  process.env.NEXT_PUBLIC_MANAGEMENT_SERVICE_URL || "management_service:8004"
+  process.env.NEXT_PUBLIC_MANAGEMENT_SERVICE_URL || "management_service:8003"
+);
+const baseUrlAccount = formatServiceUrl(
+  process.env.NEXT_PUBLIC_ACCOUNT_SERVICE_URL || "account_service:8004"
+);
+const baseUrlBuilding = formatServiceUrl(
+  process.env.NEXT_PUBLIC_BUILDING_SERVICE_URL || "building_service:8006"
+);
+const baseUrlPeople = formatServiceUrl(
+  process.env.NEXT_PUBLIC_VALIDATION_SERVICE_URL || "identity_service:8009"
 );
 
 // Types for better type safety
@@ -62,6 +71,9 @@ export {
   baseUrlAuth,
   baseUrlPeople,
   baseUrlApplication,
+  baseUrlAccount,
+  baseUrlBuilding,
+  baseUrlRestriction,
   tokenSecret,
   cookieObject,
 };

web_services/client_frontend/src/components/custom/content/PageToBeChildrendSingle.tsx

@@ -2,12 +2,12 @@ import { ContentProps } from "@/validations/mutual/dashboard/props";
 import ContentToRenderNoPage from "@/pages/mutual/noContent/page";
 import { resolveWhichPageToRenderSingle } from "@/pages/resolver/resolver";
 
-const PageToBeChildrendSingle: React.FC<ContentProps> = ({ lang, translations, activePageUrl }) => {
-    const ApplicationToRender = resolveWhichPageToRenderSingle({ activePageUrl })
+const PageToBeChildrendSingle: React.FC<ContentProps> = async ({ lang, translations, activePageUrl, mode }) => {
+    const ApplicationToRender = await resolveWhichPageToRenderSingle({ activePageUrl })
     if (ApplicationToRender) {
-        return <ApplicationToRender lang={lang} translations={translations} activePageUrl={activePageUrl} />
+        return <ApplicationToRender lang={lang} translations={translations} activePageUrl={activePageUrl} mode={mode} />
     }
-    else { return <ContentToRenderNoPage lang={lang} /> }
+    return <ContentToRenderNoPage lang={lang} />
 }
 
 export default PageToBeChildrendSingle

web_services/client_frontend/src/components/custom/content/component.tsx

@@ -6,7 +6,7 @@ import PageToBeChildrendSingle from "./PageToBeChildrendSingle";
 import PageToBeChildrendMulti from "./PageToBeChildrendMulti";
 
 const ContentComponent: FC<ContentProps> = async ({ lang, translations, activePageUrl, isMulti, mode }) => {
-    const modeFromQuery = ModeTypesList.includes(mode || '') ? mode : 'list'
+    const modeFromQuery = ModeTypesList.includes(mode || '') ? mode : 'shortList'
     const renderProps = { lang, translations, activePageUrl, mode: modeFromQuery as ModeTypes }
     const PageToBeChildrend = isMulti ? PageToBeChildrendMulti : PageToBeChildrendSingle
     const loadingContent = <LoadingContent height="h-16" size="w-36 h-48" plane="h-full w-full" />

web_services/client_frontend/src/pages/resolver/resolver.tsx

@@ -5,17 +5,18 @@ import { ContentProps } from "@/validations/mutual/dashboard/props";
 
 import pageIndexMulti from "@/pages/multi/index";
 import pageIndexSingle from "@/pages/single/index";
+import ContentToRenderNoPage from "@/pages/mutual/noContent/page";
 
-function resolveWhichPageToRenderSingle({
-    activePageUrl,
-}: ResolverProps): React.FC<ContentProps> {
-    const ApplicationToRender = pageIndexSingle[activePageUrl]
-    return ApplicationToRender
+async function resolveWhichPageToRenderSingle({ activePageUrl }: ResolverProps): Promise<React.FC<ContentProps> | null> {
+    try {
+        return `${activePageUrl}` in pageIndexSingle ? pageIndexSingle[`${activePageUrl}`] : ContentToRenderNoPage
+    } catch (error) {
+        console.error(error)
+    }
+    return ContentToRenderNoPage
 }
 
-async function resolveWhichPageToRenderMulti({
-    activePageUrl,
-}: ResolverProps): Promise<React.FC<ContentProps> | null> {
+async function resolveWhichPageToRenderMulti({ activePageUrl }: ResolverProps): Promise<React.FC<ContentProps> | null> {
     const pageToRender = await retrievePageToRender(activePageUrl)        // TODO: Retrieve page to render
     try {
         const ApplicationToRender = pageIndexMulti[activePageUrl][pageToRender]
@@ -23,7 +24,7 @@ async function resolveWhichPageToRenderMulti({
     } catch (error) {
         console.error(error)
     }
-    return null
+    return ContentToRenderNoPage
 }
 
 export { resolveWhichPageToRenderSingle, resolveWhichPageToRenderMulti };