Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/app_config.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:team/app_theme.dart';
import 'package:team/env.dart';
import 'package:team/routes/middleware.dart';
import 'package:team/vaahextendflutter/app_theme.dart';
import 'package:team/vaahextendflutter/env.dart';
import 'package:team/vaahextendflutter/widgets/debug.dart';

final _navigatorKey = GlobalKey<NavigatorState>();
Expand Down
24 changes: 0 additions & 24 deletions lib/controllers/base_controller.dart

This file was deleted.

4 changes: 2 additions & 2 deletions lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:team/app_config.dart';
import 'package:team/controllers/base_controller.dart';
import 'package:team/vaahextendflutter/base/base_controller.dart';

void main() async {
WidgetsFlutterBinding.ensureInitialized();
BaseController baseController = Get.put(BaseController());
await baseController.init();
runApp(const AppConfig());
}
}
22 changes: 11 additions & 11 deletions lib/models/user.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ class User {

static Future<void> forgotPassword(String identifier) async {
await Api.ajax(
url: apiEndPoint, // TODO: change end point
url: apiEndPoint,
method: 'post',
params: {"identifier": identifier},
);
// TODO: On the same page of the call Show enter otp, reset pass
// TODO: On the same page of the call Show enter otp, reset pass
return;
}

Expand All @@ -41,71 +41,71 @@ class User {

static Future<Map?> createItem(Map<String, dynamic> item) async {
return await Api.ajax(
url: apiEndPoint, // TODO: change end point
url: apiEndPoint,
method: 'post',
params: item,
);
}

static Future<List<Map>?> getList(Map<String, dynamic> query) async {
return await Api.ajax(
url: apiEndPoint, // TODO: change end point
url: apiEndPoint,
method: 'get',
query: query,
);
}

static Future<List<Map>?> updateList(String type, List<Map> items) async {
return await Api.ajax(
url: apiEndPoint, // TODO: change end point
url: apiEndPoint,
method: 'post',
params: {'type': type, 'data': items},
);
}

static Future<List<Map>?> deleteList(String type, List<Map> items) async {
return await Api.ajax(
url: apiEndPoint, // TODO: change end point
url: apiEndPoint,
method: 'delete',
params: {'type': type, 'data': items},
);
}

static Future<List<Map>?> listAction(String type, List<Map> items) async {
return await Api.ajax(
url: apiEndPoint, // TODO: change end point
url: apiEndPoint,
method: 'patch',
params: {'type': type, 'data': items},
);
}

static Future<Map?> getItem(String id) async {
return await Api.ajax(
url: apiEndPoint, // TODO: change end point
url: apiEndPoint,
method: 'get',
query: {"id": id},
);
}

static Future<Map?> updateItem(String id, Map item) async {
return await Api.ajax(
url: apiEndPoint, // TODO: change end point
url: apiEndPoint,
method: 'patch',
params: {'id': id, 'item': item},
);
}

static Future<Map?> deleteItem(String id) async {
return await Api.ajax(
url: apiEndPoint, // TODO: change end point
url: apiEndPoint,
method: 'delete',
params: {"id": id},
);
}

static Future<Map?> itemAction(String id, String type) async {
return await Api.ajax(
url: apiEndPoint, // TODO: change end point
url: apiEndPoint,
method: 'post',
params: {'id': id, 'type': type},
);
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/middleware.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:team/routes/routes.dart';
import 'package:team/view/pages/not_found.dart';
import 'package:team/views/pages/not_found.dart';

Route<dynamic>? routeMiddleware(RouteSettings route) {
if (!routes.containsKey(route.name)) {
Expand Down
10 changes: 6 additions & 4 deletions lib/routes/routes.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import 'package:flutter/material.dart';
import 'package:team/view/pages/home.dart';
import 'package:team/view/pages/not_found.dart';
import 'package:team/view/pages/permission_denied.dart';
import 'package:team/views/pages/home.dart';
import 'package:team/views/pages/not_found.dart';
import 'package:team/views/pages/permission_denied.dart';
import 'package:team/views/pages/ui/index.dart';

final Map<String, Route<dynamic> Function()> routes = {
'/': HomePage.route,
HomePage.routePath: HomePage.route,
NotFoundPage.routePath: NotFoundPage.route,
PermissionDeniedPage.routePath: PermissionDeniedPage.route,
};
UIPage.routePath: UIPage.route,
};
10 changes: 10 additions & 0 deletions lib/app_theme.dart → lib/vaahextendflutter/app_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ import 'package:team/vaahextendflutter/base/base_theme.dart';
class AppTheme {
static final Map<String, MaterialColor> colors = Map.of(BaseTheme.colors);

static const panelBorder = Border();

static const int precision = 2;

static const double extraSmall = 12;
static const double small = 14;
static const double medium = 16;
static const double large = 18;
static const double extraLarge = 20;

static void init() {
// colors['primary'] = pink;
// colors['secondary'] = gray;
Expand Down
16 changes: 16 additions & 0 deletions lib/vaahextendflutter/base/base_controller.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:team/controllers/root_assets_controller.dart';
import 'package:team/vaahextendflutter/app_theme.dart';
import 'package:team/vaahextendflutter/env.dart';
import 'package:team/vaahextendflutter/services/api.dart';

class BaseController extends GetxController {
Future<void> init() async {
await GetStorage.init();
EnvironmentConfig.setEnvConfig();
AppTheme.init();
Api.init();
Get.put(RootAssetsController());
}
}
37 changes: 24 additions & 13 deletions lib/env.dart → lib/vaahextendflutter/env.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:io';

import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:team/app_theme.dart';
import 'package:team/vaahextendflutter/app_theme.dart';
import 'package:team/vaahextendflutter/helpers/console.dart';

// After changing any const you will need to restart the app (Hot-reload won't work).
Expand All @@ -18,14 +18,14 @@ final EnvironmentConfig defaultConfig = EnvironmentConfig(
version: version,
build: build,
backendUrl: '',
apiUrl: 'https://apivoid.herokuapp.com',
apiUrl: '',
timeoutLimit: 60 * 1000, // 60 seconds
firebaseId: '',
enableConsoleLogs: true,
enableLocalLogs: true,
enableApiLogs: true,
showEnvAndVersionTag: true,
envAndVersionTagColor: AppTheme.colors['black']!.withOpacity(0.7),
showDebugPanel: true,
debugPanelColor: AppTheme.colors['black']!.withOpacity(0.7),
);

// To add new configuration add new key, value pair in envConfigs
Expand All @@ -46,7 +46,7 @@ Map<String, EnvironmentConfig> envConfigs = {
envType: 'production',
enableConsoleLogs: false,
enableLocalLogs: false,
showEnvAndVersionTag: false,
showDebugPanel: false,
),
};

Expand Down Expand Up @@ -86,8 +86,8 @@ class EnvironmentConfig {
final bool enableConsoleLogs;
final bool enableLocalLogs;
final bool enableApiLogs;
final bool showEnvAndVersionTag;
final Color envAndVersionTagColor;
final bool showDebugPanel;
final Color debugPanelColor;

const EnvironmentConfig({
required this.appTitle,
Expand All @@ -102,15 +102,26 @@ class EnvironmentConfig {
required this.enableConsoleLogs,
required this.enableLocalLogs,
required this.enableApiLogs,
required this.showEnvAndVersionTag,
required this.envAndVersionTagColor,
required this.showDebugPanel,
required this.debugPanelColor,
});

static EnvironmentConfig getEnvConfig() {
final bool envControllerExists = Get.isRegistered<EnvController>();
if (!envControllerExists) {
setEnvConfig();
}
EnvController envController = Get.find<EnvController>();
return envController.config;
}

static void setEnvConfig() {
String environment = const String.fromEnvironment('environment', defaultValue: 'default');
final EnvController envController = Get.put(EnvController(environment));
Console.info('Env Type: ${envController.config.envType}');
Console.info('Version: ${envController.config.version}+${envController.config.build}');
}

EnvironmentConfig copyWith({
String? appTitle,
String? appTitleShort,
Expand All @@ -124,8 +135,8 @@ class EnvironmentConfig {
bool? enableConsoleLogs,
bool? enableLocalLogs,
bool? enableApiLogs,
bool? showEnvAndVersionTag,
Color? envAndVersionTagColor,
bool? showDebugPanel,
Color? debugPanelColor,
}) {
return EnvironmentConfig(
appTitle: appTitle ?? this.appTitle,
Expand All @@ -140,8 +151,8 @@ class EnvironmentConfig {
enableConsoleLogs: enableConsoleLogs ?? this.enableConsoleLogs,
enableLocalLogs: enableLocalLogs ?? this.enableLocalLogs,
enableApiLogs: enableApiLogs ?? this.enableApiLogs,
showEnvAndVersionTag: showEnvAndVersionTag ?? this.showEnvAndVersionTag,
envAndVersionTagColor: envAndVersionTagColor ?? this.envAndVersionTagColor,
showDebugPanel: showDebugPanel ?? this.showDebugPanel,
debugPanelColor: debugPanelColor ?? this.debugPanelColor,
);
}
}
Loading