pull new folder
This commit is contained in:
@@ -41,18 +41,8 @@ export default defineNuxtConfig({
|
||||
keycloakClientSecret: process.env.KEYCLOAK_CLIENT_SECRET,
|
||||
keycloakIssuer: process.env.KEYCLOAK_ISSUER,
|
||||
public: {
|
||||
<<<<<<< HEAD
|
||||
authUrl: process.env.AUTH_ORIGIN || 'http://10.10.150.114:3001/' || 'http://localhost:3001'
|
||||
authUrl: process.env.AUTH_ORIGIN || 'http://localhost:3001'
|
||||
}
|
||||
=======
|
||||
authUrl: process.env.AUTH_ORIGIN || "http://10.10.150.114:3001" || "http://localhost:3001"
|
||||
},
|
||||
>>>>>>> 56fb6b319be89d4c0f08ad14760937bcab970f67
|
||||
},
|
||||
|
||||
devServer: {
|
||||
host: "10.10.150.114",
|
||||
port: 3001,
|
||||
},
|
||||
|
||||
build: {
|
||||
@@ -64,10 +54,12 @@ export default defineNuxtConfig({
|
||||
"@mdi/font/css/materialdesignicons.min.css",
|
||||
"~/assets/scss/main.scss",
|
||||
],
|
||||
devServer: {
|
||||
host: "10.10.150.114",
|
||||
port: 3001,
|
||||
},
|
||||
// devServer: {
|
||||
// host: "10.10.150.114",
|
||||
// port: 3001,
|
||||
// },
|
||||
|
||||
// 'http://10.10.150.114:3001/'
|
||||
|
||||
vite: {
|
||||
css: {
|
||||
|
||||
1615
package-lock.json
generated
1615
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user