diff --git a/.gitignore b/.gitignore index 25b33b5..42da1e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ # Miscellaneous +devtools_options.yaml +ios/Podfile +macos/Podfile +pubspec.lock *.class *.log *.pyc diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig index 592ceee..ec97fc6 100644 --- a/ios/Flutter/Debug.xcconfig +++ b/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig index 592ceee..c4855bf 100644 --- a/ios/Flutter/Release.xcconfig +++ b/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/lib/constants/.gitignore b/lib/core/constants/.gitignore similarity index 100% rename from lib/constants/.gitignore rename to lib/core/constants/.gitignore diff --git a/lib/constants/color.dart b/lib/core/constants/color.dart similarity index 100% rename from lib/constants/color.dart rename to lib/core/constants/color.dart diff --git a/lib/constants/svg.dart b/lib/core/constants/svg.dart similarity index 100% rename from lib/constants/svg.dart rename to lib/core/constants/svg.dart diff --git a/lib/core/services/auth/auth_service.dart b/lib/core/services/auth/auth_service.dart new file mode 100644 index 0000000..7fe8108 --- /dev/null +++ b/lib/core/services/auth/auth_service.dart @@ -0,0 +1,26 @@ +import 'package:firebase_auth/firebase_auth.dart'; +import 'package:google_sign_in/google_sign_in.dart'; + +class AuthService { + + signInWithGoogle() async { + // begin interactive sign in progress + try{ + final GoogleSignInAccount? gUser = await GoogleSignIn().signIn(); + + // obtain auth details from request + final GoogleSignInAuthentication gAuth = await gUser!.authentication; + + // create a new credential for user + final credential = GoogleAuthProvider.credential( + accessToken: gAuth.accessToken, idToken: gAuth.idToken); + // finally lets sign in + print('User Registered'); + return await FirebaseAuth.instance.signInWithCredential(credential); + }catch(e){ + print(e.toString()); + print('User not Registered'); + } + } + +} \ No newline at end of file diff --git a/lib/screens/admin_page_screens/events.dart b/lib/screens/admin_page_screens/events.dart index eb9b232..816f1a8 100644 --- a/lib/screens/admin_page_screens/events.dart +++ b/lib/screens/admin_page_screens/events.dart @@ -1,7 +1,7 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/event_widgets/event_class.dart'; import 'package:fosscu_app/widgets/event_widgets/event_form.dart'; import 'package:fosscu_app/widgets/event_widgets/upcoming_event_list_tile.dart'; diff --git a/lib/screens/auth_page_screens/login_page.dart b/lib/screens/auth_page_screens/login_page.dart index d92f130..050cb58 100644 --- a/lib/screens/auth_page_screens/login_page.dart +++ b/lib/screens/auth_page_screens/login_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:fosscu_app/constants/color.dart'; -import 'package:fosscu_app/constants/svg.dart'; -import 'package:fosscu_app/services/auth/auth_service.dart'; +import 'package:fosscu_app/core/constants/color.dart'; +import 'package:fosscu_app/core/constants/svg.dart'; +import 'package:fosscu_app/core/services/auth/auth_service.dart'; import 'package:google_fonts/google_fonts.dart'; class LogInPage extends StatefulWidget { diff --git a/lib/screens/auth_page_screens/register_page.dart b/lib/screens/auth_page_screens/register_page.dart index 63c8566..52637f5 100644 --- a/lib/screens/auth_page_screens/register_page.dart +++ b/lib/screens/auth_page_screens/register_page.dart @@ -2,9 +2,9 @@ import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:fosscu_app/constants/color.dart'; -import 'package:fosscu_app/constants/svg.dart'; -import 'package:fosscu_app/services/auth/auth_service.dart'; +import 'package:fosscu_app/core/constants/color.dart'; +import 'package:fosscu_app/core/constants/svg.dart'; +import 'package:fosscu_app/core/services/auth/auth_service.dart'; import 'package:fosscu_app/widgets/auth_widgets/auth_button.dart'; import 'package:fosscu_app/widgets/auth_widgets/auth_field.dart'; diff --git a/lib/screens/contributor.dart b/lib/screens/contributor.dart index f72e154..b995c40 100644 --- a/lib/screens/contributor.dart +++ b/lib/screens/contributor.dart @@ -1,9 +1,9 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/apikey.dart'; -import 'package:fosscu_app/constants/color.dart'; -import 'package:fosscu_app/constants/svg.dart'; +import 'package:fosscu_app/core/constants/apikey.dart'; +import 'package:fosscu_app/core/constants/color.dart'; +import 'package:fosscu_app/core/constants/svg.dart'; import 'package:fosscu_app/widgets/contributor_page_widgets/contributor_page_tile.dart'; import 'package:fosscu_app/widgets/contributor_page_widgets/contributors_profile_container.dart'; import 'package:fosscu_app/widgets/contributor_page_widgets/listtile.dart'; diff --git a/lib/screens/drawer_page_screens/admin_page.dart b/lib/screens/drawer_page_screens/admin_page.dart index 8c93818..45c10bd 100644 --- a/lib/screens/drawer_page_screens/admin_page.dart +++ b/lib/screens/drawer_page_screens/admin_page.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/screens/admin_page_screens/events.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/screens/drawer_page_screens/birthdays.dart b/lib/screens/drawer_page_screens/birthdays.dart index aaa5c99..26790af 100644 --- a/lib/screens/drawer_page_screens/birthdays.dart +++ b/lib/screens/drawer_page_screens/birthdays.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/apikey.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/apikey.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart' as http; diff --git a/lib/screens/drawer_page_screens/community.dart b/lib/screens/drawer_page_screens/community.dart index d336cb5..7fe7122 100644 --- a/lib/screens/drawer_page_screens/community.dart +++ b/lib/screens/drawer_page_screens/community.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/drawer_widgets/drawer_page_listtile.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/screens/homepage.dart b/lib/screens/homepage.dart index 5332444..46ccf9e 100644 --- a/lib/screens/homepage.dart +++ b/lib/screens/homepage.dart @@ -1,8 +1,8 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/apikey.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/apikey.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/event_widgets/event_class.dart'; import 'package:fosscu_app/widgets/contributor_page_widgets/listtile.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/screens/learn.dart b/lib/screens/learn.dart index 70226ab..3e867f8 100644 --- a/lib/screens/learn.dart +++ b/lib/screens/learn.dart @@ -1,6 +1,6 @@ import 'package:animated_text_kit/animated_text_kit.dart'; import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/screens/learn_page_screens/advanced_concepts.dart'; import 'package:fosscu_app/screens/learn_page_screens/practice.dart'; import 'package:fosscu_app/screens/learn_page_screens/start_contributing.dart'; diff --git a/lib/screens/learn_page_screens/advanced_concepts_pages/page1.dart b/lib/screens/learn_page_screens/advanced_concepts_pages/page1.dart index b5026be..4f23604 100644 --- a/lib/screens/learn_page_screens/advanced_concepts_pages/page1.dart +++ b/lib/screens/learn_page_screens/advanced_concepts_pages/page1.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/code_snippet.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; diff --git a/lib/screens/learn_page_screens/advanced_concepts_pages/page2.dart b/lib/screens/learn_page_screens/advanced_concepts_pages/page2.dart index 98f3516..2d2ac5f 100644 --- a/lib/screens/learn_page_screens/advanced_concepts_pages/page2.dart +++ b/lib/screens/learn_page_screens/advanced_concepts_pages/page2.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; diff --git a/lib/screens/learn_page_screens/advanced_concepts_pages/page3.dart b/lib/screens/learn_page_screens/advanced_concepts_pages/page3.dart index 6fa690e..80f8a69 100644 --- a/lib/screens/learn_page_screens/advanced_concepts_pages/page3.dart +++ b/lib/screens/learn_page_screens/advanced_concepts_pages/page3.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/code_snippet.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; diff --git a/lib/screens/learn_page_screens/advanced_concepts_pages/page4.dart b/lib/screens/learn_page_screens/advanced_concepts_pages/page4.dart index 9ca8c12..e995219 100644 --- a/lib/screens/learn_page_screens/advanced_concepts_pages/page4.dart +++ b/lib/screens/learn_page_screens/advanced_concepts_pages/page4.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/code_snippet.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/code_text.dart'; diff --git a/lib/screens/learn_page_screens/practice.dart b/lib/screens/learn_page_screens/practice.dart index 7d43751..17facae 100644 --- a/lib/screens/learn_page_screens/practice.dart +++ b/lib/screens/learn_page_screens/practice.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/sub_heading.dart'; diff --git a/lib/screens/learn_page_screens/start_contributing_pages/page1.dart b/lib/screens/learn_page_screens/start_contributing_pages/page1.dart index 547a35a..b1ae286 100644 --- a/lib/screens/learn_page_screens/start_contributing_pages/page1.dart +++ b/lib/screens/learn_page_screens/start_contributing_pages/page1.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/sub_heading.dart'; import 'package:url_launcher/url_launcher_string.dart'; diff --git a/lib/screens/learn_page_screens/start_contributing_pages/page2.dart b/lib/screens/learn_page_screens/start_contributing_pages/page2.dart index c42b7f8..a8804af 100644 --- a/lib/screens/learn_page_screens/start_contributing_pages/page2.dart +++ b/lib/screens/learn_page_screens/start_contributing_pages/page2.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/code_snippet.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/sub_heading.dart'; diff --git a/lib/screens/learn_page_screens/start_contributing_pages/page3.dart b/lib/screens/learn_page_screens/start_contributing_pages/page3.dart index 4a29902..420f6d1 100644 --- a/lib/screens/learn_page_screens/start_contributing_pages/page3.dart +++ b/lib/screens/learn_page_screens/start_contributing_pages/page3.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/code_snippet.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/sub_heading.dart'; diff --git a/lib/screens/learn_page_screens/start_with_fundamentals_pages/page1.dart b/lib/screens/learn_page_screens/start_with_fundamentals_pages/page1.dart index 7ad10e3..1b36c84 100644 --- a/lib/screens/learn_page_screens/start_with_fundamentals_pages/page1.dart +++ b/lib/screens/learn_page_screens/start_with_fundamentals_pages/page1.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; diff --git a/lib/screens/learn_page_screens/start_with_fundamentals_pages/page2.dart b/lib/screens/learn_page_screens/start_with_fundamentals_pages/page2.dart index 38d11e2..7c190b6 100644 --- a/lib/screens/learn_page_screens/start_with_fundamentals_pages/page2.dart +++ b/lib/screens/learn_page_screens/start_with_fundamentals_pages/page2.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; diff --git a/lib/screens/learn_page_screens/start_with_fundamentals_pages/page3.dart b/lib/screens/learn_page_screens/start_with_fundamentals_pages/page3.dart index e49d814..06abc97 100644 --- a/lib/screens/learn_page_screens/start_with_fundamentals_pages/page3.dart +++ b/lib/screens/learn_page_screens/start_with_fundamentals_pages/page3.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; diff --git a/lib/screens/learn_page_screens/understanding_branches_pages/page1.dart b/lib/screens/learn_page_screens/understanding_branches_pages/page1.dart index 64558cd..bdb6cec 100644 --- a/lib/screens/learn_page_screens/understanding_branches_pages/page1.dart +++ b/lib/screens/learn_page_screens/understanding_branches_pages/page1.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/sub_heading.dart'; diff --git a/lib/screens/learn_page_screens/understanding_branches_pages/page2.dart b/lib/screens/learn_page_screens/understanding_branches_pages/page2.dart index 120c39f..fa48e91 100644 --- a/lib/screens/learn_page_screens/understanding_branches_pages/page2.dart +++ b/lib/screens/learn_page_screens/understanding_branches_pages/page2.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/code_snippet.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/sub_heading.dart'; diff --git a/lib/screens/learn_page_screens/understanding_branches_pages/page3.dart b/lib/screens/learn_page_screens/understanding_branches_pages/page3.dart index 9cf4adf..080edc5 100644 --- a/lib/screens/learn_page_screens/understanding_branches_pages/page3.dart +++ b/lib/screens/learn_page_screens/understanding_branches_pages/page3.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/code_snippet.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/sub_heading.dart'; diff --git a/lib/screens/learn_page_screens/what_is_github_pages/page1.dart b/lib/screens/learn_page_screens/what_is_github_pages/page1.dart index 11ef2b5..737fdb9 100644 --- a/lib/screens/learn_page_screens/what_is_github_pages/page1.dart +++ b/lib/screens/learn_page_screens/what_is_github_pages/page1.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; diff --git a/lib/screens/learn_page_screens/what_is_github_pages/page2.dart b/lib/screens/learn_page_screens/what_is_github_pages/page2.dart index c58a1f4..2ad8e67 100644 --- a/lib/screens/learn_page_screens/what_is_github_pages/page2.dart +++ b/lib/screens/learn_page_screens/what_is_github_pages/page2.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/sub_heading.dart'; diff --git a/lib/screens/learn_page_screens/what_is_github_pages/page3.dart b/lib/screens/learn_page_screens/what_is_github_pages/page3.dart index 9353e9d..5a3757f 100644 --- a/lib/screens/learn_page_screens/what_is_github_pages/page3.dart +++ b/lib/screens/learn_page_screens/what_is_github_pages/page3.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/code_snippet.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/sub_heading.dart'; diff --git a/lib/screens/learn_page_screens/what_is_github_pages/page4.dart b/lib/screens/learn_page_screens/what_is_github_pages/page4.dart index 072b953..24d8ec3 100644 --- a/lib/screens/learn_page_screens/what_is_github_pages/page4.dart +++ b/lib/screens/learn_page_screens/what_is_github_pages/page4.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/code_snippet.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/code_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; diff --git a/lib/screens/learn_page_screens/what_is_github_pages/page5.dart b/lib/screens/learn_page_screens/what_is_github_pages/page5.dart index 2df3dd0..30d009d 100644 --- a/lib/screens/learn_page_screens/what_is_github_pages/page5.dart +++ b/lib/screens/learn_page_screens/what_is_github_pages/page5.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/code_snippet.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; diff --git a/lib/screens/learn_page_screens/why_git_pages/page1.dart b/lib/screens/learn_page_screens/why_git_pages/page1.dart index 0d34432..c6354a7 100644 --- a/lib/screens/learn_page_screens/why_git_pages/page1.dart +++ b/lib/screens/learn_page_screens/why_git_pages/page1.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; diff --git a/lib/screens/learn_page_screens/why_git_pages/page2.dart b/lib/screens/learn_page_screens/why_git_pages/page2.dart index b301a79..3c4c353 100644 --- a/lib/screens/learn_page_screens/why_git_pages/page2.dart +++ b/lib/screens/learn_page_screens/why_git_pages/page2.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; diff --git a/lib/screens/learn_page_screens/why_git_pages/page3.dart b/lib/screens/learn_page_screens/why_git_pages/page3.dart index 1b072dc..d546823 100644 --- a/lib/screens/learn_page_screens/why_git_pages/page3.dart +++ b/lib/screens/learn_page_screens/why_git_pages/page3.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/code_snippet.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; diff --git a/lib/screens/learn_page_screens/why_git_pages/page4.dart b/lib/screens/learn_page_screens/why_git_pages/page4.dart index c1ca9eb..5d2177a 100644 --- a/lib/screens/learn_page_screens/why_git_pages/page4.dart +++ b/lib/screens/learn_page_screens/why_git_pages/page4.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/body_text.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/code_snippet.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; diff --git a/lib/screens/learn_page_screens/why_git_pages/page5.dart b/lib/screens/learn_page_screens/why_git_pages/page5.dart index 49c7dfc..c780db1 100644 --- a/lib/screens/learn_page_screens/why_git_pages/page5.dart +++ b/lib/screens/learn_page_screens/why_git_pages/page5.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/heading.dart'; import 'package:fosscu_app/widgets/learn_subpage_widgets/sub_heading.dart'; diff --git a/lib/screens/profilepage.dart b/lib/screens/profilepage.dart index 6377b7a..1fff613 100644 --- a/lib/screens/profilepage.dart +++ b/lib/screens/profilepage.dart @@ -4,8 +4,8 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:fosscu_app/constants/apikey.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/apikey.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/profile_page_widgets/dropdown.dart'; import 'package:fosscu_app/widgets/profile_page_widgets/profile_text.dart'; import 'package:fosscu_app/widgets/profile_page_widgets/profile_text_field.dart'; diff --git a/lib/services/auth/auth_service.dart b/lib/services/auth/auth_service.dart deleted file mode 100644 index 1762928..0000000 --- a/lib/services/auth/auth_service.dart +++ /dev/null @@ -1,22 +0,0 @@ -import 'package:firebase_auth/firebase_auth.dart'; -import 'package:google_sign_in/google_sign_in.dart'; - -class AuthService { - - signInWithGoogle() async { - // begin interactive sign in progress - final GoogleSignInAccount? gUser = await GoogleSignIn().signIn(); - - // obtain auth details from request - final GoogleSignInAuthentication gAuth = await gUser!.authentication; - - // create a new credential for user - final credential = GoogleAuthProvider.credential( - accessToken: gAuth.accessToken, - idToken: gAuth.idToken - ); - // finally lets sign in - return await FirebaseAuth.instance.signInWithCredential(credential); - } - -} \ No newline at end of file diff --git a/lib/widgets/auth_widgets/auth_button.dart b/lib/widgets/auth_widgets/auth_button.dart index 5e7ad49..83dfbef 100644 --- a/lib/widgets/auth_widgets/auth_button.dart +++ b/lib/widgets/auth_widgets/auth_button.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; class AuthButton extends StatelessWidget { diff --git a/lib/widgets/auth_widgets/auth_field.dart b/lib/widgets/auth_widgets/auth_field.dart index aa35a86..207e5e3 100644 --- a/lib/widgets/auth_widgets/auth_field.dart +++ b/lib/widgets/auth_widgets/auth_field.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; class AuthField extends StatelessWidget { final controller; diff --git a/lib/widgets/contributor_page_widgets/contributor_page_tile.dart b/lib/widgets/contributor_page_widgets/contributor_page_tile.dart index 74daeff..ed2cddc 100644 --- a/lib/widgets/contributor_page_widgets/contributor_page_tile.dart +++ b/lib/widgets/contributor_page_widgets/contributor_page_tile.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:google_fonts/google_fonts.dart'; class ContributionTile extends StatefulWidget { diff --git a/lib/widgets/contributor_page_widgets/contributors_profile_container.dart b/lib/widgets/contributor_page_widgets/contributors_profile_container.dart index d4698ee..30219c8 100644 --- a/lib/widgets/contributor_page_widgets/contributors_profile_container.dart +++ b/lib/widgets/contributor_page_widgets/contributors_profile_container.dart @@ -2,9 +2,9 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:fosscu_app/constants/apikey.dart'; -import 'package:fosscu_app/constants/color.dart'; -import 'package:fosscu_app/constants/svg.dart'; +import 'package:fosscu_app/core/constants/apikey.dart'; +import 'package:fosscu_app/core/constants/color.dart'; +import 'package:fosscu_app/core/constants/svg.dart'; import 'package:fosscu_app/widgets/contributor_page_widgets/listtile.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart' as http; diff --git a/lib/widgets/contributor_page_widgets/listtile.dart b/lib/widgets/contributor_page_widgets/listtile.dart index da972ba..a4fabea 100644 --- a/lib/widgets/contributor_page_widgets/listtile.dart +++ b/lib/widgets/contributor_page_widgets/listtile.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:url_launcher/url_launcher_string.dart'; diff --git a/lib/widgets/contributor_page_widgets/merged_pr_container.dart b/lib/widgets/contributor_page_widgets/merged_pr_container.dart index 11a43de..2169a64 100644 --- a/lib/widgets/contributor_page_widgets/merged_pr_container.dart +++ b/lib/widgets/contributor_page_widgets/merged_pr_container.dart @@ -2,9 +2,9 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:fosscu_app/constants/apikey.dart'; -import 'package:fosscu_app/constants/color.dart'; -import 'package:fosscu_app/constants/svg.dart'; +import 'package:fosscu_app/core/constants/apikey.dart'; +import 'package:fosscu_app/core/constants/color.dart'; +import 'package:fosscu_app/core/constants/svg.dart'; import 'package:fosscu_app/widgets/contributor_page_widgets/listtile.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:shimmer_animation/shimmer_animation.dart'; diff --git a/lib/widgets/contributor_page_widgets/raised_pr_container.dart b/lib/widgets/contributor_page_widgets/raised_pr_container.dart index 6e6b975..ebca3c9 100644 --- a/lib/widgets/contributor_page_widgets/raised_pr_container.dart +++ b/lib/widgets/contributor_page_widgets/raised_pr_container.dart @@ -2,9 +2,9 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:fosscu_app/constants/apikey.dart'; -import 'package:fosscu_app/constants/color.dart'; -import 'package:fosscu_app/constants/svg.dart'; +import 'package:fosscu_app/core/constants/apikey.dart'; +import 'package:fosscu_app/core/constants/color.dart'; +import 'package:fosscu_app/core/constants/svg.dart'; import 'package:fosscu_app/widgets/contributor_page_widgets/listtile.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart' as http; diff --git a/lib/widgets/contributor_page_widgets/top5_contributors_container.dart b/lib/widgets/contributor_page_widgets/top5_contributors_container.dart index 4e3cb34..0c301b6 100644 --- a/lib/widgets/contributor_page_widgets/top5_contributors_container.dart +++ b/lib/widgets/contributor_page_widgets/top5_contributors_container.dart @@ -2,9 +2,9 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:fosscu_app/constants/apikey.dart'; -import 'package:fosscu_app/constants/color.dart'; -import 'package:fosscu_app/constants/svg.dart'; +import 'package:fosscu_app/core/constants/apikey.dart'; +import 'package:fosscu_app/core/constants/color.dart'; +import 'package:fosscu_app/core/constants/svg.dart'; import 'package:fosscu_app/widgets/contributor_page_widgets/listtile.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart' as http; diff --git a/lib/widgets/drawer_widgets/drawer_listtile.dart b/lib/widgets/drawer_widgets/drawer_listtile.dart index f75fb15..c2a22d6 100644 --- a/lib/widgets/drawer_widgets/drawer_listtile.dart +++ b/lib/widgets/drawer_widgets/drawer_listtile.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:google_fonts/google_fonts.dart'; class DrawerListTile extends StatelessWidget { diff --git a/lib/widgets/drawer_widgets/drawer_page_listtile.dart b/lib/widgets/drawer_widgets/drawer_page_listtile.dart index 15a50b3..3c9bef8 100644 --- a/lib/widgets/drawer_widgets/drawer_page_listtile.dart +++ b/lib/widgets/drawer_widgets/drawer_page_listtile.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:url_launcher/url_launcher_string.dart'; diff --git a/lib/widgets/event_widgets/event_form.dart b/lib/widgets/event_widgets/event_form.dart index 23862e2..5d48b9c 100644 --- a/lib/widgets/event_widgets/event_form.dart +++ b/lib/widgets/event_widgets/event_form.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; class EventForm extends StatelessWidget { final String hintText; diff --git a/lib/widgets/event_widgets/upcoming_event_list_tile.dart b/lib/widgets/event_widgets/upcoming_event_list_tile.dart index 6268f67..e4019db 100644 --- a/lib/widgets/event_widgets/upcoming_event_list_tile.dart +++ b/lib/widgets/event_widgets/upcoming_event_list_tile.dart @@ -1,7 +1,7 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:fosscu_app/widgets/event_widgets/event_form.dart'; import 'package:top_snackbar_flutter/custom_snack_bar.dart'; import 'package:top_snackbar_flutter/top_snack_bar.dart'; diff --git a/lib/widgets/learn_subpage_widgets/body_text.dart b/lib/widgets/learn_subpage_widgets/body_text.dart index a3ab195..c62731b 100644 --- a/lib/widgets/learn_subpage_widgets/body_text.dart +++ b/lib/widgets/learn_subpage_widgets/body_text.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:google_fonts/google_fonts.dart'; class LearnPageBodyText extends StatelessWidget { diff --git a/lib/widgets/learn_subpage_widgets/code_snippet.dart b/lib/widgets/learn_subpage_widgets/code_snippet.dart index bca595a..6e4ab79 100644 --- a/lib/widgets/learn_subpage_widgets/code_snippet.dart +++ b/lib/widgets/learn_subpage_widgets/code_snippet.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:google_fonts/google_fonts.dart'; class CodeSnippet extends StatelessWidget { diff --git a/lib/widgets/learn_subpage_widgets/code_text.dart b/lib/widgets/learn_subpage_widgets/code_text.dart index 5049278..c31ef89 100644 --- a/lib/widgets/learn_subpage_widgets/code_text.dart +++ b/lib/widgets/learn_subpage_widgets/code_text.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:google_fonts/google_fonts.dart'; class CodeText extends StatelessWidget { diff --git a/lib/widgets/learn_subpage_widgets/heading.dart b/lib/widgets/learn_subpage_widgets/heading.dart index fe06848..6ad0c7b 100644 --- a/lib/widgets/learn_subpage_widgets/heading.dart +++ b/lib/widgets/learn_subpage_widgets/heading.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:google_fonts/google_fonts.dart'; class LearnPageHeading extends StatelessWidget { diff --git a/lib/widgets/learn_subpage_widgets/learn_page_card.dart b/lib/widgets/learn_subpage_widgets/learn_page_card.dart index 8fac074..b2d3b24 100644 --- a/lib/widgets/learn_subpage_widgets/learn_page_card.dart +++ b/lib/widgets/learn_subpage_widgets/learn_page_card.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:google_fonts/google_fonts.dart'; class LearnPageCard extends StatelessWidget { diff --git a/lib/widgets/learn_subpage_widgets/sub_heading.dart b/lib/widgets/learn_subpage_widgets/sub_heading.dart index ce959c6..44df671 100644 --- a/lib/widgets/learn_subpage_widgets/sub_heading.dart +++ b/lib/widgets/learn_subpage_widgets/sub_heading.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; import 'package:google_fonts/google_fonts.dart'; class LearnPageSubHeading extends StatelessWidget { diff --git a/lib/widgets/member_widgets.dart/achievement_container.dart b/lib/widgets/member_widgets.dart/achievement_container.dart index 773f109..637d0f0 100644 --- a/lib/widgets/member_widgets.dart/achievement_container.dart +++ b/lib/widgets/member_widgets.dart/achievement_container.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; class AchievementContainer extends StatelessWidget { final String bodyText; diff --git a/lib/widgets/member_widgets.dart/airtable_list_tile.dart b/lib/widgets/member_widgets.dart/airtable_list_tile.dart index c1de26e..58db912 100644 --- a/lib/widgets/member_widgets.dart/airtable_list_tile.dart +++ b/lib/widgets/member_widgets.dart/airtable_list_tile.dart @@ -3,9 +3,9 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:fosscu_app/constants/apikey.dart'; -import 'package:fosscu_app/constants/color.dart'; -import 'package:fosscu_app/constants/svg.dart'; +import 'package:fosscu_app/core/constants/apikey.dart'; +import 'package:fosscu_app/core/constants/color.dart'; +import 'package:fosscu_app/core/constants/svg.dart'; import 'package:fosscu_app/widgets/member_widgets.dart/member_expanded_text.dart'; import 'package:fosscu_app/widgets/profile_page_widgets/profile_text_field.dart'; import 'package:http/http.dart' as http; diff --git a/lib/widgets/member_widgets.dart/member_list_tile.dart b/lib/widgets/member_widgets.dart/member_list_tile.dart index 7e693f7..6bfedde 100644 --- a/lib/widgets/member_widgets.dart/member_list_tile.dart +++ b/lib/widgets/member_widgets.dart/member_list_tile.dart @@ -2,8 +2,8 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:fosscu_app/constants/color.dart'; -import 'package:fosscu_app/constants/svg.dart'; +import 'package:fosscu_app/core/constants/color.dart'; +import 'package:fosscu_app/core/constants/svg.dart'; import 'package:fosscu_app/widgets/member_widgets.dart/achievement_container.dart'; import 'package:fosscu_app/widgets/member_widgets.dart/button.dart'; import 'package:fosscu_app/widgets/member_widgets.dart/member_expanded_text.dart'; diff --git a/lib/widgets/navbar.dart b/lib/widgets/navbar.dart index 1179d6f..4043546 100644 --- a/lib/widgets/navbar.dart +++ b/lib/widgets/navbar.dart @@ -3,8 +3,8 @@ import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:fosscu_app/constants/color.dart'; -import 'package:fosscu_app/constants/svg.dart'; +import 'package:fosscu_app/core/constants/color.dart'; +import 'package:fosscu_app/core/constants/svg.dart'; import 'package:fosscu_app/screens/drawer_page_screens/admin_page.dart'; import 'package:fosscu_app/screens/drawer_page_screens/birthdays.dart'; import 'package:fosscu_app/screens/drawer_page_screens/community.dart'; diff --git a/lib/widgets/profile_page_widgets/dropdown.dart b/lib/widgets/profile_page_widgets/dropdown.dart index a1ec8d5..56ac3ab 100644 --- a/lib/widgets/profile_page_widgets/dropdown.dart +++ b/lib/widgets/profile_page_widgets/dropdown.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; class DropDown extends StatefulWidget { final ValueChanged? onValueChanged; diff --git a/lib/widgets/profile_page_widgets/profile_text_field.dart b/lib/widgets/profile_page_widgets/profile_text_field.dart index 2ace2e0..2759199 100644 --- a/lib/widgets/profile_page_widgets/profile_text_field.dart +++ b/lib/widgets/profile_page_widgets/profile_text_field.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:fosscu_app/constants/color.dart'; +import 'package:fosscu_app/core/constants/color.dart'; class ProfileTextField extends StatelessWidget { final TextEditingController textEditingController; diff --git a/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig index c2efd0b..4b81f9b 100644 --- a/macos/Flutter/Flutter-Debug.xcconfig +++ b/macos/Flutter/Flutter-Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig index c2efd0b..5caa9d1 100644 --- a/macos/Flutter/Flutter-Release.xcconfig +++ b/macos/Flutter/Flutter-Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig"