Browse Source

[FIX] version

Gogs 7 years ago
parent
commit
1619f9fd08
8 changed files with 114 additions and 45 deletions
  1. 4 4
      package.json
  2. 3 1
      src/actions/index.js
  3. 16 4
      src/components/App.js
  4. 3 3
      src/components/pages/TasksList.js
  5. 2 0
      src/index.js
  6. 20 0
      src/registerAuthEngine.js
  7. 34 0
      src/utils/http.js
  8. 32 33
      yarn.lock

+ 4 - 4
package.json

@@ -6,16 +6,16 @@
     "axios": "^0.18.0",
     "history": "^4.7.2",
     "lodash": "^4.17.5",
-    "material-ui": "^1.0.0-beta.36",
+    "material-ui": "^1.0.0-beta.40",
     "prop-types": "^15.6.1",
-    "react": "^16.2.0",
-    "react-dom": "^16.2.0",
+    "react": "^16.3.0",
+    "react-dom": "^16.3.0",
     "react-helmet": "^5.2.0",
     "react-redux": "^5.0.7",
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
     "react-router-redux": "^5.0.0-alpha.9",
-    "react-scripts": "1.1.1",
+    "react-scripts": "^1.1.1",
     "redux": "^3.7.2",
     "redux-thunk": "^2.2.0",
     "typeface-roboto": "^0.0.54"

+ 3 - 1
src/actions/index.js

@@ -1,6 +1,7 @@
 import axios from 'axios'
 import { isArray } from 'lodash'
 import { API_URL } from '../constants/ResourceNames'
