From d494ae4db04ba1865b1724cbbe704c7a38c2e791 Mon Sep 17 00:00:00 2001
From: Cristian Dan <cristian.dan@live.com>
Date: Thu, 12 Jan 2017 22:34:43 +0200
Subject: [PATCH 1/2] added .gitignore to steps 1-6

---
 branch-step-01-solution/.gitignore | 6 ++++++
 branch-step-01/.gitignore          | 6 ++++++
 branch-step-02-solution/.gitignore | 6 ++++++
 branch-step-02/.gitignore          | 6 ++++++
 branch-step-03-solution/.gitignore | 6 ++++++
 branch-step-03/.gitignore          | 6 ++++++
 branch-step-04-solution/.gitignore | 6 ++++++
 branch-step-04/.gitignore          | 6 ++++++
 branch-step-05-solution/.gitignore | 6 ++++++
 branch-step-05/.gitignore          | 6 ++++++
 branch-step-06-solution/.gitignore | 6 ++++++
 branch-step-06/.gitignore          | 6 ++++++
 12 files changed, 72 insertions(+)
 create mode 100644 branch-step-01-solution/.gitignore
 create mode 100644 branch-step-01/.gitignore
 create mode 100644 branch-step-02-solution/.gitignore
 create mode 100644 branch-step-02/.gitignore
 create mode 100644 branch-step-03-solution/.gitignore
 create mode 100644 branch-step-03/.gitignore
 create mode 100644 branch-step-04-solution/.gitignore
 create mode 100644 branch-step-04/.gitignore
 create mode 100644 branch-step-05-solution/.gitignore
 create mode 100644 branch-step-05/.gitignore
 create mode 100644 branch-step-06-solution/.gitignore
 create mode 100644 branch-step-06/.gitignore

diff --git a/branch-step-01-solution/.gitignore b/branch-step-01-solution/.gitignore
new file mode 100644
index 0000000..9a08c0a
--- /dev/null
+++ b/branch-step-01-solution/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+logs
+*.log
+npm-debug.log*
+.idea
+.DB_Store
\ No newline at end of file
diff --git a/branch-step-01/.gitignore b/branch-step-01/.gitignore
new file mode 100644
index 0000000..9a08c0a
--- /dev/null
+++ b/branch-step-01/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+logs
+*.log
+npm-debug.log*
+.idea
+.DB_Store
\ No newline at end of file
diff --git a/branch-step-02-solution/.gitignore b/branch-step-02-solution/.gitignore
new file mode 100644
index 0000000..9a08c0a
--- /dev/null
+++ b/branch-step-02-solution/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+logs
+*.log
+npm-debug.log*
+.idea
+.DB_Store
\ No newline at end of file
diff --git a/branch-step-02/.gitignore b/branch-step-02/.gitignore
new file mode 100644
index 0000000..9a08c0a
--- /dev/null
+++ b/branch-step-02/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+logs
+*.log
+npm-debug.log*
+.idea
+.DB_Store
\ No newline at end of file
diff --git a/branch-step-03-solution/.gitignore b/branch-step-03-solution/.gitignore
new file mode 100644
index 0000000..9a08c0a
--- /dev/null
+++ b/branch-step-03-solution/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+logs
+*.log
+npm-debug.log*
+.idea
+.DB_Store
\ No newline at end of file
diff --git a/branch-step-03/.gitignore b/branch-step-03/.gitignore
new file mode 100644
index 0000000..9a08c0a
--- /dev/null
+++ b/branch-step-03/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+logs
+*.log
+npm-debug.log*
+.idea
+.DB_Store
\ No newline at end of file
diff --git a/branch-step-04-solution/.gitignore b/branch-step-04-solution/.gitignore
new file mode 100644
index 0000000..9a08c0a
--- /dev/null
+++ b/branch-step-04-solution/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+logs
+*.log
+npm-debug.log*
+.idea
+.DB_Store
\ No newline at end of file
diff --git a/branch-step-04/.gitignore b/branch-step-04/.gitignore
new file mode 100644
index 0000000..9a08c0a
--- /dev/null
+++ b/branch-step-04/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+logs
+*.log
+npm-debug.log*
+.idea
+.DB_Store
\ No newline at end of file
diff --git a/branch-step-05-solution/.gitignore b/branch-step-05-solution/.gitignore
new file mode 100644
index 0000000..9a08c0a
--- /dev/null
+++ b/branch-step-05-solution/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+logs
+*.log
+npm-debug.log*
+.idea
+.DB_Store
\ No newline at end of file
diff --git a/branch-step-05/.gitignore b/branch-step-05/.gitignore
new file mode 100644
index 0000000..9a08c0a
--- /dev/null
+++ b/branch-step-05/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+logs
+*.log
+npm-debug.log*
+.idea
+.DB_Store
\ No newline at end of file
diff --git a/branch-step-06-solution/.gitignore b/branch-step-06-solution/.gitignore
new file mode 100644
index 0000000..9a08c0a
--- /dev/null
+++ b/branch-step-06-solution/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+logs
+*.log
+npm-debug.log*
+.idea
+.DB_Store
\ No newline at end of file
diff --git a/branch-step-06/.gitignore b/branch-step-06/.gitignore
new file mode 100644
index 0000000..9a08c0a
--- /dev/null
+++ b/branch-step-06/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+logs
+*.log
+npm-debug.log*
+.idea
+.DB_Store
\ No newline at end of file

