Skip to content

Commit

Permalink
chore(project): DATA_NORGE_BASE_URI -> FDK_DATA_NORGE_BASE_URI
Browse files Browse the repository at this point in the history
  • Loading branch information
Lillebo committed Sep 18, 2024
1 parent 2967e57 commit c086ea4
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions apps/docs/src/app/[lang]/[...slug]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ export default async function Page({ params }: DocsPageType) {
});

const {
DATA_NORGE_BASE_URI,
FDK_DATA_NORGE_BASE_URI,
FDK_BASE_URI = ''
} = process.env;

const baseUri = DATA_NORGE_BASE_URI || FDK_BASE_URI;
const baseUri = FDK_DATA_NORGE_BASE_URI || FDK_BASE_URI;

// Render page
return (
Expand Down
4 changes: 2 additions & 2 deletions apps/docs/src/app/[lang]/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ const DocsLayout = async ({ children, ...props }: PropsWithChildren & DocsLayout
const dictionary = await getDictionary(lang, 'docs');

const {
DATA_NORGE_BASE_URI,
FDK_DATA_NORGE_BASE_URI,
FDK_BASE_URI = '',
FDK_COMMUNITY_BASE_URI: communityBaseUri = '/'
} = process.env;

const baseUri = DATA_NORGE_BASE_URI || FDK_BASE_URI;
const baseUri = FDK_DATA_NORGE_BASE_URI || FDK_BASE_URI;

return (
<RootLayout {...props}>
Expand Down
4 changes: 2 additions & 2 deletions apps/forms/app/[lang]/data-hunter/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ const DataHunterPage = async ({ params: { lang } }: DataHunterPageProps) => {
const commonDictionary = await getDictionary(lang, 'common');

const {
DATA_NORGE_BASE_URI,
FDK_DATA_NORGE_BASE_URI,
FDK_BASE_URI = '/'
} = process.env;

const baseUri = DATA_NORGE_BASE_URI || FDK_BASE_URI;
const baseUri = FDK_DATA_NORGE_BASE_URI || FDK_BASE_URI;

const breadcrumbList = [
{
Expand Down
4 changes: 2 additions & 2 deletions apps/frontpage/src/app/[lang]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ const Frontpage = async ({ params }: FrontpageProps) => {
noStore();

const {
DATA_NORGE_BASE_URI,
FDK_DATA_NORGE_BASE_URI,
FDK_BASE_URI = '',
FDK_LLM_SEARCH_BASE_URI: llmSearchBaseUri = ''
} = process.env;

const baseUri = DATA_NORGE_BASE_URI || FDK_BASE_URI;
const baseUri = FDK_DATA_NORGE_BASE_URI || FDK_BASE_URI;

const commonDictionary = await getDictionary(params.lang, 'common');
const frontpageDictionary = await getDictionary(params.lang, 'frontpage');
Expand Down
4 changes: 2 additions & 2 deletions deploy/prod/docs-frontend/docs-frontend-env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ spec:
secretKeyRef:
name: commonurl-prod
key: FDK_BASE_URI
- name: DATA_NORGE_BASE_URI
- name: FDK_DATA_NORGE_BASE_URI
valueFrom:
secretKeyRef:
name: commonurl-prod
key: DATA_NORGE_BASE_URI
key: FDK_DATA_NORGE_BASE_URI
4 changes: 2 additions & 2 deletions deploy/prod/forms-frontend/forms-frontend-env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ spec:
secretKeyRef:
name: commonurl-prod
key: FDK_BASE_URI
- name: DATA_NORGE_BASE_URI
- name: FDK_DATA_NORGE_BASE_URI
valueFrom:
secretKeyRef:
name: commonurl-prod
key: DATA_NORGE_BASE_URI
key: FDK_DATA_NORGE_BASE_URI
4 changes: 2 additions & 2 deletions deploy/prod/frontpage-frontend/frontpage-frontend-env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ spec:
secretKeyRef:
name: commonurl-prod
key: FDK_LLM_SEARCH_BASE_URI
- name: DATA_NORGE_BASE_URI
- name: FDK_DATA_NORGE_BASE_URI
valueFrom:
secretKeyRef:
name: commonurl-prod
key: DATA_NORGE_BASE_URI
key: FDK_DATA_NORGE_BASE_URI
4 changes: 2 additions & 2 deletions libs/ui/src/lib/layout-root/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ const RootLayout = async ({ children, params }: RootLayoutProps & PropsWithChild
const dictionary = await getDictionary(params.lang, 'common');

const {
DATA_NORGE_BASE_URI,
FDK_DATA_NORGE_BASE_URI,
FDK_BASE_URI = '',
FDK_COMMUNITY_BASE_URI: communityBaseUri = '/',
FDK_REGISTRATION_BASE_URI: registrationBaseUri = '/',
} = process.env;

const baseUri = DATA_NORGE_BASE_URI || FDK_BASE_URI;
const baseUri = FDK_DATA_NORGE_BASE_URI || FDK_BASE_URI;

return (
<html lang={params.lang}>
Expand Down

0 comments on commit c086ea4

Please sign in to comment.