Skip to content

M
medapp_eksad
Commit 80620da2 authored by Budi Prasetyo's avatar Budi Prasetyo
Browse files
Options

fixing bug, route , const , directory

parent 74d1f6fc
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 39 deletions
lib/dashboard/main_dashboard.dart → lib/dashboard/admin/main_dashboard_admin.dart
View file @ 80620da2
import 'package:flutter/material.dart';
import 'package:easy_sidemenu/easy_sidemenu.dart';
class Dashboard extends StatefulWidget {
const Dashboard({Key? key}) : super(key: key);
class DashboardAdmin extends StatefulWidget {
const DashboardAdmin({Key? key}) : super(key: key);
@override
State<Dashboard> createState() => _DashboardState();
State<DashboardAdmin> createState() => _DashboardAdminState();
}
class _DashboardState extends State<Dashboard> {
class _DashboardAdminState extends State<DashboardAdmin> {
PageController page = PageController();
@override
Widget build(BuildContext context) {
......@@ -21,7 +21,7 @@ class _DashboardState extends State<Dashboard> {
padding: const EdgeInsets.symmetric(vertical: 8,horizontal: 30),
child: Container(
width: 200,
decoration: BoxDecoration(image: DecorationImage(image: AssetImage('assets/logo/medapp-logo.png'),fit: BoxFit.fill)),
decoration: const BoxDecoration(image: DecorationImage(image: AssetImage('assets/logo/medapp-logo.png'),fit: BoxFit.fill)),
),
),
actions: [
......@@ -68,7 +68,7 @@ class _DashboardState extends State<Dashboard> {
selectedTitleTextStyle: const TextStyle(color: Colors.black),
selectedIconColor: Colors.black,
unselectedIconColor: Colors.black87,
unselectedTitleTextStyle: TextStyle(color: Colors.black87),
unselectedTitleTextStyle: const TextStyle(color: Colors.black87),
// decoration: BoxDecoration(
// borderRadius: BorderRadius.all(Radius.circular(10)),
// ),
......
lib/main.dart
View file @ 80620da2
import 'package:flutter/material.dart';
import 'package:medapp_eksad/dashboard/main_dashboard.dart';
import 'package:medapp_eksad/dashboard/admin/main_dashboard_admin.dart';
import 'package:medapp_eksad/homepage.dart';
import 'package:medapp_eksad/login.dart';
import 'package:medapp_eksad/register.dart';
......@@ -26,7 +26,7 @@ class MyApp extends StatelessWidget {
'/contact': (context) => const ContactUs(),
'/login': (context) => const login(),
'/register': (context) => const Register(),
'/dashboard': (context) => const Dashboard()
'/dashboard': (context) => const DashboardAdmin()
},
);
}
......
lib/screen/footer.dart
View file @ 80620da2
......@@ -165,16 +165,16 @@ class Footer extends StatelessWidget {
Container(
height: screenSize.height * 0.04,
child: const itemBawah(
item: 'Service',
routeName: '/service',
item: 'Solutions',
routeName: '/solutions',
),
),
const Spacer(),
Container(
height: screenSize.height * 0.04,
child: const itemBawah(
item: 'Career',
routeName: '/career',
item: 'Contact Us',
routeName: '/contact',
),
),
],
......@@ -204,7 +204,7 @@ class Footer extends StatelessWidget {
height: screenSize.height * 0.04,
child: const itemBawah(
item: 'Retained Search',
routeName: '/service',
routeName: '/solutions',
),
),
const Spacer(),
......@@ -212,7 +212,7 @@ class Footer extends StatelessWidget {
height: screenSize.height * 0.04,
child: const itemBawah(
item: 'Dedicated Services',
routeName: '/service',
routeName: '/solutions',
),
),
const Spacer(),
......@@ -220,7 +220,7 @@ class Footer extends StatelessWidget {
height: screenSize.height * 0.04,
child: const itemBawah(
item: 'Contract Services',
routeName: '/service',
routeName: '/solutions',
),
),
const Spacer(),
......@@ -228,7 +228,7 @@ class Footer extends StatelessWidget {
height: screenSize.height * 0.04,
child: const itemBawah(
item: 'Recruitment',
routeName: '/service',
routeName: '/solutions',
),
),
],
......@@ -287,7 +287,7 @@ class Footer extends StatelessWidget {
title: TextButton(
onPressed: () {
launch(
'mailto:Hello@eksad.com?subject=Hello saya ingin bertanya tentang protalent');
'mailto:Hello@eksad.com?subject=Hello saya ingin bertanya tentang Medapp');
},
child: Container(
height: screenSize.height * 0.04,
......
lib/screen/solution.dart
View file @ 80620da2
......@@ -37,7 +37,7 @@ class _SolutionsState extends State<Solutions> {
? AppBarKecil()
: AppbarHomeLarge(screenSize, context, Colors.black, Colors.black,
Colors.blue, Colors.black, Colors.black),
drawer: DrawerMeddApp(),
drawer: const DrawerMeddApp(),
body: ResponsiveWidget.isSmallScreen(context)
? ListView(
children: const [
......
lib/screen_small/small_solution/small_solution1.dart
View file @ 80620da2
......@@ -97,7 +97,7 @@ class _SmallOurSolutionState extends State<SmallOurSolution> {
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
primary: Color.fromARGB(255, 48, 104, 170),
primary: const Color.fromARGB(255, 48, 104, 170),
// shape: MaterialStateProperty.all(RoundedRectangleBorder(borderRadius: BorderRadius.circular(30.0))),
),
child: const Text(
......
lib/screen_small/small_solution/small_solution2.dart
View file @ 80620da2
......@@ -18,7 +18,7 @@ class _SmallOurSolution2State extends State<SmallOurSolution2> {
width: screenSize.width,
height: screenSize.height*0.55,
padding: EdgeInsets.symmetric( vertical: screenSize.height*0.05),
child: Container(
child: SizedBox(
width: screenSize.width,
height: screenSize.height*0.5,
child: SmallVerticalSlider()
......
lib/widget/drawer.dart
View file @ 80620da2
......@@ -23,21 +23,21 @@ class DrawerMeddApp extends StatelessWidget {
),
child: Column(
children: [
SizedBox(height: 50,),
const SizedBox(height: 50,),
ListTile(
leading: Icon(Icons.home),
title: Text('Home',style: TextStyle(fontWeight: FontWeight.w500),),
leading: const Icon(Icons.home),
title: const Text('Home',style: TextStyle(fontWeight: FontWeight.w500),),
onTap: () => Navigator.pushNamed(context, '/') ,
),
ListTile(
leading: Icon(Icons.people),
title: Text('About Us',style: TextStyle(fontWeight: FontWeight.w500),),
leading: const Icon(Icons.people),
title: const Text('About Us',style: TextStyle(fontWeight: FontWeight.w500),),
onTap: () =>Navigator.pushNamed(context, '/about') ,
),
ListTile(
leading: Icon(Icons.settings_applications),
title: Text('Our Solution',style: TextStyle(fontWeight: FontWeight.w500),),
leading: const Icon(Icons.settings_applications),
title: const Text('Our Solution',style: TextStyle(fontWeight: FontWeight.w500),),
onTap: () =>Navigator.pushNamed(context, '/solutions') ,
),
// ListTile(
......@@ -46,10 +46,19 @@ class DrawerMeddApp extends StatelessWidget {
// onTap: () => Navigator.pushNamed(context, '/career') ,
// ),
ListTile(
leading: Icon(Icons.contact_phone),
title: Text('Contact Us',style: TextStyle(fontWeight: FontWeight.w500),),
leading: const Icon(Icons.contact_phone),
title: const Text('Contact Us',style: TextStyle(fontWeight: FontWeight.w500),),
onTap: () => Navigator.pushNamed(context, '/contact') ,
),
const SizedBox(height: 60,),
ListTile(
title: const Text('Login',style: TextStyle(fontWeight: FontWeight.w500),),
onTap: () => Navigator.pushNamed(context, '/login') ,
),
ListTile(
title: const Text('Register',style: TextStyle(fontWeight: FontWeight.w500),),
onTap: () => Navigator.pushNamed(context, '/register') ,
),
],
),
),
......
lib/widget/small_image_slide.dart
View file @ 80620da2
......@@ -90,7 +90,7 @@ class SmallVerticalSlider extends StatelessWidget {
child: ElevatedButton(
onPressed: () => _controller.previousPage(),
style: ElevatedButton.styleFrom(primary: Colors.grey),
child: Icon(Icons.arrow_back_ios_new_outlined),
child: const Icon(Icons.arrow_back_ios_new_outlined),
),
),
),
......@@ -100,7 +100,7 @@ class SmallVerticalSlider extends StatelessWidget {
child: ElevatedButton(
onPressed: () => _controller.nextPage(),
style: ElevatedButton.styleFrom(primary: Colors.grey),
child: Icon(Icons.arrow_forward_ios_outlined),
child: const Icon(Icons.arrow_forward_ios_outlined),
),
),
),
......
pubspec.lock
View file @ 80620da2
......@@ -303,13 +303,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
sidebarx:
dependency: "direct main"
description:
name: sidebarx
url: "https://pub.dartlang.org"
source: hosted
version: "0.7.0"
simple_animations:
dependency: transitive
description:
......
pubspec.yaml
View file @ 80620da2
......@@ -36,7 +36,6 @@ dependencies:
intl: ^0.17.0
dropdown_search: ^5.0.2
easy_sidemenu: ^0.3.1
sidebarx: ^0.7.0
flutter_web_plugins:
sdk: flutter
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment