removed some domain dependencies

This commit is contained in:
mrfry 2023-04-11 16:18:38 +02:00
parent a1dab7a3ca
commit 50daae3cf1
4 changed files with 7 additions and 35 deletions

18
make.sh
View file

@ -1,18 +1,2 @@
#!/bin/bash #!/bin/bash
scriptPath=$(dirname -- "${0}") npm run export
domainPath="${scriptPath}/../../data/domain"
domain="${DOMAIN}"
if [ -z "${domain}" ] && [ -f "${domainPath}" ]; then
domain=$(cat "${domainPath}")
fi
if [ -z "${domain}" ]; then
echo -e "\033[0;41mDOMAIN is not set, and ${domainPath} does not exist!\033[0m"
exit 1
fi
NEXT_PUBLIC_DOMAIN="${domain}" npm run export
echo "Exported with domain: '${domain}'"

View file

@ -2,8 +2,6 @@ import React from 'react'
import Head from 'next/head' import Head from 'next/head'
import { useQueryClient } from 'react-query' import { useQueryClient } from 'react-query'
import constants from '../constants'
export default function Header(props) { export default function Header(props) {
const { title } = props const { title } = props
const queryClient = useQueryClient() const queryClient = useQueryClient()
@ -17,7 +15,9 @@ export default function Header(props) {
return ( return (
<Head> <Head>
<title>{`${unreadString}${titleString}Qmining | ${constants.domain}`}</title> <title>{`${unreadString}${titleString}Qmining${
typeof window !== 'undefined' ? `| ${window.location.domain}` : ''
}`}</title>
</Head> </Head>
) )
} }

View file

@ -1,22 +1,10 @@
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
const useLocalhost = process && process.env.NODE_ENV === 'development' const useLocalhost = process && process.env.NODE_ENV === 'development'
// eslint-disable-next-line no-undef
const domain = process && process.env.NEXT_PUBLIC_DOMAIN
if (!domain && !useLocalhost) {
throw new Error(
'Domain is not defined! Please set NEXT_PUBLIC_DOMAIN env variable!'
)
}
const constants = { const constants = {
domain: domain || 'localhost',
// FIXME: remove siteUrl, replace with Link // FIXME: remove siteUrl, replace with Link
siteUrl: useLocalhost ? 'http://localhost:8080/' : `https://${domain}/`, siteUrl: useLocalhost ? 'http://localhost:8080/' : '/',
apiUrl: useLocalhost apiUrl: useLocalhost ? 'http://localhost:8080/api/' : '/api/',
? 'http://localhost:8080/api/'
: `https://${domain}/api/`,
chatUrl: useLocalhost ? 'http://localhost:8080/' : `https://${domain}/`,
mobileWindowWidth: 700, mobileWindowWidth: 700,
maxQuestionsToRender: 250, maxQuestionsToRender: 250,
imageExts: ['gif', 'png', 'jpeg', 'jpg'], imageExts: ['gif', 'png', 'jpeg', 'jpg'],

View file

@ -202,7 +202,7 @@ export default class Chat extends React.Component {
return return
} }
// https://socket.io/docs/v4/handling-cors/#Configuration // https://socket.io/docs/v4/handling-cors/#Configuration
const socket = io(`${constants.chatUrl}`, { const socket = io(`${constants.siteUrl}`, {
withCredentials: true, withCredentials: true,
extraHeaders: { extraHeaders: {
'qmining-chat': 'qmining-chat', 'qmining-chat': 'qmining-chat',