mirror of
				https://github.com/Unleash/unleash.git
				synced 2025-10-27 11:02:16 +01:00 
			
		
		
		
	Merge branch 'main' into fix-rollout-datatype
This commit is contained in:
		
						commit
						04a85da1be
					
				@ -456,8 +456,8 @@ export const routes = [
 | 
				
			|||||||
        type: 'protected',
 | 
					        type: 'protected',
 | 
				
			||||||
        menu: {},
 | 
					        menu: {},
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    /* If you update this route path, make sure you update the path in SWRProvider.tsx */
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /* If you update this route path, make sure you update the path in SWRProvider.tsx */
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        path: '/login',
 | 
					        path: '/login',
 | 
				
			||||||
        title: 'Log in',
 | 
					        title: 'Log in',
 | 
				
			||||||
@ -478,15 +478,16 @@ export const routes = [
 | 
				
			|||||||
    /* If you update this route path, make sure you update the path in SWRProvider.tsx */
 | 
					    /* If you update this route path, make sure you update the path in SWRProvider.tsx */
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        path: '/reset-password',
 | 
					        path: '/reset-password',
 | 
				
			||||||
        title: 'reset-password',
 | 
					        title: 'Reset password',
 | 
				
			||||||
        hidden: true,
 | 
					        hidden: true,
 | 
				
			||||||
        component: ResetPassword,
 | 
					        component: ResetPassword,
 | 
				
			||||||
        type: 'unprotected',
 | 
					        type: 'unprotected',
 | 
				
			||||||
        menu: {},
 | 
					        menu: {},
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					    /* If you update this route path, make sure you update the path in SWRProvider.tsx */
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        path: '/forgotten-password',
 | 
					        path: '/forgotten-password',
 | 
				
			||||||
        title: 'reset-password',
 | 
					        title: 'Forgotten password',
 | 
				
			||||||
        hidden: true,
 | 
					        hidden: true,
 | 
				
			||||||
        component: ForgottenPassword,
 | 
					        component: ForgottenPassword,
 | 
				
			||||||
        type: 'unprotected',
 | 
					        type: 'unprotected',
 | 
				
			||||||
 | 
				
			|||||||
@ -32,7 +32,8 @@ const SWRProvider: React.FC<ISWRProviderProps> = ({
 | 
				
			|||||||
            if (
 | 
					            if (
 | 
				
			||||||
                path === formatApiPath('login') ||
 | 
					                path === formatApiPath('login') ||
 | 
				
			||||||
                path === formatApiPath('new-user') ||
 | 
					                path === formatApiPath('new-user') ||
 | 
				
			||||||
                path === formatApiPath('reset-password')
 | 
					                path === formatApiPath('reset-password') ||
 | 
				
			||||||
 | 
					                path === formatApiPath('forgotten-password')
 | 
				
			||||||
            ) {
 | 
					            ) {
 | 
				
			||||||
                return;
 | 
					                return;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user