Skip to content
Open
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
5 changes: 5 additions & 0 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,13 @@ class OpSoApp extends StatelessWidget {
builder: (theme, darkTheme) => MaterialApp(
initialRoute: '/splash_screen',
routes: {
<<<<<<< HEAD
"/program_page": (context) => const HomePage(),
"/girl_script_summer_of_code": (context) => const GSSOCScreen(),
=======
"/progarm_page": (context) => const HomePage(),
"/girl_script_summer_of_code": (context)=> const GSSOCScreen(),
>>>>>>> upstream/main
"/social_winter_of_code": (context) => const SWOCScreen(),
"/season_of_kde": (context) => const SeasonOfKDE(),
"/google_summer_of_code": (context) =>
Expand Down
2 changes: 1 addition & 1 deletion lib/programs screen/open_summer_of_code.dart
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ class _OpenSummerOfCodeState extends State<OpenSummerOfCode> {
),
);
} else {
return const Center(child: Text("Some error occured"));
return const Center(child: Text("Some error occurred"));
}
}),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/splash_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class _SplashScreenState extends State<SplashScreen> {
void initState() {
super.initState();
Timer(Duration(seconds: 3), () {
Navigator.of(context).pushReplacementNamed('/progarm_page');
Navigator.of(context).pushReplacementNamed('/program_page');
});
}

Expand Down