update
This commit is contained in:
parent
148cdec83c
commit
7749f1100d
19 changed files with 447 additions and 217 deletions
|
|
@ -5,6 +5,7 @@ import 'package:pharmacy_mobile/functions/checkexisting_function.dart';
|
|||
import 'package:pharmacy_mobile/tables/ref_categories.dart';
|
||||
import 'package:pharmacy_mobile/widgets/buttonwithprogress_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/form_border_widget2.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_form_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/snackbar_widget.dart';
|
||||
|
|
@ -92,7 +93,7 @@ class _AddCategoryPageState extends State<AddCategoryPage> {
|
|||
child: Center(
|
||||
child: Column(
|
||||
children: [
|
||||
InputWidget(label: 'Category Name', controller: _categoryController),
|
||||
InputFormWidget(label: 'Category Name', controller: _categoryController),
|
||||
const Gap(32),
|
||||
// if (_isLoading)
|
||||
// const Center(child: CircularProgressIndicator(color: Colors.white))
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import 'package:pharmacy_mobile/widgets/buttonwithprogress_widget.dart';
|
|||
import 'package:pharmacy_mobile/widgets/dropdown_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/dropdown_wrappermulti_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/form_border_widget2.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_form_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/snackbar_widget.dart';
|
||||
|
|
@ -157,7 +158,7 @@ class _AddGenericsPageState extends State<AddGenericsPage> {
|
|||
child: DropdownWrapperMultiWidget(list: _categoryList, text: 'List', children: [
|
||||
Column(
|
||||
children: [
|
||||
InputWidget(label: 'Name', controller: _nameController),
|
||||
InputFormWidget(label: 'Name', controller: _nameController),
|
||||
const Gap(16),
|
||||
DropDownWidget(
|
||||
label: 'Category',
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import 'package:pharmacy_mobile/tables/ref_manufactorers.dart';
|
|||
import 'package:pharmacy_mobile/widgets/button_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/buttonwithprogress_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/form_border_widget2.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_form_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/snackbar_widget.dart';
|
||||
|
|
@ -87,7 +88,7 @@ class _AddManufactorerPageState extends State<AddManufacturerPage> {
|
|||
),
|
||||
const Gap(32),
|
||||
const TextWidget(
|
||||
text: 'Add Manufactorer',
|
||||
text: 'Add Manufacturer',
|
||||
title: true,
|
||||
),
|
||||
const Gap(16),
|
||||
|
|
@ -97,9 +98,9 @@ class _AddManufactorerPageState extends State<AddManufacturerPage> {
|
|||
key: _formKey,
|
||||
child: Column(
|
||||
children: [
|
||||
InputWidget(label: 'Name', controller: _nameController),
|
||||
InputFormWidget(label: 'Name', controller: _nameController),
|
||||
const Gap(16),
|
||||
InputWidget(label: 'Address', controller: _addressController),
|
||||
InputFormWidget(label: 'Address', controller: _addressController),
|
||||
const Gap(32),
|
||||
// if (_isLoading)
|
||||
// const Center(child: CircularProgressIndicator(color: Colors.white))
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ import 'package:pharmacy_mobile/widgets/dropdown_widget.dart';
|
|||
import 'package:pharmacy_mobile/widgets/dropdown_wrappermulti_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/form_border_widget2.dart';
|
||||
import 'package:pharmacy_mobile/widgets/image_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_form_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/scanbarcode_widget.dart';
|
||||
|
|
@ -243,7 +244,7 @@ class _AddMedicinePageState extends State<AddMedicinePage> {
|
|||
key: _formKey,
|
||||
child: DropdownWrapperMultiWidget(list: _genericNameList, text: 'Data', children: [
|
||||
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
|
||||
InputWidget(label: 'Name', controller: _nameController),
|
||||
InputFormWidget(label: 'Name', controller: _nameController),
|
||||
const Gap(16),
|
||||
DropDownWidget(
|
||||
label: 'Generic Name',
|
||||
|
|
@ -271,7 +272,7 @@ class _AddMedicinePageState extends State<AddMedicinePage> {
|
|||
onChanged: _updateManufactorer,
|
||||
),
|
||||
const Gap(16),
|
||||
InputWidget(label: 'Barcode', controller: _barcodeController),
|
||||
InputFormWidget(label: 'Barcode', controller: _barcodeController),
|
||||
ScanbarcodeWidget(onTap: _scanBarcode),
|
||||
const Gap(16),
|
||||
if (imageUrl.isNotEmpty)
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import 'package:pharmacy_mobile/widgets/datepicker_widget.dart';
|
|||
import 'package:pharmacy_mobile/widgets/dropdown_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/dropdown_wrappermulti_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/form_border_widget2.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_form_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/snackbar_widget.dart';
|
||||
|
|
@ -196,7 +197,7 @@ class _AddStockPageState extends State<AddStockPage> with WidgetsBindingObserver
|
|||
],
|
||||
),
|
||||
const Gap(16),
|
||||
InputWidget(label: 'Quantity', controller: _quantityController),
|
||||
InputFormWidget(label: 'Quantity', controller: _quantityController),
|
||||
const Gap(16),
|
||||
DatePickerWidget(
|
||||
label: 'Date Expiration',
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import 'package:pharmacy_mobile/tables/ref_types.dart';
|
|||
import 'package:pharmacy_mobile/widgets/button_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/buttonwithprogress_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/form_border_widget2.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_form_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/snackbar_widget.dart';
|
||||
|
|
@ -96,7 +97,7 @@ class _AddTypePageState extends State<AddTypePage> {
|
|||
child: Center(
|
||||
child: Column(
|
||||
children: [
|
||||
InputWidget(label: 'Type Name', controller: _typeController),
|
||||
InputFormWidget(label: 'Type Name', controller: _typeController),
|
||||
const Gap(32),
|
||||
// if (_isLoading)
|
||||
// const Center(child: CircularProgressIndicator(color: Colors.white))
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import 'package:pharmacy_mobile/widgets/button_widget.dart';
|
|||
import 'package:pharmacy_mobile/widgets/dropdown_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/dropdown_wrappermulti_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/form_border_widget2.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_form_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/snackbar_widget.dart';
|
||||
|
|
@ -145,7 +146,7 @@ class _DeleteStockPageState extends State<DeleteStockPage> {
|
|||
// value: _selectedStock,
|
||||
),
|
||||
const Gap(16),
|
||||
InputWidget(label: 'Quantity', controller: _quantityController, onChanged: _setQuantity),
|
||||
InputFormWidget(label: 'Quantity', controller: _quantityController, onChanged: _setQuantity),
|
||||
const Gap(32),
|
||||
if (_noStock)
|
||||
const WarningWidget(
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:glossy/glossy.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:gap/gap.dart';
|
||||
import 'package:pharmacy_mobile/auth/auth_service.dart';
|
||||
import 'package:pharmacy_mobile/widgets/buttonwithprogress_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/glossy_container_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_form_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/snackbar_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/text_widget.dart';
|
||||
|
|
@ -128,28 +126,23 @@ class _LoginPageState extends State<LoginPage> {
|
|||
Padding(
|
||||
padding: const EdgeInsets.only(left: 32, right: 32),
|
||||
child: GlossyContainerWidget(
|
||||
height: containerHeight,
|
||||
// height: containerHeight,
|
||||
child: Form(
|
||||
child: Column(
|
||||
children: [
|
||||
InputWidget(label: 'Email', controller: _emailController),
|
||||
InputFormWidget(label: 'Email', controller: _emailController),
|
||||
const Gap(16),
|
||||
KeyboardListener(
|
||||
focusNode: _focusNode,
|
||||
onKeyEvent: (event) {
|
||||
if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.enter) {
|
||||
_signIn();
|
||||
}
|
||||
InputFormWidget(
|
||||
label: 'Password',
|
||||
controller: _passwordController,
|
||||
password: true,
|
||||
onSubmitted: (String password) {
|
||||
_signIn();
|
||||
},
|
||||
child: InputWidget(
|
||||
label: 'Password',
|
||||
controller: _passwordController,
|
||||
password: true,
|
||||
),
|
||||
),
|
||||
const Gap(40),
|
||||
ButtonWithProgressWidget(
|
||||
trigger: _isLoading, progressText: 'Logging In', buttonText: 'Login', onPressed: _signIn)
|
||||
trigger: _isLoading, progressText: 'Logging In', buttonText: 'Login', onPressed: _signIn),
|
||||
],
|
||||
)),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:gap/gap.dart';
|
||||
import 'package:glossy/glossy.dart';
|
||||
import 'package:internet_connection_checker/internet_connection_checker.dart';
|
||||
import 'package:pharmacy_mobile/auth/auth_service.dart';
|
||||
import 'package:pharmacy_mobile/widgets/buttonwithprogress_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/glossy_container_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_form_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/snackbar_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/text_widget.dart';
|
||||
|
|
@ -108,81 +107,77 @@ class _RegisterPageState extends State<RegisterPage> {
|
|||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
body: PageBackgroundWidget(
|
||||
page: 'register',
|
||||
child: Center(
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
const Gap(96),
|
||||
const TitleWidget(
|
||||
firstTextSize: 14,
|
||||
secondTextSize: 24,
|
||||
logoSize: 90,
|
||||
),
|
||||
const Gap(32),
|
||||
const TextWidget(
|
||||
text: 'Register',
|
||||
title: true,
|
||||
),
|
||||
const Gap(16),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 32, right: 32),
|
||||
child: GlossyContainerWidget(
|
||||
height: containerHeight,
|
||||
child: Form(
|
||||
child: Column(
|
||||
children: [
|
||||
InputWidget(label: 'Email', controller: _emailController),
|
||||
const Gap(16),
|
||||
InputWidget(
|
||||
label: 'Password',
|
||||
controller: _passwordController,
|
||||
password: true,
|
||||
),
|
||||
const Gap(16),
|
||||
InputWidget(
|
||||
label: 'Confirm Password',
|
||||
controller: _confirmPasswordController,
|
||||
password: true,
|
||||
),
|
||||
const Gap(40),
|
||||
// TextButton(onPressed: () => {_signIn()}, child: const Text('Login'))
|
||||
// if (_isLoading)
|
||||
// const Center(child: CircularProgressIndicator(color: Colors.white))
|
||||
// else
|
||||
// ButtonWidget(text: 'Create Account', onPressed: _signUp)
|
||||
ButtonWithProgressWidget(
|
||||
trigger: _isLoading,
|
||||
progressText: 'Registering',
|
||||
buttonText: 'Register',
|
||||
onPressed: _signUp)
|
||||
],
|
||||
)),
|
||||
),
|
||||
),
|
||||
const Gap(16),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
const TextWidget(
|
||||
text: "Already have an account?",
|
||||
size: 14,
|
||||
),
|
||||
const Gap(8),
|
||||
GestureDetector(
|
||||
onTap: () => {context.push('/login')},
|
||||
child: const TextWidget(
|
||||
text: 'Login here',
|
||||
size: 14,
|
||||
underlined: true,
|
||||
body: PageBackgroundWidget(
|
||||
page: 'register',
|
||||
child: Center(
|
||||
child: Column(mainAxisAlignment: MainAxisAlignment.start, children: [
|
||||
const Gap(96),
|
||||
const TitleWidget(
|
||||
firstTextSize: 14,
|
||||
secondTextSize: 24,
|
||||
logoSize: 90,
|
||||
),
|
||||
const Gap(32),
|
||||
const TextWidget(
|
||||
text: 'Register',
|
||||
title: true,
|
||||
),
|
||||
const Gap(16),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 32, right: 32),
|
||||
child: GlossyContainerWidget(
|
||||
// height: containerHeight,
|
||||
child: Form(
|
||||
child: Column(
|
||||
children: [
|
||||
InputFormWidget(label: 'Email', controller: _emailController),
|
||||
const Gap(16),
|
||||
InputFormWidget(
|
||||
label: 'Password',
|
||||
controller: _passwordController,
|
||||
password: true,
|
||||
validator: (value) {
|
||||
if (value == null || value.isEmpty) {
|
||||
showNotification(context, 'Error: Please enter a password', false);
|
||||
}
|
||||
return null;
|
||||
},
|
||||
),
|
||||
)
|
||||
],
|
||||
)
|
||||
],
|
||||
),
|
||||
)),
|
||||
);
|
||||
const Gap(16),
|
||||
InputFormWidget(
|
||||
label: 'Confirm Password',
|
||||
controller: _confirmPasswordController,
|
||||
password: true,
|
||||
onSubmitted: (String? password) {
|
||||
_signUp();
|
||||
},
|
||||
),
|
||||
const Gap(40),
|
||||
ButtonWithProgressWidget(
|
||||
trigger: _isLoading, progressText: 'Registering', buttonText: 'Register', onPressed: _signUp)
|
||||
],
|
||||
)),
|
||||
),
|
||||
),
|
||||
const Gap(16),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
const TextWidget(
|
||||
text: "Already have an account?",
|
||||
size: 14,
|
||||
),
|
||||
const Gap(8),
|
||||
GestureDetector(
|
||||
onTap: () => {context.push('/login')},
|
||||
child: const TextWidget(
|
||||
text: 'Login here',
|
||||
size: 14,
|
||||
underlined: true,
|
||||
),
|
||||
)
|
||||
],
|
||||
)
|
||||
]))));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue