Skip to content

Commit

Permalink
Merge pull request #9 from E-Waste-Bank/staging
Browse files Browse the repository at this point in the history 
Merge pull request #8 from E-Waste-Bank/main
  • Loading branch information
@ratama98
ratama98 authored Dec 12, 2022
2 parents d01607a + 35cea1d commit 50f2279
Show file tree
Hide file tree
Showing 37 changed files with 1,362 additions and 857 deletions.
8 changes: 4 additions & 4 deletions about_us/lib/about_us.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class AboutUsPage extends StatefulWidget {
const AboutUsPage({Key? key}) : super(key: key);

@override
_AboutUsPageState createState() => _AboutUsPageState();
State<AboutUsPage> createState() => _AboutUsPageState();
}

class _AboutUsPageState extends State<AboutUsPage> {
Expand All @@ -33,22 +33,22 @@ class _AboutUsPageState extends State<AboutUsPage> {
alignment: Alignment.center,
child: Column(
children: [
Text(
const Text(
"Get To Know Us!",
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 30,
),
),
Text(
const Text(
"Kami hadir untuk memudahkan masyarakat untuk mengumpulkan dan mengelola barang elektronik yang sudah tidak layak pakai. Melalui aplikasi ini, masyarakat dapat mendapatkan uang melalui menjual barang elektronik yang sudah tidak layak pakai, yang nantinya akan dijemput oleh kami. Selain itu, kami memberikan informasi tips dan tricks mengenai pengelolaan E Waste.",
textAlign: TextAlign.justify,
style: TextStyle(
fontSize: 20,
),
),
Text(
const Text(
"What People Say About Us?",
textAlign: TextAlign.center,
style: TextStyle(
Expand Down
52 changes: 18 additions & 34 deletions about_us/lib/page/add_feedack.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@

import 'package:flutter/material.dart';
import 'package:pbp_django_auth/pbp_django_auth.dart';
import 'package:about_us/page/list_feedback.dart';
import 'package:e_waste_bank_mobile/drawer.dart';
import 'package:provider/provider.dart';


class AddFeedbackPage extends StatefulWidget {
const AddFeedbackPage({super.key});
Expand All @@ -12,14 +16,14 @@ class AddFeedbackPage extends StatefulWidget {
class _AddFeedbackPageState extends State<AddFeedbackPage> {
final _formKey = GlobalKey<FormState>();
String _nama= "";
DateTime now = DateTime.now();
String _feedback = "";

@override
Widget build(BuildContext context) {
final request = context.watch<CookieRequest>();
return Scaffold(
appBar: AppBar(
title: Text('Add Your Feedback'),
title: const Text('Add Your Feedback'),
),
// Menambahkan drawer menu
drawer: const MyDrawer(),
Expand All @@ -32,17 +36,14 @@ class _AddFeedbackPageState extends State<AddFeedbackPage> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Padding(
// Menggunakan padding sebesar 8 pixels
padding: const EdgeInsets.all(8.0),
child: TextFormField(
decoration: InputDecoration(
labelText: "Nama",
// Menambahkan circular border agar lebih rapi
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(5.0),
),
),
// Menambahkan behavior saat nama diketik
onChanged: (String? value) {
setState(() {
_nama = value!;
Expand Down Expand Up @@ -99,36 +100,19 @@ class _AddFeedbackPageState extends State<AddFeedbackPage> {
style: ButtonStyle(
backgroundColor: MaterialStateProperty.all(Colors.blue),
),
onPressed: () {
onPressed: () async {
if (_formKey.currentState!.validate()) {
DataFeedback.listNama.add(_nama);
DataFeedback.listTanggal.add(now);
DataFeedback.listFeedback.add(_feedback);
showDialog(
context: context,
builder: (context) {
return Dialog(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
elevation: 15,
child: ListView(
padding: const EdgeInsets.only(top: 20, bottom: 20),
shrinkWrap: true,
children: <Widget>[
const Center(child: Text('Data Berhasil Ditambahkan')),
const SizedBox(height: 20),
TextButton(
onPressed: () {
Navigator.pop(context);
},
child: const Text('Kembali'),
),
],
),

);
},
// ignore: unused_local_variable
final response = await request.post(
'https://e-waste-bank.up.railway.app/about-us/add-feedback-flutter/', {
'name': _nama,
'your_feedback':_feedback
}
);
// ignore: use_build_context_synchronously
Navigator.pushReplacement(
context,
MaterialPageRoute(builder: (context) => const ListFeedbackPage()),
);
}
},
Expand Down
22 changes: 8 additions & 14 deletions about_us/lib/page/list_feedback.dart
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
import 'package:about_us/page/add_feedack.dart';
import 'package:flutter/material.dart';
import 'package:about_us/model/feedback.dart';
import 'dart:convert';
import 'package:http/http.dart' as http;
import 'package:e_waste_bank_mobile/drawer.dart';

class DataFeedback{
static List<String> listNama = [];
static List<DateTime> listTanggal = [];
static List<String> listFeedback = [];
}

class ListFeedbackPage extends StatefulWidget {
const ListFeedbackPage({Key? key}) : super(key: key);

@override
_ListFeedbackPageState createState() => _ListFeedbackPageState();
State<ListFeedbackPage> createState() => _ListFeedbackPageState();
}

class _ListFeedbackPageState extends State<ListFeedbackPage> {
Expand All @@ -33,16 +26,17 @@ class _ListFeedbackPageState extends State<ListFeedbackPage> {
var data = jsonDecode(utf8.decode(response.bodyBytes));

// melakukan konversi data json menjadi object
List<Feedbacks> listMyWatchlist = [];
List<Feedbacks> listFeedback = [];
for (var d in data) {
if (d != null) {
listMyWatchlist.add(Feedbacks.fromJson(d));
listFeedback.add(Feedbacks.fromJson(d));
}
}

return listMyWatchlist;
return listFeedback;
}

@override
Widget build(BuildContext context) {

return Scaffold(
Expand Down Expand Up @@ -76,7 +70,7 @@ class _ListFeedbackPageState extends State<ListFeedbackPage> {
child: Card(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
side: BorderSide(color: Colors.blue)
side: const BorderSide(color: Colors.blue)
),
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 3, vertical: 3),
Expand All @@ -85,12 +79,12 @@ class _ListFeedbackPageState extends State<ListFeedbackPage> {
"${snapshot.data![index].fields.yourFeedback}"
),
subtitle: Padding(
padding: EdgeInsets.all(5.0),
padding: const EdgeInsets.all(5.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("${snapshot.data![index].fields.name}"),
Text("${snapshot.data![index].fields.date}"),
Text("${snapshot.data![index].fields.date}".toString().substring(0,10)),
],
),
),
Expand Down
3 changes: 3 additions & 0 deletions about_us/pubspec.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: about_us
description: A new Flutter package project.
version: 0.0.1
publish_to: "none"
homepage:

environment:
Expand All @@ -13,6 +14,8 @@ dependencies:
e_waste_bank_mobile:
path: ../.
http: ^0.13.5
pbp_django_auth: ^0.2.3
provider: ^6.0.4

dev_dependencies:
flutter_test:
Expand Down
12 changes: 0 additions & 12 deletions about_us/test/about_us_test.dart
View file

This file was deleted.

19 changes: 19 additions & 0 deletions keuangan/lib/methods/get_admin_cashout.dart
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import 'package:provider/provider.dart';
import 'package:pbp_django_auth/pbp_django_auth.dart';
import 'package:keuangan/models/admin_cashout_model.dart';

Future<List<Cashout>> fetchAdminCashout(context) async {
final requester = Provider.of<CookieRequest>(context, listen: false);

var data = await requester
.get("https://e-waste-bank.up.railway.app/keuangan/json/admin-cashouts/");

List<Cashout> listCashouts = [];
for (var each in data) {
if (each != null) {
listCashouts.add(Cashout.fromJson(each));
}
}

return listCashouts;
}
19 changes: 19 additions & 0 deletions keuangan/lib/methods/get_admin_keuangan.dart
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import 'package:provider/provider.dart';
import 'package:pbp_django_auth/pbp_django_auth.dart';
import 'package:keuangan/models/admin_keuanganadmin_model.dart';

Future<List<KeuanganAdmin>> fetchKeuanganAdmin(context) async {
final requester = Provider.of<CookieRequest>(context, listen: false);

var data = await requester
.get("https://e-waste-bank.up.railway.app/keuangan/json/admin/");

List<KeuanganAdmin> listKeuanganAdmin = [];
for (var each in data) {
if (each != null) {
listKeuanganAdmin.add(KeuanganAdmin.fromJson(each));
}
}

return listKeuanganAdmin;
}
13 changes: 3 additions & 10 deletions keuangan/lib/models/admin_cashout_model.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,36 +43,29 @@ class Fields {
required this.disbursed,
});

User? user;
String user;
int uangModel;
double amount;
bool approved;
bool disbursed;

factory Fields.fromJson(Map<String, dynamic> json) => Fields(
user: userValues.map[json["user"]],
user: json["user"],
uangModel: json["uang_model"],
amount: json["amount"].toDouble(),
approved: json["approved"],
disbursed: json["disbursed"],
);

Map<String, dynamic> toJson() => {
"user": userValues.reverse![user],
"user": user,
"uang_model": uangModel,
"amount": amount,
"approved": approved,
"disbursed": disbursed,
};
}

enum User { PEBEPE, CBKADAL }

final userValues = EnumValues({
"cbkadal": User.CBKADAL,
"pebepe": User.PEBEPE
});

enum Model { KEUANGAN_CASHOUT }

final modelValues = EnumValues({
Expand Down
4 changes: 2 additions & 2 deletions keuangan/lib/models/admin_keuanganadmin_model.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ class Fields {
required this.user,
});

int uangUser;
double uangUser;
String user;

factory Fields.fromJson(Map<String, dynamic> json) => Fields(
uangUser: json["uang_user"],
uangUser: json["uang_user"].toDouble(),
user: json["user"],
);

Expand Down
Loading

0 comments on commit 50f2279

Please sign in to comment.