Tuuli/tuuli_app
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

User panel fully functional

Browse source
This commit is contained in:
Andrew 2023-04-25 15:08:03 +07:00
parent e562216658
commit f67e947f8b
16 changed files with 1346 additions and 641 deletions
Download patch file Download diff file Expand all files Collapse all files

106
lib/models/db_column_definition.dart Normal file
View file

@ -0,0 +1,106 @@
import 'package:tuuli_api/tuuli_api.dart';
extension ColumnsParser on TableDefinition {
List<DBColumnDefinition> get parsedColumns {
return columns
.split(",")
.map((e) {
final parts = e.split(":");
final name = parts[0];
switch (parts[1]) {
case "serial":
return PrimarySerialColumnDefinition(name);
case "str":
return TextColumnDefinition(
name,
parts.contains("unique"),
parts.contains("default"),
);
case "bool":
return BooleanColumnDefinition(
name,
parts.contains("unique"),
parts.contains("default"),
);
case "datetime":
return TimestampColumnDefinition(
name,
parts.contains("unique"),
parts.contains("default"),
);
case "float":
return DoubleColumnDefinition(
name,
parts.contains("unique"),
parts.contains("default"),
);
case "int":
return IntegerColumnDefinition(
name,
parts.contains("unique"),
parts.contains("default"),
);
case "int-user":
return UserRefColumnDefinition(name);
case "int-asset":
return AssetRefColumnDefinition(name);
}
return null;
})
.whereType<DBColumnDefinition>()
.toList(growable: false);
}
}
abstract class DBColumnDefinition {
final String name;
final bool unique;
final bool hasDefault;
DBColumnDefinition({
required this.name,
required this.unique,
required this.hasDefault,
});
}
class PrimarySerialColumnDefinition extends DBColumnDefinition {
PrimarySerialColumnDefinition(String name)
: super(name: name, unique: false, hasDefault: false);
}
class TextColumnDefinition extends DBColumnDefinition {
TextColumnDefinition(String name, bool unique, bool hasDefault)
: super(name: name, unique: unique, hasDefault: hasDefault);
}
class BooleanColumnDefinition extends DBColumnDefinition {
BooleanColumnDefinition(String name, bool unique, bool hasDefault)
: super(name: name, unique: unique, hasDefault: hasDefault);
}
class TimestampColumnDefinition extends DBColumnDefinition {
TimestampColumnDefinition(String name, bool unique, bool hasDefault)
: super(name: name, unique: unique, hasDefault: hasDefault);
}
class DoubleColumnDefinition extends DBColumnDefinition {
DoubleColumnDefinition(String name, bool unique, bool hasDefault)
: super(name: name, unique: unique, hasDefault: hasDefault);
}
class IntegerColumnDefinition extends DBColumnDefinition {
IntegerColumnDefinition(String name, bool unique, bool hasDefault)
: super(name: name, unique: unique, hasDefault: hasDefault);
}
class UserRefColumnDefinition extends DBColumnDefinition {
UserRefColumnDefinition(String name)
: super(name: name, unique: false, hasDefault: false);
}
class AssetRefColumnDefinition extends DBColumnDefinition {
AssetRefColumnDefinition(String name)
: super(name: name, unique: false, hasDefault: false);
}

11
lib/models/group_definition.dart Normal file
View file

@ -0,0 +1,11 @@
class GroupDefinition {
final int id;
final String name;
final String description;
const GroupDefinition({
required this.id,
required this.name,
required this.description,
});
}

13
lib/models/user_definition.dart Normal file
View file

@ -0,0 +1,13 @@
class UserDefinition {
final int id;
final String username;
final String password;
final String accessToken;
const UserDefinition({
required this.id,
required this.username,
required this.password,
required this.accessToken,
});
}

11
lib/models/user_in_group_definition.dart Normal file
View file

@ -0,0 +1,11 @@
class UserInGroupDefinition {
final int id;
final int userId;
final int groupId;
const UserInGroupDefinition({
required this.id,
required this.userId,
required this.groupId,
});
}

