add full version of client

client/mygs/.vscode/settings.json

 {
-    "java.configuration.updateBuildConfiguration": "interactive"
+    "java.configuration.updateBuildConfiguration": "automatic"
 }
\ No newline at end of file

client/mygs/android/app/build.gradle

@@ -42,6 +42,7 @@ android {
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
+        
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).

client/mygs/assets/icons/check_mark.svg

+<svg width="10" height="8" viewBox="0 0 10 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 4.1667L2.95956 6.1262C3.3501 6.5167 3.9832 6.5168 4.3738 6.1262L9 1.5" stroke="black" stroke-width="2" stroke-linecap="round"/>
+</svg>

client/mygs/assets/icons/warning.svg

+<svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.5 9.9375V22.4625" stroke="#020202" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M35.025 2.77502H9.975C8.07539 2.77502 6.25358 3.52964 4.91035 4.87287C3.56712 6.2161 2.8125 8.03791 2.8125 9.93752V27.825C2.8125 29.7246 3.56712 31.5464 4.91035 32.8897C6.25358 34.2329 8.07539 34.9875 9.975 34.9875H17.1375L22.5 40.35L27.8625 34.9875H35.025C36.9246 34.9875 38.7464 34.2329 40.0897 32.8897C41.4329 31.5464 42.1875 29.7246 42.1875 27.825V9.93752C42.1875 8.03791 41.4329 6.2161 40.0897 4.87287C38.7464 3.52964 36.9246 2.77502 35.025 2.77502Z" stroke="#020202" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M20.7188 26.0438H24.2812" stroke="#020202" stroke-width="2" stroke-miterlimit="10"/>
+</svg>

client/mygs/i18n/en.json

@@ -107,7 +107,38 @@
     "amount":"Amount",
     "liters": "liters",
     "download":"Download",
-    "contact_support":"Contact support"
+    "contact_support":"Contact support",
 
+    "reset": "Reset",
+    "price": "Price",
+    "from": "From",
+    "to": "To",
+    "apply":"Apply",
+
+
+    "enter_dispenser_number": "Enter the dispenser number",
+    "scan":"Scan",
+    "dispenser": "dispenser",
+    "fuel_quantiy":"Fuel quantiy",
+    "auto": "Auto",
+
+    "pay":"Pay",
+    "instruction":"Instruction",
+    "refueling_progress": "Refueling progress",
+
+    "please_wait_attendant": "Please wait for the gas station attendant",
+    "ready":"Ready",
+    "thank_for_purchase" : "Thank you for your purchase!",
+    "warning_after_refuel": "Please do not forget to take the gun out of the fuel tank",
+    "main_page":"Main page",
+
+    "share_data":"Share data",
+    "not_shared_yet":"It looks like you haven't shared your data with anyone yet",
+    "payment": "Payment",
+    "choose_payments": "Choose payments",
+    "clear":"Clear",
+    "choose_cars": "Choose cars",
+    "select_payments":"Select payments",
+    "select_cars":"Select cars"
 
 }
\ No newline at end of file

client/mygs/lib/classes/fuel_class.dart

