From 823fd4cd41c3fca5ba78d3d08a47254ad107c807 Mon Sep 17 00:00:00 2001
From: "nandhita.zefania" <nandhita.zefania@ui.ac.id>
Date: Mon, 12 Dec 2022 22:57:20 +0700
Subject: [PATCH] feat: handle uri parse
---
tk_apap_flutter/lib/pages/CreateAppointment.dart | 13 +++----------
tk_apap_flutter/lib/pages/DaftarAppointment.dart | 2 +-
tk_apap_flutter/lib/pages/DetailAppointment.dart | 4 ++--
tk_apap_flutter/lib/pages/HomeScreen.dart | 2 +-
tk_apap_flutter/lib/pages/LihatProfil.dart | 2 +-
tk_apap_flutter/lib/pages/TopUpSaldo.dart | 4 ++--
tk_apap_flutter/lib/pages/detailTagihan.dart | 4 ++--
tk_apap_flutter/lib/pages/login.dart | 7 +------
tk_apap_flutter/lib/pages/register.dart | 2 +-
tk_apap_flutter/lib/pages/tagihan.dart | 2 +-
tk_apap_flutter/lib/widgets/drawerWidget.dart | 2 +-
11 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/tk_apap_flutter/lib/pages/CreateAppointment.dart b/tk_apap_flutter/lib/pages/CreateAppointment.dart
index 7f42d5c..6a7ba2a 100644
--- a/tk_apap_flutter/lib/pages/CreateAppointment.dart
+++ b/tk_apap_flutter/lib/pages/CreateAppointment.dart
@@ -20,11 +20,7 @@ class _CreateAppointmentState extends State<CreateAppointment> {
// Data yang diperlukan tanggal dan waktu, dropdown [namaDokter - Tarif]
Future<List<Dokter>> getAllDoktor() async {
-<<<<<<< HEAD
- var uri = Uri.parse('http://10.0.2.2:8080/api/doktor/all');
-=======
- var uri = Uri.parse('http://192.168.1.2:8080/api/doktor/all');
->>>>>>> 043382a8d2493050d1fd9e4c42073c45da6a4ea9
+ var uri = Uri.parse('https://apap-053.cs.ui.ac.id/api/doktor/all');
dynamic token = await SessionManager().get('token');
String tknString = ('Bearer $token');
print(tknString);
@@ -107,11 +103,8 @@ class _CreateAppointmentState extends State<CreateAppointment> {
String strUsername = username;
var response = await http.post(
Uri.parse(
-<<<<<<< HEAD
- 'http://10.0.2.2:8080/api/appointment/create'),
-=======
- 'http://192.168.1.2:8080/api/appointment/create'),
->>>>>>> 043382a8d2493050d1fd9e4c42073c45da6a4ea9
+ 'https://apap-053.cs.ui.ac.id/api/appointment/create'),
+
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json; charset=UTF-8',
diff --git a/tk_apap_flutter/lib/pages/DaftarAppointment.dart b/tk_apap_flutter/lib/pages/DaftarAppointment.dart
index 5138fbd..8e16d1f 100644
--- a/tk_apap_flutter/lib/pages/DaftarAppointment.dart
+++ b/tk_apap_flutter/lib/pages/DaftarAppointment.dart
@@ -17,7 +17,7 @@ class DaftarAppointment extends StatefulWidget {
class _DaftarAppointmentState extends State<DaftarAppointment> {
Future<List<AptDTO>> getAppointment() async {
- var uri = Uri.parse('http://192.168.1.5:8080/api/appointment/all');
+ var uri = Uri.parse('https://apap-053.cs.ui.ac.id/api/appointment/all');
dynamic token = await SessionManager().get('token');
String tknString = ('Bearer $token');
http.Response response = await http.get(uri, headers: {
diff --git a/tk_apap_flutter/lib/pages/DetailAppointment.dart b/tk_apap_flutter/lib/pages/DetailAppointment.dart
index 8acc8bb..b6ef909 100644
--- a/tk_apap_flutter/lib/pages/DetailAppointment.dart
+++ b/tk_apap_flutter/lib/pages/DetailAppointment.dart
@@ -16,7 +16,7 @@ class DetailAppointment extends StatelessWidget {
Future<DetailDTO> getDetailApt() async {
String kode = await SessionManager().get("kodeApt") as String;
- var uri = Uri.parse('http://192.168.1.5:8080/api/appointment/detail/$kode');
+ var uri = Uri.parse('https://apap-053.cs.ui.ac.id/api/appointment/detail/$kode');
dynamic token = await SessionManager().get("token");
String tknString = 'Bearer $token';
log("here");
@@ -100,7 +100,7 @@ class DetailAppointment extends StatelessWidget {
const SizedBox(height: 16,),
TextButton(
onPressed: (data.detailResep == 0) ? null : () {
- return Navigator.of(context).pushNamed(HomeScreen.routeName); // TODO: Ke Resep
+ return Navigator.of(context).pushNamed(HomeScreen.routeName);
},
child: (data.detailResep == 0) ? const Text('Tidak Ada Resep') : const Text('Detail Resep'),
),
diff --git a/tk_apap_flutter/lib/pages/HomeScreen.dart b/tk_apap_flutter/lib/pages/HomeScreen.dart
index 6ed3278..19614cc 100644
--- a/tk_apap_flutter/lib/pages/HomeScreen.dart
+++ b/tk_apap_flutter/lib/pages/HomeScreen.dart
@@ -310,7 +310,7 @@ class _HomeScreenState extends State<HomeScreen> {
}
}
- final List<Widget> _children = [ //TODO:ubah pages
+ final List<Widget> _children = [
HomeScreen(),
CreateAppointment(),
LihatProfil(),
diff --git a/tk_apap_flutter/lib/pages/LihatProfil.dart b/tk_apap_flutter/lib/pages/LihatProfil.dart
index 851a247..82b6b93 100644
--- a/tk_apap_flutter/lib/pages/LihatProfil.dart
+++ b/tk_apap_flutter/lib/pages/LihatProfil.dart
@@ -13,7 +13,7 @@ class LihatProfil extends StatelessWidget {
static const routeName = '/edit';
Future<PasienDTO> getPasien() async {
- var uri = Uri.parse('http://10.0.2.2:8080/api/pasien/getself');
+ var uri = Uri.parse('https://apap-053.cs.ui.ac.id/api/pasien/getself');
dynamic token = await SessionManager().get('token');
String tknString = ('Bearer $token');
http.Response response = await http.get(uri, headers: {
diff --git a/tk_apap_flutter/lib/pages/TopUpSaldo.dart b/tk_apap_flutter/lib/pages/TopUpSaldo.dart
index a8ab4f3..4e96423 100644
--- a/tk_apap_flutter/lib/pages/TopUpSaldo.dart
+++ b/tk_apap_flutter/lib/pages/TopUpSaldo.dart
@@ -18,7 +18,7 @@ class TopUpSaldo extends StatelessWidget {
var textJumlahTopUp = TextEditingController();
Future<PasienDTO> getPasien() async {
- var uri = Uri.parse('http://10.0.2.2:8080/api/pasien/getself');
+ var uri = Uri.parse('https://apap-053.cs.ui.ac.id/api/pasien/getself');
dynamic token = await SessionManager().get('token');
String tknString = ('Bearer $token');
http.Response response = await http.get(uri, headers: {
@@ -303,7 +303,7 @@ class TopUpSaldo extends StatelessWidget {
String strUsername = username;
var response = await http.post(
Uri.parse(
- 'http://10.0.2.2:8080/api/pasien/top-up/' + strUsername),
+ 'https://apap-053.cs.ui.ac.id/api/pasien/top-up/' + strUsername),
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json; charset=UTF-8',
diff --git a/tk_apap_flutter/lib/pages/detailTagihan.dart b/tk_apap_flutter/lib/pages/detailTagihan.dart
index 28849d1..ad563eb 100644
--- a/tk_apap_flutter/lib/pages/detailTagihan.dart
+++ b/tk_apap_flutter/lib/pages/detailTagihan.dart
@@ -15,7 +15,7 @@ class DetailTagihan extends StatelessWidget {
Future<TagihanDTO> getDetailTagihan() async {
String kode = await SessionManager().get("kodeTagihan") as String;
- var uri = Uri.parse('http://192.168.1.2:8080/api/tagihan/detail/$kode');
+ var uri = Uri.parse('https://apap-053.cs.ui.ac.id/api/tagihan/detail/$kode');
dynamic token = await SessionManager().get("token");
String tknString = 'Bearer $token';
log("here");
@@ -105,7 +105,7 @@ class DetailTagihan extends StatelessWidget {
dynamic kodeTagihan = await SessionManager().get("kodeTagihan");
var response = await http.post(
Uri.parse(
- 'http://192.168.1.2:8080/api/tagihan/bayar'),
+ 'https://apap-053.cs.ui.ac.id/api/tagihan/bayar'),
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json; charset=UTF-8',
diff --git a/tk_apap_flutter/lib/pages/login.dart b/tk_apap_flutter/lib/pages/login.dart
index bb5f597..e5c1054 100644
--- a/tk_apap_flutter/lib/pages/login.dart
+++ b/tk_apap_flutter/lib/pages/login.dart
@@ -24,14 +24,10 @@ class _LoginState extends State<Login> {
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
UserLogin user = UserLogin("", "");
bool _isHidden = true;
-<<<<<<< HEAD
final url = Uri.parse(
- 'http://10.0.2.2:8080/api/authenticate'); //TODO:ubah sesuai IP Address, nanti pakai link web
+ 'https://apap-053.cs.ui.ac.id/api/authenticate');
-=======
- final url = Uri.parse('http://192.168.1.2:8080/api/authenticate'); //TODO:ubah sesuai IP Address, nanti pakai link web
->>>>>>> 043382a8d2493050d1fd9e4c42073c45da6a4ea9
final header = <String, String>{
'Content-Type': 'application/json; charset=UTF-8'
};
@@ -51,7 +47,6 @@ class _LoginState extends State<Login> {
Map<String, dynamic> jsonResponse = await stringToMap(json);
print(jsonResponse);
if (jsonResponse["role"] == "PASIEN") {
- // TODO: PASIEN
saveSession(jsonResponse);
Navigator.of(context).pushReplacementNamed(HomeScreen.routeName);
} else {
diff --git a/tk_apap_flutter/lib/pages/register.dart b/tk_apap_flutter/lib/pages/register.dart
index c9c032e..c42b9e4 100644
--- a/tk_apap_flutter/lib/pages/register.dart
+++ b/tk_apap_flutter/lib/pages/register.dart
@@ -224,7 +224,7 @@ class _RegisterState extends State<Register> {
if (_formKey.currentState.validate()) {
var response = await http.post(
Uri.parse(
- 'http://10.0.2.2:8080/api/pasien/register'),
+ 'https://apap-053.cs.ui.ac.id/api/pasien/register'),
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'},
diff --git a/tk_apap_flutter/lib/pages/tagihan.dart b/tk_apap_flutter/lib/pages/tagihan.dart
index ea6f461..8df7ae0 100644
--- a/tk_apap_flutter/lib/pages/tagihan.dart
+++ b/tk_apap_flutter/lib/pages/tagihan.dart
@@ -20,7 +20,7 @@ class DaftarTagihan extends StatefulWidget {
class _DaftarTagihanState extends State<DaftarTagihan> {
Future<List<TagihanDTO>> getTagihan() async {
- var uri = Uri.parse('http://192.168.1.2:8080/api/tagihan/all');
+ var uri = Uri.parse('https://apap-053.cs.ui.ac.id/api/tagihan/all');
dynamic token = await SessionManager().get('token');
String tknString = ('Bearer $token');
http.Response response = await http.get(uri,
diff --git a/tk_apap_flutter/lib/widgets/drawerWidget.dart b/tk_apap_flutter/lib/widgets/drawerWidget.dart
index 10e0852..f1011fd 100644
--- a/tk_apap_flutter/lib/widgets/drawerWidget.dart
+++ b/tk_apap_flutter/lib/widgets/drawerWidget.dart
@@ -118,7 +118,7 @@ class CustomDrawer extends StatelessWidget {
color: Colors.black
),),
onTap: () {
- Navigator.of(context).pushNamed(DaftarTagihan.routeName); // TODO: ubah tagihan
+ Navigator.of(context).pushNamed(DaftarTagihan.routeName);
},
),
ListTile(
--
GitLab