Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Zaid/event #3

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
c7293cc
navigation bar: Implement navigation bar and fix paths
HimanishM25 Jan 29, 2022
d4ce7ce
navigation bar: Initial implementation
HimanishM25 Jan 29, 2022
04f3364
app bar : Universal implementation of appbar
HimanishM25 Jan 29, 2022
6823e8c
app bar: Add app drawer
HimanishM25 Jan 29, 2022
0b0cb8c
app bar: Match style with rest of the app
HimanishM25 Jan 29, 2022
bbf7ca5
UI/UX: Beautify elements
HimanishM25 Jan 29, 2022
2070053
UI/UX: Change dark/light theme based on system settings
HimanishM25 Jan 29, 2022
f0471dc
Assets: Use transparent bg on logo
HimanishM25 Jan 29, 2022
7644654
UI/UX: Universal theme implementation
HimanishM25 Jan 30, 2022
42a8c6a
EventCard: Add event card
startswithzed Jan 30, 2022
0c75829
Merge branch 'origin' into zaid/EventCard
startswithzed Jan 30, 2022
ed8a958
navigation bar: Implement indexed stack
HimanishM25 Jan 30, 2022
ab942d1
Authentication: Implement Google Sign In
HimanishM25 Jan 30, 2022
d178b8a
Events: Add Tabbed bar
startswithzed Jan 30, 2022
6998c61
app bar: Add Google Profile Avatar
HimanishM25 Jan 31, 2022
16209cc
UI/UX: Initial design for SignIn Page
HimanishM25 Jan 31, 2022
f1e119e
Authentication: Setup native Email auth. framework
HimanishM25 Jan 31, 2022
9bc7cf3
misc : pubspec changes
HimanishM25 Feb 1, 2022
1e99432
UI/UX: Add account page
HimanishM25 Feb 1, 2022
76e26ab
Authentication: Add native Email signIn support
HimanishM25 Feb 1, 2022
210ba9a
Authentication: Unify SignIn Page for Google and Email
HimanishM25 Feb 1, 2022
998463d
Backup: Standalone Email SignIn page
HimanishM25 Feb 1, 2022
77b66e5
Authentication: Fix broken Email SignIn
HimanishM25 Feb 1, 2022
e9a1885
misc: Pubspec changes
HimanishM25 Feb 2, 2022
4f155da
Authentication: Create SignUp page
HimanishM25 Feb 2, 2022
9aaa12d
Authentication: Implement email and password verification
HimanishM25 Feb 2, 2022
e70f6ac
misc: Code Cleanup
HimanishM25 Feb 2, 2022
1ea8431
Merge branch 'zaid/EventTabs' into wip
HimanishM25 Feb 10, 2022
aa1db1c
misc: Fix navigation
HimanishM25 Feb 10, 2022
b10914c
UI/UX: Fix merge errors
HimanishM25 Feb 10, 2022
e3971db
misc: Overflow fix
HimanishM25 Feb 10, 2022
5058f92
misc: update compile version
HimanishM25 Feb 10, 2022
75ca5ad
Merge branch 'wip'
HimanishM25 Feb 10, 2022
f00d4a7
UI/UX: Minor UI updates for production build
HimanishM25 Feb 10, 2022
973bca6
UI/UX: Adapt app theme
HimanishM25 Feb 10, 2022
4b98ae0
misc: Fix overflow error and cleanup code
HimanishM25 Feb 10, 2022
fc710dd
Authentication: Update navigation path
HimanishM25 Feb 10, 2022
5f076ec
UI/UI: Update visual elements and fix overflow errors
HimanishM25 Feb 11, 2022
a395beb
Docs: Add relevant information
HimanishM25 Feb 14, 2022
2ea700a
Docs: cleanup
HimanishM25 Feb 14, 2022
37f65ff
Team Members: Display Team member data
startswithzed Feb 14, 2022
0b869e3
Merge branch 'master' into wip
HimanishM25 Feb 15, 2022
97736f7
Merge branch 'zaid/team' into wip
HimanishM25 Feb 15, 2022
123c22e
UI/UX: Adapt to app theme and add social icons
HimanishM25 Feb 15, 2022
09bd472
misc: Add known data
HimanishM25 Feb 15, 2022
cef108a
Add RSVP feature and improve Event Details screen
startswithzed Feb 17, 2022
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
Prev Previous commit
Next Next commit
navigation bar: Initial implementation
HimanishM25 committed Jan 29, 2022
commit d4ce7ceab55caf92f44d71017d1da9f2a0f41844
5 changes: 3 additions & 2 deletions lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:dsc_client/utils/sharedPreferences.dart';
import 'package:dsc_client/widgets/navigation.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@@ -53,13 +54,13 @@ class DSC extends StatelessWidget {
settings: settings);
case '/home':
return PageRouteBuilder(
pageBuilder: (_, a1, a2) => Home(), settings: settings);
pageBuilder: (_, a1, a2) => navigate(), settings: settings);
case '/eventDetails':
return PageRouteBuilder(
pageBuilder: (_, a1, a2) => EventDetails(), settings: settings);
default:
return PageRouteBuilder(
pageBuilder: (_, a1, a2) => Home(),
pageBuilder: (_, a1, a2) => navigate(),
settings: settings,
);
}
194 changes: 97 additions & 97 deletions lib/screens/homeScreen/home.dart
Original file line number Diff line number Diff line change
@@ -60,103 +60,103 @@ class _HomeState extends State<Home> {
),
),
),
CircleAvatar(
backgroundColor: Colors.white,
child: GestureDetector(
onTap: () {
showModalBottomSheet(
backgroundColor: Colors.transparent,
context: context,
builder: (context) => Container(
height: 280,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(50),
topRight: Radius.circular(50),
),
boxShadow: [
BoxShadow(
blurRadius: 8.0,
spreadRadius: 3.0,
color: Colors.grey.shade600,
offset: Offset(0, 0),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
child: Center(
child: Icon(
Icons.linear_scale,
color: Colors.grey.shade600,
),
),
),
SizedBox(
height: 8,
),
ListTile(
title: Text(
"About DSC",
textAlign: TextAlign.center,
style: TextStyle(color: Colors.black),
),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => AboutDSC()));
},
),
ListTile(
title: Text("Team Members",
textAlign: TextAlign.center,
style: TextStyle(color: Colors.black)),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => Team()));
},
),
ListTile(
title: Text("Medium Articles",
textAlign: TextAlign.center,
style: TextStyle(color: Colors.black)),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
ArticlesPage()));
},
),
ListTile(
title: Text("Request an Event",
textAlign: TextAlign.center,
style: TextStyle(color: Colors.black)),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
RequestEventForm()));
},
)
],
),
),
);
},
child: Image.asset(
"assets/images/main_logo.png",
height: 20,
),
),
),
// CircleAvatar(
// backgroundColor: Colors.white,
// child: GestureDetector(
// onTap: () {
// showModalBottomSheet(
// backgroundColor: Colors.transparent,
// context: context,
// builder: (context) => Container(
// height: 280,
// decoration: BoxDecoration(
// color: Colors.white,
// borderRadius: BorderRadius.only(
// topLeft: Radius.circular(50),
// topRight: Radius.circular(50),
// ),
// boxShadow: [
// BoxShadow(
// blurRadius: 8.0,
// spreadRadius: 3.0,
// color: Colors.grey.shade600,
// offset: Offset(0, 0),
// ),
// ],
// ),
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// Container(
// child: Center(
// child: Icon(
// Icons.linear_scale,
// color: Colors.grey.shade600,
// ),
// ),
// ),
// SizedBox(
// height: 8,
// ),
// ListTile(
// title: Text(
// "About DSC",
// textAlign: TextAlign.center,
// style: TextStyle(color: Colors.black),
// ),
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (context) => AboutDSC()));
// },
// ),
// ListTile(
// title: Text("Team Members",
// textAlign: TextAlign.center,
// style: TextStyle(color: Colors.black)),
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (context) => Team()));
// },
// ),
// ListTile(
// title: Text("Medium Articles",
// textAlign: TextAlign.center,
// style: TextStyle(color: Colors.black)),
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (context) =>
// ArticlesPage()));
// },
// ),
// ListTile(
// title: Text("Request an Event",
// textAlign: TextAlign.center,
// style: TextStyle(color: Colors.black)),
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (context) =>
// RequestEventForm()));
// },
// )
// ],
// ),
// ),
// );
// },
// child: Image.asset(
// "assets/images/main_logo.png",
// height: 20,
// ),
// ),
// ),
GestureDetector(
onTap: () {
setState(() {