3
lib/pages/bottomsheets/create_table_item_bottomsheet.dart
View file

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
/*import 'package:flutter/material.dart';
import 'package:flutter_fast_forms/flutter_fast_forms.dart';
import 'package:get/get.dart';
import 'package:tuuli_app/api/api_client.dart';
@ -196,3 +196,4 @@ class _CreateTableItemBottomSheetState
}
}
}
*/

3
lib/pages/bottomsheets/create_user_bottomsheet.dart
View file

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
/*import 'package:flutter/material.dart';
import 'package:flutter_fast_forms/flutter_fast_forms.dart';
import 'package:get/get.dart';
import 'package:tuuli_app/api/api_client.dart';
@ -215,3 +215,4 @@ class _CreateUserBottomSheetState extends State<CreateUserBottomSheet> {
);
}
}
*/

3
lib/pages/bottomsheets/edit_table_bottomsheet.dart
View file

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
/*import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:recase/recase.dart';
import 'package:tuuli_app/api/model/table_field_model.dart';
@ -240,3 +240,4 @@ class _EditTableBottomSheetState extends State<EditTableBottomSheet> {
});
}
}
*/

3
lib/pages/bottomsheets/open_table_bottomsheet.dart
View file

@ -1,4 +1,4 @@
import 'package:bottom_sheet/bottom_sheet.dart';
/*import 'package:bottom_sheet/bottom_sheet.dart';
import 'package:data_table_2/data_table_2.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
@ -255,3 +255,4 @@ class _OpenTableBottomSheetState extends State<OpenTableBottomSheet> {
});
}
}
*/

10
lib/pages/checkup_page.dart
View file

