Merge pull request #8 from rafaVls/hamburger-refactor

Hamburger refactor

backend/.example.flaskenv

@@ -1,2 +1 @@
 FLASK_APP=weatherly
-FLASK_ENV=development

backend/requirements.txt

@@ -6,6 +6,7 @@ charset-normalizer==2.0.7
 click==8.0.3
 coverage==6.1.2
 Flask==2.0.2
+Flask-Cors==3.0.10
 idna==3.3
 iniconfig==1.1.1
 itsdangerous==2.0.1

backend/start.py

@@ -0,0 +1,6 @@
+from weatherly import create_app
+
+app = create_app('flask_production.cfg')
+
+if __name__ == '__main__':
+    app.run();

backend/weatherly/__init__.py

@@ -1,8 +1,10 @@
 from flask import Flask
+from flask_cors import CORS
 from . import forecast, geocoding, reverse_geocoding
 
 def create_app(config_filename="flask.cfg"):
     app = Flask(__name__, instance_relative_config=True)
+    CORS(app)
 
     app.config.from_pyfile(config_filename)
     app.register_blueprint(forecast.bp)

backend/weatherly/forecast.py

@@ -1,5 +1,5 @@
 from os import environ
-from flask import Blueprint, request
+from flask import Blueprint, request, current_app
 
 from .Param import Param
 from ._utils import multithread_request, fetch_api 
@@ -27,7 +27,7 @@ def get_forecast():
             "lat": latitude.value,
             "lon": longitude.value,
             "exclude": "minutely,alerts",
-            "appid": environ.get("ONECALL_API_KEY")
+            "appid": current_app.config["ONECALL_API_KEY"]
         }
 
         data_metric, data_imperial = multithread_request(

backend/weatherly/geocoding.py

@@ -1,5 +1,5 @@
 from os import environ
-from flask import Blueprint, request
+from flask import Blueprint, request, current_app
 
 from .Param import Param
 from ._utils import fetch_api
@@ -21,7 +21,7 @@ def get_coordinates():
         url = "https://maps.googleapis.com/maps/api/geocode/json"
         payload = {
             "address": address.value,
-            "key": environ.get("GEOCODING_API_KEY")
+            "key": current_app.config["GEOCODING_API_KEY"]
         }
 
         data = fetch_api(payload, url)

backend/weatherly/reverse_geocoding.py

@@ -1,5 +1,5 @@
 from os import environ
-from flask import Blueprint, request
+from flask import Blueprint, request, current_app
 
 from .Param import Param
 from ._utils import fetch_api
@@ -24,7 +24,7 @@ def get_reverse_geocode():
         payload = {
             "latlng": f"{latitude.value},{longitude.value}",
             "result_type": "political",
-            "key": environ.get("REVERSE_GEOCODING_API_KEY")
+            "key": current_app.config["REVERSE_GEOCODING_API_KEY"]
         }
 
         data = fetch_api(payload, url)

client/package.json

@@ -21,6 +21,7 @@
     "react-dom": "^17.0.2"
   },
   "devDependencies": {
+    "@types/node": "^17.0.13",
     "@types/react": "^17.0.35",
     "@types/react-dom": "^17.0.11",
     "@vitejs/plugin-react": "^1.0.9",

client/src/context/GlobalState.tsx

@@ -20,6 +20,7 @@ type Props = {
 
 function GlobalProvider({ children }: Props) {
   const [state, dispatch] = useReducer(AppReducer, initialState);
+  const API_URL = import.meta.env.VITE_API_URL;
 
   function setCoordinates(latitude: number, longitude: number): void {
     dispatch({
@@ -34,7 +35,7 @@ function GlobalProvider({ children }: Props) {
       const lat = position.lat;
       const lon = position.lng;
 
-      const url = `//localhost:5000/forecast?lat=${lat}&lon=${lon}`;
+      const url = `${API_URL}/forecast?lat=${lat}&lon=${lon}`;
       const res = await fetch(url);
       const { forecast_imperial, forecast_metric } = await res.json();
 
@@ -55,7 +56,7 @@ function GlobalProvider({ children }: Props) {
 
   async function getGeocoding(address: string): Promise<void> {
     try {
-      const url = `//localhost:5000/geocoding?address=${address}`;
+      const url = `${API_URL}/geocoding?address=${address}`;
       const res = await fetch(url);
       const { data } = await res.json();
 

client/src/env.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_API_URL: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}