-
- {data.map((item, i) =>
)}
+ const metaData = {
+ authors: "Authors",
+ title: "Home Title: Countries",
+ description: "countries description",
+ lastModified: "some date",
+ altTitle: "some alt-title",
+ canonical: "http://countries-canonical-url.com"
+ };
+
+ return (
+
+
+
+
+ {data.map((item, i) => )}
+
+
);
}
-};
\ No newline at end of file
+};
+const mapStateToProps = state => {
+ return {
+ Countries: state.Countries
+ };
+};
+
+export default connect(
+ mapStateToProps
+)(Countries);
\ No newline at end of file
diff --git a/src/components/Country/index.js b/src/components/Country/index.js
index 825523b..0324885 100644
--- a/src/components/Country/index.js
+++ b/src/components/Country/index.js
@@ -5,21 +5,21 @@ import { Loading } from "../../common";
import Meta from "../../Utils/Meta";
-const m = ({ country }) => ({ country });
+class Country extends Component {
-@connect(m, { fetchCountry })
-export default class Country extends Component {
-
- static fetching({ dispatch, path }) {
- return [dispatch(fetchCountry(path.substr(1)))];
+ // static fetching({ dispatch, path }) {
+ // return [this.props.dispatch(fetchCountry(path.substr(1)))];
+ // }
+ componentWillMount() {
+ this.props.dispatch(fetchCountry(this.props.match.params.name));
}
componentDidMount() {
- this.props.fetchCountry(this.props.match.params.name);
+ this.props.dispatch(fetchCountry(this.props.match.params.name));
}
render() {
- const { country: { isFetching, flag, name, nativeName, capital, region, population, languages } } = this.props;
+ const { Country: { isFetching, flag, name, nativeName, capital, region, population, languages } } = this.props;
if (isFetching) {
return
;
@@ -28,10 +28,10 @@ export default class Country extends Component {
const metaData = {
authors: "Authors",
title: name,
- description: "some description",
+ description: "country description",
lastModified: "some date",
altTitle: "some alt-title",
- canonical: "http://some-canonical-url.com"
+ canonical: "http://country-canonical-url.com"
};
return (
@@ -74,4 +74,13 @@ export default class Country extends Component {
);
}
-}
\ No newline at end of file
+}
+const mapStateToProps = state => {
+ return {
+ Country: state.Country
+ };
+};
+
+export default connect(
+ mapStateToProps
+)(Country);
diff --git a/src/reducers/countries.js b/src/reducers/countries.js
index cedc3c2..862897e 100644
--- a/src/reducers/countries.js
+++ b/src/reducers/countries.js
@@ -9,7 +9,7 @@ const INITIAL_STATE = {
lastUpdate: Date.now()
};
-export default (state = INITIAL_STATE, action) => {
+const Countries = (state = INITIAL_STATE, action) => {
switch (action.type) {
case REQUEST_COUNTRIES: {
return { ...state, isFetching: true };
@@ -20,4 +20,5 @@ export default (state = INITIAL_STATE, action) => {
default:
return state;
}
-};
\ No newline at end of file
+};
+export default Countries;
\ No newline at end of file
diff --git a/src/reducers/country.js b/src/reducers/country.js
index f3b2699..d4b69ea 100644
--- a/src/reducers/country.js
+++ b/src/reducers/country.js
@@ -15,8 +15,8 @@ const INITIAL_STATE = {
lastUpdate: Date.now()
};
-export default(state = INITIAL_STATE, action) => {
- switch(action.type) {
+const Country = (state = INITIAL_STATE, action) => {
+ switch (action.type) {
case REQUEST_COUNTRY: {
return { ...state, isFetching: true };
}
@@ -25,4 +25,5 @@ export default(state = INITIAL_STATE, action) => {
}
default: return state;
}
-};
\ No newline at end of file
+};
+export default Country;
\ No newline at end of file
diff --git a/src/reducers/index.js b/src/reducers/index.js
index c17988e..5b76a7f 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -3,6 +3,6 @@ import Countries from "./countries";
import Country from "./country";
export default combineReducers({
- countries: Countries,
- country: Country,
+ Countries,
+ Country,
});
\ No newline at end of file