From 3e6781a0bd3ef2ba81273bab899dd8f13a7ba8a9 Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Thu, 23 Jan 2025 12:24:08 +0800 Subject: [PATCH] update --- .fvmrc | 6 ++++++ .gitignore | 3 +++ .vscode/settings.json | 3 +++ lib/main.dart | 9 ++++----- lib/pages/main_page.dart | 2 +- 5 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 .fvmrc create mode 100644 .vscode/settings.json diff --git a/.fvmrc b/.fvmrc new file mode 100644 index 0000000..92ca861 --- /dev/null +++ b/.fvmrc @@ -0,0 +1,6 @@ +{ + "flutter": "3.27.3", + "runPubGetOnSdkChanges": true, + "updateVscodeSettings": true, + "updateGitIgnore": true +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 79c113f..b6323af 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,6 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release + +# FVM Version Cache +.fvm/ \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..cd2c40b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "dart.flutterSdkPath": ".fvm/versions/3.27.3" +} \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 6be6e68..852a224 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:pharmacy_mobile/auth/auth_gate.dart'; -// import 'package:pharmacy_mobile/pages/index_page.dart'; +// import 'package:pharmacy_mobile/auth/auth_gate.dart'; +import 'package:pharmacy_mobile/pages/index_page.dart'; import 'package:pharmacy_mobile/pages/login_page.dart'; import 'package:go_router/go_router.dart'; import 'package:pharmacy_mobile/pages/main_page.dart'; @@ -26,15 +26,13 @@ Future main() async { runApp(MyApp()); } -final supabase = Supabase.instance.client; - final _router = GoRouter( initialLocation: '/', routes: [ GoRoute( name: 'index', // Optional, add name to your routes. Allows you navigate by name instead of path path: '/', - builder: (context, state) => AuthGate(), + builder: (context, state) => IndexPage(), ), GoRoute( name: 'login', @@ -61,6 +59,7 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { return MaterialApp.router( + debugShowCheckedModeBanner: false, // initialRoute: '/', // routes: { // '/': (context) => const IndexPage(), diff --git a/lib/pages/main_page.dart b/lib/pages/main_page.dart index 67d01b1..8640bb7 100644 --- a/lib/pages/main_page.dart +++ b/lib/pages/main_page.dart @@ -54,7 +54,7 @@ class MainPage extends StatelessWidget { const Gap(16), MenuWidget( icon: FontAwesomeIcons.squarePlus, - text: 'Add Medicine', + text: 'Add Generics', ), TextButton(onPressed: () => {signOut()}, child: const Text('Logout')) ],