Skip to content

Commit b5a3aeb

Browse files
authored
Account management - Part I (#575)
Fix #396 Fix #305 Fix #222
1 parent 02f9517 commit b5a3aeb

35 files changed

+40
-2879
lines changed

lib/login/class/create_account.dart

Lines changed: 0 additions & 91 deletions
This file was deleted.

lib/login/class/recover_request.dart

Lines changed: 0 additions & 35 deletions
This file was deleted.

lib/login/providers/sign_up_provider.dart

Lines changed: 0 additions & 31 deletions
This file was deleted.

lib/login/repositories/sign_up_repository.dart

Lines changed: 0 additions & 74 deletions
This file was deleted.

lib/login/router.dart

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@ import 'package:flutter/foundation.dart';
22
import 'package:flutter_riverpod/flutter_riverpod.dart';
33
import 'package:titan/drawer/providers/is_web_format_provider.dart';
44
import 'package:titan/login/ui/app_sign_in.dart' deferred as app_sign_in;
5-
import 'package:titan/login/ui/pages/create_account_page/create_account_page.dart'
6-
deferred as create_account_page;
7-
import 'package:titan/login/ui/pages/forget_page/forget_page.dart'
8-
deferred as forget_page;
9-
import 'package:titan/login/ui/pages/recover_password/recover_password_page.dart'
10-
deferred as recover_password_page;
11-
import 'package:titan/login/ui/pages/register_page/register_page.dart'
12-
deferred as register_page;
135
import 'package:titan/login/ui/web/web_sign_in.dart' deferred as web_sign_in;
146
import 'package:titan/tools/middlewares/authenticated_middleware.dart';
157
import 'package:titan/tools/middlewares/deferred_middleware.dart';
@@ -18,45 +10,9 @@ import 'package:qlevar_router/qlevar_router.dart';
1810
class LoginRouter {
1911
final Ref ref;
2012
static const String root = '/login';
21-
static const String createAccount = '/create_account';
22-
static const String forgotPassword = '/forgot_password';
2313
static const String mailReceived = '/mail_received';
2414
LoginRouter(this.ref);
2515

26-
QRoute accountRoute() => QRoute(
27-
path: createAccount,
28-
builder: () => register_page.Register(),
29-
pageType: const QMaterialPage(),
30-
middleware: [DeferredLoadingMiddleware(register_page.loadLibrary)],
31-
children: [
32-
QRoute(
33-
path: mailReceived,
34-
pageType: const QMaterialPage(),
35-
builder: () => create_account_page.CreateAccountPage(),
36-
middleware: [
37-
DeferredLoadingMiddleware(create_account_page.loadLibrary),
38-
],
39-
),
40-
],
41-
);
42-
43-
QRoute passwordRoute() => QRoute(
44-
path: forgotPassword,
45-
builder: () => forget_page.ForgetPassword(),
46-
pageType: const QMaterialPage(),
47-
middleware: [DeferredLoadingMiddleware(forget_page.loadLibrary)],
48-
children: [
49-
QRoute(
50-
path: mailReceived,
51-
pageType: const QMaterialPage(),
52-
builder: () => recover_password_page.RecoverPasswordPage(),
53-
middleware: [
54-
DeferredLoadingMiddleware(recover_password_page.loadLibrary),
55-
],
56-
),
57-
],
58-
);
59-
6016
QRoute route() => QRoute(
6117
path: LoginRouter.root,
6218
builder: () => (kIsWeb && ref.watch(isWebFormatProvider))

lib/login/ui/app_sign_in.dart

Lines changed: 4 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'package:heroicons/heroicons.dart';
44
import 'package:hooks_riverpod/hooks_riverpod.dart';
55
import 'package:titan/auth/providers/openid_provider.dart';
66
import 'package:titan/login/providers/animation_provider.dart';
7-
import 'package:titan/login/router.dart';
87
import 'package:titan/login/tools/constants.dart';
98
import 'package:titan/login/ui/auth_page.dart';
109
import 'package:titan/login/ui/components/sign_in_up_bar.dart';
@@ -73,6 +72,7 @@ class AppSignIn extends HookConsumerWidget {
7372
.watch(authTokenProvider)
7473
.when(
7574
data: (token) {
75+
controller?.reverse();
7676
QR.to(pathForwarding.path);
7777
},
7878
error: (e, s) {
@@ -82,7 +82,9 @@ class AppSignIn extends HookConsumerWidget {
8282
LoginTextConstants.loginFailed,
8383
);
8484
},
85-
loading: () {},
85+
loading: () {
86+
controller?.forward();
87+
},
8688
);
8789
},
8890
color: ColorConstants.background2,
@@ -96,51 +98,6 @@ class AppSignIn extends HookConsumerWidget {
9698
),
9799
),
98100
const Spacer(flex: 1),
99-
Row(
100-
mainAxisAlignment: MainAxisAlignment.spaceBetween,
101-
children: [
102-
Container(
103-
height: 40,
104-
alignment: Alignment.centerLeft,
105-
child: InkWell(
106-
splashColor: const Color.fromRGBO(255, 255, 255, 1),
107-
onTap: () {
108-
QR.to(LoginRouter.createAccount);
109-
controller?.forward();
110-
},
111-
child: const Text(
112-
LoginTextConstants.createAccount,
113-
style: TextStyle(
114-
color: Colors.white,
115-
fontWeight: FontWeight.w800,
116-
decoration: TextDecoration.underline,
117-
fontSize: 14,
118-
),
119-
),
120-
),
121-
),
122-
Container(
123-
height: 40,
124-
alignment: Alignment.centerLeft,
125-
child: InkWell(
126-
splashColor: const Color.fromRGBO(255, 255, 255, 1),
127-
onTap: () {
128-
QR.to(LoginRouter.forgotPassword);
129-
controller?.forward();
130-
},
131-
child: const Text(
132-
LoginTextConstants.forgotPassword,
133-
style: TextStyle(
134-
color: Colors.white,
135-
fontWeight: FontWeight.w800,
136-
decoration: TextDecoration.underline,
137-
fontSize: 14,
138-
),
139-
),
140-
),
141-
),
142-
],
143-
),
144101
],
145102
),
146103
),

lib/login/ui/components/animation_provider.dart

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)