Resolve conflicts

Author: zoltantothcom

package.json

@@ -72,7 +72,7 @@
     "prettier": "1.17.0",
     "react-test-renderer": "16.8.6",
     "redux-mock-store": "1.5.3",
-    "storybook-addon-styled-component-theme": "1.2.1",
+    "storybook-addon-styled-component-theme": "1.2.3",
     "surge": "0.20.4",
     "wait-on": "3.2.0",
     "webpack": "4.30.0",

src/static/patterns/behavioral_observer.js

@@ -40,13 +40,13 @@ var fees = {
   }
 };
 
-var proft = {
+var profit = {
   update: function(product) {
     product.price = product.price * 2;
   }
 };
 
-module.exports = [Product, fees, proft];`,
+module.exports = [Product, fees, profit];`,
   codeES6: `class Product {
   constructor() {
     this.price = 0;
@@ -83,13 +83,13 @@ class fees {
   }
 }
 
-class proft {
+class profit {
   update(product) {
     product.price = product.price * 2;
   }
 }
 
-export { Product, fees, proft };`
+export { Product, fees, profit };`
 };
 
 export default OBSERVER;

src/static/patterns/behavioral_template.js

@@ -7,7 +7,6 @@ const TEMPLATE = {
     Template Method lets subclasses redefine certain steps of an algorithm without changing the algorithm's structure.`,
   when: `you have to define steps of the algorithm once and let subclasses to implement its behaviour`,
   codeES5: `function Tax() {}
-
 Tax.prototype.calc = function(value) {
   if (value >= 1000) value = this.overThousand(value);
 
@@ -19,16 +18,16 @@ Tax.prototype.complementaryFee = function(value) {
 };
 
 function Tax1() {}
-  Tax1.prototype = Object.create(Tax.prototype);
+Tax1.prototype = Object.create(Tax.prototype);
 
-  Tax1.prototype.overThousand = function(value) {
+Tax1.prototype.overThousand = function(value) {
   return value * 1.1;
 };
 
 function Tax2() {}
-  Tax2.prototype = Object.create(Tax.prototype);
+Tax2.prototype = Object.create(Tax.prototype);
 
-  Tax2.prototype.overThousand = function(value) {
+Tax2.prototype.overThousand = function(value) {
   return value * 1.2;
 };
 

src/static/patterns/creational_abstractFactory.js

@@ -20,12 +20,12 @@ function pilotDroidPattern() {
 }
 
 function B1() {}
-  B1.prototype.info = function() {
+B1.prototype.info = function() {
   return 'B1, Battle Droid';
 };
 
 function Rx24() {}
-  Rx24.prototype.info = function() {
+Rx24.prototype.info = function() {
   return 'Rx24, Pilot Droid';
 };
 

src/static/patterns/structural_flyweight.js

@@ -29,7 +29,7 @@ module.exports = colorCreator;`,
 }
 
 class colorCreator {
-  constructor(name) {
+  constructor() {
     this.colors = {};
   }
 

yarn.lock

@@ -11323,10 +11323,10 @@ stealthy-require@^1.1.1:
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
   integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
-[email protected].1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/storybook-addon-styled-component-theme/-/storybook-addon-styled-component-theme-1.2.1.tgz#f21ae416db31b40882cb9c29e4b6240cbb2e3b63"
-  integrity sha512-oL3UlKG9fWwZ8AS+bPWp3u4ubeNnygTwojmnZLbZpSA55+PEhadS/X3Fgcuf2/rCIq907KFVAu49mjLMRp26Rg==
+[email protected].3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/storybook-addon-styled-component-theme/-/storybook-addon-styled-component-theme-1.2.3.tgz#c99625642e07fc7e4965f73c695791b3d81ed969"
+  integrity sha512-/XrG8VFBpYjyydeYszvbZIsl87SSRmDPKt1zD/uoaHASedUK8rzCBU3MsAGtUi6FvyXCeISj9wsoWnu4FyMS0w==
   dependencies:
     immutable "^3.8.2"
     recompose "^0.27.1"