check
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import 'dart:ui';
|
||||
import 'dart:ui' as ui;
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_animate/flutter_animate.dart';
|
||||
@@ -6,9 +6,11 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
|
||||
import '../../../app/providers.dart';
|
||||
import '../../../core/constants/asset_paths.dart';
|
||||
import '../../../core/router/app_router.dart';
|
||||
import '../../../core/theme/app_colors.dart';
|
||||
import '../../../core/theme/app_dimens.dart';
|
||||
import '../../../core/utils/validators.dart';
|
||||
import '../../../core/widgets/brand_mark.dart';
|
||||
import '../../../core/widgets/primary_button.dart';
|
||||
import '../providers/auth_controller.dart';
|
||||
@@ -31,17 +33,27 @@ class LoginScreen extends ConsumerStatefulWidget {
|
||||
class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
final _formKey = GlobalKey<FormState>();
|
||||
|
||||
// Blank on purpose. The role tabs that used to sit above these fields chose
|
||||
// between two built-in accounts and decided, locally, whether the terminal
|
||||
// opened the admin shell or the billing screen. The back office decides that
|
||||
// now — `POST /login` answers with the role — so offering the choice here
|
||||
// would only let someone pick a screen the server is about to override.
|
||||
final _email = TextEditingController();
|
||||
final _password = TextEditingController();
|
||||
/// Which of the two default accounts the tabs are pointing at. Only a
|
||||
/// convenience for filling the fields — [AuthController.signIn] decides the
|
||||
/// role from the email that is actually submitted, so typing a different
|
||||
/// address over the top still signs in as that account.
|
||||
TerminalLogin _login = TerminalLogin.admin;
|
||||
|
||||
late final _email = TextEditingController(text: _login.email);
|
||||
late final _password = TextEditingController(text: _login.password);
|
||||
|
||||
bool _obscure = true;
|
||||
bool _rememberTerminal = true;
|
||||
|
||||
void _selectLogin(TerminalLogin login) {
|
||||
setState(() {
|
||||
_login = login;
|
||||
_email.text = login.email;
|
||||
_password.text = login.password;
|
||||
});
|
||||
ref.read(authControllerProvider.notifier).clearError();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_email.dispose();
|
||||
@@ -54,9 +66,9 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
if (!(_formKey.currentState?.validate() ?? false)) return;
|
||||
|
||||
final ok = await ref.read(authControllerProvider.notifier).signIn(
|
||||
email: _email.text,
|
||||
password: _password.text,
|
||||
);
|
||||
email: _email.text,
|
||||
password: _password.text,
|
||||
);
|
||||
|
||||
if (ok && mounted) context.go(AppRoutes.pos);
|
||||
}
|
||||
@@ -68,18 +80,11 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
final busy = auth is Authenticating;
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: AppColors.background,
|
||||
body: Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
// Background image
|
||||
Image.asset(
|
||||
'assets/images/bg.webp',
|
||||
fit: BoxFit.cover,
|
||||
),
|
||||
|
||||
// Light blur over the image
|
||||
|
||||
|
||||
const _Backdrop(),
|
||||
SafeArea(
|
||||
child: LayoutBuilder(
|
||||
builder: (context, box) {
|
||||
@@ -91,8 +96,8 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
vertical: tight ? AppSpacing.xl : AppSpacing.xxxl,
|
||||
),
|
||||
child: ConstrainedBox(
|
||||
// Fills the viewport so the card is centred vertically, and
|
||||
// scrolls the moment it cannot be.
|
||||
// Fills the viewport so the card is centred vertically,
|
||||
// and scrolls the moment it cannot be.
|
||||
constraints: BoxConstraints(
|
||||
minHeight: (box.maxHeight - (tight ? 40 : 64))
|
||||
.clamp(0.0, double.infinity),
|
||||
@@ -104,17 +109,21 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
_Masthead(tight: tight),
|
||||
// _Masthead(tight: tight),
|
||||
SizedBox(
|
||||
height: tight ? AppSpacing.lg : AppSpacing.xl,),
|
||||
height: tight ? AppSpacing.lg : AppSpacing.xl,
|
||||
),
|
||||
_Card(
|
||||
formKey: _formKey,
|
||||
email: _email,
|
||||
password: _password,
|
||||
obscure: _obscure,
|
||||
rememberTerminal: _rememberTerminal,
|
||||
login: _login,
|
||||
busy: busy,
|
||||
failure: auth is AuthFailure ? auth.message : null,
|
||||
failure:
|
||||
auth is AuthFailure ? auth.message : null,
|
||||
onSelectLogin: _selectLogin,
|
||||
onToggleObscure: () =>
|
||||
setState(() => _obscure = !_obscure),
|
||||
onToggleRemember: (v) =>
|
||||
@@ -125,9 +134,9 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
Center(
|
||||
child: Text(
|
||||
'Terminal ${session.terminalId}',
|
||||
style: const TextStyle(
|
||||
style: TextStyle(
|
||||
fontSize: 11.5,
|
||||
color: AppColors.textTertiary,
|
||||
color: Colors.white.withValues(alpha: 0.72),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -146,6 +155,58 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
}
|
||||
}
|
||||
|
||||
/// The shopfront behind the form.
|
||||
///
|
||||
/// Blurred hard and darkened, because it is atmosphere rather than something
|
||||
/// to read: a sharp photograph under a sign-in card competes with the two
|
||||
/// fields the person came here to fill in. Scaled up slightly before the blur
|
||||
/// so the softened edges are pushed off-screen instead of showing as a pale
|
||||
/// border.
|
||||
///
|
||||
/// Falls back to the plain background colour if the asset is missing, so an
|
||||
/// undeclared file costs the login screen its atmosphere and not its function.
|
||||
class _Backdrop extends StatelessWidget {
|
||||
const _Backdrop();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
ClipRect(
|
||||
child: ImageFiltered(
|
||||
imageFilter: ui.ImageFilter.blur(sigmaX: 0, sigmaY: 0),
|
||||
child: Transform.scale(
|
||||
scale: 1.12,
|
||||
child: Image.asset(
|
||||
AssetPaths.loginBackground,
|
||||
fit: BoxFit.cover,
|
||||
filterQuality: FilterQuality.medium,
|
||||
errorBuilder: (context, _, __) =>
|
||||
const ColoredBox(color: AppColors.background),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
// Two layers, not one: the flat wash guarantees contrast for the white
|
||||
// masthead wherever the photograph happens to be pale, and the gradient
|
||||
// puts the darkest part behind the text rather than spreading it evenly
|
||||
// and flattening the image out.
|
||||
const ColoredBox(color: Color(0x8A1A0B22)),
|
||||
const DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [Color(0x66000000), Color(0x22000000), Color(0x77000000)],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Mark and product name, directly above the card.
|
||||
class _Masthead extends StatelessWidget {
|
||||
const _Masthead({required this.tight});
|
||||
@@ -156,25 +217,31 @@ class _Masthead extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
children: [
|
||||
// BrandMark(size: tight ? 48 : 60),
|
||||
BrandMark(size: tight ? 48 : 60),
|
||||
const SizedBox(height: AppSpacing.md),
|
||||
const Text(
|
||||
'Nearle POS',
|
||||
style: TextStyle(
|
||||
fontSize: 20,
|
||||
fontSize: 22,
|
||||
fontWeight: FontWeight.w700,
|
||||
letterSpacing: -0.4,
|
||||
color: Colors.white,
|
||||
height: 1.2,
|
||||
shadows: [
|
||||
Shadow(color: Color(0x66000000), blurRadius: 12),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (!tight) ...[
|
||||
const SizedBox(height: 2),
|
||||
const Text(
|
||||
Text(
|
||||
'Scanner-first billing for Indian retail',
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
color: AppColors.textSecondary,
|
||||
color: Colors.white.withValues(alpha: 0.82),
|
||||
shadows: const [
|
||||
Shadow(color: Color(0x55000000), blurRadius: 10),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -190,8 +257,10 @@ class _Card extends StatelessWidget {
|
||||
required this.password,
|
||||
required this.obscure,
|
||||
required this.rememberTerminal,
|
||||
required this.login,
|
||||
required this.busy,
|
||||
required this.failure,
|
||||
required this.onSelectLogin,
|
||||
required this.onToggleObscure,
|
||||
required this.onToggleRemember,
|
||||
required this.onSubmit,
|
||||
@@ -202,8 +271,10 @@ class _Card extends StatelessWidget {
|
||||
final TextEditingController password;
|
||||
final bool obscure;
|
||||
final bool rememberTerminal;
|
||||
final TerminalLogin login;
|
||||
final bool busy;
|
||||
final String? failure;
|
||||
final ValueChanged<TerminalLogin> onSelectLogin;
|
||||
final VoidCallback onToggleObscure;
|
||||
final ValueChanged<bool?> onToggleRemember;
|
||||
final VoidCallback onSubmit;
|
||||
@@ -218,9 +289,9 @@ class _Card extends StatelessWidget {
|
||||
border: Border.all(color: AppColors.border),
|
||||
boxShadow: const [
|
||||
BoxShadow(
|
||||
color: Color(0x0F101828),
|
||||
blurRadius: 24,
|
||||
offset: Offset(0, 8),
|
||||
color: Color(0x33101828),
|
||||
blurRadius: 40,
|
||||
offset: Offset(0, 16),
|
||||
),
|
||||
],
|
||||
),
|
||||
@@ -251,17 +322,31 @@ class _Card extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(height: AppSpacing.xl),
|
||||
|
||||
const _Label('Email or username'),
|
||||
_RoleSwitch(
|
||||
selected: login,
|
||||
enabled: !busy,
|
||||
onSelect: onSelectLogin,
|
||||
),
|
||||
const SizedBox(height: AppSpacing.sm),
|
||||
Text(
|
||||
login.blurb,
|
||||
style: const TextStyle(
|
||||
fontSize: 12.5,
|
||||
color: AppColors.textTertiary,
|
||||
height: 1.45,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: AppSpacing.xl),
|
||||
|
||||
const _Label('Store email'),
|
||||
TextFormField(
|
||||
controller: email,
|
||||
keyboardType: TextInputType.emailAddress,
|
||||
textInputAction: TextInputAction.next,
|
||||
enabled: !busy,
|
||||
// Not validated as an email. The back office takes this as
|
||||
// `authname` and accepts either form; rejecting a username here
|
||||
// would block an account the server would have let in.
|
||||
validator: (v) =>
|
||||
(v ?? '').trim().isEmpty ? 'This is required' : null,
|
||||
validator: (v) => (v ?? '').trim().isEmpty
|
||||
? 'Store email is required'
|
||||
: Validators.emailOptional(v),
|
||||
decoration: const InputDecoration(
|
||||
hintText: 'store@example.in',
|
||||
prefixIcon: Icon(Icons.storefront_outlined),
|
||||
@@ -276,8 +361,9 @@ class _Card extends StatelessWidget {
|
||||
enabled: !busy,
|
||||
textInputAction: TextInputAction.done,
|
||||
onFieldSubmitted: (_) => onSubmit(),
|
||||
validator: (v) =>
|
||||
(v ?? '').isEmpty ? 'Password is required' : null,
|
||||
validator: (v) => (v ?? '').isEmpty
|
||||
? 'Password is required'
|
||||
: ((v ?? '').length < 6 ? 'Password looks too short' : null),
|
||||
decoration: InputDecoration(
|
||||
hintText: 'Enter your password',
|
||||
prefixIcon: const Icon(Icons.lock_outline_rounded),
|
||||
@@ -347,7 +433,7 @@ class _Card extends StatelessWidget {
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(Icons.error_outline_rounded,
|
||||
color: AppColors.danger, size: 18,),
|
||||
color: AppColors.danger, size: 18,),
|
||||
const SizedBox(width: AppSpacing.sm),
|
||||
Expanded(
|
||||
child: Text(
|
||||
@@ -371,6 +457,12 @@ class _Card extends StatelessWidget {
|
||||
busy: busy,
|
||||
onPressed: onSubmit,
|
||||
),
|
||||
|
||||
const SizedBox(height: AppSpacing.lg),
|
||||
_DemoHint(
|
||||
login: login,
|
||||
onFill: busy ? null : () => onSelectLogin(login),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
@@ -399,3 +491,167 @@ class _Label extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
/// Which of the two default accounts is being signed into.
|
||||
///
|
||||
/// The roles are not cosmetic — they decide whether the terminal opens the
|
||||
/// full shell or the billing screen alone, and whether signing out leaves the
|
||||
/// products behind — so the choice is made before the credentials rather than
|
||||
/// inferred from them afterwards.
|
||||
class _RoleSwitch extends StatelessWidget {
|
||||
const _RoleSwitch({
|
||||
required this.selected,
|
||||
required this.enabled,
|
||||
required this.onSelect,
|
||||
});
|
||||
|
||||
final TerminalLogin selected;
|
||||
final bool enabled;
|
||||
final ValueChanged<TerminalLogin> onSelect;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
padding: const EdgeInsets.all(4),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.surfaceAlt,
|
||||
borderRadius: AppRadius.brSm,
|
||||
border: Border.all(color: AppColors.border),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
for (final login in TerminalLogin.values)
|
||||
Expanded(
|
||||
child: _RoleTab(
|
||||
login: login,
|
||||
selected: login == selected,
|
||||
enabled: enabled,
|
||||
onTap: () => onSelect(login),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _RoleTab extends StatelessWidget {
|
||||
const _RoleTab({
|
||||
required this.login,
|
||||
required this.selected,
|
||||
required this.enabled,
|
||||
required this.onTap,
|
||||
});
|
||||
|
||||
final TerminalLogin login;
|
||||
final bool selected;
|
||||
final bool enabled;
|
||||
final VoidCallback onTap;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final icon = login == TerminalLogin.admin
|
||||
? Icons.admin_panel_settings_outlined
|
||||
: Icons.point_of_sale_rounded;
|
||||
|
||||
return Material(
|
||||
color: Colors.transparent,
|
||||
child: InkWell(
|
||||
onTap: enabled ? onTap : null,
|
||||
borderRadius: AppRadius.brXs,
|
||||
child: AnimatedContainer(
|
||||
duration: const Duration(milliseconds: 160),
|
||||
height: 40,
|
||||
alignment: Alignment.center,
|
||||
decoration: BoxDecoration(
|
||||
color: selected ? AppColors.surface : Colors.transparent,
|
||||
borderRadius: AppRadius.brXs,
|
||||
border: Border.all(
|
||||
color: selected ? AppColors.primaryBorder : Colors.transparent,
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(
|
||||
icon,
|
||||
size: 17,
|
||||
color: selected ? AppColors.primary : AppColors.textSecondary,
|
||||
),
|
||||
const SizedBox(width: AppSpacing.sm),
|
||||
Flexible(
|
||||
child: Text(
|
||||
login.label,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
fontSize: 13.5,
|
||||
fontWeight: selected ? FontWeight.w700 : FontWeight.w500,
|
||||
color:
|
||||
selected ? AppColors.primary : AppColors.textSecondary,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _DemoHint extends StatelessWidget {
|
||||
const _DemoHint({required this.login, this.onFill});
|
||||
|
||||
final TerminalLogin login;
|
||||
final VoidCallback? onFill;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
padding: const EdgeInsets.all(AppSpacing.md),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.primarySurface,
|
||||
borderRadius: AppRadius.brSm,
|
||||
border: Border.all(color: AppColors.primaryBorder),
|
||||
),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const Icon(Icons.info_outline_rounded,
|
||||
size: 17, color: AppColors.primary,),
|
||||
const SizedBox(width: AppSpacing.sm),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
'Default ${login.label.toLowerCase()} account',
|
||||
style: const TextStyle(
|
||||
fontSize: 12.5,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.primary,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 2),
|
||||
SelectableText(
|
||||
'${login.email} \u00b7 ${login.password}',
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
color: AppColors.textSecondary,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: onFill,
|
||||
style: TextButton.styleFrom(
|
||||
minimumSize: const Size(0, 32),
|
||||
padding: const EdgeInsets.symmetric(horizontal: AppSpacing.sm),
|
||||
),
|
||||
child: const Text('Fill', style: TextStyle(fontSize: 12.5)),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user