mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-03 20:06:08 +01:00 
			
		
		
		
	fix assuming that trilium is exposed on the root path, closes #3452
This commit is contained in:
		@@ -14,7 +14,7 @@ function setupPage(req, res) {
 | 
				
			|||||||
            windowService.closeSetupWindow();
 | 
					            windowService.closeSetupWindow();
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        else {
 | 
					        else {
 | 
				
			||||||
            res.redirect('/');
 | 
					            res.redirect('.');
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ module.exports = {
 | 
				
			|||||||
        mobile: './src/public/app/desktop.js',
 | 
					        mobile: './src/public/app/desktop.js',
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    output: {
 | 
					    output: {
 | 
				
			||||||
        publicPath: `/${assetPath}/app-dist/`,
 | 
					        publicPath: `${assetPath}/app-dist/`,
 | 
				
			||||||
        path: path.resolve(__dirname, 'src/public/app-dist'),
 | 
					        path: path.resolve(__dirname, 'src/public/app-dist'),
 | 
				
			||||||
        filename: 'desktop.js'
 | 
					        filename: 'desktop.js'
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ module.exports = {
 | 
				
			|||||||
        mobile: './src/public/app/mobile.js',
 | 
					        mobile: './src/public/app/mobile.js',
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    output: {
 | 
					    output: {
 | 
				
			||||||
        publicPath: `/${assetPath}/app-dist/`,
 | 
					        publicPath: `${assetPath}/app-dist/`,
 | 
				
			||||||
        path: path.resolve(__dirname, 'src/public/app-dist'),
 | 
					        path: path.resolve(__dirname, 'src/public/app-dist'),
 | 
				
			||||||
        filename: 'mobile.js'
 | 
					        filename: 'mobile.js'
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ module.exports = {
 | 
				
			|||||||
        mobile: './src/public/app/setup.js',
 | 
					        mobile: './src/public/app/setup.js',
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    output: {
 | 
					    output: {
 | 
				
			||||||
        publicPath: `/${assetPath}/app-dist/`,
 | 
					        publicPath: `${assetPath}/app-dist/`,
 | 
				
			||||||
        path: path.resolve(__dirname, 'src/public/app-dist'),
 | 
					        path: path.resolve(__dirname, 'src/public/app-dist'),
 | 
				
			||||||
        filename: 'setup.js'
 | 
					        filename: 'setup.js'
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user