mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-03 20:06:08 +01:00 
			
		
		
		
	fix setup on non-root paths #404
This commit is contained in:
		
							
								
								
									
										2
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "trilium",
 | 
			
		||||
  "version": "0.37.2",
 | 
			
		||||
  "version": "0.37.3",
 | 
			
		||||
  "lockfileVersion": 1,
 | 
			
		||||
  "requires": true,
 | 
			
		||||
  "dependencies": {
 | 
			
		||||
 
 | 
			
		||||
@@ -76,12 +76,12 @@ function SetupModel() {
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            // not using server.js because it loads too many dependencies
 | 
			
		||||
            $.post('/api/setup/new-document', {
 | 
			
		||||
            $.post('api/setup/new-document', {
 | 
			
		||||
                username: username,
 | 
			
		||||
                password: password1,
 | 
			
		||||
                theme: theme
 | 
			
		||||
            }).then(() => {
 | 
			
		||||
                window.location.replace("/");
 | 
			
		||||
                window.location.replace("./");
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
        else if (this.setupType() === 'sync-from-server') {
 | 
			
		||||
@@ -128,10 +128,10 @@ function SetupModel() {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
async function checkOutstandingSyncs() {
 | 
			
		||||
    const { stats, initialized } = await $.get('/api/sync/stats');
 | 
			
		||||
    const { stats, initialized } = await $.get('api/sync/stats');
 | 
			
		||||
 | 
			
		||||
    if (initialized) {
 | 
			
		||||
        window.location.replace("/");
 | 
			
		||||
        window.location.replace("./");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    const totalOutstandingSyncs = stats.outstandingPushes + stats.outstandingPulls;
 | 
			
		||||
 
 | 
			
		||||
@@ -138,7 +138,6 @@
 | 
			
		||||
</div>
 | 
			
		||||
 | 
			
		||||
<script type="text/javascript">
 | 
			
		||||
    const baseApiUrl = 'api/';
 | 
			
		||||
    const glob = {
 | 
			
		||||
        sourceId: ''
 | 
			
		||||
    };
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user