MarinoDev/FBLA24
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Compare commits

base: MarinoDev:577801423d83860afc614584e3034cda9fca7fdc
Branches Tags
MarinoDev:main
MarinoDev:v0.2.0
MarinoDev:0.1.1
MarinoDev:0.1.0
..
compare: MarinoDev:02bce8318af08a342c77ecffd139f74edfa6c649
Branches Tags
MarinoDev:main
MarinoDev:v0.2.0
MarinoDev:0.1.1
MarinoDev:0.1.0

No commits in common. "577801423d83860afc614584e3034cda9fca7fdc" and "02bce8318af08a342c77ecffd139f74edfa6c649" have entirely different histories.
577801423d ... 02bce8318a

6 changed files with 69 additions and 121 deletions
Show Stats Expand all files Collapse all files

3
fbla_ui/lib/pages/business_detail.dart
View File

@ -166,7 +166,8 @@ class _CreateBusinessDetailState extends State<BusinessDetail> {
.replaceAll('www.', ''),
style: const TextStyle(color: Colors.blue)),
onTap: () {
launchUrl(Uri.parse(business.website!));
launchUrl(
Uri.parse('https://${business.website}'));
},
),
],

2
fbla_ui/lib/pages/businesses_overview.dart
View File

@ -513,7 +513,7 @@ class _BusinessHeaderState extends State<_BusinessHeader> {
IconButton(
icon: const Icon(Icons.link),
onPressed: () {
launchUrl(Uri.parse(business.website!));
launchUrl(Uri.parse('https://${business.website}'));
},
),
IconButton(

1
fbla_ui/lib/pages/create_edit_business.dart
View File

@ -247,7 +247,6 @@ class _CreateEditBusinessState extends State<CreateEditBusiness> {
),
validator: (value) {
if (value != null &&
value.isNotEmpty &&
!RegExp(r'(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}(?:/[^/\s]*)*')
.hasMatch(value)) {
return 'Enter a valid Website';

2
fbla_ui/lib/pages/listing_detail.dart
View File

@ -123,7 +123,7 @@ class _CreateBusinessDetailState extends State<JobListingDetail> {
.replaceAll('www.', ''),
style: const TextStyle(color: Colors.blue)),
onTap: () {
launchUrl(Uri.parse(listing.link!));
launchUrl(Uri.parse('https://${listing.link!}'));
},
),
],

6
fbla_ui/lib/pages/listings_overview.dart
View File

@ -151,8 +151,7 @@ class _JobsOverviewState extends State<JobsOverview> {
setState(() {
_isRetrying = true;
});
await widget.updateBusinessesCallback(
null, null);
await widget.updateBusinessesCallback(null, null);
}
},
),
@ -593,7 +592,8 @@ class _JobHeaderState extends State<_JobHeader> {
IconButton(
icon: const Icon(Icons.link),
onPressed: () {
launchUrl(Uri.parse(business.listings![0].link!));
launchUrl(Uri.parse(
'https://${business.listings![0].link!}'));
},
),
IconButton(

108
fbla_ui/lib/pages/signin_page.dart
View File

@ -37,7 +37,7 @@ class _SignInPageState extends State<SignInPage> {
heightFactor: 1.0,
child: Container(
padding: const EdgeInsets.fromLTRB(12, 50, 12, 50),
height: 450,
height: 475,
width: 500,
child: Card(
child: Padding(
@ -60,12 +60,9 @@ class _SignInPageState extends State<SignInPage> {
controller: _usernameController,
autocorrect: false,
decoration: const InputDecoration(
prefixIcon: Padding(
padding: EdgeInsets.all(16.0),
child: Icon(Icons.person_outline),
),
prefixIcon: Icon(Icons.person_outline),
labelText: 'Username',
),
border: OutlineInputBorder()),
),
),
Padding(
@ -110,13 +107,11 @@ class _SignInPageState extends State<SignInPage> {
autocorrect: false,
obscureText: obscurePassword,
decoration: InputDecoration(
prefixIcon: const Padding(
padding: EdgeInsets.all(16.0),
child: Icon(Icons.fingerprint),
),
prefixIcon: const Icon(Icons.fingerprint),
labelText: 'Password',
border: const OutlineInputBorder(),
suffixIcon: Padding(
padding: const EdgeInsets.only(right: 16.0),
padding: const EdgeInsets.all(8.0),
child: IconButton(
onPressed: () {
setState(() {
@ -136,44 +131,35 @@ class _SignInPageState extends State<SignInPage> {
errorMessage!,
style: const TextStyle(color: Colors.red),
),
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: FilledButton(
style: FilledButton.styleFrom(
shape: const RoundedRectangleBorder(
borderRadius:
BorderRadius.all(Radius.circular(6)))),
child: SizedBox(
width: 374,
height: 40,
child: Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: [
_isloading
? Padding(
padding: EdgeInsets.only(right: 8.0),
child: const SizedBox(
CheckboxListTile(
value: rememberMe,
onChanged: (value) async {
setState(() {
rememberMe = value!;
});
},
title: const Text('Remember me'),
),
ElevatedButton.icon(
style: ElevatedButton.styleFrom(
backgroundColor:
Theme.of(context).colorScheme.primary,
// padding: const EdgeInsets.only(left: 20.0, right: 20.0, top: 12.0, bottom: 12.0),
),
icon: _isloading
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(
color: Colors.white,
strokeWidth: 3,
)),
)
: const Padding(
padding: EdgeInsets.only(right: 8.0),
child: Icon(Icons.done,
color: Colors.white),
),
const Text('Sign in',
style: TextStyle(
color: Colors.white, fontSize: 18)),
],
),
),
))
: const Icon(Icons.done, color: Colors.white),
label: const Text('Sign In',
style: TextStyle(color: Colors.white)),
onPressed: () async {
setState(() {
errorMessage = null;
_isloading = true;
});
jwt = await signIn(username, password).timeout(
@ -203,44 +189,6 @@ class _SignInPageState extends State<SignInPage> {
}
},
),
),
Expanded(
child: Align(
alignment: Alignment.bottomLeft,
child: Row(
children: [
Padding(
padding: const EdgeInsets.only(left: 8.0),
child: MouseRegion(
cursor: SystemMouseCursors.click,
child: GestureDetector(
child: Row(
children: [
Checkbox(
value: rememberMe,
onChanged: (value) {
setState(() {
rememberMe = value!;
});
}),
const Padding(
padding: EdgeInsets.all(8.0),
child: Text('Remember me'),
)
],
),
onTap: () {
setState(() {
rememberMe = !rememberMe;
});
},
),
),
),
],
),
),
),
],
),
),