Browse Source

fix naming

Skylsmoi 6 years ago
parent
commit
09298964b2
3 changed files with 23 additions and 3 deletions
  1. 1 1
      src/appFactory.js
  2. 20 0
      src/container/RouteWorkspace.jsx
  3. 2 2
      src/reducer/contentType.js

+ 1 - 1
src/appFactory.js View File

@@ -37,7 +37,7 @@ export function appFactory (WrappedComponent) {
37 37
           renderApp={this.renderApp}
38 38
           renderCreateContentApp={this.renderCreateContentApp}
39 39
           emitEventApp={this.emitEventApp}
40
-          hideApp={this.hideApp}
40
+          // hideApp={this.hideApp}
41 41
         />
42 42
       )
43 43
     }

+ 20 - 0
src/container/RouteWorkspace.jsx View File

@@ -0,0 +1,20 @@
1
+import React from 'react'
2
+import {PAGE} from '../helper.js'
3
+import WorkspaceContent from './WorkspaceContent.jsx'
4
+import Dashboard from './Dashboard.jsx'
5
+
6
+// dunno why i would need this, but, at the time, it sounded a good idea
7
+
8
+class RouteWorkspace extends React.Component {
9
+  render () {
10
+    return (
11
+      <Switch>
12
+        <PrivateRoute path={PAGE.WORKSPACE.DASHBOARD(':idws')} component={Dashboard} />
13
+        <PrivateRoute path={PAGE.WORKSPACE.CALENDAR(':idws')} component={() => <div><br /><br /><br /><br />NYI</div>} />
14
+        <PrivateRoute path={PAGE.WORKSPACE.CONTENT(':idws', ':type?', ':idcts?')} component={WorkspaceContent} />
15
+      </Switch>
16
+    )
17
+  }
18
+}
19
+
20
+export default RouteWorkspace

+ 2 - 2
src/reducer/contentType.js View File

@@ -12,9 +12,9 @@ export function contentType (state = [], action) {
12 12
         availableStatuses: ct.available_statuses.map(as => ({
13 13
           label: as.label,
14 14
           slug: as.slug,
15
-          fa_icon: as.fa_icon,
15
+          faIcon: as.fa_icon,
16 16
           hexcolor: as.hexcolor,
17
-          global_status: as.global_status
17
+          globalStatus: as.global_status
18 18
         }))
19 19
       }))
20 20