Fixing .env

Makefile

@@ -37,7 +37,7 @@ backend-format:
 
 # Build the docker db
 .PHONY: db-run
-backend-docker:
+db-run:
 	docker-compose up
 
 # Run backend

README.md

@@ -55,7 +55,7 @@ For this project, we will be using some third-party APIs.
 
 ## Running the project
 
-Before you run the project you will need to add an .env file at the root directory and an .env file in the frontend directory. To this file, add the variable `EXPO_PUBLIC_API_DOMAIN={your ngrok static domain here}`. This will be used to 
+Before you run the project you will need to add an .env file at the root directory. To this file, add the variable `EXPO_PUBLIC_API_DOMAIN={your ngrok static domain here}`. This will be used to 
 
 ### Docker
 We will be containerizing our PostGreSQL database in Docker. Follow the steps below to add the DB to your local machine.

frontend/babel.config.js

@@ -3,6 +3,12 @@ module.exports = function(api) {
   api.cache(true);
   return {
     presets: ['babel-preset-expo'],
-    plugins: ["nativewind/babel"],
+    plugins: ["nativewind/babel", 
+      ["module:react-native-dotenv", {
+        "moduleName": "@env",
+        "path": "../.env",
+        }
+      ]
+    ],
   };
 }

frontend/package.json

@@ -13,7 +13,6 @@
     "@react-navigation/native": "^6.1.9",
     "autoprefixer": "^10.4.16",
     "axios": "^1.6.4",
-    "dotenv": "^16.3.1",
     "eslint-plugin-typescript": "^0.14.0",
     "expo": "~49.0.15",
     "expo-status-bar": "~1.6.0",
@@ -34,6 +33,7 @@
     "eslint": "^8.56.0",
     "eslint-config-universe": "^12.0.0",
     "prettier": "^3.1.1",
+    "react-native-dotenv": "^3.4.9",
     "tailwindcss": "3.3.2",
     "typescript": "^5.3.3"
   },

frontend/services/users.ts

@@ -1,5 +1,5 @@
 import axios, { AxiosResponse } from 'axios';
-import { API_LINK } from './CommonURLS';
+import { API_LINK } from './CommonDocs';
 import { User } from '../types/types';
 
 export const getAllUsers = async (): Promise<User[]>  => {

frontend/yarn.lock

@@ -6862,6 +6862,13 @@ react-is@^17.0.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
+react-native-dotenv@^3.4.9:
+  version "3.4.9"
+  resolved "https://registry.yarnpkg.com/react-native-dotenv/-/react-native-dotenv-3.4.9.tgz#621c5b0c1d0c5c7f569bfe5a1d804bec7885c010"
+  integrity sha512-dbyd+mcy7SUzxEgmt33TRf1FGcNe6swJhXmB0unKkI49F7+pidog9kPtjxMLTAfmKA8gcN2XHQSKltGfGbGCLQ==
+  dependencies:
+    dotenv "^16.3.1"
+
 react-native-paper@^5.11.6:
   version "5.11.6"
   resolved "https://registry.yarnpkg.com/react-native-paper/-/react-native-paper-5.11.6.tgz#6b783f50872aa61d34c6dcd32bfae91d1804c7c7"