nilsjohan/recipe-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: enhance admin and profile repositories with token handling; update dropdown initial values in various screens

Browse Source
This commit is contained in:
Nils-Johan Gynther
2026-04-23 21:34:08 +02:00
parent 111d196403
commit b589f7415d
15 changed files with 63 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flutter/build/test_cache/build/c1a2004662044feb47c136be2870373c.cache.dill.track.dill
BIN
View File
Binary file not shown.
flutter/lib/features/admin/data/admin_repository.dart
+20 -9
View File
@@ -2,6 +2,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../core/api/api_client.dart';
import '../../../core/api/api_paths.dart';
import '../../../core/api/guarded_api_call.dart';
import '../../auth/data/auth_providers.dart';
import '../domain/user_admin.dart';
final adminRepositoryProvider = Provider<AdminRepository>((ref) {
@@ -14,26 +15,31 @@ class AdminRepository {
AdminRepository(this._apiClient, this._ref);
Future<String?> _token() => _ref.read(authStateProvider.future);
Future<List<UserAdmin>> listUsers() async {
final token = await _token();
final data = await guardedApiCall(
_ref,
() => _apiClient.getJson(UserApiPaths.list),
() => _apiClient.getJson(UserApiPaths.list, token: token),
);
return (data as List<dynamic>).map((e) => UserAdmin.fromJson(e as Map<String, dynamic>)).toList();
}
Future<UserAdmin> setRole(int userId, String newRole) async {
final token = await _token();
final data = await guardedApiCall(
_ref,
() => _apiClient.patchJson(UserApiPaths.setRole(userId), body: {'role': newRole}),
() => _apiClient.patchJson(UserApiPaths.setRole(userId), body: {'role': newRole}, token: token),
);
return UserAdmin.fromJson(data);
}
Future<UserAdmin> setPremium(int userId, {required bool isPremium}) async {
final token = await _token();
final data = await guardedApiCall(
_ref,
() => _apiClient.patchJson(UserApiPaths.setPremium(userId), body: {'isPremium': isPremium}),
() => _apiClient.patchJson(UserApiPaths.setPremium(userId), body: {'isPremium': isPremium}, token: token),
);
return UserAdmin.fromJson(data);
}
@@ -44,6 +50,7 @@ class AdminRepository {
required String password,
String role = 'user',
}) async {
final token = await _token();
final data = await guardedApiCall(
_ref,
() => _apiClient.postJson(UserApiPaths.list, body: {
@@ -51,21 +58,25 @@ class AdminRepository {
'email': email,
'password': password,
'role': role,
}),
}, token: token),
);
return UserAdmin.fromJson(data as Map<String, dynamic>);
}
Future<void> deleteUser(int userId) => guardedApiCall(
_ref,
() => _apiClient.deleteJson(UserApiPaths.delete(userId)),
);
Future<void> deleteUser(int userId) async {
final token = await _token();
return guardedApiCall(
_ref,
() => _apiClient.deleteJson(UserApiPaths.delete(userId), token: token),
);
}
/// Returns `{ temporaryPassword, to, subject, body }`.
Future<Map<String, dynamic>> resetPassword(int userId) async {
final token = await _token();
final result = await guardedApiCall<dynamic>(
_ref,
() => _apiClient.postJson(UserApiPaths.resetPassword(userId)),
() => _apiClient.postJson(UserApiPaths.resetPassword(userId), token: token),
);
return (result as Map<String, dynamic>);
}
flutter/lib/features/admin/presentation/admin_screen.dart
+1 -1
View File
@@ -379,7 +379,7 @@ class _CreateUserDialogState extends State<_CreateUserDialog> {
),
const SizedBox(height: 12),
DropdownButtonFormField<String>(
value: _role,
initialValue: _role,
decoration: const InputDecoration(labelText: 'Roll'),
items: const [
DropdownMenuItem(value: 'user', child: Text('Användare')),
flutter/lib/features/auth/presentation/login_screen.dart
-1
View File
@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import '../../../core/api/api_error_mapper.dart';
import '../../../core/l10n/l10n.dart';
flutter/lib/features/inventory/data/inventory_providers.dart
+4
View File
@@ -19,6 +19,10 @@ class _StringNotifier extends Notifier<String> {
final String _initial;
@override
String build() => _initial;
void setValue(String value) {
state = value;
}
}
final inventoryLocationFilterProvider =
flutter/lib/features/inventory/presentation/create_inventory_screen.dart
+2 -2
View File
@@ -196,7 +196,7 @@ class _CreateInventoryScreenState
const SizedBox(width: 8),
Expanded(
child: DropdownButtonFormField<String>(
value: _unitController.text.trim().isEmpty
initialValue: _unitController.text.trim().isEmpty
? null
: _unitController.text.trim(),
isExpanded: true,
@@ -224,7 +224,7 @@ class _CreateInventoryScreenState
),
const SizedBox(height: 12),
DropdownButtonFormField<String>(
value: _locationController.text.trim().isEmpty
initialValue: _locationController.text.trim().isEmpty
? null
: _locationController.text.trim(),
isExpanded: true,
flutter/lib/features/inventory/presentation/inventory_edit_screen.dart
+2 -2
View File
@@ -175,7 +175,7 @@ class _InventoryEditScreenState extends ConsumerState<InventoryEditScreen> {
const SizedBox(width: 8),
Expanded(
child: DropdownButtonFormField<String>(
value: _unitController.text.trim().isEmpty
initialValue: _unitController.text.trim().isEmpty
? null
: _unitController.text.trim(),
isExpanded: true,
@@ -204,7 +204,7 @@ class _InventoryEditScreenState extends ConsumerState<InventoryEditScreen> {
),
const SizedBox(height: 12),
DropdownButtonFormField<String>(
value: _locationController.text.trim().isEmpty
initialValue: _locationController.text.trim().isEmpty
? null
: _locationController.text.trim(),
isExpanded: true,
flutter/lib/features/inventory/presentation/inventory_screen.dart
+5 -6
View File
@@ -4,9 +4,7 @@ import 'package:go_router/go_router.dart';
import '../../../core/api/api_error_mapper.dart';
import '../../../core/ui/async_state_views.dart';
import '../../auth/data/auth_providers.dart';
import '../data/inventory_providers.dart';
import '../domain/inventory_item.dart';
import 'swipeable_inventory_tile.dart';
class InventoryScreen extends ConsumerWidget {
@@ -53,14 +51,14 @@ class InventoryScreen extends ConsumerWidget {
selected: location == option,
onSelected: (_) => ref
.read(inventoryLocationFilterProvider.notifier)
.state = option,
.setValue(option),
),
)
.toList(),
),
const SizedBox(height: 8),
DropdownButtonFormField<String>(
value: sort,
initialValue: sort,
isExpanded: true,
decoration: const InputDecoration(
labelText: 'Sortering',
@@ -75,8 +73,9 @@ class InventoryScreen extends ConsumerWidget {
)
.toList(),
onChanged: (value) {
ref.read(inventorySortFilterProvider.notifier).state =
value ?? '';
ref
.read(inventorySortFilterProvider.notifier)
.setValue(value ?? '');
},
),
],
flutter/lib/features/meal_plan/data/meal_plan_providers.dart
+12
View File
@@ -16,6 +16,18 @@ class _IntNotifier extends Notifier<int> {
final int _initial;
@override
int build() => _initial;
void increment() {
state = state + 1;
}
void decrement() {
state = state - 1;
}
void reset() {
state = 0;
}
}
final mealPlanWeekOffsetProvider =
flutter/lib/features/meal_plan/data/meal_plan_repository.dart
+3 -3
View File
@@ -19,7 +19,7 @@ class MealPlanRepository {
message: 'Ogiltigt svar från servern.',
);
}
return (data as List)
return data
.map((item) => MealPlanEntry.fromJson(item as Map<String, dynamic>))
.toList();
} on ApiException {
@@ -41,7 +41,7 @@ class MealPlanRepository {
message: 'Ogiltigt svar från servern.',
);
}
return (data as List)
return data
.map((item) => ShoppingItem.fromJson(item as Map<String, dynamic>))
.toList();
} on ApiException {
@@ -63,7 +63,7 @@ class MealPlanRepository {
message: 'Ogiltigt svar från servern.',
);
}
return (data as List)
return data
.map((item) => InventoryCompareItem.fromJson(item as Map<String, dynamic>))
.toList();
} on ApiException {
flutter/lib/features/meal_plan/presentation/meal_plan_screen.dart
+5 -5
View File
@@ -114,19 +114,19 @@ class _MealPlanScreenState extends ConsumerState<MealPlanScreen> {
crossAxisAlignment: WrapCrossAlignment.center,
children: [
OutlinedButton.icon(
onPressed: () => ref.read(mealPlanWeekOffsetProvider.notifier).state--,
onPressed: () => ref.read(mealPlanWeekOffsetProvider.notifier).decrement(),
icon: const Icon(Icons.chevron_left),
label: Text(l10n.mealPlanWeekPrevious),
),
Chip(label: Text(weekLabel)),
OutlinedButton.icon(
onPressed: () => ref.read(mealPlanWeekOffsetProvider.notifier).state++,
onPressed: () => ref.read(mealPlanWeekOffsetProvider.notifier).increment(),
icon: const Icon(Icons.chevron_right),
label: Text(l10n.mealPlanWeekNext),
),
if (ref.watch(mealPlanWeekOffsetProvider) != 0)
TextButton(
onPressed: () => ref.read(mealPlanWeekOffsetProvider.notifier).state = 0,
onPressed: () => ref.read(mealPlanWeekOffsetProvider.notifier).reset(),
child: Text(l10n.mealPlanWeekCurrent),
),
],
@@ -203,7 +203,7 @@ class _DayCard extends StatelessWidget {
),
const SizedBox(height: 12),
DropdownButtonFormField<String>(
value: selectedValue,
initialValue: selectedValue,
isExpanded: true,
decoration: InputDecoration(
labelText: l10n.mealPlanSelectRecipe,
@@ -248,7 +248,7 @@ class _DayCard extends StatelessWidget {
SizedBox(
width: 220,
child: DropdownButtonFormField<int>(
value: currentServings,
initialValue: currentServings,
decoration: InputDecoration(
labelText: l10n.mealPlanServingsLabel,
border: const OutlineInputBorder(),
flutter/lib/features/pantry/presentation/pantry_screen.dart
+2 -2
View File
@@ -51,7 +51,7 @@ class _PantryScreenState extends ConsumerState<PantryScreen> {
),
const SizedBox(height: 12),
DropdownButtonFormField<String>(
value: selectedUnit,
initialValue: selectedUnit,
isExpanded: true,
decoration: const InputDecoration(
labelText: 'Enhet',
@@ -72,7 +72,7 @@ class _PantryScreenState extends ConsumerState<PantryScreen> {
),
const SizedBox(height: 12),
DropdownButtonFormField<String>(
value: selectedLocation,
initialValue: selectedLocation,
isExpanded: true,
decoration: const InputDecoration(
labelText: 'Plats (valfri)',
flutter/lib/features/profile/data/profile_repository.dart
+4 -2
View File
@@ -16,9 +16,10 @@ class ProfileRepository {
ProfileRepository(this._apiClient, this._ref);
Future<UserProfile> getMe() async {
final token = await _ref.read(authStateProvider.future);
final data = await guardedApiCall(
_ref,
() => _apiClient.getJson(UserApiPaths.me),
() => _apiClient.getJson(UserApiPaths.me, token: token),
);
return UserProfile.fromJson(data);
}
@@ -28,6 +29,7 @@ class ProfileRepository {
String? firstName,
String? lastName,
}) async {
final token = await _ref.read(authStateProvider.future);
final body = <String, dynamic>{
if (email != null) 'email': email,
if (firstName != null) 'firstName': firstName,
@@ -35,7 +37,7 @@ class ProfileRepository {
};
final data = await guardedApiCall(
_ref,
() => _apiClient.patchJson(UserApiPaths.me, body: body),
() => _apiClient.patchJson(UserApiPaths.me, body: body, token: token),
);
return UserProfile.fromJson(data);
}
flutter/lib/features/recipes/data/recipe_repository.dart
+1 -1
View File
@@ -17,7 +17,7 @@ class RecipeRepository {
throw const ApiException(
type: ApiErrorType.unknown, message: 'Ogiltigt svar från servern.');
}
return (data as List)
return data
.map((e) => Recipe.fromJson(e as Map<String, dynamic>))
.toList();
} on ApiException {
flutter/lib/features/recipes/presentation/recipe_edit_screen.dart
+2 -2
View File
@@ -399,7 +399,7 @@ class _RecipeEditScreenState extends ConsumerState<RecipeEditScreen> {
],
),
DropdownButtonFormField<int>(
value: ingredient.productId,
initialValue: ingredient.productId,
isExpanded: true,
decoration: const InputDecoration(
labelText: 'Produkt *',
@@ -461,7 +461,7 @@ class _RecipeEditScreenState extends ConsumerState<RecipeEditScreen> {
const SizedBox(width: 12),
Expanded(
child: DropdownButtonFormField<String>(
value: ingredient.unit.trim().isEmpty ? null : ingredient.unit,
initialValue: ingredient.unit.trim().isEmpty ? null : ingredient.unit,
isExpanded: true,
decoration: const InputDecoration(
labelText: 'Enhet *',