From 27d0f19357b41f1e5931a349882695bcffba14a0 Mon Sep 17 00:00:00 2001 From: Ishav Sohal Date: Fri, 15 Dec 2023 22:34:17 -0500 Subject: [PATCH] bug fixes --- backend/routes/users.py | 12 ++--- backend/utils/FirebaseAPI.py | 2 +- frontend/src/APIs/FLASK_API.tsx | 6 +-- frontend/src/models/User.ts | 85 ++++++++++++++++----------------- frontend/src/screens/signup.tsx | 3 +- 5 files changed, 54 insertions(+), 54 deletions(-) diff --git a/backend/routes/users.py b/backend/routes/users.py index bc285db..562b6ed 100644 --- a/backend/routes/users.py +++ b/backend/routes/users.py @@ -25,7 +25,7 @@ def get_user(user_id: str) -> Response: @users.route("/get_top_users", methods=['POST']) @carbon_auth.auth.login_required def get_top_users() -> Response: - try: + #try: count = request.get_json()["count"] # Monthly @@ -78,8 +78,8 @@ def get_top_users() -> Response: 'top_yearly_users': top_yearly_users, 'top_overall_users': top_overall_users, }) - except CarbonTrackError as e: - abort(code=400, description=f"{e}") + #except CarbonTrackError as e: + # abort(code=400, description=f"{e}") @users.route("/user_email/", methods=['GET']) @@ -129,7 +129,7 @@ def get_current_user() -> Response: @users.route("/user", methods=["PUT"]) @carbon_auth.auth.login_required def create_user() -> Response: - try: + #try: res: dict = request.get_json()["user"] user = User.from_json(res) user.email = user.email.lower() @@ -147,8 +147,8 @@ def create_user() -> Response: return jsonify( {"error": "User Already Exits With Same Email, Please Log In"} ) - except CarbonTrackError as e: - abort(code=400, description=f"{e}") + # except CarbonTrackError as e: + # abort(code=400, description=f"{e}") @users.route("/user/", methods=["DELETE"]) diff --git a/backend/utils/FirebaseAPI.py b/backend/utils/FirebaseAPI.py index 9915c65..40a9645 100644 --- a/backend/utils/FirebaseAPI.py +++ b/backend/utils/FirebaseAPI.py @@ -7,7 +7,7 @@ from models.user import User from mongodb_api.carbon_track_db import CarbonTrackDB -cred = credentials.Certificate(dict(os.environ)) +cred = credentials.Certificate("secrets.json") APP = firebase_admin.initialize_app(cred) diff --git a/frontend/src/APIs/FLASK_API.tsx b/frontend/src/APIs/FLASK_API.tsx index 9a94096..9d874c2 100644 --- a/frontend/src/APIs/FLASK_API.tsx +++ b/frontend/src/APIs/FLASK_API.tsx @@ -1,6 +1,6 @@ -import axios from "axios"; -import firebaseService from "../utilities/firebase"; -const FLASK_LOCAL_ADDRESS: string = "http://10.0.0.72:6050"; +import axios from 'axios'; +import firebaseService from '../utilities/firebase'; +const FLASK_LOCAL_ADDRESS: string = 'http://10.0.0.95:6050'; // Function to get the Firebase authentication token const getFirebaseAuthToken = async (): Promise => { diff --git a/frontend/src/models/User.ts b/frontend/src/models/User.ts index 7cd3212..89f7189 100644 --- a/frontend/src/models/User.ts +++ b/frontend/src/models/User.ts @@ -1,55 +1,54 @@ import { type ObjectId } from 'mongodb'; export interface User { - _id: ObjectId - uid: string; - full_name: string - email: string - badges: string[] - friends: ObjectId[] - overall_score: number - province: string - household: number - fuel_efficiency: number - photoURL: string; + _id: ObjectId; + uid: string; + full_name: string; + email: string; + badges: string[]; + friends: ObjectId[]; + monthly_score: number; + yearly_score: number; + overall_score: number; + province: string; + household: number; + fuel_efficiency: number; + photoURL: string; } - export interface RankUser { - rank: number; - name: string; - footprint: number; - score: number; - } - + rank: number; + name: string; + footprint: number; + score: number; +} export interface TopUsersLists { - top_monthly_users: RankUser[] - top_yearly_users: RankUser[] - top_overall_users: RankUser[] + top_monthly_users: RankUser[]; + top_yearly_users: RankUser[]; + top_overall_users: RankUser[]; } - export function getUserLevel(score: number): number { - if (score < 250) { - return 1; - } else if (score < 500) { - return 2; - } else if (score < 1000) { - return 3; - } else if (score < 2000) { - return 4; - } else if (score < 4000) { - return 5; - } else if (score < 8000) { - return 6; - } else if (score < 16000) { - return 7; - } else if (score < 32000) { - return 8; - } else if (score < 64000) { - return 9; - } else { - return 10; - } + if (score < 250) { + return 1; + } else if (score < 500) { + return 2; + } else if (score < 1000) { + return 3; + } else if (score < 2000) { + return 4; + } else if (score < 4000) { + return 5; + } else if (score < 8000) { + return 6; + } else if (score < 16000) { + return 7; + } else if (score < 32000) { + return 8; + } else if (score < 64000) { + return 9; + } else { + return 10; } +} diff --git a/frontend/src/screens/signup.tsx b/frontend/src/screens/signup.tsx index e777fa5..9c0ee43 100644 --- a/frontend/src/screens/signup.tsx +++ b/frontend/src/screens/signup.tsx @@ -59,6 +59,8 @@ export default function SignUp(): JSX.Element { email, badges: [], friends: [], + monthly_score: 0, + yearly_score: 0, overall_score: 0, province: '', household: 0, @@ -74,7 +76,6 @@ export default function SignUp(): JSX.Element { } } catch (err) { console.error('[signup.tsx - handleSignUp] User not created in Flask:', err); - } };