Browse Source

fixed for app thread + added route '/'

Skylsmoi 5 years ago
parent
commit
11032fd712
3 changed files with 6 additions and 4 deletions
  1. 3 3
      dist/index.html
  2. 1 1
      src/container/OpenContentApp.jsx
  3. 2 0
      src/container/Tracim.jsx

+ 3 - 3
dist/index.html View File

@@ -21,8 +21,8 @@
21 21
     <script src='/tracim.app.entry.js'></script>
22 22
 
23 23
     <script src='/app/html-documents.app.js'></script>
24
-    <!-- <script src='/app/thread.app.js'></script>
25
-    <script src='/app/file.app.js'></script> -->
24
+    <script src='/app/thread.app.js'></script>
25
+    <!-- <script src='/app/file.app.js'></script> -->
26 26
 
27 27
     <script src="/dev/jquery-3.2.1.js"></script>
28 28
     <script src="/dev/popper-1.12.3.js"></script>
@@ -51,7 +51,7 @@
51 51
         const selectedApp = getSelectedApp(app.config.slug)
52 52
 
53 53
         if (selectedApp.isRendered) {
54
-          GLOBAL_dispatchEvent({type: `${app.config.slug}_showApp`, data: app})
54
+          GLOBAL_dispatchEvent({type: `${app.config.slug}_showApp`, data: app}) // handled by html-documents:src/container/HtmlDocument.jsx
55 55
         } else {
56 56
           selectedApp.renderApp(app)
57 57
           selectedApp.isRendered = true

+ 1 - 1
src/container/OpenContentApp.jsx View File

@@ -29,7 +29,7 @@ export class OpenContentApp extends React.Component {
29 29
         this.props.updateAppOpened(true)
30 30
       } else {
31 31
         GLOBAL_dispatchEvent({
32
-          type: 'html-documents_reloadContent',
32
+          type: 'html-documents_reloadContent', // handled by html-documents:src/container/HtmlDocument.jsx
33 33
           data: contentToOpen
34 34
         })
35 35
       }

+ 2 - 0
src/container/Tracim.jsx View File

@@ -55,6 +55,8 @@ class Tracim extends React.Component {
55 55
             <div className='tracim__content'>
56 56
               <Route path={PAGE.LOGIN} component={Login} />
57 57
 
58
+              <PrivateRoute exact path='/' component={WorkspaceContent} />
59
+
58 60
               <Switch>
59 61
                 <PrivateRoute path={PAGE.WORKSPACE.DASHBOARD(':idws')} component={Dashboard} />
60 62
                 <PrivateRoute path={PAGE.WORKSPACE.CALENDAR(':idws')} component={() => <div><br /><br /><br /><br />NYI</div>} />