Skip to content

Commit

Permalink
chore: structure fix 1
Browse files Browse the repository at this point in the history
  • Loading branch information
SeoHyeonSim committed Jan 28, 2025
1 parent f7398a8 commit ef028e9
Show file tree
Hide file tree
Showing 24 changed files with 148 additions and 706 deletions.
13 changes: 9 additions & 4 deletions android/app/google-service.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{"installed":{"client_id":"1068261222530-cqa1h83puodc9ngn79b04ot2ehq43o2d.apps.googleusercontent.com","project_id":"ontime-441411","auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://oauth2.googleapis.com/token","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs"}}



{
"installed": {
"client_id": "1068261222530-cqa1h83puodc9ngn79b04ot2ehq43o2d.apps.googleusercontent.com",
"project_id": "ontime-441411",
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
"token_uri": "https://oauth2.googleapis.com/token",
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs"
}
}
39 changes: 33 additions & 6 deletions lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,34 @@
// import 'package:flutter/material.dart';
// import 'package:on_time_front/core/di/di_setup.dart';
// import 'package:on_time_front/presentation/shared/router/go_router.dart';
// import 'package:on_time_front/presentation/shared/theme/theme.dart';

// void main() async {
// configureDependencies();
// runApp(MyApp());
// WidgetsFlutterBinding.ensureInitialized();
// }

// class MyApp extends StatelessWidget {
// const MyApp({super.key});

// @override
// Widget build(BuildContext context) {
// return MaterialApp.router(
// routerConfig: goRouterConfig,
// theme: themeData,
// );
// }
// }

import 'package:flutter/material.dart';
import 'package:on_time_front/core/di/di_setup.dart';
import 'package:on_time_front/presentation/shared/router/go_router.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:on_time_front/presentation/preparation/screens/schedule_list_screen.dart';
import 'package:on_time_front/presentation/shared/theme/theme.dart';
import 'package:on_time_front/widgets/login_buttons/login_test_screen.dart';

void main() async {
configureDependencies();
runApp(MyApp());
runApp(const ProviderScope(child: MyApp()));
WidgetsFlutterBinding.ensureInitialized();
}

Expand All @@ -14,9 +37,13 @@ class MyApp extends StatelessWidget {

@override
Widget build(BuildContext context) {
return MaterialApp.router(
routerConfig: goRouterConfig,
return MaterialApp(
theme: themeData,
home: Scaffold(
backgroundColor: Colors.grey,
body: ScheduleListScreen(),
// body: LoginTestScreen(),
),
);
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:on_time_front/widgets/login_buttons/google_login_button.dart';
import 'package:on_time_front/widgets/login_buttons/kakao_login_button.dart';
import 'package:on_time_front/presentation/login/components/google_login_button.dart';
import 'package:on_time_front/presentation/login/components/kakao_login_button.dart';

class LoginTestScreen extends StatelessWidget {
const LoginTestScreen({super.key});
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit ef028e9

Please sign in to comment.