favourite_exercise and main_gym

backend/secfit/users/forms.py

@@ -9,11 +9,13 @@ class CustomUserCreationForm(UserCreationForm):
     country = forms.CharField(max_length=50)
     city = forms.CharField(max_length=50)
     street_address = forms.CharField(max_length=50)
+    favourite_exercise = forms.CharField(max_length=50)
+    main_gym = forms.CharField(max_length=50)
 
 
     class Meta(UserCreationForm):
         model = get_user_model()
-        fields = ("username", "coach", "phone_number", "country", "city", "street_address")
+        fields = ("username", "coach", "phone_number", "country", "city", "street_address", "favourite_exercise", "main_gym")
 
 
 class CustomUserChangeForm(UserChangeForm):

backend/secfit/users/models.py

@@ -18,7 +18,9 @@ class User(AbstractUser):
     country = models.TextField(max_length=50, blank=True)
     city = models.TextField(max_length=50, blank=True)
     street_address = models.TextField(max_length=50, blank=True)
-    
+    favourite_exercise = models.TextField(max_length=50, blank=True)
+    main_gym = models.TextField(max_length=50, blank=True)
+
 
 def athlete_directory_path(instance, filename):
     """

backend/secfit/users/serializers.py

@@ -22,6 +22,8 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
             "country",
             "city",
             "street_address",
+            "favourite_exercise",
+            "main_gym",
             "coach",
             "workouts",
             "coach_files",
@@ -49,7 +51,9 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
         country = validated_data["country"]
         city = validated_data["city"]
         street_address = validated_data["street_address"]
-        user_obj = get_user_model()(username=username, email=email, phone_number=phone_number, country=country, city=city, street_address=street_address)
+        favourite_exercise = validated_data["favourite_exercise"]
+        main_gym = validated_data["main_gym"]
+        user_obj = get_user_model()(username=username, email=email, phone_number=phone_number, country=country, city=city, street_address=street_address, favourite_exercise=favourite_exercise, main_gym=main_gym)
         user_obj.set_password(password)
         user_obj.save()
 
@@ -69,6 +73,8 @@ class UserGetSerializer(serializers.HyperlinkedModelSerializer):
             "country",
             "city",
             "street_address",
+            "favourite_exercise",
+            "main_gym",
             "coach",
             "workouts",
             "coach_files",

frontend/www/register.html

@@ -59,6 +59,16 @@
                         <input class="form-control" name="street_address" placeholder="Street address" type="text"
                             required>
                     </div> <!-- form-group// -->
+                    <div class="input-group mb-2">
+                        <span class="input-group-text"> <i class="fas  fa-hotel"></i> </span>
+                        <input class="form-control" name="main_gym" placeholder="Main gym" type="text"
+                               required>
+                    </div> <!-- form-group// -->
+                    <div class="input-group mb-2">
+                        <span class="input-group-text"> <i class="fas  fa-hotel"></i> </span>
+                        <input class="form-control" name="favourite_exercise" placeholder="Favourite exercise" type="text"
+                               required>
+                    </div> <!-- form-group// -->
                     <div class="d-grid">
                         <input type="button" class="btn btn-primary" id="btn-create-account"
                             value=" Create Account  ">
@@ -77,4 +87,4 @@
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js" integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW" crossorigin="anonymous"></script>
 </body>
 
-</html>
+</html>
\ No newline at end of file

frontend/www/scripts/profile.js

@@ -81,7 +81,11 @@ async function createExercise() {
         document.body.prepend(alert);
     }
 
-    console.log("TEST*IJG")
+    const username = sessionStorage.getItem("username");
+    console.log("USERNAME:", username);
+    let response2 = await sendRequest("GET", `${HOST}/api/users/`);
+    let data2 = await response2.json();
+    console.log("USER:", data2.results.map((item) => console.log(item)));
 }
 
 function handleEditExerciseButtonClick() {

frontend/www/scripts/register.js

 async function createNewUser(event) {
     let form = document.querySelector("#form-register-user");
     let formData = new FormData(form);
-
     let response = await sendRequest("POST", `${HOST}/api/users/`, formData, "");
-    
+
     if (!response.ok) {
       let data = await response.json();
       let alert = createAlert("Registration failed!", data);
@@ -16,7 +15,9 @@ async function createNewUser(event) {
         phone_number:   formData.get("phone_number"),
         country:        formData.get("country"),
         city:           formData.get("city"),
-        street_address: formData.get("street_address")
+        street_address: formData.get("street_address"),
+          main_gym:   formData.get("main_gym"),
+          favourite_exercise:   formData.get("favourite_exercise")
         };
       response = await sendRequest("POST", `${HOST}/api/token/`, body);
       if (response.ok) {
@@ -32,7 +33,7 @@ async function createNewUser(event) {
       }
       form.reset();
       window.location.replace("workouts.html");
-    }  
+    }
   }
 
-document.querySelector("#btn-create-account").addEventListener("click", async (event) => await createNewUser(event));
+document.querySelector("#btn-create-account").addEventListener("click", async (event) => await createNewUser(event));
\ No newline at end of file

frontend/www/scripts/workouts.js

@@ -103,4 +103,4 @@ window.addEventListener("DOMContentLoaded", async () => {
             }
         });
     }
-});
+});
\ No newline at end of file