Merge branch 'master' of github.com:Tourniercy/RunningApp

Author: Ervin

.gitignore

@@ -3,4 +3,5 @@ App/node_modules
 .idea
 App/.expo
 package-lock.json
-.DS_Storecd
+.DS_Storecd
+Web/.php-version

App/.env

@@ -1 +1 @@
-API_URL=http://122e27b1.ngrok.io
+API_URL=http://e9c1e508.ngrok.io

App/auth/Auth.js

@@ -1,69 +1,65 @@
-import { AsyncStorage } from "react-native";
+import {AsyncStorage} from "react-native";
 import config from '../config/config';
 
 let USER_TOKEN = "";
 let USER_REFRESH_TOKEN = "";
 let USER_ID = "";
 
 export async function getToken(values) {
+  console.log(config);
+  return await
 
-  let token = await
-
-    fetch(``+config.API_URL+`/api/login_check`, {
-
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        "username": values.email,
-        "password": values.password,
-      })
-    })
-    .then(async resp => {
-
-        return resp.json()
-    })
-    .then(async responseData => {
-
-      if (responseData.token) {
-        let id = await fetch(``+config.API_URL+`/users/check/` + values.email, {
+      fetch(`` + config.API_URL + `/api/login_check`, {
 
           method: 'POST',
           headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-          }
-        })
-        .then(async resp => {
-
-          return resp.json()
-        })
-        .then(async responseData => {
-          return responseData.id
-        })
-
-        USER_ID = await id
-        USER_TOKEN = await responseData.token
-        USER_REFRESH_TOKEN = await responseData.refresh_token
-
-        await onSignIn()
-        return 200
-      }
-      else if (responseData.code === 401) {
-        return 401
-      }
-      else if (responseData.code === 500) {
-        return 500
-      }
-
-    })
-    .catch(err => {
-      console.log(err)
-    })
-
-  return token
+              Accept: 'application/json',
+              'Content-Type': 'application/json',
+          },
+          body: JSON.stringify({
+              "username": values.email,
+              "password": values.password,
+          })
+      })
+          .then(async resp => {
+
+              return resp.json()
+          })
+          .then(async responseData => {
+
+              if (responseData.token) {
+                  let id = await fetch(`` + config.API_URL + `/users/check/` + values.email, {
+
+                      method: 'POST',
+                      headers: {
+                          Accept: 'application/json',
+                          'Content-Type': 'application/json',
+                      }
+                  })
+                      .then(async resp => {
+
+                          return resp.json()
+                      })
+                      .then(async responseData => {
+                          return responseData.id
+                      })
+
+                  USER_ID = await id
+                  USER_TOKEN = await responseData.token
+                  USER_REFRESH_TOKEN = await responseData.refresh_token
+
+                  await onSignIn()
+                  return 200
+              } else if (responseData.code === 401) {
+                  return 401
+              } else if (responseData.code === 500) {
+                  return 500
+              }
+
+          })
+          .catch(err => {
+              console.log(err)
+          })
 }
 
 export const onSignIn = async () => {

App/config/config.js

@@ -1,5 +1,11 @@
 import { API_URL } from 'react-native-dotenv';
 
+
+
+
+
+
+
 export default {
     API_URL,
 };