Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
RESULTS_PER_PAGE: "45"
NEXT_PUBLIC_SERVER_ADDRESS: "http://localhost:3000"
NEXT_PUBLIC_IMAGES_HOSTING_ADDRESS: "https://statify-images.netlify.app"
NEXT_PUBLIC_LANG: "en"

runs-on: ubuntu-latest

Expand Down
86 changes: 85 additions & 1 deletion core/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"test:coverage": "jest --coverage"
},
"dependencies": {
"@formatjs/intl": "^3.1.0",
"@hookform/resolvers": "^3.9.0",
"@prisma/client": "^5.3.1",
"@unocss/reset": "^0.64.1",
Expand Down
13 changes: 7 additions & 6 deletions core/src/app/(admin)/admin/dashboard/countries/metadata.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
import { Metadata } from "next"
import { SERVER_ADDRESS } from "@/constants/general"
import translate from "@/modules/i18n"

const metadata: Metadata = {
metadataBase: new URL(SERVER_ADDRESS),
title: "Countries Dashboard",
description: "Edit countries here: add, update or delete.",
title: translate("pages.indicators_dashboard.metadata.title"),
description: translate("pages.indicators_dashboard.metadata.description"),
themeColor: "#ffffff",
openGraph: {
images: ["/og.png"],
title: "Countries Dashboard",
description: "Edit countries here: add, update or delete.",
title: translate("pages.indicators_dashboard.metadata.title"),
description: translate("pages.indicators_dashboard.metadata.description"),
type: "website",
url: "/",
},
twitter: {
images: ["/og.png"],
title: "Countries Dashboard",
description: "Edit countries here: add, update or delete.",
title: translate("pages.indicators_dashboard.metadata.title"),
description: translate("pages.indicators_dashboard.metadata.description"),
card: "summary_large_image",
site: "@Zhorrrro",
},
Expand Down
13 changes: 7 additions & 6 deletions core/src/app/(admin)/admin/dashboard/indicators/metadata.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
import { Metadata } from "next"
import { SERVER_ADDRESS } from "@/constants/general"
import translate from "@/modules/i18n"

const metadata: Metadata = {
metadataBase: new URL(SERVER_ADDRESS),
title: "Indicators Dashboard",
description: "Edit indicators here: add, update or delete.",
title: translate("pages.indicators_dashboard.metadata.title"),
description: translate("pages.indicators_dashboard.metadata.description"),
themeColor: "#ffffff",
openGraph: {
images: ["/og.png"],
title: "Indicators Dashboard",
description: "Edit indicators here: add, update or delete.",
title: translate("pages.indicators_dashboard.metadata.title"),
description: translate("pages.indicators_dashboard.metadata.description"),
type: "website",
url: "/",
},
twitter: {
images: ["/og.png"],
title: "Indicators Dashboard",
description: "Edit indicators here: add, update or delete.",
title: translate("pages.indicators_dashboard.metadata.title"),
description: translate("pages.indicators_dashboard.metadata.description"),
card: "summary_large_image",
site: "@Zhorrrro",
},
Expand Down
13 changes: 7 additions & 6 deletions core/src/app/(admin)/admin/dashboard/values/metadata.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
import { Metadata } from "next"
import { SERVER_ADDRESS } from "@/constants/general"
import translate from "@/modules/i18n"

const metadata: Metadata = {
metadataBase: new URL(SERVER_ADDRESS),
title: "Values Dashboard",
description: "Edit values here: add, update or delete.",
title: translate("pages.values_dashboard.metadata.title"),
description: translate("pages.values_dashboard.metadata.description"),
themeColor: "#ffffff",
openGraph: {
images: ["/og.png"],
title: "Values Dashboard",
description: "Edit values here: add, update or delete.",
title: translate("pages.values_dashboard.metadata.title"),
description: translate("pages.values_dashboard.metadata.description"),
type: "website",
url: "/",
},
twitter: {
images: ["/og.png"],
title: "Values Dashboard",
description: "Edit values here: add, update or delete.",
title: translate("pages.values_dashboard.metadata.title"),
description: translate("pages.values_dashboard.metadata.description"),
card: "summary_large_image",
site: "@Zhorrrro",
},
Expand Down
13 changes: 7 additions & 6 deletions core/src/app/(admin)/admin/signin/metadata.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
import { Metadata } from "next"
import { SERVER_ADDRESS } from "@/constants/general"
import translate from "@/modules/i18n"

const metadata: Metadata = {
metadataBase: new URL(SERVER_ADDRESS),
title: "Sign In",
description: "Sign In as administrator to be able to edit data.",
title: translate("pages.signin.metadata.title"),
description: translate("pages.signin.metadata.description"),
themeColor: "#ffffff",
openGraph: {
images: ["/og.png"],
title: "Sign In",
description: "Sign In as administrator to be able to edit data.",
title: translate("pages.signin.metadata.title"),
description: translate("pages.signin.metadata.description"),
type: "website",
url: "/",
},
twitter: {
images: ["/og.png"],
title: "Sign In",
description: "Sign In as administrator to be able to edit data.",
title: translate("pages.signin.metadata.title"),
description: translate("pages.signin.metadata.description"),
card: "summary_large_image",
site: "@Zhorrrro",
},
Expand Down
7 changes: 6 additions & 1 deletion core/src/app/(public)/(with-toolbar)/bookmarks/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import { ReactNode, Suspense } from "react"
import IndicatorsListViewLoader from "@/containers/indicators-list-view/IndicatorsListViewLoader"
import translate from "@/modules/i18n"

export default function DashboardLayout({ children }: { children: ReactNode }) {
return (
<Suspense fallback={<IndicatorsListViewLoader text="Search results for" />}>
<Suspense
fallback={
<IndicatorsListViewLoader text={translate("pages.bookmarks.heading")} />
}
>
{children}
</Suspense>
)
Expand Down
12 changes: 5 additions & 7 deletions core/src/app/(public)/(with-toolbar)/bookmarks/metadata.ts
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
import { Metadata } from "next/types"
import { SERVER_ADDRESS } from "@/constants/general"
import translate from "@/modules/i18n"

const metadata: Metadata = {
metadataBase: new URL(SERVER_ADDRESS),
title: "Bookmarks",
description:
"Explore our database featuring 100+ indicators for hundreds of regions worldwide.",
title: translate("pages.bookmarks.metadata.title"),
description: translate("pages.bookmarks.metadata.description"),
themeColor: "#ffffff",
openGraph: {
images: ["/og.png"],
title: "Statify",
description:
"Explore our database featuring 100+ indicators for hundreds of regions worldwide.",
description: translate("pages.bookmarks.metadata.description"),
type: "website",
url: "/",
},
twitter: {
images: ["/og.png"],
title: "Statify",
description:
"Explore our database featuring 100+ indicators for hundreds of regions worldwide.",
description: translate("pages.bookmarks.metadata.description"),
card: "summary_large_image",
site: "@Zhorrrro",
},
Expand Down
8 changes: 6 additions & 2 deletions core/src/app/(public)/(with-toolbar)/bookmarks/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import IndicatorsListView from "@/containers/indicators-list-view/IndicatorsList
import InfoView from "@/containers/info-view/InfoView"
import { CommonValidations } from "@/utils/validation-schemas/common"
import pageValidationMiddleware from "@/middlewares/page-validation-middleware/pageValidationMiddleware"
import translate from "@/modules/i18n"

export { default as metadata } from "@/app/(public)/(with-toolbar)/bookmarks/metadata"

Expand All @@ -18,11 +19,14 @@ const Bookmarks = pageValidationMiddleware(async ({ searchParams }) => {
return (
<IndicatorsListView
data={data?.data}
text="Your Bookmarks"
text={translate("pages.bookmarks.heading")}
pages={data?.pages}
page={data?.page}
fallback={
<InfoView icon={<BookmarkIcon />} text={"You have no bookmarks yet"} />
<InfoView
icon={<BookmarkIcon />}
text={translate("pages.bookmarks.empty_fallback")}
/>
}
/>
)
Expand Down
Loading
Loading