From 9c408bddd435c96d311918d825eaf25db3fad4ce Mon Sep 17 00:00:00 2001
From: Cristian Dan <cristian.dan@live.com>
Date: Sat, 14 Jan 2017 19:01:31 +0200
Subject: [PATCH 2/2] fixed router problem

---
 branch-step-05-solution/src/views/PokemonPage.js | 4 ++--
 branch-step-06-solution/src/views/PokemonPage.js | 4 ++--
 branch-step-06/src/views/PokemonPage.js          | 4 ++--
 branch-step-07-solution/src/views/PokemonPage.js | 4 ++--
 branch-step-07/src/views/PokemonPage.js          | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/branch-step-05-solution/src/views/PokemonPage.js b/branch-step-05-solution/src/views/PokemonPage.js
index 2970be4..34cbc05 100755
--- a/branch-step-05-solution/src/views/PokemonPage.js
+++ b/branch-step-05-solution/src/views/PokemonPage.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import Relay from 'react-relay'
-import { Link } from 'react-router'
+import { Link, withRouter } from 'react-router'
 import PokemonCard from '../components/PokemonCard'
 import CreatePokemonMutation from '../mutations/CreatePokemonMutation'
 import deleteIcon from '../assets/delete.svg'
@@ -75,7 +75,7 @@ class PokemonPage extends React.Component {
 }
 
 export default Relay.createContainer(
-  PokemonPage,
+  withRouter(PokemonPage),
   {
     initialVariables: {
       id: null,
diff --git a/branch-step-06-solution/src/views/PokemonPage.js b/branch-step-06-solution/src/views/PokemonPage.js
index 0c903df..ec1d7c1 100755
--- a/branch-step-06-solution/src/views/PokemonPage.js
+++ b/branch-step-06-solution/src/views/PokemonPage.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import Relay from 'react-relay'
-import { Link } from 'react-router'
+import { Link, withRouter } from 'react-router'
 import PokemonCard from '../components/PokemonCard'
 import CreatePokemonMutation from '../mutations/CreatePokemonMutation'
 import DeletePokemonMutation from '../mutations/DeletePokemonMutation'
@@ -86,7 +86,7 @@ class PokemonPage extends React.Component {
 }
 
 export default Relay.createContainer(
-  PokemonPage,
+  withRouter(PokemonPage),
   {
     initialVariables: {
       id: null,
diff --git a/branch-step-06/src/views/PokemonPage.js b/branch-step-06/src/views/PokemonPage.js
index 2970be4..34cbc05 100755
--- a/branch-step-06/src/views/PokemonPage.js
+++ b/branch-step-06/src/views/PokemonPage.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import Relay from 'react-relay'
-import { Link } from 'react-router'
+import { Link, withRouter } from 'react-router'
 import PokemonCard from '../components/PokemonCard'
 import CreatePokemonMutation from '../mutations/CreatePokemonMutation'
 import deleteIcon from '../assets/delete.svg'
@@ -75,7 +75,7 @@ class PokemonPage extends React.Component {
 }
 
 export default Relay.createContainer(
-  PokemonPage,
+  withRouter(PokemonPage),
   {
     initialVariables: {
       id: null,
diff --git a/branch-step-07-solution/src/views/PokemonPage.js b/branch-step-07-solution/src/views/PokemonPage.js
index d44cc96..cf478a2 100755
--- a/branch-step-07-solution/src/views/PokemonPage.js
+++ b/branch-step-07-solution/src/views/PokemonPage.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import Relay from 'react-relay'
-import { Link } from 'react-router'
+import { Link, withRouter } from 'react-router'
 import PokemonCard from '../components/PokemonCard'
 import CreatePokemonMutation from '../mutations/CreatePokemonMutation'
 import DeletePokemonMutation from '../mutations/DeletePokemonMutation'
@@ -97,7 +97,7 @@ class PokemonPage extends React.Component {
 }
 
 export default Relay.createContainer(
-  PokemonPage,
+  withRouter(PokemonPage),
   {
     initialVariables: {
       id: null,
diff --git a/branch-step-07/src/views/PokemonPage.js b/branch-step-07/src/views/PokemonPage.js
index 0c903df..ec1d7c1 100755
--- a/branch-step-07/src/views/PokemonPage.js
+++ b/branch-step-07/src/views/PokemonPage.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import Relay from 'react-relay'
-import { Link } from 'react-router'
+import { Link, withRouter } from 'react-router'
 import PokemonCard from '../components/PokemonCard'
 import CreatePokemonMutation from '../mutations/CreatePokemonMutation'
 import DeletePokemonMutation from '../mutations/DeletePokemonMutation'
@@ -86,7 +86,7 @@ class PokemonPage extends React.Component {
 }
 
 export default Relay.createContainer(
-  PokemonPage,
+  withRouter(PokemonPage),
   {
     initialVariables: {
       id: null,