@@ -116,7 +116,7 @@ class Scholarship extends React.Component {
return (
-
Autre(s) avantage(s) :
+
Autre(s) avantage(s) :
{
otherAdvantages != "" && otherAdvantages !== null ?
@@ -132,11 +132,11 @@ class Scholarship extends React.Component {
return (
-
{type}
+
{type}
{this.renderFinancialAdvantage()}
{this.renderOtherAdvantages()}
-
Informations complémentaires :
+
Informations complémentaires :
);
@@ -153,6 +153,7 @@ Scholarship.propTypes = {
otherAdvantages: PropTypes.string,
amountMin: PropTypes.string,
amountMax: PropTypes.string,
+ currencies: PropTypes.array.isRequired,
};
export default withStyles(styles, { withTheme: true })(Scholarship);
diff --git a/frontend/src/components/university/shared/UnivInfoProvider.js b/frontend/src/components/university/shared/UnivInfoProvider.js
index 368ce071120f3bb5c802ec853c9bcf2267fa4003..e0e8522a0a25783c8995af76690fe1632686a348 100644
--- a/frontend/src/components/university/shared/UnivInfoProvider.js
+++ b/frontend/src/components/university/shared/UnivInfoProvider.js
@@ -12,11 +12,9 @@ import getActions from "../../../api/getActions";
class UnivInfoProvider extends CustomComponentForAPI {
customRender() {
- const { city, country } = this.getUnivCityAndCountry(this.props.univId);
- const universities = this.getReadData("universities");
- const countries = this.getReadData("countries");
- const currencies = this.getReadData("currencies");
const { univId } = this.props,
+ { city, country } = this.getUnivCityAndCountry(univId),
+ { universities, countries, currencies } = this.getReadDataFor(["universities", "countries", "currencies"]),
countryId = country.id,
cityId = city.id;
diff --git a/frontend/src/components/university/shared/fields/DateField.js b/frontend/src/components/university/shared/fields/DateField.js
index 3722f6ee25402f85baa915284a54c7c5efc306df..ef7edabfda010112899a1c7db39b3e88e52b3a30 100644
--- a/frontend/src/components/university/shared/fields/DateField.js
+++ b/frontend/src/components/university/shared/fields/DateField.js
@@ -1,11 +1,11 @@
import React from "react";
-import DatePicker from "material-ui-pickers/DatePicker";
-import DateFnsUtils from "material-ui-pickers/utils/date-fns-utils";
-import MuiPickersUtilsProvider from "material-ui-pickers/utils/MuiPickersUtilsProvider";
import PropTypes from "prop-types";
import compose from "recompose/compose";
import withStyles from "@material-ui/core/styles/withStyles";
+import { DatePicker, MuiPickersUtilsProvider } from "material-ui-pickers";
+import DateFnsUtils from "@date-io/date-fns";
+
import frLocale from "date-fns/locale/fr";
import format from "date-fns/format";
@@ -21,9 +21,15 @@ const styles = theme => ({
});
+/**
+ * Class to customize the header of the date selection box
+ *
+ * @class LocalizedUtils
+ * @extends {DateFnsUtils}
+ */
class LocalizedUtils extends DateFnsUtils {
getDatePickerHeaderText(date) {
- return format(date, "d MMM YYYY", { locale: this.locale });
+ return format(date, "d MMM yyyy", { locale: this.locale });
}
}
@@ -58,7 +64,7 @@ class DateField extends Field {
- {title}
+ {title}
);
} else {
return (
-
{title}
+
{title}
);
}
} else {
return (
);
}
-}
\ No newline at end of file
+}
diff --git a/frontend/src/index.js b/frontend/src/index.js
index cefa34a067fee21cbc0953617677e2853ef9493d..960aab2953cc010d40f6883bd638e616ad620c5d 100644
--- a/frontend/src/index.js
+++ b/frontend/src/index.js
@@ -9,11 +9,11 @@ import ThemeProvider from "./components/ThemeProvider";
const MainReactEntry = () => (
-
-
-
-
-
+ {/* */}
+
+
+
+ {/* */}
);
diff --git a/frontend/src/reducers/filter.js b/frontend/src/reducers/filter.js
index 8bf6bd6eb2cccd6fd8f98609a2b70a07d139f8e8..0a5b68157df24f5a87194aecffbbff5ad9a9f1ff 100644
--- a/frontend/src/reducers/filter.js
+++ b/frontend/src/reducers/filter.js
@@ -12,7 +12,7 @@ export function saveSelectedUniversities(state = [], action) {
}
}
-export function saveFilterConfig(state = { contriesFilter: { selectedItems: [], inputValue: "" } }, action) {
+export function saveFilterConfig(state = { countriesFilter: { selectedItems: [], inputValue: "" } }, action) {
switch (action.type) {
case SAVE_FILTER_CONFIG:
return Object.assign({}, state, action.config);
diff --git a/frontend/src/reducers/search.js b/frontend/src/reducers/search.js
index 8bf6bd6eb2cccd6fd8f98609a2b70a07d139f8e8..0a5b68157df24f5a87194aecffbbff5ad9a9f1ff 100644
--- a/frontend/src/reducers/search.js
+++ b/frontend/src/reducers/search.js
@@ -12,7 +12,7 @@ export function saveSelectedUniversities(state = [], action) {
}
}
-export function saveFilterConfig(state = { contriesFilter: { selectedItems: [], inputValue: "" } }, action) {
+export function saveFilterConfig(state = { countriesFilter: { selectedItems: [], inputValue: "" } }, action) {
switch (action.type) {
case SAVE_FILTER_CONFIG:
return Object.assign({}, state, action.config);
diff --git a/frontend/src/utils/arrayOfInstancesToMap.js b/frontend/src/utils/arrayOfInstancesToMap.js
new file mode 100644
index 0000000000000000000000000000000000000000..70cd1ff86749057f0624980f9ed1decb2fe91859
--- /dev/null
+++ b/frontend/src/utils/arrayOfInstancesToMap.js
@@ -0,0 +1,13 @@
+/**
+ * Function that converts an array of instances of a model to a map.
+ *
+ * @export
+ * @param {Array} arr
+ * @param {string} [attrToUseAsKey="id"]
+ * @returns {Map}
+ */
+export default function arrayOfInstancesToMap(arr, attrToUseAsKey = "id") {
+ let out = new Map;
+ arr.forEach(instance => out.set(instance[attrToUseAsKey], instance));
+ return out;
+}
diff --git a/frontend/webpack.config.base.js b/frontend/webpack.config.base.js
index e19bbbc24fd999bed031d432b0c62c3b18f81042..85ecc1ac2e281342255a44d682d54f32ec3ff58f 100644
--- a/frontend/webpack.config.base.js
+++ b/frontend/webpack.config.base.js
@@ -7,7 +7,7 @@ const config = {
"./src/index",
],
vendor: [
- "babel-polyfill",
+ "@babel/polyfill",
]
},
output: {
@@ -21,7 +21,6 @@ const config = {
exclude: /node_modules/,
loader: "babel-loader",
options: {
- presets: ["es2015", "react", "stage-0"],
compact: true
},
},