Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Minecraftian14
Minecraftian14 committed Nov 11, 2023
2 parents 00ca9d0 + 62646a6 commit 5a8e76c
Show file tree
Hide file tree
Showing 4 changed files with 205 additions and 2 deletions.
3 changes: 2 additions & 1 deletion lib/service/wrapper.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:kiit_connect/page/mainpage.dart';
import 'package:kiit_connect/user/member/basicprofile.dart';
import 'package:kiit_connect/user/member/skill/competency.dart';
import 'package:kiit_connect/user/newscreens/home.dart';

import '../user/member/work/profesionalexp.dart';
import '../user/member/work/projects.dart';
Expand Down Expand Up @@ -32,7 +33,7 @@ class _WrapperState extends State<Wrapper> {
if (snapshot.data == null) {
return Login();
} else {
return BasicProfile();
return NewHomePage();
}
}
return Scaffold(
Expand Down
195 changes: 194 additions & 1 deletion lib/user/newscreens/home.dart
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,206 @@
import 'package:flutter/material.dart';
import 'package:kiit_connect/drawer/drawer.dart';
import 'package:kiit_connect/theme/colors.dart';
import 'package:kiit_connect/user/member/basicprofile.dart';
import 'package:carousel_slider/carousel_slider.dart';
import 'package:kiit_connect/user/member/sem/first_sem.dart';
import 'package:kiit_connect/user/member/work/collegeexp.dart';
import 'package:kiit_connect/user/member/work/profesionalexp.dart';
import 'package:kiit_connect/user/member/work/projects.dart';

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

@override
Widget build(BuildContext context) {
return Scaffold(
body: BasicProfile(),
endDrawer: const SideDrawer(),
body: SafeArea(
child: SingleChildScrollView(
physics: const BouncingScrollPhysics(),
child: padWrap(Column(
children: [
smallSpacing(),
const Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text("Welcome Back!",
style: TextStyle(
color: greenHighlight,
fontSize: 12,
))
],
),
const Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
"Mayank Singh", // name will be taken from firebase/google account
style: TextStyle(
color: primary,
fontSize: 23,
))
],
),
smallSpacing(),
const Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text("Educational Details",
style: TextStyle(color: primary, fontSize: 20))
],
),
smallSpacing(),
CarouselSlider(
options: CarouselOptions(height: 175.0),
items: [1, 2, 3, 4, 5].map((i) {
return Builder(
builder: (BuildContext context) {
return Container(
width: MediaQuery.of(context).size.width,
margin:
const EdgeInsets.symmetric(horizontal: 5.0),
decoration:
const BoxDecoration(color: greenHighlight),
child: Text(
'text $i',
style: const TextStyle(fontSize: 16.0),
));
},
);
}).toList(),
),
smallSpacing(),
const Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
"Profiling Progress",
style: TextStyle(
color: primary,
fontSize: 20,
),
)
],
),
smallSpacing(),
GestureDetector(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => BasicProfile()));
},
child: Container(
width: 384,
height: 125,
color: darkHighlight,
padding: EdgeInsets.only(left: 20, top: 20),
child: const Text(
"Basic Profile",
style: TextStyle(
fontSize: 21,
color: primary,
fontFamily: 'Times New Roman',
),
),
),
),
smallSpacing(),
GestureDetector(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => FirstSemesterPerformance()));
},
child: Container(
width: 384,
height: 125,
color: darkHighlight,
padding: EdgeInsets.only(left: 20, top: 20),
child: const Text(
"Semester Wise Performance",
style: TextStyle(
fontSize: 21,
color: primary,
fontFamily: 'Times New Roman',
),
),
),
),
smallSpacing(),
GestureDetector(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => ProfessionalExperience()));
},
child: Container(
width: 384,
height: 125,
color: darkHighlight,
padding: EdgeInsets.only(left: 20, top: 20),
child: const Text(
"Internship Report",
style: TextStyle(
fontSize: 21,
color: primary,
fontFamily: 'Times New Roman',
),
),
),
),
smallSpacing(),
GestureDetector(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => CollegeExperience()));
},
child: Container(
width: 384,
height: 125,
color: darkHighlight,
padding: EdgeInsets.only(left: 20, top: 20),
child: const Text(
"CollegeExperience",
style: TextStyle(
fontSize: 21,
color: primary,
fontFamily: 'Times New Roman',
),
),
),
),
smallSpacing(),
GestureDetector(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PersonalProject()));
},
child: Container(
width: 384,
height: 125,
color: darkHighlight,
padding: EdgeInsets.only(left: 20, top: 20),
child: const Text(
"Projects",
style: TextStyle(
fontSize: 21,
color: primary,
fontFamily: 'Times New Roman',
),
),
),
),

],
)))),
);
}
}
8 changes: 8 additions & 0 deletions pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.1"
carousel_slider:
dependency: "direct main"
description:
name: carousel_slider
sha256: "9c695cc963bf1d04a47bd6021f68befce8970bcd61d24938e1fb0918cf5d9c42"
url: "https://pub.dev"
source: hosted
version: "4.2.1"
characters:
dependency: transitive
description:
Expand Down
1 change: 1 addition & 0 deletions pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ dependencies:
path_provider: ^2.1.0
easy_pdf_viewer: ^1.0.7
icons_launcher: ^2.0.4
carousel_slider: ^4.2.1

dev_dependencies:
flutter_test:
Expand Down

0 comments on commit 5a8e76c

Please sign in to comment.