瀏覽代碼

Adapte unos imports para que compilara en App.js y HomeScreen.js

ErnestoOrtiz2 2 年之前
父節點
當前提交
77095a3265
共有 4 個文件被更改,包括 149 次插入10 次删除
  1. 6
    3
      App.js
  2. 140
    6
      package-lock.json
  3. 1
    0
      package.json
  4. 2
    1
      screens/HomeScreen.js

+ 6
- 3
App.js 查看文件

@@ -9,10 +9,13 @@ import { createStore, applyMiddleware } from 'redux';
9 9
 
10 10
 import AvailabilityScreen from './screens/AvailabilityScreen';
11 11
 import MailScreen from './screens/MailScreen';
12
-import RegisterScreen from './screens/RegisterScreen';
13
-import LoginScreen from './screens/LoginScreen';
12
+//import RegisterScreen from './screens/RegisterScreen';
13
+import RegisterScreen from './screens/auth/RegisterScreen';
14
+//import LoginScreen from './screens/LoginScreen';
15
+import LoginScreen from './screens/auth/LoginScreen';
14 16
 import HomeScreen from './screens/HomeScreen';
15
-import Loading from './components/Loading';
17
+//import Loading from './components/Loading';
18
+import Loading from './screens/main/Loading';
16 19
 import { firebaseConfig } from './config/firebaseConfig';
17 20
 import rootReducer from './redux/reducers'
18 21
 

+ 140
- 6
package-lock.json 查看文件

@@ -6,6 +6,7 @@
6 6
     "": {
7 7
       "dependencies": {
8 8
         "@react-native-picker/picker": "^2.1.0",
9
+        "@react-navigation/drawer": "^6.1.8",
9 10
         "@react-navigation/native": "^6.0.4",
10 11
         "@react-navigation/stack": "^6.0.9",
11 12
         "expo": "~42.0.1",
@@ -3208,6 +3209,36 @@
3208 3209
         "react-native": ">=0.57"
3209 3210
       }
3210 3211
     },
3212
+    "node_modules/@react-navigation/drawer": {
3213
+      "version": "6.1.8",
3214
+      "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.1.8.tgz",
3215
+      "integrity": "sha512-kYE2EO5dianUuUcaYmAlYBcgtmvGm2fxWTQ5sn103cgPNidp4KBUR9ClkhF+btfRaHKq+8Ul5M6qvL0mBAv/Lg==",
3216
+      "dependencies": {
3217
+        "@react-navigation/elements": "^1.2.1",
3218
+        "color": "^3.1.3",
3219
+        "warn-once": "^0.1.0"
3220
+      },
3221
+      "peerDependencies": {
3222
+        "@react-navigation/native": "^6.0.0",
3223
+        "react": "*",
3224
+        "react-native": "*",
3225
+        "react-native-gesture-handler": ">= 1.0.0",
3226
+        "react-native-reanimated": ">= 1.0.0",
3227
+        "react-native-safe-area-context": ">= 3.0.0",
3228
+        "react-native-screens": ">= 3.0.0"
3229
+      }
3230
+    },
3231
+    "node_modules/@react-navigation/drawer/node_modules/@react-navigation/elements": {
3232
+      "version": "1.2.1",
3233
+      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.2.1.tgz",
3234
+      "integrity": "sha512-EnmAbKMsptrliRKf95rdgS6BhMjML+mIns06+G1Vdih6BrEo7/0iytThUv3WBf99AI76dyEq/cqLUwHPiFzXWg==",
3235
+      "peerDependencies": {
3236
+        "@react-navigation/native": "^6.0.0",
3237
+        "react": "*",
3238
+        "react-native": "*",
3239
+        "react-native-safe-area-context": ">= 3.0.0"
3240
+      }
3241
+    },
3211 3242
     "node_modules/@react-navigation/native": {
3212 3243
       "version": "6.0.4",
3213 3244
       "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.0.4.tgz",
@@ -8313,6 +8344,12 @@
8313 8344
         "mkdirp": "bin/cmd.js"
8314 8345
       }
8315 8346
     },
8347
+    "node_modules/mockdate": {
8348
+      "version": "3.0.5",
8349
+      "resolved": "https://registry.npmjs.org/mockdate/-/mockdate-3.0.5.tgz",
8350
+      "integrity": "sha512-iniQP4rj1FhBdBYS/+eQv7j1tadJ9lJtdzgOpvsOHng/GbcDh2Fhdeq+ZRldrPYdXvCyfFUmFeEwEGXZB5I/AQ==",
8351
+      "peer": true
8352
+    },
8316 8353
     "node_modules/ms": {
8317 8354
       "version": "2.1.2",
8318 8355
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -9330,6 +9367,38 @@
9330 9367
         "react-native": ">=0.42.0"
9331 9368
       }
9332 9369
     },
