@c-rex/templates 0.1.26 → 0.1.27

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@c-rex/templates",
-    "version": "0.1.26",
+    "version": "0.1.27",
     "type": "module",
     "files": [
         "src"

package/src/articles/wrapper.tsx

@@ -6,11 +6,12 @@ import { LeftSidebar } from "@c-rex/components/left-sidebar";
 import { RightSidebar } from "@c-rex/components/right-sidebar";
 import { Breadcrumb } from "@c-rex/components/breadcrumb";
 import { RenderArticle } from "@c-rex/components/render-article";
-import { articleInfoItemType, DocumentsType, Favorite } from "@c-rex/types";
+import { articleInfoItemType, DocumentsType } from "@c-rex/types";
 import { AvailableVersionsInterface, TreeOfContent } from "@c-rex/interfaces";
 import { Separator } from "@c-rex/ui/separator";
 import { ArrowBigLeft, PanelRight, ArrowBigRight, FileSearchIcon, X, Search } from "lucide-react";
-import { SearchInput } from "../../../components/src/navbar/search-input";
+import { SearchInput } from "../../../components/src/search-input";
+
 import { useMultiSidebar } from "@c-rex/ui/sidebar";
 import { Button } from "@c-rex/ui/button";
 import { useQueryState } from "nuqs";
@@ -106,36 +107,36 @@ export const ArticleWrapper = ({
                     <RenderArticle htmlContent={htmlContent} contentLang={articleLang} />
 
                     {/*
-                    <div className="absolute top-0 right-0 flex flex-col gap-2 items-end">
-                        {favoritesList.map((item) => (
-                            <div
-                                key={item.id}
-                                className={cn(
-                                    "group h-8 cursor-pointer w-4 hover:w-40 transition-all duration-300 relative",
-                                    `bg-${item.color}`,
-                                    item.id == id ? "rounded-r-sm" : "rounded-sm"
-                                )}
-                            >
-                                {item.id == id && (
-                                    <div className={cn(
-                                        "absolute -left-[16px] top-1/2 -translate-y-1/2 h-8 border-t-[16px] border-t-transparent border-b-[16px] border-b-transparent border-r-[16px]",
-                                        `border-r-${item.color}`,
-                                    )} />
-                                )}
-                                <a
-                                    href={`../topics/${item.id}`}
-                                    className="flex items-center justify-end h-8 opacity-0 group-hover:opacity-100 text-primary-foreground transition-all duration-300 text-right px-2"
+                        <div className="absolute top-0 right-0 flex flex-col gap-2 items-end">
+                            {favoritesList.map((item) => (
+                                <div
+                                    key={item.id}
+                                    className={cn(
+                                        "group h-8 cursor-pointer w-4 hover:w-40 transition-all duration-300 relative",
+                                        `bg-${item.color}`,
+                                        item.id == id ? "rounded-r-sm" : "rounded-sm"
+                                    )}
                                 >
-                                    <span
-                                        className="text-right text-ellipsis overflow-hidden whitespace-nowrap"
-                                        title={item.label}
+                                    {item.id == id && (
+                                        <div className={cn(
+                                            "absolute -left-[16px] top-1/2 -translate-y-1/2 h-8 border-t-[16px] border-t-transparent border-b-[16px] border-b-transparent border-r-[16px]",
+                                            `border-r-${item.color}`,
+                                        )} />
+                                    )}
+                                    <a
+                                        href={`../topics/${item.id}`}
+                                        className="flex items-center justify-end h-8 opacity-0 group-hover:opacity-100 text-primary-foreground transition-all duration-300 text-right px-2"
                                     >
-                                        {item.label}
-                                    </span>
-                                </a>
-                            </div>
-                        ))}
-                    </div>
+                                        <span
+                                            className="text-right text-ellipsis overflow-hidden whitespace-nowrap"
+                                            title={item.label}
+                                        >
+                                            {item.label}
+                                        </span>
+                                    </a>
+                                </div>
+                            ))}
+                        </div>
                     */}
                 </div>
 

package/src/home/page.tsx

@@ -7,7 +7,7 @@ import { parseAsBoolean, parseAsInteger, parseAsString, useQueryStates } from 'n
 import { informationUnitsResponse } from "@c-rex/interfaces";
 import { Button } from "@c-rex/ui/button";
 import { Badge } from "@c-rex/ui/badge";
-import { ResultList } from "@c-rex/components/result-list";
+import { ResultContainer } from "@c-rex/components/result-container";
 import { DialogFilter } from "@c-rex/components/dialog-filter";
 import { AutoComplete } from "@c-rex/components/autocomplete";
 import { DEVICE_OPTIONS, OPERATOR_OPTIONS } from "@c-rex/constants";
@@ -366,7 +366,7 @@ export const HomePage: FC<HomePageProps> = ({ data }) => {
                 </Sheet>
 
                 <div className="flex-1">
-                    <ResultList
+                    <ResultContainer
                         items={data.items}
                         pagination={data.pageInfo}
                     />

package/src/home/page2.tsx

@@ -7,7 +7,7 @@ import { parseAsBoolean, parseAsInteger, parseAsString, useQueryStates } from 'n
 import { informationUnitsResponse } from "@c-rex/interfaces";
 import { Button } from "@c-rex/ui/button";
 import { Badge } from "@c-rex/ui/badge";
-import { ResultList } from "@c-rex/components/result-list";
+import { ResultContainer } from "@c-rex/components/result-container";
 import { DialogFilter } from "@c-rex/components/dialog-filter";
 import { AutoComplete } from "@c-rex/components/autocomplete";
 import { DEVICE_OPTIONS, OPERATOR_OPTIONS } from "@c-rex/constants";
@@ -373,7 +373,7 @@ export const HomePage: FC<HomePageProps> = ({ data }) => {
                 </Sheet>
 
                 <div className="flex-1">
-                    <ResultList
+                    <ResultContainer
                         items={data.items}
                         pagination={data.pageInfo}
                     />

package/src/layout.tsx

@@ -8,8 +8,9 @@ import { cookies } from "next/headers";
 import { CrexSDK } from "@c-rex/core/sdk";
 import { getIssuerMetadata } from "@c-rex/core/OIDC";
 import { resolveUILanguage, resolveContentLanguage } from "./utils";
-import { LanguageService } from "@c-rex/services";
+import { informationUnitsLanguagesServer } from "@c-rex/services/server-requests";
 import { CONTENT_LANG_KEY, UI_LANG_KEY } from "@c-rex/constants";
+import { transformLanguageData } from "@c-rex/utils";
 
 interface DefaultRootLayoutProps {
     children: React.ReactNode;
@@ -23,7 +24,6 @@ export const DefaultRootLayout = async ({ children }: DefaultRootLayoutProps) =>
     const uiLangCookie = cookieStore.get(UI_LANG_KEY)?.value ?? null;
     const clientConfigs = sdk.getClientConfig();
     const serverConfigs = sdk.getServerConfig();
-    const languageService = new LanguageService()
     const contentLangCookie = cookieStore.get(CONTENT_LANG_KEY)?.value ?? null;
 
     sdk.updateConfigProp('OIDC', {
@@ -31,7 +31,8 @@ export const DefaultRootLayout = async ({ children }: DefaultRootLayoutProps) =>
         issuerMetadata: metadata
     });
 
-    const availableLanguages = await languageService.getLanguagesAndCountries();
+    const data = await informationUnitsLanguagesServer();
+    const availableLanguages = transformLanguageData(data as { value: string; score: number; }[]);
 
     const uiLang = resolveUILanguage({
         uiLangCookie,
@@ -66,4 +67,4 @@ export const DefaultRootLayout = async ({ children }: DefaultRootLayoutProps) =>
             </html>
         </NuqsAdapter>
     );
-}
+};

package/src/utils.ts

@@ -46,4 +46,4 @@ export const resolveContentLanguage = ({
     if (hasLang) return browserLang;
 
     return defaultLang;
-}
+}

package/src/home/components/filter-sidebar.tsx

@@ -1,105 +0,0 @@
-"use client";
-
-import React, { FC } from "react";
-import { useTranslations } from 'next-intl'
-import { Check, ChevronDown } from "lucide-react"
-import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@c-rex/ui/collapsible";
-import {
-    SidebarContent,
-    SidebarGroup,
-    SidebarGroupContent,
-    SidebarGroupLabel,
-    SidebarHeader,
-    SidebarMenu,
-    SidebarMenuSub,
-    SidebarMenuSubButton,
-    SidebarMenuSubItem
-} from "@c-rex/ui/sidebar";
-import { useBreakpoint } from "@c-rex/ui/hooks";
-import { DEVICE_OPTIONS } from "@c-rex/constants";
-import { SheetContent, SheetHeader } from "@c-rex/ui/sheet";
-
-interface FilterSidebarProps {
-    tags: { [key: string]: any[] }
-    totalItemCount: number
-    updateFilterParam: (key: string, item: any) => void
-}
-
-export const FilterSidebar: FC<FilterSidebarProps> = ({ tags, totalItemCount, updateFilterParam }) => {
-    const t = useTranslations();
-    const device = useBreakpoint();
-    const isMobile = device !== null && (device === DEVICE_OPTIONS.MOBILE);
-
-    if (Object.keys(tags).length === 0) return null;
-
-    const content = (
-        <SidebarContent className="!gap-0">
-
-            {Object.entries(tags).map(([key, value]: any) => (
-
-                <Collapsible defaultOpen key={key} className="py-0 group/collapsible">
-                    <SidebarGroup>
-
-                        <SidebarGroupLabel asChild className="hover:bg-sidebar-accent text-sidebar-accent-foreground text-sm font-bold">
-                            <CollapsibleTrigger className="!h-9">
-                                {t(`filter.tags.${key}`)}
-                                <ChevronDown className="ml-auto transition-transform group-data-[state=open]/collapsible:rotate-180" />
-                            </CollapsibleTrigger>
-                        </SidebarGroupLabel>
-
-                        <CollapsibleContent>
-                            <SidebarGroupContent>
-                                <SidebarMenu>
-                                    <SidebarMenuSub>
-                                        {value.map((item: any) => (
-                                            <SidebarMenuSubItem key={item.shortId}>
-                                                <SidebarMenuSubButton
-                                                    className="cursor-pointer"
-                                                    isActive={item.active}
-                                                    onClick={() => updateFilterParam(key, item)}
-                                                >
-                                                    {item.label} ({item.hits}/{item.total})
-                                                    {item.active && <Check className="ml-2" />}
-                                                </SidebarMenuSubButton>
-                                            </SidebarMenuSubItem>
-                                        ))}
-                                    </SidebarMenuSub>
-                                </SidebarMenu>
-                            </SidebarGroupContent>
-                        </CollapsibleContent>
-                    </SidebarGroup>
-                </Collapsible>
-            ))}
-        </SidebarContent>
-    )
-
-    if (isMobile) {
-        return (
-
-            <SheetContent
-                side="left"
-                className="!pt-6 !px-2 w-[400px] overflow-y-auto"
-            >
-                <SheetHeader className="justify-center items-end font-bold">
-                    {t("filter.filters")}
-                    <span className="text-xs text-muted-foreground leading-5">
-                        {totalItemCount} {t("results.results")}
-                    </span>
-                </SheetHeader>
-                {content}
-            </SheetContent>
-        )
-    }
-
-    return (
-        <div className="w-60 lg:w-80 bg-sidebar rounded-md border pb-4">
-            <SidebarHeader className="justify-center items-end font-bold">
-                {t("filter.filters")}
-                <span className="text-xs text-muted-foreground leading-5">
-                    {totalItemCount} {t("results.results")}
-                </span>
-            </SidebarHeader>
-            {content}
-        </div>
-    );
-};