Skip to content

Commit 0c7169a

Browse files
Sameera-PereraSameera-Perera
authored
Merge pull request #39 from Sameera-Perera/Refactor/code-structure
Refactor/code structure
2 parents c6c1734 + 3abf915 commit 0c7169a

File tree

190 files changed

+660
-732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+660
-732
lines changed

‎README.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,8 @@ Welcome to the Flutter-TDD-Clean-Architecture-E-Commerce-App GitHub repository!
6262
</div>
6363

6464
## Backend Options
65-
### Node json-server(Mock API)
66-
* Source Code - https://github.com/Sameera-Perera/E-Commerce-Mock-API
67-
* Live - https://e-commerce-mock-api-webservice.onrender.com
68-
69-
### Java Spring Boot
70-
* Source Code - coming soon
71-
* Live - coming soon
65+
### Nest JS Backend
66+
* Source Code - https://github.com/Sameera-Perera/E-Commerce-App-Backend
7267

7368
## Contributing:
7469

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

‎android/settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "8.1.0" apply false
21+
id "com.android.application" version "8.1.1" apply false
2222
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
2323
}
2424

‎lib/core/constant/strings.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
const String appTitle = 'EShop';
33

44
// Networking and APIs
5-
const String baseUrl = 'https://e-commerce-mock-api-d8zv.onrender.com';
6-
// const String baseUrl = 'http://192.168.1.43:4000';
5+
// const String baseUrl = 'https://e-commerce-mock-api-d8zv.onrender.com';
6+
const String baseUrl = 'http://192.168.1.157:4000';
77
const String defaultApiKey = '';
88
const String defaultSources = '';
99

‎lib/core/router/app_router.dart‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
import 'package:eshop/presentation/views/main/home/filter/filter_view.dart';
21
import 'package:flutter/material.dart';
32

4-
import '../../domain/entities/cart/cart_item.dart';
5-
import '../../domain/entities/product/product.dart';
6-
import '../../domain/entities/user/user.dart';
7-
import '../../presentation/views/authentication/signin_view.dart';
8-
import '../../presentation/views/authentication/signup_view.dart';
9-
import '../../presentation/views/main/main_view.dart';
10-
import '../../presentation/views/main/other/about/about_view.dart';
11-
import '../../presentation/views/main/other/delivery_info/delivery_info.dart';
12-
import '../../presentation/views/main/other/notification/notification_view.dart';
13-
import '../../presentation/views/main/other/orders/order_view.dart';
14-
import '../../presentation/views/main/other/profile/profile_screen.dart';
15-
import '../../presentation/views/main/other/settings/settings_view.dart';
16-
import '../../presentation/views/order_chekout/order_checkout_view.dart';
17-
import '../../presentation/views/product/product_details_view.dart';
3+
import 'package:eshop/features/account/presentation/views/other/about/about_view.dart';
4+
import 'package:eshop/features/account/presentation/views/other/notification/notification_view.dart';
5+
import 'package:eshop/features/account/presentation/views/other/profile/profile_screen.dart';
6+
import 'package:eshop/features/account/presentation/views/other/settings/settings_view.dart';
7+
import 'package:eshop/features/auth/domain/entities/user.dart';
8+
import 'package:eshop/features/auth/presentation/views/authentication/signin_view.dart';
9+
import 'package:eshop/features/auth/presentation/views/authentication/signup_view.dart';
10+
import 'package:eshop/features/cart/domain/entities/cart/cart_item.dart';
11+
import 'package:eshop/features/delivery_info/presentation/views/delivery_info.dart';
12+
import 'package:eshop/features/home/presentation/views/main_view.dart';
13+
import 'package:eshop/features/orders/presentation/views/order_checkout_view.dart';
14+
import 'package:eshop/features/orders/presentation/views/order_view.dart';
15+
import 'package:eshop/features/products/domain/entities/product/product.dart';
16+
import 'package:eshop/features/products/presentation/views/filter_view.dart';
17+
import 'package:eshop/features/products/presentation/views/product_details_view.dart';
1818
import '../error/exceptions.dart';
1919

2020
class AppRouter {

‎lib/core/services/services_locator.dart‎

Lines changed: 73 additions & 115 deletions
Large diffs are not rendered by default.

‎lib/core/usecases/usecase.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import 'package:equatable/equatable.dart';
33

44
import '../error/failures.dart';
55

6-
abstract class UseCase<Type, Params> {
7-
Future<Either<Failure, Type>> call(Params params);
6+
abstract class UseCase<T, Params> {
7+
Future<Either<Failure, T>> call(Params params);
88
}
99

1010
class NoParams extends Equatable {

lib/presentation/widgets/alert_card.dart renamed to lib/core/widgets/alert_card.dart

File renamed without changes.

lib/presentation/widgets/input_form_button.dart renamed to lib/core/widgets/input_form_button.dart

File renamed without changes.

lib/presentation/widgets/input_text_form_field.dart renamed to lib/core/widgets/input_text_form_field.dart

File renamed without changes.

0 commit comments

Comments
 (0)