Merge 65c6874 into 0f2956f

openmrs · Jun 1, 2018 · a113214 · a113214
2 parents 0f2956f + 65c6874
commit a113214
Show file tree

Hide file tree

Showing 29 changed files with 1,498 additions and 46 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -6,7 +6,8 @@
     "camelcase":"off",
     "jsx-a11y/label-has-for":0,
     "react/jsx-closing-tag-location":0,
-    "import/no-named-as-default":0
+    "import/no-named-as-default":0,
+    "class-methods-use-this": "off"
   },
   "parser": "babel-eslint"
 }
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,4 @@ yarn.lock
 
 #test snapshots
 **/__snapshots__/**
+src/components/dashboard/container/ListContainer.jsx
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,14 +12,20 @@
     "enzyme-to-json": "^3.3.3",
     "eslint": "^4.19.1",
     "jest-localstorage-mock": "^2.2.0",
+    "moment": "^2.22.1",
+    "moxios": "^0.4.0",
     "prop-types": "^15.6.1",
+    "qs": "^6.5.2",
     "react": "^16.3.2",
+    "react-addons-shallow-compare": "^15.6.2",
+    "react-avatar": "^2.5.1",
     "react-dom": "^16.3.2",
     "react-mock-router": "^1.0.15",
     "react-notify-toast": "^0.4.0",
     "react-redux": "^5.0.7",
     "react-router-dom": "^4.2.2",
     "react-scripts": "1.1.4",
+    "react-tooltip": "^3.6.0",
     "redux": "^4.0.0",
     "redux-logger": "^3.0.6",
     "redux-mock-store": "^1.5.1",

diff --git a/public/index.html b/public/index.html
@@ -9,6 +9,7 @@
     <title>OpenMRS OCL client</title>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.11/css/all.css" integrity="sha384-p2jx59pefphTFIpeqCcISO9MdVfIm4pNnsL08A6v5vaQc4owkQqxMV8kg4Yvhaw/" crossorigin="anonymous">
+    <link rel="stylesheet" href="util.css">
   </head>
   <body>
     <noscript>