Merge branch 'master' of http://103.44.149.204/qorridi/medapp_eksad

lib/api/contact_api.dart

@@ -19,6 +19,7 @@ Future savecontact(nama, email, nohp, message) async {
   // } else {
   //   return false;
   // }
+  return response.statusCode;
 }
 
 Future<List<contact>> showcontact() async {

lib/auth/forget_password.dart

+import 'package:flutter/material.dart';
+
+
+class ForgotPassword extends StatefulWidget {
+  const ForgotPassword({Key? key}) : super(key: key);
+
+  @override
+  State<ForgotPassword> createState() => _ForgotPasswordState();
+}
+
+class _ForgotPasswordState extends State<ForgotPassword> {
+
+  final formKey = GlobalKey<FormState>();
+  String email = '';
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      children: [
+        Container(
+          decoration: BoxDecoration(
+              image: DecorationImage(
+                  image: AssetImage('assets/images/medapp_image2.jpg'),
+                  fit: BoxFit.fill)),
+        ),
+        Padding(
+          padding: const EdgeInsets.all(21.0),
+          child: ElevatedButton(onPressed: (){
+            Navigator.pushNamed(context, '/login');
+          }, child: Icon(Icons.arrow_back)),
+        ),
+        Center(
+          child:AlertDialog(
+                title: Text('Find your account'),
+            content: Form(
+              key: formKey,
+              child: TextFormField(
+                textAlign: TextAlign.start,
+                decoration: InputDecoration(
+                  labelText: "Enter your email address",
+                  hintStyle: const TextStyle(),
+                  border: OutlineInputBorder(
+                      borderRadius:
+                      BorderRadius.circular(5.0)),
+                ),
+                onChanged: (value) => email = value,
+              ),
+            ),
+            actions: <Widget>[
+
+              TextButton(
+                onPressed: () {
+                  Navigator.pushNamed(context, 'dashboard');
+                },
+                child: const Text('Send'),
+              ),
+            ],
+              )
+        ),
+      ],
+    );
+  }
+}

lib/dashboard/admin/admin_contact.dart

