Redux added and display universities marker with no ajax operationnal

frontend/src/actions/index.js

+import { ADD_ARTICLE } from "../constants/action-types";
+
+export const addArticle = article => ({ type: ADD_ARTICLE, payload: article });
\ No newline at end of file

frontend/src/components/App.js

 import React from "react";
 import ReactDOM from "react-dom";
+import { Provider } from "react-redux";
+import store from "../store/index";
 import Dashboard from "./Dashboard";
-import UnivMap from './UnivMap';
 
 const App = () => (
-    <Dashboard />
+    <Provider store={store}>
+        <Dashboard />
+    </Provider>
 );
 
+
 const wrapper = document.getElementById("app");
 
-wrapper ? ReactDOM.render(<App />, wrapper) : null;
\ No newline at end of file
+wrapper ? ReactDOM.render(<App />, wrapper) : null;
+

frontend/src/components/UnivMap.js

 import React, { Component } from 'react';
+import { connect } from "react-redux";
 import { Map, TileLayer, Marker, Popup, LayersControl, FeatureGroup, Circle, LayerGroup } from 'react-leaflet';
 // import MarkerClusterGroup from 'react-leaflet-markercluster';
 
-export default class UnivMap extends Component {
-    state = {
-        lat: 51.505,
-        lng: -0.09,
-        zoom: 13,
-        height: '200px'
-    }
-
-    render() {
-        const position = [this.state.lat, this.state.lng]
-        return (
-            <Map center={position} zoom={this.state.zoom} style={{ height: "500px" }}>
-                <LayersControl position="topright">
-                    <LayersControl.BaseLayer name="OpenStreetMap France" checked={false}>
-                        <TileLayer
-                            attribution='&copy; Openstreetmap France | &copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
-                            url="https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png"
-                            maxZoom={20}
-                        />
-                    </LayersControl.BaseLayer>
-
-                    <LayersControl.BaseLayer name="Stamen Watercolor" checked={true}>
-                        <LayerGroup>
-                            <TileLayer
-                                attribution='Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> &mdash; Map data &copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
-                                url="https://stamen-tiles-{s}.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.png"
-                                minZoom={1}
-                                maxZoom={18}
-                                subdomains='abcd'
-                            />
-                            <TileLayer
-                                attribution='Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> &mdash; Map data &copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
-                                url="https://stamen-tiles-{s}.a.ssl.fastly.net/toner-labels/{z}/{x}/{y}.png"
-                                minZoom={1}
-                                subdomains='abcd'
-                                maxZoom={18}
-                            />
-                        </LayerGroup>
-                    </LayersControl.BaseLayer>
-
-
-                    <LayersControl.BaseLayer name="Esri WorldImagery">
-                        <TileLayer
-                            attribution="Tiles &copy; Esri &mdash; Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community"
-                            url="https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}"
-                        />
-                    </LayersControl.BaseLayer>
-
-                </LayersControl>
-            </Map>
-        )
-    }
-}
-
 
+const mapStateToProps = state => {
+    return { universities: state.universities };
+};
+
+const ToConnectUnivMap = ({ universities }) => (
+    <Map center={[51, 0]} zoom={13} style={{ height: "500px" }}>
+        <LayersControl position="topright">
+            <LayersControl.BaseLayer name="OpenStreetMap France" checked={false}>
+                <TileLayer
+                    attribution='&copy; Openstreetmap France | &copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+                    url="https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png"
+                    maxZoom={20}
+                />
+            </LayersControl.BaseLayer>
+
+            <LayersControl.BaseLayer name="Stamen Watercolor" checked={true}>
+                <LayerGroup>
+                    <TileLayer
+                        attribution='Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> &mdash; Map data &copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+                        url="https://stamen-tiles-{s}.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.png"
+                        minZoom={1}
+                        maxZoom={18}
+                        subdomains='abcd'
+                    />
+                    <TileLayer
+                        attribution='Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> &mdash; Map data &copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+                        url="https://stamen-tiles-{s}.a.ssl.fastly.net/toner-labels/{z}/{x}/{y}.png"
+                        minZoom={1}
+                        subdomains='abcd'
+                        maxZoom={18}
+                    />
+                </LayerGroup>
+            </LayersControl.BaseLayer>
+
+
+            <LayersControl.BaseLayer name="Esri WorldImagery">
+                <TileLayer
+                    attribution="Tiles &copy; Esri &mdash; Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community"
+                    url="https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}"
+                />
+            </LayersControl.BaseLayer>
+
+        </LayersControl>
+        {universities.map(el => (
+            <Marker position={[el.univCampus[0].lat, el.univCampus[0].lon]}>
+                <Popup>
+                    {el.name}
+                </Popup>
+            </Marker>
+
+        ))}
+
+    </Map>
+)
+
+const UnivMap = connect(mapStateToProps)(ToConnectUnivMap);
+export default UnivMap;

frontend/src/constants/action-types.js

+export const ADD_ARTICLE = "ADD_ARTICLE";
\ No newline at end of file

frontend/src/store/index.js

+import { createStore } from "redux";
+import rootReducer from "../reducers/index";
+
+const store = createStore(rootReducer);
+
+export default store;
\ No newline at end of file

