sagas, form

radiator42 · Nov 7, 2018 · a6f21f3 · tarhunakau · Nov 8, 2018 · tarhunakau
2 parents 65c4633 + 21e3f2d
commit a6f21f3
Show file tree

Hide file tree

Showing 61 changed files with 6,566 additions and 6,017 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,8 +1,8 @@
-{
-    "extends": "airbnb",
-    "plugins": [
-        "react",
-        "import",
-        "jsx-a11y"
-    ]   
+{
+    "extends": "airbnb",
+    "plugins": [
+        "react",
+        "import",
+        "jsx-a11y"
+    ]   
 }
diff --git a/.firebase/hosting.YnVpbGQ.cache b/.firebase/hosting.YnVpbGQ.cache
@@ -1,7 +1,17 @@
+<<<<<<< HEAD
 asset-manifest.json,1540803128316,60379663bdb023be2a6012d9b30383ab8d132a2f0d2765ae221302e2cc8062ae
 index.html,1540803128315,0b7bc02e60bcf0566c4f26da5e473fc9f0a3736e7e81c233e41108bfbae0df37
 manifest.json,1540803108099,e5a5ca27c4444034354b69457d23d23d62d7c9040a66a4d4e402354afd824834
 favicon.ico,1540803108097,eae62e993eb980ec8a25058c39d5a51feab118bd2100c4deebb2a9c158ec11f9
 service-worker.js,1540803128557,4ef3806796e795611d629a7aca3dedd6be6fd5301d3a9eb9ad63f9871ed77228
 static/js/main.3bde5e51.js,1540803128381,809aa1302a6ccb179eb2699210fe3c0c19a3c88e94281a3a18e2b36d351753f7
 static/js/main.3bde5e51.js.map,1540803128379,e0e7bef414facce6292dd6101f866f7be2d4c970e19c0fdd86f4e17e0c327e9a
+=======
+asset-manifest.json,1540755387887,99baced4d191609dd9fe897f9d7e93d5bdc832d79ed576bc9d3c17c60e8fd23d
+favicon.ico,1540755329009,eae62e993eb980ec8a25058c39d5a51feab118bd2100c4deebb2a9c158ec11f9
+index.html,1540755387886,93da335108f4765e46b857eef39033c5a4feaa09974e60f97769727ecafe9f8f
+manifest.json,1540755329012,65d4aa66cd0b8963e88196705111adfccad2e8b80725b6a7a82ca8a9a0de8889
+service-worker.js,1540755388195,17189a1ef751d8dab280b23e0bee052cf87aa7d853a2fe46667367bb0c7473a1
+static/js/main.59b2685d.js,1540755387929,bf2eef5e8fedef0500f37223d2ab91b2079d923c738594506e38dcd90114747f
+static/js/main.59b2685d.js.map,1540755387918,58307421f037c0c16e09b910ae7200f4e29a587e8990010c02e9a6dafc9db6ce
+>>>>>>> 21e3f2d88a438a6d8634faec0c054352fd302855
diff --git a/.gitignore b/.gitignore
@@ -1,27 +1,27 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.vscode
-/.firebase
-#.firebasers
-#/src/config
-
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.env
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.vscode
+/.firebase
+#.firebasers
+#/src/config
+
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.env
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,14 +1,14 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Запустить программу",
-      "program": "${workspaceFolder}\\start"
-    }
-  ]
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Запустить программу",
+      "program": "${workspaceFolder}\\start"
+    }
+  ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,2 +1,2 @@
-{
+{
 }
-Original file line number
+Diff line change
@@ -1,2 +1,2 @@
-    {
+    {
     }