+import http from '../utils/http'
 import { 
     REQUEST_START,
     REQUEST_OK, 
@@ -43,7 +44,8 @@ export const get = resource => async dispatch => {
     })
 
     try {
-        const response = await axios.get(`${API_URL}${resource}`)
+        // const response = await axios.get(`${API_URL}${resource}`)
+        const response = await http.get(`${resource}`)
         dispatch(ok(response.data))
     } catch (error) {
         dispatch(ko(resource, error))

+ 16 - 4
src/components/App.js

@@ -1,18 +1,30 @@
 import React, { Component } from 'react'
 import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles'
-import Reboot from 'material-ui/Reboot'
+import CssBaseline from 'material-ui/CssBaseline'
 import { Provider } from 'react-redux'
 import { ConnectedRouter } from 'react-router-redux'
 import { store, history } from '../reducers'
 import Routes from '../components/common/Routes'
 
 class App extends Component {
+    /**
+     * 
+     * @param {*} error 
+     * @param {*} info 
+     */
+    componentDidCatch(error, info) {
+        console.log(error, info)
+    }
+
+    /**
+     * 
+     */
     render() {
         const theme = createMuiTheme({
             palette: {
                 primary: { 
                     main: '#0288d1'
-                },
+                }
             },
             typography: {
                 fontSize: 12
@@ -20,8 +32,8 @@ class App extends Component {
         })
 
         return (
-            <MuiThemeProvider theme={theme}>
-                <Reboot />
+            <MuiThemeProvider theme={theme}>    
+                <CssBaseline />
                 <Provider store={store}>
                     <ConnectedRouter history={history}>
                         <Routes />

+ 3 - 3
src/components/pages/TasksList.js

@@ -89,7 +89,7 @@ class TasksList extends Component {
         const { name, nameConfirmation } = this.state
         
         if (isEmpty(name) || isEmpty(nameConfirmation)) {
-            return;
+            return
         }
 
         if (isEqual(name, nameConfirmation)) {
@@ -137,7 +137,7 @@ class TasksList extends Component {
                 <Dialog open={isDialogOpened} onClose={this.handleCloseDialog}>
                     <DialogTitle>Confirmar</DialogTitle>
                     <DialogContent>
-                        <DialogContentText>Estas solicitando crear un contenedor Odoo. Tenga en cuenta que ésta tarea puede tardar unos instantes dependiendo del tráfico de red y el uso de los recursos del servidor</DialogContentText>
+                        <DialogContentText>Estás solicitando crear un nuevo contenedor Odoo. Tenga en cuenta que ésta tarea puede tardar unos instantes dependiendo del tráfico de red y del uso de los recursos del servidor</DialogContentText>
                         <TextField 
                             id='name'
                             margin='dense' 
@@ -151,7 +151,7 @@ class TasksList extends Component {
                         <TextField
                             id='nameConfirmation'
                             margin='dense' 
-                            label='Nombre del sistema'
+                            label='Repita el nombre del sistema'
                             type='text' 
                             autoComplete='off' 
                             fullWidth

+ 2 - 0
src/index.js

@@ -2,7 +2,9 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 import App from './components/App'
 import registerServiceWorker from './registerServiceWorker'
+import registerAuthEngine from './registerAuthEngine'
 import 'typeface-roboto'
 
 ReactDOM.render(<App />, document.getElementById('root'));
+registerAuthEngine();
 registerServiceWorker();

+ 20 - 0
src/registerAuthEngine.js

@@ -0,0 +1,20 @@
+import axios from 'axios'
+
+const TOKEN_KEY = 'eiruAutomation'
+
+/**
+ * 
+ */
+const init = () => {
+    const token = localStorage.getItem(TOKEN_KEY)
+
+    if (!token) {
+        return
+    }
+
+    axios.defaults.headers.common['Accept'] = 'application/json'
+    axios.defaults.headers.common['Content-Type'] = 'application/json'
+    axios.defaults.headers.common['Authorization'] = `JWT ${token}`
+} 
+
+export default init

+ 34 - 0
src/utils/http.js

@@ -0,0 +1,34 @@
+import axios from 'axios'
+import { API_URL } from '../constants/ResourceNames'
+
+const TOKEN_KEY = 'eiruAutomation'
+
+// Create instance
+const instance = axios.create({
+    baseURL: API_URL,
+    headers: {
+        'Accept': 'application/json',
+        'Content-Type': 'application/json'
+    },
+    timeout: 1000
+})
+
+// Define interceptor
+instance.interceptors.request.use(config => {
+    const token = localStorage.getItem(TOKEN_KEY)
+
+    if (token) {
+        config.headers['Authorization'] = `JWT ${token}`
+    }
+
+    return config
+}, error => Promise.reject(error))
+
+// Define defaults
+instance.defaults.headers.common['Content-Type'] = 'application/json'
+// instance.defaults.headers.get['Content-Type'] = 'application/json'
+// instance.defaults.headers.post['Content-Type'] = 'application/json'
+// instance.defaults.headers.put['Content-Type'] = 'application/json'
+// instance.defaults.headers.patch['Content-Type'] = 'application/json'
+
+export default instance

+ 32 - 33
yarn.lock

@@ -3,8 +3,8 @@
 
 
 "@types/jss@^9.3.0":
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/@types/jss/-/jss-9.3.1.tgz#9e113f5d3e6bba6d8babca6be528b5cf19d37a16"
+  version "9.3.3"
+  resolved "https://registry.yarnpkg.com/@types/jss/-/jss-9.3.3.tgz#818c6281c1909bfba173ee220fd1236fdeeb708e"
 
 "@types/react-transition-group@^2.0.6":
   version "2.0.7"
@@ -13,8 +13,8 @@
     "@types/react" "*"
 
 "@types/react@*":
-  version "16.0.40"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.40.tgz#caabc2296886f40b67f6fc80f0f3464476461df9"
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.3.1.tgz#6f6aaffaf7dba502ff5ca15e4aa18caee9b04995"
 
 abab@^1.0.3:
   version "1.0.4"
@@ -1943,8 +1943,8 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
 deepmerge@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.0.1.tgz#25c1c24f110fb914f80001b925264dd77f3f4312"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.0.tgz#511a54fff405fc346f0240bb270a3e9533a31102"
 
 default-require-extensions@^1.0.0:
   version "1.0.0"
@@ -4280,9 +4280,9 @@ jss-vendor-prefixer@^7.0.0:
   dependencies:
     css-vendor "^0.3.8"
 
-jss@^9.3.2, jss@^9.3.3:
-  version "9.8.0"
-  resolved "https://registry.yarnpkg.com/jss/-/jss-9.8.0.tgz#77830def563870103f8671ed31ce3a3d2f32aa2b"
+jss@^9.3.3, jss@^9.7.0:
+  version "9.8.1"
+  resolved "https://registry.yarnpkg.com/jss/-/jss-9.8.1.tgz#e2ff250777ad657430e6edc47a63516541b888fa"
   dependencies:
     is-in-browser "^1.1.3"
     symbol-observable "^1.1.0"
@@ -4299,8 +4299,8 @@ jsx-ast-utils@^2.0.0:
     array-includes "^3.0.3"
 
 keycode@^2.1.9:
-  version "2.1.9"
-  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.1.9.tgz#964a23c54e4889405b4861a5c9f0480d45141dfa"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
 
 killable@^1.0.0:
   version "1.0.0"
@@ -4530,9 +4530,9 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-material-ui@^1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-1.0.0-beta.36.tgz#e877c570008cb0e4e7784fc69ff0359121a4866a"
+material-ui@^1.0.0-beta.40:
+  version "1.0.0-beta.40"
+  resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-1.0.0-beta.40.tgz#eaf0a0b264739c2c4d2cfe82fe100338814962bb"
   dependencies:
     "@types/jss" "^9.3.0"
     "@types/react-transition-group" "^2.0.6"
@@ -5265,8 +5265,8 @@ pluralize@^7.0.0:
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
 
 popper.js@^1.12.9:
-  version "1.12.9"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.12.9.tgz#0dfbc2dff96c451bb332edcfcfaaf566d331d5b3"
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.1.tgz#b8815e5cda6f62fc2042e47618649f75866e6753"
 
 portfinder@^1.0.9:
   version "1.0.13"
@@ -5779,9 +5779,9 @@ react-dev-utils@^5.0.0:
     strip-ansi "3.0.1"
     text-table "0.2.0"
 
-react-dom@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
+react-dom@^16.3.0:
+  version "16.3.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.0.tgz#b318e52184188ecb5c3e81117420cca40618643e"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"
@@ -5811,22 +5811,22 @@ react-helmet@^5.2.0:
     react-side-effect "^1.1.0"
 
 react-jss@^8.1.0:
-  version "8.3.3"
-  resolved "https://registry.yarnpkg.com/react-jss/-/react-jss-8.3.3.tgz#677a57569d3e4f5099fcdeafeddd8d2c62ab5977"
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/react-jss/-/react-jss-8.4.0.tgz#7cb43d85dea56afafc8f0fd072ae27fcc0518950"
   dependencies:
     hoist-non-react-statics "^2.3.1"
-    jss "^9.3.2"
+    jss "^9.7.0"
     jss-preset-default "^4.3.0"
     prop-types "^15.6.0"
     theming "^1.3.0"
 
 react-lifecycles-compat@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-1.0.2.tgz#551d8b1d156346e5fcf30ffac9b32ce3f78b8850"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-1.1.0.tgz#6641d0709bd5505329b5c90322147ef2d343485c"
 
 react-popper@^0.8.0:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.8.2.tgz#092095ff13933211d3856d9f325511ec3a42f12c"
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.8.3.tgz#0f73333137c9fb0af6ec4074d2d0585a0a0461e1"
   dependencies:
     popper.js "^1.12.9"
     prop-types "^15.6.0"
@@ -5873,7 +5873,7 @@ react-router@^4.2.0:
     prop-types "^15.5.4"
     warning "^3.0.0"
 
-react-scripts@1.1.1:
+react-scripts@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-1.1.1.tgz#279d449f7311fed910506987a1ade014027788a8"
   dependencies:
@@ -5934,19 +5934,18 @@ react-side-effect@^1.1.0:
     shallowequal "^1.0.1"
 
 react-transition-group@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.2.1.tgz#e9fb677b79e6455fd391b03823afe84849df4a10"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.3.0.tgz#8dd1af58f6af284b19fd057f512e74f20438ad31"
   dependencies:
     chain-function "^1.0.0"
-    classnames "^2.2.5"
     dom-helpers "^3.2.0"
     loose-envify "^1.3.1"
     prop-types "^15.5.8"
     warning "^3.0.0"
 
-react@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
+react@^16.3.0:
+  version "16.3.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.3.0.tgz#fc5a01c68f91e9b38e92cf83f7b795ebdca8ddff"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"