9370
+    "node_modules/react-native-reanimated": {
9371
+      "version": "2.2.3",
9372
+      "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.2.3.tgz",
9373
+      "integrity": "sha512-d+BV39Jp4Om0ZkgVjop672/004ytlTfDT01EloO3HFZs9wR2QTuCjekq8yi3xl0G2xGZKd4DXhvqabIa7OnMYA==",
9374
+      "peer": true,
9375
+      "dependencies": {
9376
+        "@babel/plugin-transform-object-assign": "^7.10.4",
9377
+        "fbjs": "^3.0.0",
9378
+        "mockdate": "^3.0.2",
9379
+        "string-hash-64": "^1.0.3"
9380
+      },
9381
+      "peerDependencies": {
9382
+        "react": "*",
9383
+        "react-native": "*",
9384
+        "react-native-gesture-handler": "*"
9385
+      }
9386
+    },
9387
+    "node_modules/react-native-reanimated/node_modules/fbjs": {
9388
+      "version": "3.0.1",
9389
+      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.1.tgz",
9390
+      "integrity": "sha512-8+vkGyT4lNDRKHQNPp0yh/6E7FfkLg89XqQbOYnvntRh+8RiSD43yrh9E5ejp1muCizTL4nDVG+y8W4e+LROHg==",
9391
+      "peer": true,
9392
+      "dependencies": {
9393
+        "cross-fetch": "^3.0.4",
9394
+        "fbjs-css-vars": "^1.0.0",
9395
+        "loose-envify": "^1.0.0",
9396
+        "object-assign": "^4.1.0",
9397
+        "promise": "^7.1.1",
9398
+        "setimmediate": "^1.0.5",
9399
+        "ua-parser-js": "^0.7.30"
9400
+      }
9401
+    },
9333 9402
     "node_modules/react-native-safe-area-context": {
9334 9403
       "version": "3.3.2",
9335 9404
       "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-3.3.2.tgz",
@@ -11039,6 +11108,12 @@
11039 11108
         "safe-buffer": "~5.1.0"
11040 11109
       }
11041 11110
     },
11111
+    "node_modules/string-hash-64": {
11112
+      "version": "1.0.3",
11113
+      "resolved": "https://registry.npmjs.org/string-hash-64/-/string-hash-64-1.0.3.tgz",
11114
+      "integrity": "sha512-D5OKWKvDhyVWWn2x5Y9b+37NUllks34q1dCDhk/vYcso9fmhs+Tl3KR/gE4v5UNj2UA35cnX4KdVVGkG1deKqw==",
11115
+      "peer": true
11116
+    },
11042 11117
     "node_modules/string-width": {
11043 11118
       "version": "4.2.3",
11044 11119
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -11328,9 +11403,9 @@
11328 11403
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
11329 11404
     },
11330 11405
     "node_modules/ua-parser-js": {
11331
-      "version": "0.7.28",
11332
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz",
11333
-      "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==",
11406
+      "version": "0.7.30",
11407
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.30.tgz",
11408
+      "integrity": "sha512-uXEtSresNUlXQ1QL4/3dQORcGv7+J2ookOG2ybA/ga9+HYEXueT2o+8dUJQkpedsyTyCJ6jCCirRcKtdtx1kbg==",
11334 11409
       "funding": [
11335 11410
         {
11336 11411
           "type": "opencollective",
@@ -14277,6 +14352,24 @@
14277 14352
       "integrity": "sha512-iJ/QaDrBMBaW6cFuQyR3DXzcn2h7c5O7mGgmNLCBQHTTtLNBZR+Sxogy6YleFPeToNdysG5mTTkXqBmlWHMQqg==",
14278 14353
       "requires": {}
14279 14354
     },
14355
+    "@react-navigation/drawer": {
14356
+      "version": "6.1.8",
14357
+      "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.1.8.tgz",
14358
+      "integrity": "sha512-kYE2EO5dianUuUcaYmAlYBcgtmvGm2fxWTQ5sn103cgPNidp4KBUR9ClkhF+btfRaHKq+8Ul5M6qvL0mBAv/Lg==",
14359
+      "requires": {
14360
+        "@react-navigation/elements": "^1.2.1",
14361
+        "color": "^3.1.3",
14362
+        "warn-once": "^0.1.0"
14363
+      },
14364
+      "dependencies": {
14365
+        "@react-navigation/elements": {
14366
+          "version": "1.2.1",
14367
+          "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.2.1.tgz",
14368
+          "integrity": "sha512-EnmAbKMsptrliRKf95rdgS6BhMjML+mIns06+G1Vdih6BrEo7/0iytThUv3WBf99AI76dyEq/cqLUwHPiFzXWg==",
14369
+          "requires": {}
14370
+        }
14371
+      }
14372
+    },
14280 14373
     "@react-navigation/native": {
14281 14374
       "version": "6.0.4",
14282 14375
       "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.0.4.tgz",
@@ -18462,6 +18555,12 @@
18462 18555
         "minimist": "^1.2.5"
18463 18556
       }
18464 18557
     },
18558
+    "mockdate": {
18559
+      "version": "3.0.5",
18560
+      "resolved": "https://registry.npmjs.org/mockdate/-/mockdate-3.0.5.tgz",
18561
+      "integrity": "sha512-iniQP4rj1FhBdBYS/+eQv7j1tadJ9lJtdzgOpvsOHng/GbcDh2Fhdeq+ZRldrPYdXvCyfFUmFeEwEGXZB5I/AQ==",
18562
+      "peer": true
18563
+    },
18465 18564
     "ms": {
18466 18565
       "version": "2.1.2",
18467 18566
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -19519,6 +19618,35 @@
19519 19618
         }
19520 19619
       }