@ -1,23 +1,17 @@
import 'package:animated_background/animated_background.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:tuuli_app/api_controller.dart';
class CheckupPageController extends GetxController {
@override
void onInit() {
super.onInit();
}
Future<void> checkCredentials() async {
if (ApiController.to.token.isEmpty) {
WidgetsBinding.instance.addPostFrameCallback((_) {
ApiController.to.token = "";
Get.offAllNamed("/login");
});
} else {
try {
final resp =
await ApiController.to.apiClient.listTablesApiListTablesGet();
final resp = await ApiController.to.apiClient.listTables();
WidgetsBinding.instance.addPostFrameCallback((_) {
if (resp.statusCode == 200) {

161
lib/pages/home_page.dart
View file

@ -1,8 +1,7 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:tuuli_app/api/api_client.dart';
import 'package:tuuli_app/api/model/tables_list_model.dart';
import 'package:tuuli_app/api_controller.dart';
import 'package:tuuli_app/c.dart';
import 'package:tuuli_app/pages/home_panels/none_panel.dart';
import 'package:tuuli_app/pages/home_panels/settings_panel.dart';
@ -16,35 +15,13 @@ enum PageType {
settings,
}
mixin HomePageStateRef {
void refreshData();
}
class HomePageController extends GetxController {
final _currentPage = PageType.none.obs;
PageType get currentPage => _currentPage.value;
set currentPage(PageType value) => _currentPage.value = value;
class HomePage extends StatefulWidget {
const HomePage({super.key});
String get currentPageName => pageNames[currentPage]!;
@override
State<StatefulWidget> createState() => _HomePageState();
}
class _HomePageState extends State<HomePage> with HomePageStateRef {
final apiClient = Get.find<ApiClient>();
TablesListModel tables = TablesListModel([]);
TableModel get usersTable =>
tables.tables.firstWhere((element) => element.tableName == "users");
bool get isNarrow =>
(MediaQuery.of(context).size.width - C.materialDrawerWidth) <= 600;
@override
void initState() {
super.initState();
refreshData();
}
var currentPage = PageType.none;
final pageNames = {
PageType.none: "Home",
PageType.tables: "Tables",
@ -52,8 +29,41 @@ class _HomePageState extends State<HomePage> with HomePageStateRef {
PageType.settings: "Settings",
};
@override
void onInit() {
super.onInit();
Get.lazyPut<TablesListPanelController>(
() => TablesListPanelController(),
fenix: true,
);
Get.lazyPut<UserListPanelController>(
() => UserListPanelController(),
fenix: true,
);
}
Future<void> logout() async {
ApiController.to.token = "";
await Future.wait([
Get.delete<TablesListPanelController>(),
Get.delete<UserListPanelController>(),
Get.delete<HomePageController>(),
]);
Get.offAllNamed("/");
}
}
class HomePage extends GetView<HomePageController> {
const HomePage({super.key});
bool get isNarrow =>
(Get.mediaQuery.size.width - C.materialDrawerWidth) <= 600;
AppBar get appBar => AppBar(
title: Text(pageNames[currentPage]!),
title: Obx(() => Text(controller.currentPageName)),
actions: [
IconButton(
icon: const Icon(Icons.home),
@ -62,51 +72,49 @@ class _HomePageState extends State<HomePage> with HomePageStateRef {
},
),
IconButton(
icon: const Icon(Icons.refresh),
onPressed: refreshData,
icon: const Icon(Icons.logout),
onPressed: () => controller.logout(),
),
],
);
ListView get drawerOptions => ListView(
children: [
ListTile(
leading: const Icon(Icons.table_chart),
title: const Text("Tables"),
onTap: () {
setState(() {
currentPage = PageType.tables;
});
},
Obx(
() => ListTile(
leading: const Icon(Icons.table_chart),
title: const Text("Tables"),
onTap: () {
controller.currentPage = PageType.tables;
},
selected: controller.currentPage == PageType.tables,
),
),
ListTile(
leading: const Icon(Icons.person),
title: const Text("Users"),
onTap: () {
setState(() {
currentPage = PageType.users;
});
},
Obx(
() => ListTile(
leading: const Icon(Icons.person),
title: const Text("Users"),
onTap: () {
controller.currentPage = PageType.users;
},
selected: controller.currentPage == PageType.users,
),
),
ListTile(
leading: const Icon(Icons.settings),
title: const Text("Settings"),
onTap: () {
setState(() {
currentPage = PageType.settings;
});
},
Obx(
() => ListTile(
leading: const Icon(Icons.settings),
title: const Text("Settings"),
onTap: () {
controller.currentPage = PageType.settings;
},
selected: controller.currentPage == PageType.settings,
),
),
const Divider(),
ListTile(
leading: const Icon(Icons.logout),
title: const Text("Logout"),
onTap: () {
GetStorage().erase().then((value) {
GetStorage().save();
Get.offAllNamed("/");
});
},
onTap: () => controller.logout(),
),
],
);
@ -140,12 +148,12 @@ class _HomePageState extends State<HomePage> with HomePageStateRef {
),
LimitedBox(
maxWidth: MediaQuery.of(context).size.width - C.materialDrawerWidth,
child: Builder(builder: (context) {
switch (currentPage) {
child: Obx(() {
switch (controller.currentPage) {
case PageType.tables:
return TablesListPanel(parent: this, tables: tables);
return const TablesListPanel();
case PageType.users:
return UsersListPanel(usersTable: usersTable);
return const UsersListPanel();
case PageType.settings:
return const SettingsPanel();
case PageType.none:
@ -158,25 +166,4 @@ class _HomePageState extends State<HomePage> with HomePageStateRef {
),
);
}
@override
void refreshData() {
apiClient.tablesList().then(
(value) => value.unfold(
(tables) {
setState(() {
this.tables = tables;
});
},
(error) {
ScaffoldMessenger.of(context).hideCurrentSnackBar();
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(error.toString()),
),
);
},
),
);
}
}

299
lib/pages/home_panels/tables_list_panel.dart
View file

@ -1,110 +1,106 @@
import 'package:bottom_sheet/bottom_sheet.dart';
import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:tuuli_api/tuuli_api.dart';
import 'package:tuuli_app/api_controller.dart';
import 'package:recase/recase.dart';
import 'package:tuuli_app/api/api_client.dart';
import 'package:tuuli_app/api/model/tables_list_model.dart';
import 'package:tuuli_app/c.dart';
import 'package:tuuli_app/pages/bottomsheets/edit_table_bottomsheet.dart';
import 'package:tuuli_app/pages/bottomsheets/open_table_bottomsheet.dart';
import 'package:tuuli_app/pages/home_page.dart';
class TablesListPanel extends StatefulWidget {
final TablesListModel tables;
final HomePageStateRef parent;
const TablesListPanel({
super.key,
required this.tables,
required this.parent,
});
import 'package:tuuli_app/models/db_column_definition.dart';
class TablesListPanelController extends GetxController {
@override
State<StatefulWidget> createState() => _TablesListPanelState();
void onInit() {
super.onInit();
refreshData();
}
final _isLoading = false.obs;
bool get isLoading => _isLoading.value;
final _tables = <TableDefinition>[].obs;
List<TableDefinition> get tables => _tables;
Future<void> refreshData() async {
_isLoading.value = true;
try {
final resp = await ApiController.to.apiClient.listTables();
final respData = resp.data;
if (respData == null) {
throw Exception("No data in response");
}
_tables.clear();
_tables.addAll(respData);
} on DioError catch (e) {
final respData = e.response?.data;
if (respData != null) {
Get.snackbar(
"Error trying to get tables",
"${respData['error']}",
);
} else {
Get.snackbar(
"Error trying to get tables",
"$e",
);
}
} catch (e) {
Get.snackbar(
"Error trying to get tables",
"$e",
);
}
_isLoading.value = false;
}
Future<void> createNewTable() async {}
Future<void> openTable(TableDefinition table) async {}
}
class _TablesListPanelState extends State<TablesListPanel> {
final apiClient = Get.find<ApiClient>();
@override
void initState() {
super.initState();
}
class TablesListPanel extends GetView<TablesListPanelController> {
const TablesListPanel({super.key});
@override
Widget build(BuildContext context) {
return _buildTableList();
}
Widget _buildTableCard(BuildContext ctx, TableModel table) {
return Card(
clipBehavior: Clip.antiAlias,
child: InkWell(
onTap: () => _openTable(table),
child: Container(
margin: const EdgeInsets.all(5),
padding: const EdgeInsets.all(5),
child: Stack(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(
table.tableName.pascalCase,
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
Row(
children: [
Text(
table.system ? "System" : "Userland",
style: const TextStyle(
fontSize: 12,
),
),
],
),
Row(
children: [
Text(
"${table.columns.length} column(s)",
style: const TextStyle(
fontSize: 11,
fontStyle: FontStyle.italic,
),
),
],
)
],
),
],
return Stack(
children: [
Column(
children: [
AppBar(
elevation: 0,
actions: [
IconButton(
icon: const Icon(Icons.add),
onPressed: () => controller.createNewTable(),
),
IconButton(
icon: const Icon(Icons.refresh),
onPressed: () => controller.refreshData(),
),
],
),
Expanded(
child: Obx(
() => controller.tables.isEmpty ? whenNoTables : cardGrid),
),
],
),
Obx(
() => Positioned(
right: 16,
bottom: 16,
child: controller.isLoading
? const CircularProgressIndicator()
: const SizedBox(),
),
),
),
],
);
}
Widget get newTableCard => Card(
clipBehavior: Clip.antiAlias,
child: InkWell(
onTap: _createNewTable,
child: Container(
margin: const EdgeInsets.all(5),
padding: const EdgeInsets.all(5),
child: const Icon(Icons.add),
),
),
);
Widget _buildTableList() {
var tableItems = widget.tables.tables
.where((table) => !table.hidden && !table.system)
.toList(growable: false);
if (tableItems.isEmpty) {
return Center(
Widget get whenNoTables => Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
@ -113,7 +109,7 @@ class _TablesListPanelState extends State<TablesListPanel> {
Text(
"No tables found",
style: TextStyle(
color: Theme.of(context).disabledColor,
color: Get.theme.disabledColor,
fontSize: 24,
),
),
@ -121,81 +117,66 @@ class _TablesListPanelState extends State<TablesListPanel> {
Text(
"Maybe create one?",
style: TextStyle(
color: Theme.of(context).disabledColor,
color: Get.theme.disabledColor,
fontSize: 14,
),
),
const SizedBox(height: 16),
ElevatedButton.icon(
onPressed: _createNewTable,
icon: const Icon(Icons.add),
label: const Text("Create table"),
)
],
),
);
}
return GridView.builder(
shrinkWrap: true,
itemCount: tableItems.length + 1,
itemBuilder: (ctx, i) =>
i == 0 ? newTableCard : _buildTableCard(ctx, tableItems[i - 1]),
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 5,
Widget get cardGrid => GridView.count(
shrinkWrap: true,
crossAxisCount: 3,
childAspectRatio: 5 / 2,
children: [...controller.tables.map((e) => _buildTableCard(e))],
);
Widget _buildTableCard(TableDefinition table) {
return Card(
clipBehavior: Clip.antiAlias,
child: InkWell(
onTap: () => controller.openTable(table),
child: Container(
margin: const EdgeInsets.all(5),
padding: const EdgeInsets.all(5),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(
table.tableName.pascalCase,
maxLines: 1,
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
overflow: TextOverflow.ellipsis,
),
),
Row(
children: [
Text(
table.system ? "System" : "Userland",
style: const TextStyle(
fontSize: 12,
),
),
],
),
Row(
children: [
Text(
"${table.parsedColumns.length} column(s)",
style: const TextStyle(
fontSize: 11,
fontStyle: FontStyle.italic,
),
),
],
)
],
),
),
),
);
}
void _createNewTable() async {
final result = await showFlexibleBottomSheet<EditTableBottomSheetResult>(
minHeight: 0,
initHeight: 0.75,
maxHeight: 1,
context: context,
builder: (_, __, ___) => const EditTableBottomSheet(),
anchors: [0, 0.5, 1],
isSafeArea: true,
isDismissible: false,
);
if (result == null) return;
await apiClient
.createTable(result.tableName, result.fields)
.then((e) => WidgetsBinding.instance.addPostFrameCallback((_) {
e.unfold((_) {
Get.snackbar(
"Success",
"Table created",
colorText: Colors.white,
);
}, (error) {
Get.defaultDialog(
title: "Error",
middleText: error.toString(),
textConfirm: "OK",
onConfirm: () => Get.back(),
);
});
}));
widget.parent.refreshData();
}
void _openTable(TableModel table) async {
await showFlexibleBottomSheet<void>(
minHeight: 1,
initHeight: 1,
maxHeight: 1,
context: context,
builder: (_, __, ___) => OpenTableBottomSheet(table: table),
anchors: [0, 0.5, 1],
isSafeArea: true,
isDismissible: false,
);
widget.parent.refreshData();
}
}

1054
lib/pages/home_panels/users_list_panel.dart
View file

File diff suppressed because it is too large Load diff

169
lib/pages/login_page.dart
View file

@ -1,6 +1,5 @@
import 'dart:async';
import 'package:animated_background/animated_background.dart';
import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
@ -8,9 +7,9 @@ import 'package:tuuli_api/tuuli_api.dart';
import 'package:tuuli_app/api_controller.dart';
class LoginPageController extends GetxController {
final _login = "".obs;
String get login => _login.value;
set login(String value) => _login.value = value;
final _username = "".obs;
String get username => _username.value;
set username(String value) => _username.value = value;
final _password = "".obs;
String get password => _password.value;
@ -20,18 +19,18 @@ class LoginPageController extends GetxController {
bool get submitted => _submitted.value;
set submitted(bool value) => _submitted.value = value;
bool get isFormValid => login.isNotEmpty && password.isNotEmpty;
bool get isFormValid => username.isNotEmpty && password.isNotEmpty;
Future<void> submitForm() async {
submitted = true;
if (isFormValid) {
final amb = AuthModelBuilder()
..username = login
..password = password;
try {
final resp = await ApiController.to.apiClient
.getAccessTokenApiGetAccessTokenPost(authModel: amb.build());
final resp = await ApiController.to.apiClient.getAccessToken(
authModel: AuthModel(
username: username,
password: password,
),
);
final respData = resp.data;
if (resp.statusCode == 200 && respData != null) {
@ -105,9 +104,9 @@ class LoginPage extends GetView<LoginPageController> {
enabled: !controller.submitted,
decoration: const InputDecoration(
labelText: 'Login',
hintText: 'Enter your login',
hintText: 'Enter your username',
),
onChanged: (value) => controller.login = value,
onChanged: (value) => controller.username = value,
validator: (value) {
if (value == null || value.isEmpty) {
return 'Please enter your Login';
@ -149,147 +148,3 @@ class LoginPage extends GetView<LoginPageController> {
);
}
}
/*
class LoginPage extends StatefulWidget {
const LoginPage({super.key});
@override
State<StatefulWidget> createState() => _LoginPageState();
}
class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
final _formKey = GlobalKey<FormState>();
final apiClient = Get.find<ApiClient>();
var submitted = false;
final loginPageController = TextEditingController();
final passwordController = TextEditingController();
@override
Widget build(BuildContext context) {
final screenSize = MediaQuery.of(context).size;
final formWidth = screenSize.width <= 600 ? screenSize.width : 300.0;
return Scaffold(
body: Stack(
children: [
AnimatedBackground(
behaviour: RandomParticleBehaviour(),
vsync: this,
child: const SizedBox.square(
dimension: 0,
),
),
Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
LimitedBox(
maxWidth: formWidth,
child: Container(
color: Colors.black.withAlpha(100),
padding: const EdgeInsets.all(16),
child: Form(
key: _formKey,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
TextFormField(
controller: loginPageController,
enabled: !submitted,
decoration: const InputDecoration(
labelText: 'Login',
hintText: 'Enter your login',
),
validator: (value) {
if (value == null || value.isEmpty) {
return 'Please enter your Login';
}
return null;
},
),
TextFormField(
controller: passwordController,
obscureText: true,
enabled: !submitted,
decoration: const InputDecoration(
labelText: 'Password',
hintText: 'Enter your password',
),
validator: (value) {
if (value == null || value.isEmpty) {
return 'Please enter your password';
}
return null;
},
),
const SizedBox(height: 16),
ElevatedButton(
onPressed: submitted ? null : _submit,
child: const Text('Login'),
),
],
),
),
),
),
],
),
],
),
);
}
Future<void> _submit() async {
if (!_formKey.currentState!.validate()) {
return;
}
setState(() {
submitted = true;
});
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Trying to login...'),
),
);
final response = await apiClient.login(
loginPageController.text.trim(),
passwordController.text.trim(),
);
response.unfold((data) {
ScaffoldMessenger.of(context).hideCurrentSnackBar();
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Login successful'),
),
);
apiClient.setAccessToken(data.accessToken);
GetStorage()
.write("accessToken", data.accessToken)
.then((value) => GetStorage().save())
.then((value) {
Timer(1.seconds, () {
ScaffoldMessenger.of(context).hideCurrentSnackBar();
WidgetsBinding.instance.addPostFrameCallback((_) {
Get.offAllNamed("/home");
});
});
});
}, (error) {
ScaffoldMessenger.of(context).hideCurrentSnackBar();
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(error.toString()),
),
);
setState(() {
submitted = false;
});
});
}
}
*/