frontend/static/frontend/css/leaflet.css

-../../../../node_modules/leaflet/dist/leaflet.css
\ No newline at end of file

frontend/static/frontend/leaflet-dist

+../../../node_modules/leaflet/dist/
\ No newline at end of file

frontend/templates/frontend/index.html

@@ -13,7 +13,7 @@
   </body>
 
   {% load static %}
-  <link rel="stylesheet" href="{% static '/frontend/css/leaflet.css' %}"/>
+  <link rel="stylesheet" href="{% static '/frontend/leaflet-dist/leaflet.css' %}"/>
   <script src="{% static "/frontend/main.js" %}"></script>
   <noscript>Cette application nécessite Javascript... Merci de l'activer ou d'utiliser un navigateur approprié.</noscript> 
 </html>
\ No newline at end of file

package-lock.json

@@ -3763,8 +3763,7 @@
     "hoist-non-react-statics": {
       "version": "2.5.5",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
-      "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==",
-      "dev": true
+      "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
     },
     "home-or-tmp": {
       "version": "2.0.0",
@@ -3908,7 +3907,6 @@
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
       "requires": {
         "loose-envify": "^1.0.0"
       }
@@ -4149,8 +4147,7 @@
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-      "dev": true
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
     },
     "js-yaml": {
       "version": "3.12.0",
@@ -4432,14 +4429,12 @@
     "lodash": {
       "version": "4.17.10",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
-      "dev": true
+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
     },
     "lodash-es": {
       "version": "4.17.10",
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.10.tgz",
-      "integrity": "sha512-iesFYPmxYYGTcmQK0sL8bX3TGHyM6b2qREaB4kamHfQyfPJP0xgoGxp19nsH16nsfquLdiyKyX3mQkfiSGV8Rg==",
-      "dev": true
+      "integrity": "sha512-iesFYPmxYYGTcmQK0sL8bX3TGHyM6b2qREaB4kamHfQyfPJP0xgoGxp19nsH16nsfquLdiyKyX3mQkfiSGV8Rg=="
     },
     "lodash.camelcase": {
       "version": "4.3.0",
@@ -4463,7 +4458,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
       "requires": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
@@ -4807,8 +4801,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
       "version": "0.1.0",
@@ -5202,7 +5195,6 @@
       "version": "15.6.2",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
       "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
-      "dev": true,
       "requires": {
         "loose-envify": "^1.3.1",
         "object-assign": "^4.1.1"
@@ -5383,6 +5375,19 @@
       "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==",
       "dev": true
     },
+    "react-redux": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz",
+      "integrity": "sha512-5VI8EV5hdgNgyjfmWzBbdrqUkrVRKlyTKk1sGH3jzM2M2Mhj/seQgPXaz6gVAj2lz/nz688AdTqMO18Lr24Zhg==",
+      "requires": {
+        "hoist-non-react-statics": "^2.5.0",
+        "invariant": "^2.0.0",
+        "lodash": "^4.17.5",
+        "lodash-es": "^4.17.5",
+        "loose-envify": "^1.1.0",
+        "prop-types": "^15.6.0"
+      }
+    },
     "react-resize-detector": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/react-resize-detector/-/react-resize-detector-1.1.0.tgz",
@@ -5556,6 +5561,43 @@
         }
       }
     },
+    "redux": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.0.tgz",
+      "integrity": "sha512-NnnHF0h0WVE/hXyrB6OlX67LYRuaf/rJcbWvnHHEPCF/Xa/AZpwhs/20WyqzQae5x4SD2F9nPObgBh2rxAgLiA==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "symbol-observable": "^1.2.0"
+      },
+      "dependencies": {
+        "symbol-observable": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+          "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
+        }
+      }
+    },
+    "redux-devtools": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/redux-devtools/-/redux-devtools-3.4.1.tgz",
+      "integrity": "sha1-CdNCzgq2CHvmeelTodfFMO+hE44=",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.2.0",
+        "prop-types": "^15.5.7",
+        "redux-devtools-instrument": "^1.0.1"
+      }
+    },
+    "redux-devtools-instrument": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/redux-devtools-instrument/-/redux-devtools-instrument-1.9.0.tgz",
+      "integrity": "sha512-pLFQoja1ojpsSRTWbC9yyc/a+z8uwOD7FPKLp+Abs7qjsah6khA5o8HBE2wa0VipE5vniYINdkNyxV/2iWADKg==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.2.0",
+        "symbol-observable": "^1.0.2"
+      }
+    },
     "regenerate": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",

package.json

@@ -15,7 +15,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "leaflet.markercluster": "^1.3.0"
+    "leaflet.markercluster": "^1.3.0",
+    "react-redux": "^5.0.7",
+    "redux": "^4.0.0"
   },
   "devDependencies": {
     "@material-ui/core": "^1.5.1",
@@ -37,6 +39,7 @@
     "react-leaflet": "^2.0.1",
     "react-script": "^2.0.5",
     "recharts": "^1.1.0",
+    "redux-devtools": "^3.4.1",
     "weak-key": "^1.0.1",
     "webpack": "^4.17.0",
     "webpack-cli": "^3.1.0"