Commit 80620da2 authored by Budi Prasetyo's avatar Budi Prasetyo

fixing bug, route , const , directory

parent 74d1f6fc
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:easy_sidemenu/easy_sidemenu.dart'; import 'package:easy_sidemenu/easy_sidemenu.dart';
class Dashboard extends StatefulWidget { class DashboardAdmin extends StatefulWidget {
const Dashboard({Key? key}) : super(key: key); const DashboardAdmin({Key? key}) : super(key: key);
@override @override
State<Dashboard> createState() => _DashboardState(); State<DashboardAdmin> createState() => _DashboardAdminState();
} }
class _DashboardState extends State<Dashboard> { class _DashboardAdminState extends State<DashboardAdmin> {
PageController page = PageController(); PageController page = PageController();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
...@@ -21,7 +21,7 @@ class _DashboardState extends State<Dashboard> { ...@@ -21,7 +21,7 @@ class _DashboardState extends State<Dashboard> {
padding: const EdgeInsets.symmetric(vertical: 8,horizontal: 30), padding: const EdgeInsets.symmetric(vertical: 8,horizontal: 30),
child: Container( child: Container(
width: 200, 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: [ actions: [
...@@ -68,7 +68,7 @@ class _DashboardState extends State<Dashboard> { ...@@ -68,7 +68,7 @@ class _DashboardState extends State<Dashboard> {
selectedTitleTextStyle: const TextStyle(color: Colors.black), selectedTitleTextStyle: const TextStyle(color: Colors.black),
selectedIconColor: Colors.black, selectedIconColor: Colors.black,
unselectedIconColor: Colors.black87, unselectedIconColor: Colors.black87,
unselectedTitleTextStyle: TextStyle(color: Colors.black87), unselectedTitleTextStyle: const TextStyle(color: Colors.black87),
// decoration: BoxDecoration( // decoration: BoxDecoration(
// borderRadius: BorderRadius.all(Radius.circular(10)), // borderRadius: BorderRadius.all(Radius.circular(10)),
// ), // ),
......
import 'package:flutter/material.dart'; 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/homepage.dart';
import 'package:medapp_eksad/login.dart'; import 'package:medapp_eksad/login.dart';
import 'package:medapp_eksad/register.dart'; import 'package:medapp_eksad/register.dart';
...@@ -26,7 +26,7 @@ class MyApp extends StatelessWidget { ...@@ -26,7 +26,7 @@ class MyApp extends StatelessWidget {
'/contact': (context) => const ContactUs(), '/contact': (context) => const ContactUs(),
'/login': (context) => const login(), '/login': (context) => const login(),
'/register': (context) => const Register(), '/register': (context) => const Register(),
'/dashboard': (context) => const Dashboard() '/dashboard': (context) => const DashboardAdmin()
}, },
); );
} }
......
...@@ -165,16 +165,16 @@ class Footer extends StatelessWidget { ...@@ -165,16 +165,16 @@ class Footer extends StatelessWidget {
Container( Container(
height: screenSize.height * 0.04, height: screenSize.height * 0.04,
child: const itemBawah( child: const itemBawah(
item: 'Service', item: 'Solutions',
routeName: '/service', routeName: '/solutions',
), ),
), ),
const Spacer(), const Spacer(),
Container( Container(
height: screenSize.height * 0.04, height: screenSize.height * 0.04,
child: const itemBawah( child: const itemBawah(
item: 'Career', item: 'Contact Us',
routeName: '/career', routeName: '/contact',
), ),
), ),
], ],
...@@ -204,7 +204,7 @@ class Footer extends StatelessWidget { ...@@ -204,7 +204,7 @@ class Footer extends StatelessWidget {
height: screenSize.height * 0.04, height: screenSize.height * 0.04,
child: const itemBawah( child: const itemBawah(
item: 'Retained Search', item: 'Retained Search',
routeName: '/service', routeName: '/solutions',
), ),
), ),
const Spacer(), const Spacer(),
...@@ -212,7 +212,7 @@ class Footer extends StatelessWidget { ...@@ -212,7 +212,7 @@ class Footer extends StatelessWidget {
height: screenSize.height * 0.04, height: screenSize.height * 0.04,
child: const itemBawah( child: const itemBawah(
item: 'Dedicated Services', item: 'Dedicated Services',
routeName: '/service', routeName: '/solutions',
), ),
), ),
const Spacer(), const Spacer(),
...@@ -220,7 +220,7 @@ class Footer extends StatelessWidget { ...@@ -220,7 +220,7 @@ class Footer extends StatelessWidget {
height: screenSize.height * 0.04, height: screenSize.height * 0.04,
child: const itemBawah( child: const itemBawah(
item: 'Contract Services', item: 'Contract Services',
routeName: '/service', routeName: '/solutions',
), ),
), ),
const Spacer(), const Spacer(),
...@@ -228,7 +228,7 @@ class Footer extends StatelessWidget { ...@@ -228,7 +228,7 @@ class Footer extends StatelessWidget {
height: screenSize.height * 0.04, height: screenSize.height * 0.04,
child: const itemBawah( child: const itemBawah(
item: 'Recruitment', item: 'Recruitment',
routeName: '/service', routeName: '/solutions',
), ),
), ),
], ],
...@@ -287,7 +287,7 @@ class Footer extends StatelessWidget { ...@@ -287,7 +287,7 @@ class Footer extends StatelessWidget {
title: TextButton( title: TextButton(
onPressed: () { onPressed: () {
launch( 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( child: Container(
height: screenSize.height * 0.04, height: screenSize.height * 0.04,
......
...@@ -37,7 +37,7 @@ class _SolutionsState extends State<Solutions> { ...@@ -37,7 +37,7 @@ class _SolutionsState extends State<Solutions> {
? AppBarKecil() ? AppBarKecil()
: AppbarHomeLarge(screenSize, context, Colors.black, Colors.black, : AppbarHomeLarge(screenSize, context, Colors.black, Colors.black,
Colors.blue, Colors.black, Colors.black), Colors.blue, Colors.black, Colors.black),
drawer: DrawerMeddApp(), drawer: const DrawerMeddApp(),
body: ResponsiveWidget.isSmallScreen(context) body: ResponsiveWidget.isSmallScreen(context)
? ListView( ? ListView(
children: const [ children: const [
......
...@@ -97,7 +97,7 @@ class _SmallOurSolutionState extends State<SmallOurSolution> { ...@@ -97,7 +97,7 @@ class _SmallOurSolutionState extends State<SmallOurSolution> {
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10), 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))), // shape: MaterialStateProperty.all(RoundedRectangleBorder(borderRadius: BorderRadius.circular(30.0))),
), ),
child: const Text( child: const Text(
......
...@@ -18,7 +18,7 @@ class _SmallOurSolution2State extends State<SmallOurSolution2> { ...@@ -18,7 +18,7 @@ class _SmallOurSolution2State extends State<SmallOurSolution2> {
width: screenSize.width, width: screenSize.width,
height: screenSize.height*0.55, height: screenSize.height*0.55,
padding: EdgeInsets.symmetric( vertical: screenSize.height*0.05), padding: EdgeInsets.symmetric( vertical: screenSize.height*0.05),
child: Container( child: SizedBox(
width: screenSize.width, width: screenSize.width,
height: screenSize.height*0.5, height: screenSize.height*0.5,
child: SmallVerticalSlider() child: SmallVerticalSlider()
......
...@@ -23,21 +23,21 @@ class DrawerMeddApp extends StatelessWidget { ...@@ -23,21 +23,21 @@ class DrawerMeddApp extends StatelessWidget {
), ),
child: Column( child: Column(
children: [ children: [
SizedBox(height: 50,), const SizedBox(height: 50,),
ListTile( ListTile(
leading: Icon(Icons.home), leading: const Icon(Icons.home),
title: Text('Home',style: TextStyle(fontWeight: FontWeight.w500),), title: const Text('Home',style: TextStyle(fontWeight: FontWeight.w500),),
onTap: () => Navigator.pushNamed(context, '/') , onTap: () => Navigator.pushNamed(context, '/') ,
), ),
ListTile( ListTile(
leading: Icon(Icons.people), leading: const Icon(Icons.people),
title: Text('About Us',style: TextStyle(fontWeight: FontWeight.w500),), title: const Text('About Us',style: TextStyle(fontWeight: FontWeight.w500),),
onTap: () =>Navigator.pushNamed(context, '/about') , onTap: () =>Navigator.pushNamed(context, '/about') ,
), ),
ListTile( ListTile(
leading: Icon(Icons.settings_applications), leading: const Icon(Icons.settings_applications),
title: Text('Our Solution',style: TextStyle(fontWeight: FontWeight.w500),), title: const Text('Our Solution',style: TextStyle(fontWeight: FontWeight.w500),),
onTap: () =>Navigator.pushNamed(context, '/solutions') , onTap: () =>Navigator.pushNamed(context, '/solutions') ,
), ),
// ListTile( // ListTile(
...@@ -46,10 +46,19 @@ class DrawerMeddApp extends StatelessWidget { ...@@ -46,10 +46,19 @@ class DrawerMeddApp extends StatelessWidget {
// onTap: () => Navigator.pushNamed(context, '/career') , // onTap: () => Navigator.pushNamed(context, '/career') ,
// ), // ),
ListTile( ListTile(
leading: Icon(Icons.contact_phone), leading: const Icon(Icons.contact_phone),
title: Text('Contact Us',style: TextStyle(fontWeight: FontWeight.w500),), title: const Text('Contact Us',style: TextStyle(fontWeight: FontWeight.w500),),
onTap: () => Navigator.pushNamed(context, '/contact') , 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') ,
),
], ],
), ),
), ),
......
...@@ -90,7 +90,7 @@ class SmallVerticalSlider extends StatelessWidget { ...@@ -90,7 +90,7 @@ class SmallVerticalSlider extends StatelessWidget {
child: ElevatedButton( child: ElevatedButton(
onPressed: () => _controller.previousPage(), onPressed: () => _controller.previousPage(),
style: ElevatedButton.styleFrom(primary: Colors.grey), 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 { ...@@ -100,7 +100,7 @@ class SmallVerticalSlider extends StatelessWidget {
child: ElevatedButton( child: ElevatedButton(
onPressed: () => _controller.nextPage(), onPressed: () => _controller.nextPage(),
style: ElevatedButton.styleFrom(primary: Colors.grey), style: ElevatedButton.styleFrom(primary: Colors.grey),
child: Icon(Icons.arrow_forward_ios_outlined), child: const Icon(Icons.arrow_forward_ios_outlined),
), ),
), ),
), ),
......
...@@ -303,13 +303,6 @@ packages: ...@@ -303,13 +303,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.0" version: "2.0.0"
sidebarx:
dependency: "direct main"
description:
name: sidebarx
url: "https://pub.dartlang.org"
source: hosted
version: "0.7.0"
simple_animations: simple_animations:
dependency: transitive dependency: transitive
description: description:
......
...@@ -36,7 +36,6 @@ dependencies: ...@@ -36,7 +36,6 @@ dependencies:
intl: ^0.17.0 intl: ^0.17.0
dropdown_search: ^5.0.2 dropdown_search: ^5.0.2
easy_sidemenu: ^0.3.1 easy_sidemenu: ^0.3.1
sidebarx: ^0.7.0
flutter_web_plugins: flutter_web_plugins:
sdk: flutter 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