19521 19620
     },
19621
+    "react-native-reanimated": {
19622
+      "version": "2.2.3",
19623
+      "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.2.3.tgz",
19624
+      "integrity": "sha512-d+BV39Jp4Om0ZkgVjop672/004ytlTfDT01EloO3HFZs9wR2QTuCjekq8yi3xl0G2xGZKd4DXhvqabIa7OnMYA==",
19625
+      "peer": true,
19626
+      "requires": {
19627
+        "@babel/plugin-transform-object-assign": "^7.10.4",
19628
+        "fbjs": "^3.0.0",
19629
+        "mockdate": "^3.0.2",
19630
+        "string-hash-64": "^1.0.3"
19631
+      },
19632
+      "dependencies": {
19633
+        "fbjs": {
19634
+          "version": "3.0.1",
19635
+          "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.1.tgz",
19636
+          "integrity": "sha512-8+vkGyT4lNDRKHQNPp0yh/6E7FfkLg89XqQbOYnvntRh+8RiSD43yrh9E5ejp1muCizTL4nDVG+y8W4e+LROHg==",
19637
+          "peer": true,
19638
+          "requires": {
19639
+            "cross-fetch": "^3.0.4",
19640
+            "fbjs-css-vars": "^1.0.0",
19641
+            "loose-envify": "^1.0.0",
19642
+            "object-assign": "^4.1.0",
19643
+            "promise": "^7.1.1",
19644
+            "setimmediate": "^1.0.5",
19645
+            "ua-parser-js": "^0.7.30"
19646
+          }
19647
+        }
19648
+      }
19649
+    },
19522 19650
     "react-native-safe-area-context": {
19523 19651
       "version": "3.3.2",
19524 19652
       "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-3.3.2.tgz",
@@ -20614,6 +20742,12 @@
20614 20742
         "safe-buffer": "~5.1.0"
20615 20743
       }
20616 20744
     },
20745
+    "string-hash-64": {
20746
+      "version": "1.0.3",
20747
+      "resolved": "https://registry.npmjs.org/string-hash-64/-/string-hash-64-1.0.3.tgz",
20748
+      "integrity": "sha512-D5OKWKvDhyVWWn2x5Y9b+37NUllks34q1dCDhk/vYcso9fmhs+Tl3KR/gE4v5UNj2UA35cnX4KdVVGkG1deKqw==",
20749
+      "peer": true
20750
+    },
20617 20751
     "string-width": {
20618 20752
       "version": "4.2.3",
20619 20753
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -20845,9 +20979,9 @@
20845 20979
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
20846 20980
     },
20847 20981
     "ua-parser-js": {
20848
-      "version": "0.7.28",
20849
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz",
20850
-      "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g=="
20982
+      "version": "0.7.30",
20983
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.30.tgz",
20984
+      "integrity": "sha512-uXEtSresNUlXQ1QL4/3dQORcGv7+J2ookOG2ybA/ga9+HYEXueT2o+8dUJQkpedsyTyCJ6jCCirRcKtdtx1kbg=="
20851 20985
     },
20852 20986
     "uglify-es": {
20853 20987
       "version": "3.3.9",

+ 1
- 0
package.json 查看文件

@@ -9,6 +9,7 @@
9 9
   },
10 10
   "dependencies": {
11 11
     "@react-native-picker/picker": "^2.1.0",
12
+    "@react-navigation/drawer": "^6.1.8",
12 13
     "@react-navigation/native": "^6.0.4",
13 14
     "@react-navigation/stack": "^6.0.9",
14 15
     "expo": "~42.0.1",

+ 2
- 1
screens/HomeScreen.js 查看文件

@@ -6,7 +6,8 @@ import { Text, View, ImageBackground } from 'react-native';
6 6
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
7 7
 
8 8
 import { fetchUser } from '../redux/actions/index'
9
-import Loading from '../components/Loading'
9
+//import Loading from '../components/Loading'
10
+import Loading from './main/Loading'
10 11
 import { styles } from '../config/styles'
11 12
 
12 13
 export class HomeScreen extends Component {