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.

Sign up for GitHub

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

Jump to bottom

changing request to web view #19

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

changing request to web view #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 28 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "apps_for_good",
"cwd": "apps_for_good",
"request": "launch",
"type": "dart"
},
{
"name": "apps_for_good (profile mode)",
"cwd": "apps_for_good",
"request": "launch",
"type": "dart",
"flutterMode": "profile"
},
{
"name": "apps_for_good (release mode)",
"cwd": "apps_for_good",
"request": "launch",
"type": "dart",
"flutterMode": "release"
}
]
}
83 changes: 79 additions & 4 deletions apps_for_good/lib/calendar_screens/calendar_view_container.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class _CalendarViewContainerState extends State<CalendarViewContainer> {
return Scaffold(
backgroundColor: const Color.fromARGB(255, 14, 37, 57),
body: SafeArea(
<<<<<<< Updated upstream:apps_for_good/lib/calendar_screens/calendar_view_container.dart
child: Container(
width: double.infinity,
height: MediaQuery.of(context).size.height,
Expand Down Expand Up @@ -103,12 +104,86 @@ class _CalendarViewContainerState extends State<CalendarViewContainer> {
fontWeight: FontWeight.w600,
fontSize: 18,
color: Colors.white,
=======
child: SingleChildScrollView(
child: Container(
width: double.infinity,
height: MediaQuery.of(context).size.height,
padding: EdgeInsets.symmetric(horizontal: 30, vertical: 50),
child: Column(
children: <Widget> [
Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget> [
Text('GrandCare Calendar', style: GoogleFonts.poppins(
fontSize: 30,
color: Colors.white
>>>>>>> Stashed changes:apps_for_good/lib/calendar_view_container.dart
),),
),

const SizedBox(

width:
100, // Set the width to make the divider shorter horizontally
child: Divider(
color: Colors.grey,
height: 20.0, // Adjust the height as needed
),
),
const SizedBox(height: 20,),
Text("Please view the GrandCare appointments calendar and schedule a time for meeting with a counselor that is available.",
textAlign: TextAlign.center,
style: GoogleFonts.poppins(
color: Colors.white,
fontSize: 15
),),

],
),
],
),
const SizedBox(height: 20),

SizedBox(
height: MediaQuery.of(context).size.height / 3,
child:WebViewWidget(controller: controller,)
),

const SizedBox(height: 20),

Column(
children: <Widget> [
const SizedBox(height: 20),
Text("After you have seen a time that works for both you and an available counselor, pleae click below to schedule your meeting.",
textAlign: TextAlign.center,
style: GoogleFonts.poppins(
color: Colors.white,
fontSize: 15
),),

SizedBox(height: 20,),

MaterialButton(
minWidth: double.infinity,
height: 60,
onPressed: () {
Navigator.push(context, MaterialPageRoute(builder: (context) => const AppointmentsViewContainer()));},
shape: RoundedRectangleBorder(
side: const BorderSide(
color: Colors.white,
),
borderRadius: BorderRadius.circular(50)
),

child: Text("Schedule an Appointment", style: GoogleFonts.poppins(
fontWeight: FontWeight.w600,
fontSize: 18,
color: Colors.white,
),),
),

],
),
],
),
),
),
),
Expand Down
6 changes: 5 additions & 1 deletion apps_for_good/lib/makereq.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ class FormScreenState extends State<Requests_Page> {
return Scaffold(

appBar: AppBar(
<<<<<<< Updated upstream
title: Text('Requests Page'),
=======
title: Text('Inquiry Page', style: GoogleFonts.poppins()),
>>>>>>> Stashed changes
leading: IconButton(
icon: Icon(Icons.arrow_back, color: Colors.black),
onPressed: () => Navigator.of(context).pop(),
Expand Down Expand Up @@ -117,7 +121,7 @@ class FormScreenState extends State<Requests_Page> {
style: TextStyle(color: Color.fromARGB(255, 229, 243, 255),),
value: _town,
dropdownColor: const Color.fromARGB(255, 52, 52, 52),
decoration: InputDecoration(labelText: 'Choose a Service*', labelStyle: GoogleFonts.poppins(textStyle: TextStyle(color: Color.fromARGB(255, 229, 243, 255),),),),
decoration: InputDecoration(labelText: 'Town*', labelStyle: GoogleFonts.poppins(textStyle: TextStyle(color: Color.fromARGB(255, 229, 243, 255),),),),
items: <String>[
'Ashburnham',
'Ashby',
Expand Down
5 changes: 3 additions & 2 deletions apps_for_good/lib/onboarding_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:GrandCare/intro_screens/intro_page_1.dart';
import 'package:GrandCare/intro_screens/intro_page_2.dart';
import 'package:GrandCare/intro_screens/intro_page_3.dart';
import 'package:GrandCare/login_choice.dart';
import 'package:GrandCare/resources_menu.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:smooth_page_indicator/smooth_page_indicator.dart';
Expand Down Expand Up @@ -79,8 +80,8 @@ class _OnBoardingScreenState extends State<OnBoardingScreen> {
Navigator.push(
context,
PageRouteBuilder(
pageBuilder: (_, __, ___) => LoginChoice(),
transitionDuration: Duration(milliseconds: 500),
pageBuilder: (_, __, ___) => const ResourcesMenu(),
transitionDuration: const Duration(milliseconds: 500),
transitionsBuilder: (_, a, __, c) =>
FadeTransition(opacity: a, child: c),
),
Expand Down
Loading