-class Fuel {
+class FuelClass {
   String? id;
   String? name;
   double? price;
   String? fuelType;
 
-  Fuel({this.id, this.name, this.price, this.fuelType});
+  FuelClass({this.id, this.name, this.price, this.fuelType});
 
-  Fuel.fromJson(Map<String, dynamic> json) {
+  FuelClass.fromJson(Map<String, dynamic> json) {
     id = json['id'];
     name = json['name'];
     price = json['price'];

client/mygs/lib/classes/gas_station_class.dart

@@ -18,11 +18,11 @@ class GasStation {
   DateTime? openedTo;
 
   Adress? adress;
-  List<Fuel>? fuels;
+  List<FuelClass>? fuels;
   List<String>? paymentMethods;
   List<String>? services;
   List<RefuelingStand>? refuelingStands;
-  List<Ofer>? ofers;
+  List<OferClass>? ofers;
 
   GasStation(
       {this.id,
@@ -84,8 +84,8 @@ class GasStation {
     return data;
   }
 
-  List<Fuel> getFuelsList(List<dynamic> json) {
-    return (json).map((e) => Fuel.fromJson(e)).toList();
+  List<FuelClass> getFuelsList(List<dynamic> json) {
+    return (json).map((e) => FuelClass.fromJson(e)).toList();
   }
 
   List<RefuelingStand> getRefuelingStandsList(List<dynamic> json) {
@@ -94,8 +94,8 @@ class GasStation {
         .toList();
   }
 
-  List<Ofer> getOfersList(List<dynamic> json) {
-    return (json).map((e) => Ofer.fromJson(e)).toList();
+  List<OferClass> getOfersList(List<dynamic> json) {
+    return (json).map((e) => OferClass.fromJson(e)).toList();
   }
 
   List<String> getStringList(List<dynamic> json) {

client/mygs/lib/classes/message_class.dart

@@ -2,7 +2,7 @@ import 'package:MyGS/classes/user_class.dart';
 
 class Message {
   String? id;
-  User? author;
+  UserClass? author;
   String? content;
   DateTime? created;
 

client/mygs/lib/classes/ofer_cless.dart

-class Ofer {
+class OferClass {
   String? id;
   String? content;
   String? imgUrl;
   String? title;
- 
-  Ofer({
+  
+  OferClass({
     this.id,
     this.content,
     this.imgUrl,
     this.title
   });
 
-  Ofer.fromJson(Map<String, dynamic> json) {
+  OferClass.fromJson(Map<String, dynamic> json) {
     id = json['id'];
     content = json['content'];
     imgUrl = json['img_url'];
@@ -26,4 +26,5 @@ class Ofer {
     data['title'] = this.title;
     return data;
   }
+  
 }
\ No newline at end of file

client/mygs/lib/classes/question_class.dart

+
+class QuestionClass {
+  String? id;
+  String? question;
+  String? answer;
+
+
+  QuestionClass({this.answer, this.id, this.question});
+
+  QuestionClass.fromJson(Map<String, dynamic> json) {
+    id = json['id'];
+    question = json['question'];
+    answer = json['answer'];
+
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['id'] = this.id;
+    data['question'] = this.question;
+    data['answer'] = this.answer;
+    return data;
+  }
+}

client/mygs/lib/classes/refueling_stand_class.dart

@@ -4,7 +4,7 @@ import 'package:MyGS/classes/fuel_class.dart';
 class RefuelingStand {
   String? id;
   String? standId;
-  List<Fuel>? fuels;
+  List<FuelClass>? fuels;
  
 
   RefuelingStand({
@@ -19,8 +19,8 @@ class RefuelingStand {
     fuels = getFuelsList(json['fuels']);
   }
 
-  List<Fuel> getFuelsList(List<dynamic> json) {
-    return (json).map((e) => Fuel.fromJson(e)).toList();
+  List<FuelClass> getFuelsList(List<dynamic> json) {
+    return (json).map((e) => FuelClass.fromJson(e)).toList();
   }
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();

client/mygs/lib/classes/share_class.dart

@@ -2,27 +2,39 @@ import 'package:MyGS/classes/auto_class.dart';
 import 'package:MyGS/classes/card_class.dart';
 import 'package:MyGS/classes/user_class.dart';
 
-class Share {
+class ShareClass {
   String? id;
   List<AutoClass>? sharedCars;
   List<CardClass>? sharedCards;
-  User? invitedUser;
+  String? invitedUser;
 
-  Share({this.id, this.invitedUser, this.sharedCards, this.sharedCars});
+  ShareClass({this.id, this.invitedUser, this.sharedCards, this.sharedCars});
 
-  Share.fromJson(Map<String, dynamic> json) {
+  ShareClass.fromJson(Map<String, dynamic> json) {
     id = json['id'];
-    sharedCards = json['sharedCards'];
-    sharedCars = json['sharedCars'];
-    invitedUser = json['invitedUser'];
+    sharedCards = getCardList(json['shared_cards']);
+    sharedCars = getAutoList(json['shared_cars']);
+    invitedUser = json['invited_user'];
+  }
+
+  List<AutoClass> getAutoList(List<dynamic> json) {
+    return (json)
+        .map((e) => AutoClass.fromJson(e))
+        .toList();
+  }
+
+  List<CardClass> getCardList(List<dynamic> json) {
+    return (json)
+        .map((e) => CardClass.fromJson(e))
+        .toList();
   }
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     data['id'] = this.id;
-    data['invitedUser'] = this.invitedUser;
-    data['sharedCards'] = this.sharedCards;
-    data['sharedCars'] = this.sharedCars;
+    data['invited_user'] = this.invitedUser;
+    data['shared_cards'] = this.sharedCards;
+    data['shared_cars'] = this.sharedCars;
     return data;
   }
 }

client/mygs/lib/classes/user_class.dart

@@ -5,23 +5,22 @@ import 'package:MyGS/classes/share_class.dart';
 import 'card_class.dart';
 import 'order_class.dart';
 
-class User {
+class UserClass {
   String? id;
-  String? dob;
+  DateTime? dob;
   String? email;
   String? name;
   String? surname;
-  String? password;
   String? phone;
 
   List<CardClass>? cards;
   List<AutoClass>? cars;
   List<GasStation>? favorites;
   List<OrderClass>? orders;
-  List<Share>? invitedUsers;
+  List<ShareClass>? invitedUsers;
   bool? isMale;
 
-  User({
+  UserClass({
     this.cards,
     this.cars,
     this.dob,
@@ -32,13 +31,12 @@ class User {
     this.isMale,
     this.name,
     this.orders,
-    this.password,
     this.phone,
     this.surname,
     
   });
 
-  User.fromJson(Map<String, dynamic> json) {
+  UserClass.fromJson(Map<String, dynamic> json) {
     id = json['id'];
     cards = json['cards'];
     cars = json['cars'];
@@ -49,7 +47,6 @@ class User {
     isMale = json['isMale'];
     name = json['name'];
     orders = json['orders'];
-    password = json['password'];
     phone = json['phone'];
     surname = json['surname'];
   }
@@ -66,7 +63,6 @@ class User {
     data['isMale'] = this.isMale;
     data['name'] = this.name;
     data['orders'] = this.orders;
-    data['password'] = this.password;
     data['phone'] = this.phone;
     data['surname'] = this.surname;
     return data;

client/mygs/lib/components/dividers/widget_divider.dart

+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/src/widgets/framework.dart';
+import 'package:flutter/src/widgets/placeholder.dart';
+
+import '../../utility/variables/colors.dart';
+
+class WidgetDivider extends StatefulWidget {
+  const WidgetDivider({super.key, required this.child, required this.height});
+
+  final Widget child;
+  final double height;
+
+  @override
+  State<WidgetDivider> createState() => _WidgetDividerState();
+}
+
+class _WidgetDividerState extends State<WidgetDivider> {
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        Expanded(
+          child: Divider(
+            color: colorGrayTextFields,
+            height: widget.height,
+          ),
+        ),
+        widget.child,
+        // Padding(
+        //   padding: EdgeInsets.symmetric(horizontal: text != '' ? font10 : 0),
+        //   child: Text(
+        //     text,
+        //     style: styleInscriptions,
+        //   ),
+        // ),
+        Expanded(
+          child: Divider(
+            color: colorGrayTextFields,
+            height: widget.height,
+          ),
+        ),
+      ],
+    );
+  }
+}