update for endpoint propagation

This commit is contained in:
Michael Schramm 2020-06-01 01:45:17 +02:00
parent 06ec73289f
commit 5eac444849
3 changed files with 12 additions and 6 deletions

View File

@ -1,7 +1,6 @@
import {CaretDownOutlined, UserOutlined} from '@ant-design/icons'
import {MenuFoldOutlined, MenuUnfoldOutlined} from '@ant-design/icons/lib'
import {Dropdown, Layout, Menu, PageHeader, Spin, Tag} from 'antd'
import getConfig from 'next/config'
import Link from 'next/link'
import {useRouter} from 'next/router'
import React, {FunctionComponent} from 'react'
@ -9,8 +8,6 @@ import {sideMenu, SideMenuElement} from './sidemenu'
import {useWindowSize} from './use.window.size'
import {clearAuth} from './with.auth'
const { publicRuntimeConfig } = getConfig()
const { SubMenu, ItemGroup } = Menu
const { Header, Content, Sider } = Layout
@ -200,7 +197,7 @@ const Structure: FunctionComponent<Props> = (props) => {
marginTop: 40,
}}
>
Version: <Tag color="gold">{publicRuntimeConfig.version}</Tag>
Version: <Tag color="gold">{process.env.version}</Tag>
</Menu.Item>
</Menu>
</Sider>

View File

@ -4,8 +4,11 @@ const p = require('./package.json')
const version = p.version;
module.exports = withImages({
poweredByHeader: false,
publicRuntimeConfig: {
endpoint: process.env.API_HOST || '/graphql',
},
env: {
version,
}
})

View File

@ -34,5 +34,11 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
)
}
export default wrapper.withRedux(App)
// export default App
const WrappedApp = wrapper.withRedux(App)
WrappedApp.getInitialProps = async (): Promise<any> => {
// important for now to pass public runtime config to clients!
return {}
}
export default WrappedApp