@@ -274,129 +274,112 @@ class AppIndex extends React.Component<AppIndexProps, any> {
274
274
type = "text/html"
275
275
href = { window . location . href }
276
276
media = "(aspect-ratio: 1280/720)"
277
- /> ,
278
-
279
- < link
280
- key = "preconnect-googleapis"
281
- rel = "preconnect"
282
- href = "https://fonts.googleapis.com"
283
- /> ,
284
- < link
285
- key = "preconnect-gstatic"
286
- rel = "preconnect"
287
- href = "https://fonts.gstatic.com"
288
- crossOrigin = "anonymous"
289
- /> ,
290
- < link
291
- key = "font-ubuntu"
292
- href = "https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,700;1,400& display = swap "
293
- rel = "stylesheet"
294
277
/>
295
278
] }
296
279
</ Helmet >
297
280
< SystemWarning />
298
- < Router history = { history } >
299
- < Switch >
300
- < LazyRoute
301
- exact
302
- path = { IMPORT_APP_FROM_TEMPLATE_URL }
303
- component = { LazyAppFromTemplate }
304
- />
281
+ < Router history = { history } >
282
+ < Switch >
283
+ < LazyRoute
284
+ exact
285
+ path = { IMPORT_APP_FROM_TEMPLATE_URL }
286
+ component = { LazyAppFromTemplate }
287
+ />
305
288
306
- < LazyRoute
307
- exact
308
- fallback = "layout"
309
- path = { PUBLIC_APP_EDITOR_URL }
310
- component = { LazyPublicAppEditor }
311
- />
289
+ < LazyRoute
290
+ exact
291
+ fallback = "layout"
292
+ path = { PUBLIC_APP_EDITOR_URL }
293
+ component = { LazyPublicAppEditor }
294
+ />
312
295
313
- < LazyRoute
314
- fallback = "layout"
315
- path = { APP_EDITOR_URL }
316
- component = { LazyAppEditor }
317
- />
318
- < LazyRoute
319
- fallback = "layout"
320
- path = { [
321
- USER_PROFILE_URL ,
322
- NEWS_URL ,
323
- ORG_HOME_URL ,
324
- ALL_APPLICATIONS_URL ,
325
- DATASOURCE_CREATE_URL ,
326
- DATASOURCE_EDIT_URL ,
327
- DATASOURCE_URL ,
328
- SUPPORT_URL ,
329
- QUERY_LIBRARY_URL ,
330
- FOLDERS_URL ,
331
- FOLDER_URL ,
332
- TRASH_URL ,
333
- SETTING_URL ,
334
- MARKETPLACE_URL ,
335
- ADMIN_APP_URL
336
- ] }
337
- // component={ApplicationListPage}
338
- component = { LazyApplicationHome }
339
- />
340
- < LazyRoute exact path = { ADMIN_AUTH_URL } component = { LazyUserAuthComp } />
341
- < LazyRoute path = { USER_AUTH_URL } component = { LazyUserAuthComp } />
342
- < LazyRoute
343
- path = { ORG_AUTH_LOGIN_URL }
344
- component = { LazyUserAuthComp }
345
- />
346
- < LazyRoute
347
- path = { ORG_AUTH_REGISTER_URL }
348
- component = { LazyUserAuthComp }
349
- />
350
- < LazyRoute
351
- path = { ORG_AUTH_FORGOT_PASSWORD_URL }
352
- component = { LazyUserAuthComp }
353
- />
354
- < LazyRoute
355
- path = { ORG_AUTH_RESET_PASSWORD_URL }
356
- component = { LazyUserAuthComp }
357
- />
358
- < LazyRoute
359
- path = { INVITE_LANDING_URL }
360
- component = { LazyInviteLanding }
361
- />
362
- < LazyRoute
363
- path = { `${ COMPONENT_DOC_URL } /:name` }
364
- component = { LazyComponentDoc }
365
- />
366
- < LazyRoute
367
- path = { `/playground/:name/:dsl` }
368
- component = { LazyComponentPlayground }
369
- />
296
+ < LazyRoute
297
+ fallback = "layout"
298
+ path = { APP_EDITOR_URL }
299
+ component = { LazyAppEditor }
300
+ />
301
+ < LazyRoute
302
+ fallback = "layout"
303
+ path = { [
304
+ USER_PROFILE_URL ,
305
+ NEWS_URL ,
306
+ ORG_HOME_URL ,
307
+ ALL_APPLICATIONS_URL ,
308
+ DATASOURCE_CREATE_URL ,
309
+ DATASOURCE_EDIT_URL ,
310
+ DATASOURCE_URL ,
311
+ SUPPORT_URL ,
312
+ QUERY_LIBRARY_URL ,
313
+ FOLDERS_URL ,
314
+ FOLDER_URL ,
315
+ TRASH_URL ,
316
+ SETTING_URL ,
317
+ MARKETPLACE_URL ,
318
+ ADMIN_APP_URL
319
+ ] }
320
+ // component={ApplicationListPage}
321
+ component = { LazyApplicationHome }
322
+ />
323
+ < LazyRoute exact path = { ADMIN_AUTH_URL } component = { LazyUserAuthComp } />
324
+ < LazyRoute path = { USER_AUTH_URL } component = { LazyUserAuthComp } />
325
+ < LazyRoute
326
+ path = { ORG_AUTH_LOGIN_URL }
327
+ component = { LazyUserAuthComp }
328
+ />
329
+ < LazyRoute
330
+ path = { ORG_AUTH_REGISTER_URL }
331
+ component = { LazyUserAuthComp }
332
+ />
333
+ < LazyRoute
334
+ path = { ORG_AUTH_FORGOT_PASSWORD_URL }
335
+ component = { LazyUserAuthComp }
336
+ />
337
+ < LazyRoute
338
+ path = { ORG_AUTH_RESET_PASSWORD_URL }
339
+ component = { LazyUserAuthComp }
340
+ />
341
+ < LazyRoute
342
+ path = { INVITE_LANDING_URL }
343
+ component = { LazyInviteLanding }
344
+ />
345
+ < LazyRoute
346
+ path = { `${ COMPONENT_DOC_URL } /:name` }
347
+ component = { LazyComponentDoc }
348
+ />
349
+ < LazyRoute
350
+ path = { `/playground/:name/:dsl` }
351
+ component = { LazyComponentPlayground }
352
+ />
370
353
371
- { this . props . isFetchUserFinished && this . props . defaultHomePage ? (
372
- ! this . props . orgDev ? (
373
- < Redirect exact from = { BASE_URL } to = { APPLICATION_VIEW_URL ( this . props . defaultHomePage || "" , "view" ) } />
374
- ) : (
375
- < Redirect exact from = { BASE_URL } to = { ORG_HOME_URL } />
376
- )
354
+ { this . props . isFetchUserFinished && this . props . defaultHomePage ? (
355
+ ! this . props . orgDev ? (
356
+ < Redirect exact from = { BASE_URL } to = { APPLICATION_VIEW_URL ( this . props . defaultHomePage || "" , "view" ) } />
377
357
) : (
378
- < Redirect exact from = { BASE_URL } to = { ALL_APPLICATIONS_URL } />
379
- ) }
358
+ < Redirect exact from = { BASE_URL } to = { ORG_HOME_URL } />
359
+ )
360
+ ) : (
361
+ < Redirect exact from = { BASE_URL } to = { ALL_APPLICATIONS_URL } />
362
+ ) }
380
363
381
- < Redirect to = { `${ COMPONENT_DOC_URL } /input` } path = "/components" />
364
+ < Redirect to = { `${ COMPONENT_DOC_URL } /input` } path = "/components" />
382
365
383
- { developEnv ( ) && (
384
- < >
385
- < LazyRoute
386
- path = "/debug_comp/:name"
387
- component = { LazyDebugComp }
388
- />
389
- < LazyRoute
390
- exact
391
- path = "/debug_comp"
392
- component = { LazyDebugComp }
393
- />
394
- < LazyRoute path = "/debug_editor" component = { LazyAppEditor } />
395
- < LazyRoute path = "/debug_new" component = { LazyDebugNewComp } />
396
- </ >
397
- ) }
398
- </ Switch >
399
- </ Router >
366
+ { developEnv ( ) && (
367
+ < >
368
+ < LazyRoute
369
+ path = "/debug_comp/:name"
370
+ component = { LazyDebugComp }
371
+ />
372
+ < LazyRoute
373
+ exact
374
+ path = "/debug_comp"
375
+ component = { LazyDebugComp }
376
+ />
377
+ < LazyRoute path = "/debug_editor" component = { LazyAppEditor } />
378
+ < LazyRoute path = "/debug_new" component = { LazyDebugNewComp } />
379
+ </ >
380
+ ) }
381
+ </ Switch >
382
+ </ Router >
400
383
</ Wrapper >
401
384
) ;
402
385
}
@@ -453,7 +436,7 @@ export function bootstrap() {
453
436
const root = createRoot ( container ! ) ;
454
437
root . render (
455
438
< Provider store = { reduxStore } >
456
- < AppIndexWithProps />
439
+ < AppIndexWithProps />
457
440
</ Provider >
458
441
) ;
459
442
}
0 commit comments