use enw circle avatar

Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
 import '../../../main.dart';
 import '../../../mih_objects/app_user.dart';
 import '../../../mih_objects/arguments.dart';
 import 'package:supertokens_flutter/supertokens.dart';
-import '../../../mih_components/mih_profile_picture.dart';
 
 class MIHAppDrawer extends StatefulWidget {
   final AppUser signedInUser;
@@ -53,17 +53,26 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                 widget.signedInUser, widget.propicFile),
           );
         },
-        child: MIHProfilePicture(
+        child: MihCircleAvatar(
-          profilePictureFile: widget.propicFile,
+          imageFile: widget.propicFile,
-          proPicController: proPicController,
-          proPic: null,
           width: 60,
-          radius: 27,
-          drawerMode: true,
           editable: false,
+          fileNameController: proPicController,
+          onChange: (_) {},
+          userSelectedfile: null,
           frameColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
-          onChange: (newProPic) {},
         ),
+        // MIHProfilePicture(
+        //   profilePictureFile: widget.propicFile,
+        //   proPicController: proPicController,
+        //   proPic: null,
+        //   width: 60,
+        //   radius: 27,
+        //   drawerMode: true,
+        //   editable: false,
+        //   frameColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+        //   onChange: (newProPic) {},
+        // ),
 
         // Stack(
         //   alignment: Alignment.center,

Frontend/lib/mih_packages/mih_home/mih_home.dart

@@ -2,7 +2,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_action.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_tools.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_profile_picture.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
 import 'package:mzansi_innovation_hub/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_objects/business_user.dart';
@@ -101,17 +101,27 @@ class _MihHomeState extends State<MihHome> {
       return MihAppAction(
         icon: Padding(
           padding: const EdgeInsets.only(left: 5.0),
-          child: MIHProfilePicture(
+          child: MihCircleAvatar(
-            profilePictureFile: widget.propicFile,
+            imageFile: widget.propicFile,
-            proPicController: proPicController,
+            width: 50,
-            proPic: null,
-            width: 45,
-            radius: 21,
-            drawerMode: false,
             editable: false,
+            fileNameController: proPicController,
+            userSelectedfile: null,
+            // frameColor: frameColor,
             frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-            onChange: (newProPic) {},
+            onChange: (_) {},
           ),
+          // MIHProfilePicture(
+          //   profilePictureFile: widget.propicFile,
+          //   proPicController: proPicController,
+          //   proPic: null,
+          //   width: 45,
+          //   radius: 21,
+          //   drawerMode: false,
+          //   editable: false,
+          //   frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          //   onChange: (newProPic) {},
+          // ),
         ),
         iconSize: 45,
         onTap: () {

Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart

@@ -1,22 +1,20 @@
 import 'dart:convert';
 
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_apis/mih_file_api.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_file_input.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih-app_tool_body.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_profile_picture.dart';
 import 'package:mzansi_innovation_hub/mih_env/env.dart';
 import 'package:mzansi_innovation_hub/mih_objects/arguments.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
-import 'package:supertokens_flutter/supertokens.dart';
 import 'package:supertokens_flutter/http.dart' as http;
-import 'package:http/http.dart' as http2;
 
 class MihPersonalProfile extends StatefulWidget {
   final AppProfileUpdateArguments arguments;
@@ -82,33 +80,14 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
   }
 
   Future<void> uploadSelectedFile(PlatformFile? file) async {
-    //print("MIH Profile Picture: $file");
+    var response = await MihFileApi.uploadFile(
-    //var strem = new http.ByteStream.fromBytes(file.bytes.)
+      widget.arguments.signedInUser.app_id,
-    //start loading circle
+      "profile_files",
-    showDialog(
+      file,
-      context: context,
+      context,
-      builder: (context) {
-        return const Mihloadingcircle();
-      },
     );
-    var token = await SuperTokens.getAccessToken();
+    if (response == 200) {
-    var request = http2.MultipartRequest(
-        'POST', Uri.parse("${AppEnviroment.baseApiUrl}/minio/upload/file/"));
-    request.headers['accept'] = 'application/json';
-    request.headers['Authorization'] = 'Bearer $token';
-    request.headers['Content-Type'] = 'multipart/form-data';
-    request.fields['app_id'] = widget.arguments.signedInUser.app_id;
-    request.fields['folder'] = "profile_files";
-    request.files.add(await http2.MultipartFile.fromBytes('file', file!.bytes!,
-        filename: file.name.replaceAll(RegExp(r' '), '-')));
-    var response1 = await request.send();
-    if (response1.statusCode == 200) {
       deleteFileApiCall(oldProPicName);
-      // end loading circle
-      //Navigator.of(context).pop();
-      // String message =
-      //     "The file ${file.name.replaceAll(RegExp(r' '), '-')} has been successfully generated and added to ${widget.signedInUser.fname} ${widget.signedInUser.lname}'s record. You can now access and download it for their use.";
-      // successPopUp(message);
     } else {
       internetConnectionPopUp();
     }
@@ -153,11 +132,6 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
             false,
           ),
         );
-        // Navigator.of(context).pushNamed(
-        //   '/mzansi-profile',
-        //   arguments: AppProfileUpdateArguments(
-        //       widget.arguments.signedInUser, widget.arguments.propicFile),
-        // );
         String message =
             "${widget.arguments.signedInUser.email}'s information has been updated successfully!";
         successPopUp(message);
@@ -168,20 +142,13 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
   }
 
   Future<void> deleteFileApiCall(String filename) async {
-    // delete file from minio
+    var response = await MihFileApi.deleteFile(
-    var fname = filename.replaceAll(RegExp(r' '), '-');
+      widget.arguments.signedInUser.app_id,
-    var filePath =
+      "profile_files",
-        "${widget.arguments.signedInUser.app_id}/profile_files/$fname";
+      filename,
-    var response = await http.delete(
+      context,
-      Uri.parse("${AppEnviroment.baseApiUrl}/minio/delete/file/"),
-      headers: <String, String>{
-        "Content-Type": "application/json; charset=UTF-8"
-      },
-      body: jsonEncode(<String, dynamic>{"file_path": filePath}),
     );
-    //print("Here4");
+    if (response == 200) {
-    //print(response.statusCode);
-    if (response.statusCode == 200) {
       //SQL delete
     } else {
       internetConnectionPopUp();
@@ -258,21 +225,34 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
       child: Column(
         children: [
           //displayProPic(),
-          MIHProfilePicture(
+          MihCircleAvatar(
-            profilePictureFile: widget.arguments.propicFile,
+            imageFile: propicPreview,
-            proPicController: proPicController,
+            width: 150,
-            proPic: proPic,
-            width: 155,
-            radius: 70,
-            drawerMode: false,
             editable: true,
+            fileNameController: proPicController,
+            userSelectedfile: proPic,
             frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-            onChange: (newProPic) {
+            onChange: (selectedImage) {
               setState(() {
-                proPic = newProPic;
+                proPic = selectedImage;
               });
             },
           ),
+          // MIHProfilePicture(
+          //   profilePictureFile: widget.arguments.propicFile,
+          //   proPicController: proPicController,
+          //   proPic: proPic,
+          //   width: 155,
+          //   radius: 70,
+          //   drawerMode: false,
+          //   editable: true,
+          //   frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          //   onChange: (newProPic) {
+          //     setState(() {
+          //       proPic = newProPic;
+          //     });
+          //   },
+          // ),
           const SizedBox(height: 25.0),
           Visibility(
             visible: false,