+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+
+
+class Dashboard4 extends StatefulWidget {
+  const Dashboard4({Key? key}) : super(key: key);
+
+  @override
+  State<Dashboard4> createState() => _Dashboard4State();
+}
+
+class MessageUser {
+  int id;
+  String name;
+  String email;
+  String message;
+  String number;
+
+  MessageUser(
+      this.id,
+      this.name,
+      this.email,
+      this.message,
+      this.number
+      );
+}
+
+class _Dashboard4State extends State<Dashboard4> {
+  List<MessageUser> ListMessage = <MessageUser>[
+    MessageUser(1, "Jay", 'email', 'message', 'number'),
+    MessageUser(2, 'nama', 'email', 'message', 'nomer'),
+    MessageUser(1, "Jay", 'email', 'message', 'number'),
+    MessageUser(2, 'nama', 'email', 'message', 'nomer'),MessageUser(1, "Jay", 'email', 'message', 'number'),
+    MessageUser(2, 'nama', 'email', 'message', 'nomer'),MessageUser(1, "Jay", 'email', 'message', 'number'),
+    MessageUser(2, 'nama', 'email', 'message', 'nomer'),
+  ];
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  refreshList() {
+    setState(() {
+      ListMessage=ListMessage;
+    });
+  }
+
+
+
+
+  @override
+  Widget build(BuildContext context) {
+    var screenSize = MediaQuery.of(context).size;
+    return Padding(
+      padding: const EdgeInsets.all(30.0),
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 10),
+        decoration: BoxDecoration(
+            color: Colors.white60,
+            borderRadius: BorderRadius.circular(20),
+            boxShadow: [
+              BoxShadow(
+                color: const Color.fromARGB(255, 10, 116, 255)
+                    .withAlpha(60),
+                blurRadius: 5.0,
+                spreadRadius: 5.0,
+                offset: const Offset(
+                  0.0,
+                  3.0,
+                ),
+              ),
+            ]),
+        child: Column(
+          children: [
+            Container(
+              height: screenSize.height * 0.15,
+
+              child: Center(
+                child: Text('Data Messages from User',style: GoogleFonts.poppins(
+                    height: 1.5,
+                    fontSize: 31,
+                    fontWeight: FontWeight.bold,
+                    color: Colors.blueAccent[200]),),
+              ),
+            ),
+            Container(
+             // height: screenSize.height*0.63,
+              width: screenSize.width*0.95,
+              decoration: BoxDecoration(borderRadius: BorderRadius.circular(40)),
+              //color: Colors.white,
+              child: PaginatedDataTable(
+                  rowsPerPage:5,
+                  // header :Text("Data Message User"),
+                  columnSpacing: 150,
+                  columns: [
+                    DataColumn(label: Text("ID"),),
+                    DataColumn(label: Text("Name"),),
+                    DataColumn(label: Text("Email"),),
+                    DataColumn(label: Text("Message"),),
+                    DataColumn(label: Text("Number"),),
+                  ],
+                  source: UserDataTableSource(userData: ListMessage)),
+            )
+          ],
+        ),
+      ),
+    );
+
+  }
+}
+
+class UserDataTableSource extends DataTableSource {
+  UserDataTableSource({
+    required List<MessageUser> userData,
+  })
+      : _userData = userData,
+        assert(userData != null);
+
+  final List<MessageUser> _userData;
+
+  @override
+  DataRow? getRow(int index) {
+    assert(index >= 0);
+
+    if (index >= _userData.length) {
+      return null;
+    }
+    final _user = _userData[index];
+
+    return DataRow.byIndex(
+      index: index,
+      cells: <DataCell>[
+        DataCell(Text('${_user.id}')),
+        DataCell(Text('${_user.name}')),
+        DataCell(Text('${_user.email}')),
+        DataCell(Text('${_user.message}')),
+        DataCell(Text('${_user.number}')),
+      ],
+    );
+  }
+
+  @override
+  bool get isRowCountApproximate => false;
+
+  @override
+  int get rowCount => _userData.length;
+
+  @override
+  int get selectedRowCount => 0;
+
+
+  void sort<T>(Comparable<T> Function(MessageUser d) getField, bool ascending) {
+    _userData.sort((a, b) {
+      final aValue = getField(a);
+      final bValue = getField(b);
+      return ascending
+          ? Comparable.compare(aValue, bValue)
+          : Comparable.compare(bValue, aValue);
+    });
+
+    notifyListeners();
+  }
+}

lib/dashboard/admin/admin_dashboard.dart

