Merge pull request #60 from utmgdsc/feature/deploy_changes

Feature/deploy changes

backend/routes/users.py

@@ -139,26 +139,21 @@ def get_current_user() -> Response:
 @users.route("/user", methods=["PUT"])
 @carbon_auth.auth.login_required
 def create_user() -> Response:
-    try:
-        res: dict = request.get_json()["user"]
-        user = User.from_json(res)
-        user.email = user.email.lower()
-
-        query = {"email": user.email}
-        item = CarbonTrackDB.users_coll.find_one(query)
-        if item is None:
-            user = user.to_json()
-            inserted_id = CarbonTrackDB.users_coll.insert_one(user).inserted_id
-            user = User.from_json(
-                CarbonTrackDB.users_coll.find_one({"_id": inserted_id})
-            ).to_json()
-            return jsonify({"user": user})
-        else:
-            return jsonify({"error": "User Already Exits With Same Email, Please Log In"})
-
-
-    except CarbonTrackError as e:
-        abort(code=400, description=f"{e}")
+    res: dict = request.get_json()["user"]
+    user = User.from_json(res)
+    user.email = user.email.lower()
+
+    query = {"email": user.email}
+    item = CarbonTrackDB.users_coll.find_one(query)
+    if item is None:
+        user = user.to_json()
+        inserted_id = CarbonTrackDB.users_coll.insert_one(user).inserted_id
+        user = User.from_json(
+            CarbonTrackDB.users_coll.find_one({"_id": inserted_id})
+        ).to_json()
+        return jsonify({"user": user})
+    else:
+        return jsonify({"error": "User Already Exits With Same Email, Please Log In"})
 
 
 @users.route("/user/<user_id>", methods=["DELETE"])
@@ -228,6 +223,6 @@ def update_user_name(user_id: str) -> Response:
 
         item = User.from_json(item).to_json()
 
-        return jsonify({"user": item}), 200
+        return jsonify({"user": item})
     except CarbonTrackError as e:
         abort(code=400, description=f"{e}")

frontend/src/components/BadgeDisplay.tsx

@@ -22,15 +22,15 @@ const BadgesDisplay: React.FC<{ user: User }> = ({ user }) => {
     },
     completed_10_weekly_entries: {
       image: require('../../assets/complete-10-badge.png'),
-      description: 'Completed 10 weekly entry!',
+      description: 'Completed 10 weekly entries!',
     },
     completed_50_weekly_entries: {
       image: require('../../assets/complete-50-badge.png'),
-      description: 'Completed 50 weekly entry!',
+      description: 'Completed 50 weekly entries!',
     },
     completed_100_weekly_entries: {
       image: require('../../assets/complete-100-badge.png'),
-      description: 'Completed 100 weekly entry!',
+      description: 'Completed 100 weekly enties!',
     },
     decreased_emissions_for_first_time: {
       image: require('../../assets/improve-footprint-badge.png'),

frontend/src/models/User.ts

@@ -10,6 +10,9 @@ export interface User {
   monthly_score: number;
   yearly_score: number;
   overall_score: number;
+  monthly_emissions: number;
+  yearly_emissions: number;
+  overall_emissions: number;
   province: string;
   household: number;
   fuel_efficiency: number;

frontend/src/screens/settings/updateProfile.tsx

@@ -82,7 +82,7 @@ export default function UpdateProfileScreen(): JSX.Element {
         aspect: [1, 1],
         quality: 1,
       });
-      if (!result.canceled) {
+      if (!(result.canceled)) {
         await firebaseService.uploadProfilePicture(userid, result.assets[0].uri);
         setPhotoURL(result.assets[0].uri);
         setRerenderKey((prevKey) => prevKey + 1);

frontend/src/screens/signup.tsx

@@ -66,6 +66,9 @@ export default function SignUp(): JSX.Element {
         household: 0,
         fuel_efficiency: 0,
         photoURL: '',
+        monthly_emissions: 0,
+        yearly_emissions: 0,
+        overall_emissions: 0
       });
 
       if (typeof res === 'string') {