Skip to content

Commit

Permalink
some new changes done
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ritik-in-Tech
Ritik-in-Tech committed Apr 16, 2024
1 parent 23ef670 commit b051bcb
Show file tree
Hide file tree
Showing 8 changed files with 141 additions and 122 deletions.
149 changes: 76 additions & 73 deletions lib/screens/adminoptions/alldesigncredits.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,81 +114,84 @@ class _DesignCreditContainerState extends State<DesignCreditContainer> {
@override
Widget build(BuildContext context) {
final Size size = MediaQuery.of(context).size;
return Container(
padding: const EdgeInsets.all(15),
// height: 250,
width: size.width >= 400 ? 400 : 350,
margin: const EdgeInsets.fromLTRB(0, 0, 0, 10),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15),
color: const Color.fromARGB(255, 12, 44, 43),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
CustomText(
text: widget.projectName,
textType: 'Project-Name:',
),
SizedBox(
height: 10,
),
const Divider(
height: 1,
color: Colors.white,
),
SizedBox(
height: 10,
),
CustomText(
text: widget.professorName,
textType: 'Professor-Name:',
),
SizedBox(
height: 10,
),
const Divider(
height: 1,
color: Colors.white,
),
SizedBox(
height: 10,
),
CustomText(
text: widget.offeredBy,
textType: 'Offered-By:',
),
const SizedBox(
height: 10,
),
SizedBox(
height: 10,
),
const Divider(
height: 1,
color: Colors.white,
),
SizedBox(
height: 10,
),
const Text(
'Eligible Branches:',
style: TextStyle(
return Card(
elevation: 5,
child: Container(
padding: const EdgeInsets.all(15),
// height: 250,
width: size.width >= 400 ? 400 : 350,
margin: const EdgeInsets.fromLTRB(0, 0, 0, 10),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15),
color: const Color.fromARGB(255, 12, 44, 43),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
CustomText(
text: widget.projectName,
textType: 'Project-Name:',
),
SizedBox(
height: 10,
),
const Divider(
height: 1,
color: Colors.white,
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
Wrap(
spacing: 5,
runSpacing: 5,
children: widget.eligibleBranches.map(
(branches) {
return CustomText1(text: branches);
},
).toList(),
),
],
SizedBox(
height: 10,
),
CustomText(
text: widget.professorName,
textType: 'Professor-Name:',
),
SizedBox(
height: 10,
),
const Divider(
height: 1,
color: Colors.white,
),
SizedBox(
height: 10,
),
CustomText(
text: widget.offeredBy,
textType: 'Offered-By:',
),
const SizedBox(
height: 10,
),
SizedBox(
height: 10,
),
const Divider(
height: 1,
color: Colors.white,
),
SizedBox(
height: 10,
),
const Text(
'Eligible Branches:',
style: TextStyle(
color: Colors.white,
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
Wrap(
spacing: 5,
runSpacing: 5,
children: widget.eligibleBranches.map(
(branches) {
return CustomText1(text: branches);
},
).toList(),
),
],
),
),
);
}
Expand Down
34 changes: 17 additions & 17 deletions lib/screens/auth/loginscreen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,19 +323,19 @@ class _LoginScreenState extends State<LoginScreen> {
)
: Row(
children: [
// Container(
// height: size.height,
// width: size.width * 0.50,
// decoration: const BoxDecoration(
// image: DecorationImage(
// image: AssetImage(loginBackgroundImage),
// fit: BoxFit.fill,
// ),
// ),
// ),
Container(
height: size.height,
width: size.width * 0.50,
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage(loginBackgroundImage),
fit: BoxFit.fill,
),
),
),
Container(
height: size.height,
width: size.width * 0.50,
width: size.width,
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage(iitjCampus),
Expand All @@ -346,15 +346,15 @@ class _LoginScreenState extends State<LoginScreen> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
height: 600,
height: 500,
width: 500,
decoration: BoxDecoration(
border: Border.all(
width: 1,
color: Colors.grey,
),
// border: Border.all(
// width: 1,
// color: Colors.,
// ),
borderRadius: BorderRadius.circular(20),
color: const Color.fromARGB(125, 0, 0, 0),
color: Color.fromARGB(150, 0, 0, 0),
),
child: Column(
children: [
Expand Down
34 changes: 17 additions & 17 deletions lib/screens/auth/signupscreen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ class _SignUpState extends State<SignUp> {
children: [
Container(
height: size.height,
width: size.width * 0.50,
width: size.width,
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage(iitjCampus),
Expand All @@ -451,15 +451,15 @@ class _SignUpState extends State<SignUp> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
height: 600,
height: 500,
width: 500,
decoration: BoxDecoration(
border: Border.all(
width: 1,
color: Colors.grey,
),
// border: Border.all(
// width: 1,
// color: Colors.grey,
// ),
borderRadius: BorderRadius.circular(20),
color: const Color.fromARGB(125, 0, 0, 0),
color: Color.fromARGB(137, 0, 0, 0),
),
child: SingleChildScrollView(
child: Column(
Expand Down Expand Up @@ -706,16 +706,16 @@ class _SignUpState extends State<SignUp> {
],
),
),
Container(
height: size.height,
width: size.width * 0.50,
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage(loginBackgroundImage),
fit: BoxFit.fill,
),
),
),
// Container(
// height: size.height,
// width: size.width * 0.50,
// decoration: const BoxDecoration(
// image: DecorationImage(
// image: AssetImage(loginBackgroundImage),
// fit: BoxFit.fill,
// ),
// ),
// ),
],
),
),
Expand Down
1 change: 0 additions & 1 deletion lib/screens/homepage/homepage.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ class _HomePageState extends State<HomePage> {
_userFuture = result.item1;
final prefs = await SharedPreferences.getInstance();
prefs.setString('userId', _userFuture?[0].sId ?? '');
print(_userFuture?[0].email);
}
}

Expand Down
15 changes: 10 additions & 5 deletions lib/screens/studentoptions/userapplications.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
import 'package:DesignCredit/api/allapplicationsapi.dart';
import 'package:DesignCredit/models/allapplicationusermodel.dart';
import 'package:DesignCredit/widgets/constants.dart';
import 'package:DesignCredit/widgets/desktopappbar.dart';
import 'package:DesignCredit/widgets/mobileappbar.dart';
import 'package:DesignCredit/widgets/navdrawer.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:url_launcher/url_launcher.dart';
Expand Down Expand Up @@ -63,7 +65,7 @@ class _UserApplicationState extends State<UserApplication> {
child: SingleChildScrollView(
child: Column(
children: [
const MobileAppBar(),
size.width >= 1200 ? DeskTopAppBar() : MobileAppBar(),
const SizedBox(
height: 20,
),
Expand Down Expand Up @@ -194,10 +196,13 @@ class _DesignCreditContainerState extends State<ApplicationContainer> {
const SizedBox(
width: 20,
),
const Icon(
Icons.link,
color: Colors.white,
size: 30,
MouseRegion(
cursor: SystemMouseCursors.click,
child: const Icon(
Icons.link,
color: Colors.white,
size: 30,
),
),
],
),
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/constants.dart
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// API URLS
const baseUrlMain = 'http://13.201.24.145:5000/software-project.in';
const baseUrlLocalhost = 'http://localhost:5000/software-project.in';
const baseUrlMobileLocalhost = 'http://13.201.24.145:5000/software-project.in';
const baseUrlMobileLocalhost = 'http://localhost:5000/software-project.in';
const adminEmail = 'tiwari.26@iitj.ac.in';
// Images
const logo = 'assets/images/iitj.jpg';
Expand Down
16 changes: 14 additions & 2 deletions lib/widgets/desktopappbar.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
import 'package:DesignCredit/api/isprofilecompleted.dart';
import 'package:DesignCredit/screens/adminoptions/allapplications.dart';
import 'package:DesignCredit/screens/adminoptions/alluser.dart';
import 'package:DesignCredit/screens/homepage/homepage.dart';
import 'package:DesignCredit/screens/professoroptions.dart/adddesigncredit.dart';
import 'package:DesignCredit/screens/professoroptions.dart/viewdesigncredit.dart';
import 'package:DesignCredit/screens/studentoptions/designcredits.dart';
import 'package:DesignCredit/screens/studentoptions/userapplications.dart';
import 'package:DesignCredit/widgets/constants.dart';
import 'package:DesignCredit/widgets/profilepage.dart';
// import 'package:flutter/cupertino.dart';
Expand Down Expand Up @@ -108,7 +110,12 @@ class _DeskTopAppBarState extends State<DeskTopAppBar> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GestureDetector(
onTap: () {},
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const HomePage()));
},
child: const MouseRegion(
cursor: SystemMouseCursors.click,
child: SizedBox(
Expand Down Expand Up @@ -330,7 +337,12 @@ class _StudentOptionState extends State<StudentOption> {
),
ClickableText(
text: 'My Applications',
onTap: () {},
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const UserApplication()));
},
),
const SizedBox(
width: 30,
Expand Down
Loading

0 comments on commit b051bcb

Please sign in to comment.