+import 'package:flutter/material.dart';
+
+
+class Dashboard1 extends StatelessWidget {
+  const Dashboard1({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    var screenSize = MediaQuery.of(context).size;
+    return Stack(
+      children: [
+        Image.asset('assets/images/medapp_image1.png',height: screenSize.height,width: screenSize.width,)
+      ],
+    );
+  }
+}

lib/dashboard/admin/admin_whatsapp.dart

+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+
+
+class Dashboard3 extends StatefulWidget {
+  const Dashboard3({Key? key}) : super(key: key);
+
+  @override
+  State<Dashboard3> createState() => _Dashboard3State();
+}
+
+class WhatsappNumber {
+  String name;
+  String number;
+  String status;
+
+  WhatsappNumber(
+      this.name,
+      this.number,
+      this.status
+      );
+}
+
+class _Dashboard3State extends State<Dashboard3> {
+
+
+  List<WhatsappNumber> ListWhatsapp = <WhatsappNumber>[
+    WhatsappNumber("Jay", 'email', 'ACTIVE',),
+    WhatsappNumber('Rizky', 'email', 'INACTIVE',),
+    WhatsappNumber('Fahrur', 'email', 'INACTIVE',),
+  ];
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  refreshList() {
+    setState(() {
+      ListWhatsapp=ListWhatsapp;
+    });
+  }
+
+  final TextEditingController phoneController = TextEditingController();
+
+  @override
+  Widget build(BuildContext context) {
+    var screenSize = MediaQuery.of(context).size;
+    return Container(
+      height: screenSize.height,
+      width: screenSize.width,
+      child: Padding(
+        padding: const EdgeInsets.all(21.0),
+        child: Container(
+          height: screenSize.height,
+          width: screenSize.width,
+          decoration: BoxDecoration(
+              color: Colors.white60,
+              borderRadius: BorderRadius.circular(20),
+              boxShadow: [
+                BoxShadow(
+                  color: const Color.fromARGB(255, 10, 116, 255)
+                      .withAlpha(60),
+                  blurRadius: 5.0,
+                  spreadRadius: 5.0,
+                  offset: const Offset(
+                    0.0,
+                    3.0,
+                  ),
+                ),
+              ]),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+            children: [
+              Padding(
+                padding: EdgeInsets.symmetric(horizontal: screenSize.width*0.08),
+                child:  ListTile(
+                  title: Center(
+                    child: Text('WhatsApp Admin Number',
+                      style: GoogleFonts.poppins(
+                          height: 1.5,
+                          fontSize: 31,
+                          fontWeight: FontWeight.bold,
+                          color: Colors.blueAccent[200]),
+                    ),
+                  ),
+                ),
+              ),
+              Form(
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Container(
+                    height: 48,
+                    width: 250,
+                    child: TextFormField(
+                      controller: phoneController,
+                      decoration: const InputDecoration(
+                        hintText: "Enter a whatsapp number",
+                        fillColor: Colors.white,
+                        filled: true,
+                        enabledBorder: OutlineInputBorder(
+                          borderRadius: BorderRadius.zero,
+                          borderSide:
+                          BorderSide(width: 1, color: Colors.blue),
+                        ),
+                        focusedBorder: OutlineInputBorder(
+                          borderRadius: BorderRadius.zero,
+                          borderSide:
+                          BorderSide(width: 1, color: Colors.blue),
+                        ),
+                      ),
+                    ),
+                  ),
+                SizedBox(width: 15,),
+                Container(
+                  height : 45,
+                  width : 175,
+                  child: ElevatedButton(
+                    onPressed: (){},
+                    style: ElevatedButton.styleFrom(
+                      primary: Colors.blueAccent[200],
+                      onSurface: Colors.white,
+
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.all(Radius.circular(10)
+                        ),
+                      ),
+                    ),
+                    child: Text(
+                      "Change Number",
+                      style: TextStyle(
+                          fontSize: 16,
+                          letterSpacing: 2
+                      ),
+                    ),
+                  ),
+                ),
+                ],
+              ),
+              ),
+              Center(
+                child: Container(
+                  width: screenSize.width*0.75,
+                  child: ClipRRect(
+                    borderRadius: BorderRadius.circular(30),
+                    child: PaginatedDataTable(
+                        rowsPerPage:4,
+                        // header :Text("Data Message User"),
+                        columnSpacing: 170,
+                        columns: [
+                          DataColumn(label: Text("Name"),),
+                          DataColumn(label: Text("Number"),),
+                          DataColumn(label: Text("Status"),),
+                        ],
+                        source: UserDataTableSource(userData: ListWhatsapp)),
+                  ),
+                ),
+              ),
+
+            ],
+          ),
+        ),
+      ),
+
+    );
+  }
+}
+
+
+class UserDataTableSource extends DataTableSource {
+  UserDataTableSource({
+    required List<WhatsappNumber> userData,
+  })
+      : _userData = userData,
+        assert(userData != null);
+
+  final List<WhatsappNumber> _userData;
+
+  @override
+  DataRow? getRow(int index) {
+    assert(index >= 0);
+
+    if (index >= _userData.length) {
+      return null;
+    }
+    final _user = _userData[index];
+
+    return DataRow.byIndex(
+      index: index,
+      cells: <DataCell>[
+        DataCell(Text('${_user.name}')),
+        DataCell(Text('${_user.number}')),
+        DataCell(Text('${_user.status}')),
+      ],
+    );
+  }
+
+  @override
+  bool get isRowCountApproximate => false;
+
+  @override
+  int get rowCount => _userData.length;
+
+  @override
+  int get selectedRowCount => 0;
+
+
+  void sort<T>(Comparable<T> Function(WhatsappNumber d) getField, bool ascending) {
+    _userData.sort((a, b) {
+      final aValue = getField(a);
+      final bValue = getField(b);
+      return ascending
+          ? Comparable.compare(aValue, bValue)
+          : Comparable.compare(bValue, aValue);
+    });
+
+    notifyListeners();
+  }
+}

