muerwre/vault-frontend
1
0
Fork 0
mirror of https://github.com/muerwre/vault-frontend.git synced 2025-04-24 20:36:40 +07:00
Code Packages Activity Actions

fixed canonical URL

Browse source
This commit is contained in:
Fedor Katurov 2022-03-03 10:59:07 +07:00
parent ec5e796f32
commit 7fbbab363d
3 changed files with 54 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.drone.yml
View file

@ -31,11 +31,13 @@ steps:
environment: environment:
NEXT_PUBLIC_API_HOST: https://pig.vault48.org/ NEXT_PUBLIC_API_HOST: https://pig.vault48.org/
NEXT_PUBLIC_REMOTE_CURRENT: https://pig.vault48.org/static/ NEXT_PUBLIC_REMOTE_CURRENT: https://pig.vault48.org/static/
NEXT_PUBLIC_PUBLIC_HOST: https://vault48.org/
settings: settings:
dockerfile: docker/nextjs/Dockerfile dockerfile: docker/nextjs/Dockerfile
build_args_from_env: build_args_from_env:
- NEXT_PUBLIC_API_HOST - NEXT_PUBLIC_API_HOST
- NEXT_PUBLIC_REMOTE_CURRENT - NEXT_PUBLIC_REMOTE_CURRENT
- NEXT_PUBLIC_PUBLIC_HOST
tag: tag:
- ${DRONE_BRANCH} - ${DRONE_BRANCH}
custom_labels: custom_labels:
@ -56,11 +58,13 @@ steps:
environment: environment:
NEXT_PUBLIC_API_HOST: https://pig.staging.vault48.org/ NEXT_PUBLIC_API_HOST: https://pig.staging.vault48.org/
NEXT_PUBLIC_REMOTE_CURRENT: https://pig.staging.vault48.org/static/ NEXT_PUBLIC_REMOTE_CURRENT: https://pig.staging.vault48.org/static/
NEXT_PUBLIC_PUBLIC_HOST: https://staging.vault48.org/
settings: settings:
dockerfile: docker/nextjs/Dockerfile dockerfile: docker/nextjs/Dockerfile
build_args_from_env: build_args_from_env:
- NEXT_PUBLIC_API_HOST - NEXT_PUBLIC_API_HOST
- NEXT_PUBLIC_REMOTE_CURRENT - NEXT_PUBLIC_REMOTE_CURRENT
- NEXT_PUBLIC_PUBLIC_HOST
tag: tag:
- ${DRONE_BRANCH} - ${DRONE_BRANCH}
custom_labels: custom_labels:

78
src/pages/_app.tsx
View file

@ -1,5 +1,6 @@
import React from 'react'; import React from 'react';
import App from 'next/app';
import Head from 'next/head'; import Head from 'next/head';
import { PageCoverProvider } from '~/components/containers/PageCoverProvider'; import { PageCoverProvider } from '~/components/containers/PageCoverProvider';
@ -9,6 +10,7 @@ import { MainLayout } from '~/containers/main/MainLayout';
import { DragDetectorProvider } from '~/hooks/dom/useDragDetector'; import { DragDetectorProvider } from '~/hooks/dom/useDragDetector';
import { Sprites } from '~/sprites/Sprites'; import { Sprites } from '~/sprites/Sprites';
import { getMOBXStore } from '~/store'; import { getMOBXStore } from '~/store';
import { CONFIG } from '~/utils/config';
import { StoreContextProvider } from '~/utils/context/StoreContextProvider'; import { StoreContextProvider } from '~/utils/context/StoreContextProvider';
import { UserContextProvider } from '~/utils/context/UserContextProvider'; import { UserContextProvider } from '~/utils/context/UserContextProvider';
import { AudioPlayerProvider } from '~/utils/providers/AudioPlayerProvider'; import { AudioPlayerProvider } from '~/utils/providers/AudioPlayerProvider';
@ -22,39 +24,47 @@ import '~/styles/main.scss';
const mobxStore = getMOBXStore(); const mobxStore = getMOBXStore();
export default function MyApp({ Component, pageProps }) { export default class MyApp extends App {
return ( render() {
<StoreContextProvider store={mobxStore}> const { Component, pageProps, router } = this.props;
<SWRConfigProvider> const canonicalURL =
<UserContextProvider> !!CONFIG.publicHost && new URL(router.asPath, CONFIG.publicHost).toString();
<DragDetectorProvider>
<PageCoverProvider>
<SearchProvider>
<AudioPlayerProvider>
<MetadataProvider>
<AuthProvider>
<Head>
<meta
name="viewport"
content="width=device-width, initial-scale=1.0, minimum-scale=1.0, user-scalable=0"
/>
</Head>
<MainLayout> return (
<ToastProvider /> <StoreContextProvider store={mobxStore}>
<Modal /> <SWRConfigProvider>
<Sprites /> <UserContextProvider>
<Component {...pageProps} /> <DragDetectorProvider>
</MainLayout> <PageCoverProvider>
<BottomContainer /> <SearchProvider>
</AuthProvider> <AudioPlayerProvider>
</MetadataProvider> <MetadataProvider>
</AudioPlayerProvider> <AuthProvider>
</SearchProvider> <Head>
</PageCoverProvider> <meta
</DragDetectorProvider> name="viewport"
</UserContextProvider> content="width=device-width, initial-scale=1.0, minimum-scale=1.0, user-scalable=0"
</SWRConfigProvider> />
</StoreContextProvider>
); {!!canonicalURL && <link rel="canonical" href={canonicalURL} />}
</Head>
<MainLayout>
<ToastProvider />
<Modal />
<Sprites />
<Component {...pageProps} />
</MainLayout>
<BottomContainer />
</AuthProvider>
</MetadataProvider>
</AudioPlayerProvider>
</SearchProvider>
</PageCoverProvider>
</DragDetectorProvider>
</UserContextProvider>
</SWRConfigProvider>
</StoreContextProvider>
);
}
} }

9
src/utils/config/index.ts
View file

@ -1,7 +1,10 @@
export const CONFIG = { export const CONFIG = {
apiHost: process.env.REACT_APP_API_HOST || process.env.NEXT_PUBLIC_API_HOST || '', // https://vault48.org/ by default
remoteCurrent: publicHost: process.env.NEXT_PUBLIC_PUBLIC_HOST,
process.env.REACT_APP_REMOTE_CURRENT || process.env.NEXT_PUBLIC_REMOTE_CURRENT || '', // backend endpoint
apiHost: process.env.NEXT_PUBLIC_API_HOST || '',
// image storage endpoint (sames as backend, but with /static usualy)
remoteCurrent: process.env.NEXT_PUBLIC_REMOTE_CURRENT || '',
// transitional prop, marks migration to nextjs // transitional prop, marks migration to nextjs
isNextEnvironment: !!process.env.NEXT_PUBLIC_REMOTE_CURRENT || typeof window === 'undefined', isNextEnvironment: !!process.env.NEXT_PUBLIC_REMOTE_CURRENT || typeof window === 'undefined',
}; };