TDvorak/1356
1
0
Fork 0
mirror of https://github.com/Dvorinka/1356.git synced 2026-06-03 19:42:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

main, fix

Browse Source
This commit is contained in:
Tomas Dvorak
2026-01-06 13:38:45 +01:00
parent d712fe1074
commit 9f44fd57f7
11 changed files with 492 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lifetimer/lib/bootstrap/supabase_client.dart
+25
View File
@@ -6,3 +6,28 @@ void initializeSupabaseClient() {
}
SupabaseClient get supabaseClient => Supabase.instance.client;
// Service role client for admin operations (like creating user profiles)
// This should be used server-side or with proper security measures
SupabaseClient? _serviceRoleClient;
SupabaseClient getServiceRoleClient() {
if (_serviceRoleClient != null) return _serviceRoleClient!;
// Note: In a production app, the service role key should be stored securely
// This is typically handled server-side via Edge Functions or similar
// For now, we'll fall back to the regular client if service role is not available
try {
const serviceRoleKey = String.fromEnvironment('SUPABASE_SERVICE_ROLE_KEY');
const url = String.fromEnvironment('SUPABASE_URL');
if (serviceRoleKey.isNotEmpty && url.isNotEmpty) {
_serviceRoleClient = SupabaseClient(url, serviceRoleKey);
return _serviceRoleClient!;
}
} catch (e) {
// Service role key not available, will use regular client
}
return supabaseClient;
}
lifetimer/lib/data/repositories/auth_repository.dart
+63 -14
View File
@@ -147,25 +147,74 @@ class AuthRepository {
Future<User> _createUserProfile(String userId, String username, String email) async {
final now = DateTime.now().toIso8601String();
final response = await _client.from('users').insert({
'id': userId,
'username': username,
'email': email,
'created_at': now,
'updated_at': now,
}).select().single();
try {
// First try with the regular client (might fail due to RLS)
final response = await _client.from('users').insert({
'id': userId,
'username': username,
'email': email,
'created_at': now,
'updated_at': now,
}).select();
return _mapSupabaseDataToUser(response);
if (response.isNotEmpty) {
return _mapSupabaseDataToUser(response.first);
}
} catch (e) {
// If regular client fails due to RLS, try with service role client
try {
final serviceClient = getServiceRoleClient();
final response = await serviceClient.from('users').insert({
'id': userId,
'username': username,
'email': email,
'created_at': now,
'updated_at': now,
}).select();
if (response.isNotEmpty) {
return _mapSupabaseDataToUser(response.first);
}
} catch (e2) {
// If both fail, create a basic user profile from auth metadata
// This allows the app to function even without database profile creation
return User(
id: userId,
username: username,
email: email,
createdAt: DateTime.parse(now),
updatedAt: DateTime.parse(now),
);
}
}
// Fallback if no response but no error
return User(
id: userId,
username: username,
email: email,
createdAt: DateTime.parse(now),
updatedAt: DateTime.parse(now),
);
}
Future<void> _ensureUserProfileExists(String userId, dynamic supabaseUser) async {
final existingProfile = await _client
.from('users')
.select('id')
.eq('id', userId)
.maybeSingle();
try {
final existingProfile = await _client
.from('users')
.select('id')
.eq('id', userId)
.maybeSingle();
if (existingProfile == null) {
if (existingProfile == null) {
final username = supabaseUser.userMetadata?['username'] ??
'user_${userId.substring(0, 8)}';
final email = supabaseUser.email ?? '';
await _createUserProfile(userId, username, email);
}
} catch (e) {
// If RLS policy prevents reading, we'll assume the profile doesn't exist
// and let the _createUserProfile method handle the creation gracefully
final username = supabaseUser.userMetadata?['username'] ??
'user_${userId.substring(0, 8)}';
final email = supabaseUser.email ?? '';
lifetimer/lib/data/repositories/user_repository.dart
+12 -5
View File
@@ -13,9 +13,13 @@ class UserRepository {
.from('users')
.select()
.eq('id', userId)
.single();
.maybeSingle();
return app.User.fromJson(response);
if (response != null) {
return app.User.fromJson(response);
} else {
throw const ServerFailure('User profile not found');
}
} catch (e) {
throw _handleError(e);
}
@@ -48,10 +52,13 @@ class UserRepository {
.from('users')
.update(updates)
.eq('id', userId)
.select()
.single();
.select();
return app.User.fromJson(response);
if (response.isNotEmpty) {
return app.User.fromJson(response.first);
} else {
throw const ServerFailure('Failed to update profile');
}
} catch (e) {
throw _handleError(e);
}
lifetimer/lib/features/auth/presentation/auth_gate.dart
+10 -1
View File
@@ -1,8 +1,10 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../application/auth_controller.dart';
import '../../onboarding/application/onboarding_controller.dart';
import 'auth_showcase_screen.dart';
import '../../onboarding/presentation/onboarding_intro_screen.dart';
import '../../countdown/presentation/home_countdown_screen.dart';
class AuthGate extends ConsumerWidget {
const AuthGate({super.key});
@@ -10,11 +12,18 @@ class AuthGate extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final authState = ref.watch(authControllerProvider);
final onboardingState = ref.watch(onboardingControllerProvider);
if (authState == null) {
return const AuthShowcaseScreen();
}
return const OnboardingIntroScreen();
// If user is authenticated but hasn't completed onboarding
if (!onboardingState) {
return const OnboardingIntroScreen();
}
// User is authenticated and has completed onboarding
return const HomeCountdownScreen();
}
}
lifetimer/lib/features/onboarding/presentation/onboarding_how_it_works_screen.dart
+74 -43
View File
@@ -16,51 +16,82 @@ class OnboardingHowItWorksScreen extends ConsumerWidget {
return AppScaffold(
body: SafeArea(
child: Padding(
padding: const EdgeInsets.all(24.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const SizedBox(height: 24),
Text(
'How It Works',
style: Theme.of(context).textTheme.headlineLarge?.copyWith(
fontWeight: FontWeight.bold,
child: Column(
children: [
// Progress indicator and back button
Padding(
padding: const EdgeInsets.all(24.0),
child: Row(
children: [
IconButton(
onPressed: () {
context.pop();
},
icon: const Icon(Icons.arrow_back),
),
Expanded(
child: LinearProgressIndicator(
value: 2 / 3, // Step 2 of 3
backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest,
valueColor: AlwaysStoppedAnimation<Color>(
Theme.of(context).colorScheme.primary,
),
),
),
const SizedBox(width: 48), // Balance the back button
],
),
),
// Scrollable content
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.symmetric(horizontal: 24.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const SizedBox(height: 8),
Text(
'How It Works',
style: Theme.of(context).textTheme.headlineLarge?.copyWith(
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 20),
const _StepCard(
number: 1,
title: 'Create Your Bucket List',
description: 'Add between 1 and 20 goals you want to achieve. Each goal can have a description, location, and image.',
icon: Icons.edit_note,
),
const SizedBox(height: 12),
const _StepCard(
number: 2,
title: 'Finalize Your List',
description: 'Once you\'re happy with your goals, confirm your bucket list. This action cannot be undone.',
icon: Icons.lock,
),
const SizedBox(height: 12),
const _StepCard(
number: 3,
title: 'Start Your 1356-Day Journey',
description: 'The countdown begins immediately. Track your progress and make every day count.',
icon: Icons.timer,
),
const SizedBox(height: 24),
PrimaryButton(
onPressed: () {
controller.completeStep('how_it_works');
context.push('/onboarding/motivation');
},
text: 'Continue',
),
const SizedBox(height: 20),
],
),
textAlign: TextAlign.center,
),
const SizedBox(height: 32),
const _StepCard(
number: 1,
title: 'Create Your Bucket List',
description: 'Add between 1 and 20 goals you want to achieve. Each goal can have a description, location, and image.',
icon: Icons.edit_note,
),
const SizedBox(height: 16),
const _StepCard(
number: 2,
title: 'Finalize Your List',
description: 'Once you\'re happy with your goals, confirm your bucket list. This action cannot be undone.',
icon: Icons.lock,
),
const SizedBox(height: 16),
const _StepCard(
number: 3,
title: 'Start Your 1356-Day Journey',
description: 'The countdown begins immediately. Track your progress and make every day count.',
icon: Icons.timer,
),
const Spacer(),
PrimaryButton(
onPressed: () {
controller.completeStep('how_it_works');
context.push('/onboarding/motivation');
},
text: 'Continue',
),
const SizedBox(height: 16),
],
),
),
],
),
),
);
lifetimer/lib/features/onboarding/presentation/onboarding_intro_screen.dart
+98 -66
View File
@@ -16,73 +16,105 @@ class OnboardingIntroScreen extends ConsumerWidget {
return AppScaffold(
body: SafeArea(
child: Padding(
padding: const EdgeInsets.all(24.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const SizedBox(height: 48),
const Icon(
Icons.timer_outlined,
size: 100,
color: null,
child: Column(
children: [
// Progress indicator and back button
Padding(
padding: const EdgeInsets.all(24.0),
child: Row(
children: [
IconButton(
onPressed: () {
// Can't go back from intro, go to auth choice
context.push('/auth-choice');
},
icon: const Icon(Icons.arrow_back),
),
Expanded(
child: LinearProgressIndicator(
value: 1 / 3, // Step 1 of 3
backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest,
valueColor: AlwaysStoppedAnimation<Color>(
Theme.of(context).colorScheme.primary,
),
),
),
const SizedBox(width: 48), // Balance the back button
],
),
const SizedBox(height: 32),
Text(
'Welcome to LifeTimer',
style: Theme.of(context).textTheme.headlineLarge?.copyWith(
fontWeight: FontWeight.bold,
),
// Scrollable content
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.symmetric(horizontal: 24.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const SizedBox(height: 16),
const Icon(
Icons.timer_outlined,
size: 64,
color: null,
),
const SizedBox(height: 20),
Text(
'Welcome to LifeTimer',
style: Theme.of(context).textTheme.headlineLarge?.copyWith(
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 10),
Text(
'Your 1356-day journey starts here.\nCreate your bucket list and begin your countdown.',
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
height: 1.5,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 24),
const _FeatureCard(
icon: Icons.flag,
title: 'Set Your Goals',
description: 'Create a bucket list of 1-20 meaningful goals',
),
const SizedBox(height: 10),
const _FeatureCard(
icon: Icons.lock_clock,
title: 'Fixed Timeline',
description: '1356 days to achieve everything - no extensions',
),
const SizedBox(height: 10),
const _FeatureCard(
icon: Icons.trending_up,
title: 'Track Progress',
description: 'Watch yourself grow day by day',
),
const SizedBox(height: 32),
PrimaryButton(
onPressed: () {
controller.completeStep('intro');
context.push('/onboarding/how-it-works');
},
text: 'Get Started',
),
const SizedBox(height: 10),
TextButton(
onPressed: () async {
await controller.skipOnboarding();
if (context.mounted) {
context.push('/home');
}
},
child: const Text('Skip onboarding'),
),
const SizedBox(height: 20),
],
),
textAlign: TextAlign.center,
),
const SizedBox(height: 16),
Text(
'Your 1356-day journey starts here.\nCreate your bucket list and begin your countdown.',
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
height: 1.5,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 48),
const _FeatureCard(
icon: Icons.flag,
title: 'Set Your Goals',
description: 'Create a bucket list of 1-20 meaningful goals',
),
const SizedBox(height: 16),
const _FeatureCard(
icon: Icons.lock_clock,
title: 'Fixed Timeline',
description: '1356 days to achieve everything - no extensions',
),
const SizedBox(height: 16),
const _FeatureCard(
icon: Icons.trending_up,
title: 'Track Progress',
description: 'Watch yourself grow day by day',
),
const Spacer(),
PrimaryButton(
onPressed: () {
controller.completeStep('intro');
context.push('/onboarding/how-it-works');
},
text: 'Get Started',
),
const SizedBox(height: 16),
TextButton(
onPressed: () async {
await controller.skipOnboarding();
if (context.mounted) {
context.push('/home');
}
},
child: const Text('Skip onboarding'),
),
const SizedBox(height: 16),
],
),
),
],
),
),
);
@@ -105,10 +137,10 @@ class _FeatureCard extends StatelessWidget {
return Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.primaryContainer.withOpacity(0.3),
color: Theme.of(context).colorScheme.surface,
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: Theme.of(context).colorScheme.primary.withOpacity(0.2),
color: Theme.of(context).colorScheme.outline.withOpacity(0.2),
),
),
child: Row(
lifetimer/lib/features/onboarding/presentation/onboarding_motivation_screen.dart
+93 -62
View File
@@ -16,69 +16,100 @@ class OnboardingMotivationScreen extends ConsumerWidget {
return AppScaffold(
body: SafeArea(
child: Padding(
padding: const EdgeInsets.all(24.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const SizedBox(height: 24),
const Icon(
Icons.psychology_outlined,
size: 80,
color: Colors.amber,
child: Column(
children: [
// Progress indicator and back button
Padding(
padding: const EdgeInsets.all(24.0),
child: Row(
children: [
IconButton(
onPressed: () {
context.pop();
},
icon: const Icon(Icons.arrow_back),
),
Expanded(
child: LinearProgressIndicator(
value: 3 / 3, // Step 3 of 3 (complete)
backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest,
valueColor: AlwaysStoppedAnimation<Color>(
Theme.of(context).colorScheme.primary,
),
),
),
const SizedBox(width: 48), // Balance the back button
],
),
const SizedBox(height: 24),
Text(
'Your Time is Now',
style: Theme.of(context).textTheme.headlineLarge?.copyWith(
fontWeight: FontWeight.bold,
),
// Scrollable content
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.symmetric(horizontal: 24.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const SizedBox(height: 8),
const Icon(
Icons.psychology_outlined,
size: 64,
color: Colors.amber,
),
const SizedBox(height: 16),
Text(
'Your Time is Now',
style: Theme.of(context).textTheme.headlineLarge?.copyWith(
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 12),
Text(
'1356 days is approximately 3 years and 8 months.\n\n'
'That\'s enough time to transform your life, learn new skills, '
'build meaningful relationships, and achieve your biggest dreams.\n\n'
'Every day counts. Every step matters. Your journey begins now.',
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
height: 1.5,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 20),
const _MotivationCard(
icon: Icons.trending_up,
title: 'Track Progress',
description: 'Watch yourself grow as you complete goals and milestones.',
),
const SizedBox(height: 10),
const _MotivationCard(
icon: Icons.people,
title: 'Join Community',
description: 'Connect with others on similar journeys (optional).',
),
const SizedBox(height: 10),
const _MotivationCard(
icon: Icons.celebration,
title: 'Celebrate Wins',
description: 'Every achievement is worth celebrating.',
),
const SizedBox(height: 24),
PrimaryButton(
onPressed: () async {
controller.completeStep('motivation');
await controller.completeOnboarding();
if (context.mounted) {
context.push('/profile-setup');
}
},
text: 'Get Started',
),
const SizedBox(height: 20),
],
),
textAlign: TextAlign.center,
),
const SizedBox(height: 16),
Text(
'1356 days is approximately 3 years and 8 months.\n\n'
'That\'s enough time to transform your life, learn new skills, '
'build meaningful relationships, and achieve your biggest dreams.\n\n'
'Every day counts. Every step matters. Your journey begins now.',
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
height: 1.5,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 32),
const _MotivationCard(
icon: Icons.trending_up,
title: 'Track Progress',
description: 'Watch yourself grow as you complete goals and milestones.',
),
const SizedBox(height: 16),
const _MotivationCard(
icon: Icons.people,
title: 'Join Community',
description: 'Connect with others on similar journeys (optional).',
),
const SizedBox(height: 16),
const _MotivationCard(
icon: Icons.celebration,
title: 'Celebrate Wins',
description: 'Every achievement is worth celebrating.',
),
const Spacer(),
PrimaryButton(
onPressed: () async {
controller.completeStep('motivation');
await controller.completeOnboarding();
if (context.mounted) {
context.push('/profile/create');
}
},
text: 'Get Started',
),
const SizedBox(height: 16),
],
),
),
],
),
),
);
@@ -101,10 +132,10 @@ class _MotivationCard extends StatelessWidget {
return Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.primaryContainer.withOpacity(0.3),
color: Theme.of(context).colorScheme.surface,
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: Theme.of(context).colorScheme.primary.withOpacity(0.2),
color: Theme.of(context).colorScheme.outline.withOpacity(0.2),
),
),
child: Row(
lifetimer/lib/features/profile/presentation/profile_setup_screen.dart
+1 -1
View File
@@ -172,7 +172,7 @@ class _ProfileSetupScreenState extends ConsumerState<ProfileSetupScreen> {
);
if (mounted) {
context.go('/onboarding');
context.go('/home');
}
} catch (e) {
if (mounted) {
lifetimer/lib/main.dart
+4
View File
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:hive_flutter/hive_flutter.dart';
import 'bootstrap/bootstrap.dart';
import 'core/theme/app_theme.dart';
import 'core/routing/app_router.dart';
@@ -9,6 +10,9 @@ import 'core/state/providers.dart';
void main() async {
WidgetsFlutterBinding.ensureInitialized();
// Initialize Hive first before anything else
await Hive.initFlutter();
SystemChrome.setSystemUIOverlayStyle(
const SystemUiOverlayStyle(
statusBarColor: Colors.transparent,