Skip to content

build(deps): bump axios and @directus/sdk #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
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
4 changes: 3 additions & 1 deletion app/i18next-options.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
export const supportedLanguages = ["en", "de"] as const;

export default {
// This is the list of languages your application supports
supportedLngs: ["en", "de"],
supportedLngs: supportedLanguages,
// This is the language you want to use in case
// if the user language is not in the supportedLngs
fallbackLng: "en",
Expand Down
2 changes: 1 addition & 1 deletion app/i18next.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let i18next: RemixI18Next = new RemixI18Next({
detection: {
// persist language selection in cookie
cookie: i18nCookie,
supportedLanguages: i18nextOptions.supportedLngs,
supportedLanguages: [...i18nextOptions.supportedLngs],
fallbackLanguage: i18nextOptions.fallbackLng,
},
// This is the configuration for i18next used
Expand Down
63 changes: 34 additions & 29 deletions app/lib/directus.ts
Original file line number Diff line number Diff line change
@@ -1,40 +1,45 @@
import { Directus, type ID } from '@directus/sdk';
import {
createDirectus,
type DirectusClient,
rest,
type RestClient,
} from "@directus/sdk";

const directusUrl = process.env.DIRECTUS_URL || 'http://localhost:8055'
const directusUrl = process.env.DIRECTUS_URL || "http://localhost:8055";

export type UseCase = {
id: ID,
status: string,
image: string,
title: string,
description: string,
content: string,
language: "de" | "en"
}
id: number | string;
status: string;
image: string;
title: string;
description: string;
content: string;
language: "de" | "en";
};

export type Feature = {
id: ID,
title: string,
description: string,
icon: string,
language: "de" | "en"
}
id: number | string;
title: string;
description: string;
icon: string;
language: "de" | "en";
};

export type Partner = {
id: ID,
name: string,
logo: string,
link: string
}
id: number | string;
name: string;
logo: string;
link: string;
};

type DirectusCollection = {
use_cases: UseCase,
features: Feature,
partners: Partner
}
use_cases: UseCase[];
features: Feature[];
partners: Partner[];
};

const directus = new Directus<DirectusCollection>(directusUrl)
const directus = createDirectus<DirectusCollection>(directusUrl).with(rest());

export async function getDirectusClient () {
return directus
}
export function getDirectusClient(): DirectusClient<DirectusCollection> & RestClient<DirectusCollection> {
return directus;
}
28 changes: 15 additions & 13 deletions app/routes/_index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { readItems } from "@directus/sdk";
import { useMediaQuery } from "@mantine/hooks";
import { motion } from "framer-motion";
import { useTranslation } from "react-i18next";
Expand All @@ -11,6 +12,7 @@ import Integrations from "~/components/landing/sections/integrations";
import Partners from "~/components/landing/sections/partners";
import PricingPlans from "~/components/landing/sections/pricing-plans";
import Stats from "~/components/landing/stats";
import { type supportedLanguages } from "~/i18next-options";
import i18next from "~/i18next.server";
import { type Partner, getDirectusClient } from "~/lib/directus";
import { getLatestDevices } from "~/models/device.server";
Expand Down Expand Up @@ -44,26 +46,26 @@ const sections = [
];

export const loader = async ({ request }: LoaderFunctionArgs) => {
let locale = await i18next.getLocale(request);
const directus = await getDirectusClient();
const locale = await i18next.getLocale(request) as typeof supportedLanguages[number];
const directus = getDirectusClient();

const useCasesResponse = await directus.items("use_cases").readByQuery({
const useCasesResponse = await directus.request(readItems("use_cases", {
fields: ["*"],
filter: {
language: locale,
language: {_eq: locale },
},
});
}));

const featuresResponse = await directus.items("features").readByQuery({
const featuresResponse = await directus.request(readItems("features", {
fields: ["*"],
filter: {
language: locale,
language: {_eq: locale },
},
});
}));

const partnersResponse = await directus.items("partners").readByQuery({
const partnersResponse = await directus.request(readItems("partners", {
fields: ["*"],
});
}));

//* Get user Id from session
const userId = await getUserId(request);
Expand All @@ -78,9 +80,9 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
const latestDevices = await getLatestDevices();

return data({
useCases: useCasesResponse.data,
features: featuresResponse.data,
partners: partnersResponse.data,
useCases: useCasesResponse,
features: featuresResponse,
partners: partnersResponse,
stats: stats,
header: { userId: userId, userName: userName },
locale: locale,
Expand Down
87 changes: 19 additions & 68 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"dependencies": {
"@conform-to/react": "^0.9.1",
"@conform-to/zod": "^0.9.0",
"@directus/sdk": "^10.3.3",
"@directus/sdk": "^18.0.3",
"@heroicons/react": "^2.0.18",
"@hookform/resolvers": "^3.3.2",
"@isaacs/express-prometheus-middleware": "^1.2.1",
Expand Down
Loading