lib/dashboard/admin/main_dashboard_admin.dart

 import 'package:flutter/material.dart';
 import 'package:easy_sidemenu/easy_sidemenu.dart';
+import 'package:medapp_eksad/dashboard/admin/admin_contact.dart';
+import 'package:medapp_eksad/dashboard/admin/admin_dashboard.dart';
+import 'package:medapp_eksad/dashboard/admin/admin_whatsapp.dart';
 
 class DashboardAdmin extends StatefulWidget {
   const DashboardAdmin({Key? key}) : super(key: key);
@@ -130,11 +133,11 @@ class _DashboardAdminState extends State<DashboardAdmin> {
               ),
               SideMenuItem(
                 priority: 4,
-                title: 'Settings',
+                title: 'Message User',
                 onTap: () {
                   page.jumpToPage(4);
                 },
-                icon: const Icon(Icons.settings),
+                icon: const Icon(Icons.contact_mail),
               ),
 
             ],
@@ -143,15 +146,7 @@ class _DashboardAdminState extends State<DashboardAdmin> {
             child: PageView(
               controller: page,
               children: [
-                Container(
-                  color: Colors.white,
-                  child: const Center(
-                    child: Text(
-                      'Dashboard',
-                      style: TextStyle(fontSize: 35),
-                    ),
-                  ),
-                ),
+                const Dashboard1(),
                 Container(
                   color: Colors.white,
                   child: const Center(
@@ -170,20 +165,14 @@ class _DashboardAdminState extends State<DashboardAdmin> {
                     ),
                   ),
                 ),
+                Dashboard3(),
+                Dashboard4(),
+
                 Container(
                   color: Colors.white,
                   child: const Center(
                     child: Text(
-                      'Download',
-                      style: TextStyle(fontSize: 35),
-                    ),
-                  ),
-                ),
-                Container(
-                  color: Colors.white,
-                  child: const Center(
-                    child: Text(
-                      'Settings',
+                      'Dashboard',
                       style: TextStyle(fontSize: 35),
                     ),
                   ),

lib/login.dart

@@ -29,7 +29,10 @@ class _loginState extends State<login> {
     setPageTitle('Login MedApps', context);
     var screenSize = MediaQuery.of(context).size;
     return Scaffold(
-      body: Container(
+      body: Stack(
+        children: [
+
+          Container(
             decoration: const BoxDecoration(
                 image: DecorationImage(
               image: AssetImage("assets/images/bg-medapp.png"),
@@ -43,6 +46,7 @@ class _loginState extends State<login> {
                 bottom: screenSize.height * 0.13),
             child: Stack(
               children: [
+
                 Container(
                   decoration: BoxDecoration(
                     color: const Color.fromARGB(255, 10, 116, 255),
@@ -199,7 +203,20 @@ class _loginState extends State<login> {
                               ),
                             ),
                             const Spacer(
-                          flex: 3,
+                              flex: 2,
+                            ),
+                            Row(
+                              crossAxisAlignment: CrossAxisAlignment.end,
+                              mainAxisAlignment: MainAxisAlignment.end,
+                              children: [
+                                TextButton(onPressed: (){
+                                  Navigator.pushNamed(context, '/reset_password');
+                                }, child: Text('Forgot Password?')),
+                                SizedBox(width: 52,)
+                              ],
+                            ),
+                            const Spacer(
+                              flex: 2,
                             ),
                             Row(
                               children: [
@@ -299,6 +316,14 @@ class _loginState extends State<login> {
               ],
             ),
           ),
+          Padding(
+            padding: const EdgeInsets.all(21.0),
+            child: ElevatedButton(onPressed: (){
+              Navigator.pushNamed(context, '/');
+            }, child: Icon(Icons.arrow_back)),
+          ),
+        ],
+      ),
     );
   }
 }

lib/main.dart

 import 'package:flutter/material.dart';
+import 'package:medapp_eksad/auth/forget_password.dart';
 import 'package:medapp_eksad/dashboard/admin/main_dashboard_admin.dart';
 import 'package:medapp_eksad/homepage.dart';
 import 'package:medapp_eksad/login.dart';
@@ -26,7 +27,8 @@ class MyApp extends StatelessWidget {
         '/contact': (context) => const ContactUs(),
         '/login': (context) => const login(),
         '/register': (context) => const Register(),
-        '/dashboard': (context) => const DashboardAdmin()
+        '/dashboard': (context) => const DashboardAdmin(),
+        '/reset_password': (context) => const ForgotPassword(),
       },
     );
   }

lib/screen/contact_us/contact_us2.dart

@@ -21,7 +21,7 @@ class ContactUs2 extends StatelessWidget {
   Widget build(BuildContext context) {
     var screenSize = MediaQuery.of(context).size;
     return Container(
-      height: 500,
+      height: 460,
       width: screenSize.width,
       // color: Colors.blue,
       decoration: const BoxDecoration(

lib/screen/home/home2.dart

@@ -11,7 +11,7 @@ class Home2 extends StatelessWidget {
     return Container(
       width: screenSize.width * 0.5,
       color: const Color.fromARGB(255, 227, 235, 253),
-      height: screenSize.height * 0.9,
+      height: screenSize.height * 1.1,
       padding: EdgeInsets.only(
         left: screenSize.width * 0.10,
         right: screenSize.width * 0.10,

lib/screen/home/home4.dart

@@ -66,9 +66,11 @@ class Home4 extends StatelessWidget {
                               height: 100,
                               width: ScreenSize.width *0.30,
                               child: Text(
-                                  "MedApps menyediakan Aplikasi Mobile dan juga website yang bisa anda kunjungi",
+                                  "Now this application is available on your smartphone, Download now !",
                                 style: TextStyle(
-                                  fontSize: 18,
+                                  fontSize: 21,
+                                  height: 1.3,
+                                  letterSpacing: 1.3,
                                   color: Colors.white
                                 ),
                               )
@@ -95,7 +97,7 @@ class Home4 extends StatelessWidget {
                                 ),
                               ),
                               child: Text(
-                                  "LEARN MORE",
+                                  "Download",
                                 style: TextStyle(
                                   fontSize: 18,
                                   letterSpacing: 2

lib/screen/solution.dart

@@ -8,6 +8,7 @@ import 'package:medapp_eksad/screen/solution/our_solution3.dart';
 import 'package:medapp_eksad/screen_small/small_footer.dart';
 import 'package:medapp_eksad/screen_small/small_solution/small_solution1.dart';
 import 'package:medapp_eksad/screen_small/small_solution/small_solution2.dart';
+import 'package:medapp_eksad/widget/componen.dart';
 import 'package:medapp_eksad/widget/drawer.dart';
 import 'package:medapp_eksad/widget/responsive.dart';
 import 'package:flutter/services.dart';
@@ -29,7 +30,6 @@ class Solutions extends StatefulWidget {
 class _SolutionsState extends State<Solutions> {
   final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
 
-
   ScrollController controller2 = ScrollController();
   void _scrollToIndex(double index) {
     controller2.animateTo(index,
@@ -37,7 +37,6 @@ class _SolutionsState extends State<Solutions> {
         curve: Curves.fastLinearToSlowEaseIn);
   }
 
-
   @override
   Widget build(BuildContext context) {
     setPageTitle('MeddApp Solutions', context);
@@ -54,14 +53,15 @@ class _SolutionsState extends State<Solutions> {
               children: const [
                 SmallOurSolution(),
                 SmallOurSolution2(),
-
                 FooterSmall(),
               ],
             )
           : ListView(
               controller: controller2,
               children: [
-                OurSolution(button: ButtonSolution(context),),
+                OurSolution(
+                  button: ButtonSolution(context),
+                ),
                 OurSolution2(),
                 OurSolution3(),
                 ContactUs2(),
@@ -71,23 +71,19 @@ class _SolutionsState extends State<Solutions> {
     );
   }
 
-
-
-
-
-
   ElevatedButton ButtonSolution(BuildContext context) {
     return ElevatedButton(
       onPressed: () {
         _scrollToIndex(1500);
       },
-                style: ElevatedButton.styleFrom(
-                  shape: RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(10),
-                  ),
-                  primary: Color.fromARGB(255, 48, 104, 170),
-                  // shape: MaterialStateProperty.all(RoundedRectangleBorder(borderRadius: BorderRadius.circular(30.0))),
-                ),
+      style: DefaultColors(),
+      // ElevatedButton.styleFrom(
+      //   shape: RoundedRectangleBorder(
+      //     borderRadius: BorderRadius.circular(10),
+      //   ),
+      //   primary: Color.fromARGB(255, 48, 104, 170),
+      //   // shape: MaterialStateProperty.all(RoundedRectangleBorder(borderRadius: BorderRadius.circular(30.0))),
+      // ),
       child: const Text(
         'FREE DEMO',
         style: TextStyle(

lib/screen_small/small_contact/small_contact_us2.dart

@@ -249,7 +249,6 @@ class _ContactUs2_smallState extends State<ContactUs2_small> {
                                       Text('Failed to send message!'),
                                       backgroundColor: Colors.red),
                                 );
-
                                 nameController.clear();
                                 phoneController.clear();
                                 emailController.clear();

lib/widget/button_color.dart

@@ -9,7 +9,7 @@ ButtonStyle DefaultColors() {
     ),
     overlayColor: MaterialStateProperty.resolveWith<Color?>(
       (Set<MaterialState> states) {
-        if (states.contains(MaterialState.hovered)) {
+        if (states.contains(MaterialState.pressed)) {
           return Colors.red;
         } //<-- SEE HERE
         return null; // Defer to the widget's default.

lib/widget/image_slide.dart

@@ -2,9 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:carousel_slider/carousel_slider.dart';
 
 final List<String> imgList = [
-  'images/homepage.png',
-  'images/solution.jpg',
-  'images/contactus1.jpg',
   'images/solution1.jpg',
   'images/solution2.jpg',
 

lib/widget/whatsapp.dart

@@ -10,7 +10,7 @@ class WAChat extends StatelessWidget {
     required String message,
   }) async {
     String url() {
-      return "https://api.whatsapp.com/send?phone=$phone&text=${Uri.parse(message)}";
+      return "https://api.whatsapp.com/send?phone=+62$phone&text=${Uri.parse(message)}";
     }
 
     if (await canLaunch(url())) {
@@ -28,9 +28,10 @@ class WAChat extends StatelessWidget {
     return FloatingActionButton(
       onPressed: () {
         launchWhatsApp(
-            phone: 6281807890777,
+            //phone: 81807890777,
+          phone: 87701892981,
             message:
-                'Hallo, saya tertarik dengan produk EKSAD dan saya ingin tahu lebih lanjut tentang program Protalent');
+                'Hallo, saya tertarik dan saya ingin tahu lebih lanjut tentang program Medapp by EKSAD');
       },
       backgroundColor: Colors.green,
       child: GestureDetector(