Fakultas Ilmu Komputer UI

Commit 867402bf authored by Ferdi Salim Sungkar's avatar Ferdi Salim Sungkar
Browse files

[CHORES] pulling from staging and resolving conflicts

parents ab23875e f6b4472b
Pipeline #67547 passed with stages
in 4 minutes and 37 seconds
......@@ -76,7 +76,6 @@ SonarScanner:
# - echo $PATH
# - sonar-scanner -Dsonar.host.url=https://pmpl.cs.ui.ac.id/sonarqube -Dsonar.login=$SONARQUBE_TOKEN -Dsonar.branch.name=$CI_COMMIT_REF_NAME -Dsonar.projectKey=$SONARQUBE_PROJECT_KEY
# build_android:
# stage: build_android
# before_script:
......
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.18537 8.25937L5.1778 8.26694H5.17902L5.18537 8.25937ZM3.57205 9.87269L2.38549 11.0593L1.25 9.92377L8.86463 2.30914C9.49166 1.68211 10.5083 1.68211 11.1353 2.30914L18.7499 9.92377L17.6145 11.0593L16.4278 9.87264V16.3018C16.4278 17.1893 15.7084 17.9088 14.8209 17.9088H5.17902C4.29152 17.9088 3.57205 17.1893 3.57205 16.3018V9.87269ZM14.8221 8.26694L14.8071 8.25188L14.8209 8.26694H14.8221Z" fill="#12284B"/>
</svg>
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10 1C5.1211 1 1 5.1211 1 10C1 14.8789 5.1211 19 10 19C14.8789 19 19 14.8789 19 10C19 5.1211 14.8789 1 10 1ZM10 5.5C11.5543 5.5 12.7 6.6448 12.7 8.2C12.7 9.7552 11.5543 10.9 10 10.9C8.4466 10.9 7.3 9.7552 7.3 8.2C7.3 6.6448 8.4466 5.5 10 5.5ZM5.4046 14.2948C6.2119 13.1068 7.5583 12.3148 9.1 12.3148H10.9C12.4426 12.3148 13.7881 13.1068 14.5954 14.2948C13.4452 15.526 11.8135 16.3 10 16.3C8.1865 16.3 6.5548 15.526 5.4046 14.2948Z" fill="#C4C4C4"/>
</svg>
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M19 9.61356C19 5.14827 14.8387 0.999512 10.0045 0.999512C5.03931 0.999512 0.999985 5.0389 0.999985 10.0042C0.999985 11.6224 1.43071 13.1979 2.24861 14.5812L1.03309 18.9755L5.42757 17.7602C6.69904 18.5121 7.90879 19.0053 9.6137 18.9995C16.6122 18.9755 19 14.0788 19 9.61356ZM5.64563 16.2661L3.01488 16.9939L3.74264 14.3631L3.57676 14.1036C2.79502 12.8805 2.38175 11.463 2.38175 10.0042C2.38175 5.80087 5.80126 2.3813 10.0045 2.3813C14.2077 2.3813 17.6272 5.80087 17.6272 10.0042C17.6272 14.2075 14.2077 17.627 10.0045 17.627C8.54571 17.627 7.12832 17.2137 5.90507 16.432L5.64563 16.2661Z" fill="#C4C4C4"/>
<path d="M9.10005 13.6001H10.9001V15.4001H9.10005V13.6001Z" fill="#C4C4C4"/>
<path d="M11.35 8.36093C11.35 8.76716 11.1939 9.14209 10.9106 9.41683L9.32503 10.9546V12.7H10.675V11.5845L11.822 10.4722C12.3799 9.93108 12.7 9.16165 12.7 8.36093C12.7 6.78332 11.4889 5.5 10 5.5C8.51117 5.5 7.30003 6.78332 7.30003 8.36093H8.65003C8.65003 7.57212 9.2556 6.93046 10 6.93046C10.7445 6.93046 11.35 7.57212 11.35 8.36093Z" fill="#C4C4C4"/>
</svg>
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M5.87702 6.65111H15.3161V6.06107C15.3161 5.5741 14.9173 5.17601 14.4311 5.17601H10.5352V4.6607C10.5352 3.92748 9.93888 3.3335 9.20802 3.3335H6.94225C6.58822 3.3335 6.25545 3.47194 6.00368 3.72371C5.75192 3.97547 5.61424 4.30587 5.61424 4.6607V5.17678H1.7184C1.23143 5.17601 0.833336 5.57407 0.833336 6.06107V13.9653L3.80874 7.93744C4.16985 7.20337 5.06041 6.65111 5.87702 6.65111ZM6.49934 4.6607C6.49934 4.54348 6.54733 4.43254 6.62994 4.34916C6.71255 4.26418 6.82426 4.21779 6.94148 4.21779H9.20726C9.45194 4.21779 9.6494 4.41605 9.6494 4.6607V5.17678H6.49937V4.6607H6.49934Z" fill="#C4C4C4"/>
<path d="M18.5904 7.53418H5.87696C5.39075 7.53418 4.81567 7.89135 4.60245 8.32719L1.18337 15.2535C0.967823 15.6886 1.19045 16.0457 1.67665 16.0457H14.3901C14.8763 16.0457 15.4522 15.6893 15.6662 15.2535L19.0845 8.32719C19.2993 7.89135 19.0782 7.53418 18.5904 7.53418Z" fill="#C4C4C4"/>
</svg>
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.99606 18.4623H3.19486C1.67167 18.4623 0.833328 17.6161 0.833328 16.1008C0.833328 11.7871 0.833328 7.47202 0.833328 3.15567C0.833328 1.71513 1.71103 0.833496 3.1555 0.833496C7.70538 0.833496 12.2553 0.833496 16.8051 0.833496C18.3323 0.833496 19.1667 1.67971 19.1667 3.19502C19.1667 7.514 19.1667 11.829 19.1667 16.1401C19.1667 17.5807 18.285 18.4623 16.8445 18.4662H9.99606V18.4623ZM13.436 12.4601L13.5344 12.6215C13.2668 12.8537 12.9913 13.0741 12.7472 13.3181C12.3812 13.6841 12.3537 14.0817 12.6292 14.3847C12.7036 14.4591 12.7933 14.5166 12.892 14.5532C12.9907 14.5898 13.0961 14.6047 13.2011 14.5968C13.3061 14.589 13.4081 14.5586 13.5003 14.5077C13.5924 14.4569 13.6726 14.3867 13.7351 14.3021C14.3688 13.6763 14.9907 13.0426 15.6283 12.4168C15.7755 12.3174 15.8848 12.1712 15.9384 12.0018C15.992 11.8325 15.9868 11.65 15.9235 11.484C15.7582 11.0904 15.4158 11.051 15.0419 11.051H6.01688C5.40289 11.051 5.05653 11.3147 5.0644 11.7674C5.07227 12.22 5.41469 12.4601 6.04444 12.4601H13.436ZM6.93788 7.17814L6.82768 6.97347C7.07067 6.79796 7.30451 6.61011 7.52826 6.41064C7.92185 6.01705 7.94547 5.62346 7.6424 5.30466C7.33934 4.98585 6.93394 5.03702 6.54036 5.42667C5.9421 6.01705 5.35959 6.60743 4.7574 7.20569C4.50157 7.46152 4.26148 7.72522 4.43072 8.13062C4.59997 8.53602 4.966 8.58325 5.35172 8.57931H14.3059C14.9474 8.57931 15.2701 8.34316 15.2819 7.88659C15.2938 7.43003 14.9671 7.18207 14.3334 7.1742H6.93788V7.17814Z" fill="#C4C4C4"/>
</svg>
PODS:
- Flutter (1.0.0)
- flutter_keyboard_visibility (0.0.1):
- Flutter
- path_provider (0.0.1):
- Flutter
DEPENDENCIES:
- Flutter (from `Flutter`)
- flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
- path_provider (from `.symlinks/plugins/path_provider/ios`)
EXTERNAL SOURCES:
Flutter:
:path: Flutter
flutter_keyboard_visibility:
:path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
path_provider:
:path: ".symlinks/plugins/path_provider/ios"
SPEC CHECKSUMS:
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
......
import 'package:flutter/material.dart';
// Brand Colors
const primary = Color.fromRGBO(18, 40, 75, 1.0);
const secondary = Color.fromRGBO(0, 145, 201, 1.0);
// State Colors
const success = Color.fromRGBO(39, 174, 96, 1.0);
const warning = Color.fromRGBO(226, 210, 59, 1.0);
const error = Color.fromRGBO(235, 87, 87, 1.0);
// Black Colors
const black1 = Colors.black;
const black2 = Color.fromRGBO(29, 29, 29, 1.0);
const black3 = Color.fromRGBO(46, 47, 48, 1.0);
const white = Colors.white;
// Gray Colors
const gray1 = Color.fromRGBO(51, 51, 51, 1.0);
const gray2 = Color.fromRGBO(79, 79, 79, 1.0);
const gray3 = Color.fromRGBO(130, 130, 130, 1.0);
const gray4 = Color.fromRGBO(189, 189, 189, 1.0);
const gray5 = Color.fromRGBO(224, 224, 224, 1.0);
// Element Colors
const red1 = Color.fromRGBO(159, 25, 25, 1.0);
const info = Color.fromRGBO(151, 182, 255, 1.0);
import 'package:flutter/material.dart';
const primary = Color(0xFF12284B);
const secondary = Color(0xFF0091C9);
const white = Color(0xFFFFFFFF);
const black1 = Color(0xFF000000);
const gray4 = Color(0xFFBDBDBD);
\ No newline at end of file
This diff is collapsed.
import 'package:flutter/material.dart';
import 'package:fundex_app/constants.dart';
InputDecoration formInputDecoration() {
return InputDecoration(
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: gray4),
borderRadius: BorderRadius.circular(6),
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: gray4),
borderRadius: BorderRadius.circular(6),
),
border: OutlineInputBorder(
borderSide: BorderSide(color: gray4),
borderRadius: BorderRadius.circular(6),
),
contentPadding: EdgeInsets.fromLTRB(10, 0, 0, 0),
);
}
TextStyle titleTextStyle() {
return TextStyle(
fontWeight: FontWeight.bold,
fontSize: 14,
fontFamily: 'Inter',
color: primary,
);
}
TextStyle miniTitleTextStyle() {
return TextStyle(
fontWeight: FontWeight.normal,
fontSize: 12,
fontFamily: 'Noto Sans',
);
}
TextStyle checkTextStyle() {
return TextStyle(
fontWeight: FontWeight.normal,
fontSize: 12,
fontFamily: 'Inter',
color: primary,
);
}
TextStyle miniTextStyle() {
return TextStyle(
fontWeight: FontWeight.bold,
fontSize: 12,
fontFamily: 'Inter',
color: primary,
);
}
......@@ -18,7 +18,10 @@ class MyApp extends StatelessWidget {
},
),
appBar: AppBar(
title: Text('Welcome to Flutters'),
title: Text(
'Welcome to Flutters',
key: Key('welcomeToFluttersText'),
),
),
body: Center(
child: Text('Hello World'),
......
This diff is collapsed.
import 'package:flutter/material.dart';
import 'package:fundex_app/pages/business/homekyc.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:fundex_app/assets/colors.dart';
class EmailValidator {
static String validate(String value) {
return value.isEmpty ? 'Email harus di isi' : null;
}
}
class PasswordValidator {
static String validate(String value) {
return value.isEmpty ? 'Password harus di isi' : null;
}
}
class Login extends StatefulWidget {
@override
_LoginState createState() => _LoginState();
}
class _LoginState extends State<Login> {
InputDecoration formInputDecoration() {
return InputDecoration(
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: gray4),
borderRadius: BorderRadius.circular(6),
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: gray4),
borderRadius: BorderRadius.circular(6),
),
border: OutlineInputBorder(
borderSide: BorderSide(color: gray4),
borderRadius: BorderRadius.circular(6),
),
contentPadding: EdgeInsets.symmetric(vertical: 10.0, horizontal: 10.0));
}
final _keyForm = GlobalKey<FormState>();
Widget _buildEmail() {
return SizedBox(
child: TextFormField(
key: Key('emailFormField'),
decoration: formInputDecoration(),
validator: EmailValidator.validate,
keyboardType: TextInputType.text,
onSaved: (String value) {
email = value;
},
),
);
}
Widget _buildPassword() {
return SizedBox(
child: TextFormField(
key: Key('passwordFormField'),
obscureText: true,
decoration: formInputDecoration(),
validator: PasswordValidator.validate,
keyboardType: TextInputType.text,
onSaved: (String value) {
password = value;
},
),
);
}
String email;
String password;
@override
Widget build(BuildContext context) {
return MaterialApp(
home: Scaffold(
body: SafeArea(
child: Container(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Container(
child: Column(
children: <Widget>[
Container(
margin: const EdgeInsets.fromLTRB(0, 48, 0, 0),
child: Image.asset(
'assets/images/fundex-logo.png',
key: Key('fundexLogo'),
width: 82,
height: 22,
),
),
Container(
margin: const EdgeInsets.fromLTRB(0, 48, 0, 0),
child: Text(
'Login',
key: Key('loginPageTitle'),
style: GoogleFonts.inter(
fontSize: 18,
fontWeight: FontWeight.w600,
color: Color.fromRGBO(46, 47, 48, 1.0)),
)),
Container(
margin: const EdgeInsets.fromLTRB(0, 72, 0, 0),
width: 343,
child: Form(
key: _keyForm,
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Column(
children: <Widget>[
Container(
width: 343,
child: Text(
'Email',
key: Key('emailInputTitle'),
style: GoogleFonts.inter(
fontSize: 12,
fontWeight: FontWeight.w500,
color: Colors.black),
),
),
Container(
width: 343,
margin: const EdgeInsets.fromLTRB(
0, 8, 0, 0),
child: _buildEmail()),
Container(
width: 343,
margin: const EdgeInsets.fromLTRB(
0, 16, 0, 0),
child: Text(
'Password',
key: Key('passwordInputTitle'),
style: GoogleFonts.inter(
fontSize: 12,
fontWeight: FontWeight.w500,
color: Colors.black),
),
),
Container(
width: 343,
margin: const EdgeInsets.fromLTRB(
0, 8, 0, 0),
child: _buildPassword(),
),
Container(
margin: const EdgeInsets.fromLTRB(
0, 40, 0, 0),
child: SizedBox(
width: 343,
height: 52,
child: ElevatedButton(
key: Key('loginButton'),
onPressed: () {
if (!_keyForm.currentState
.validate()) {
return;
}
_keyForm.currentState.save();
print(email);
print(password);
Navigator.push(context,
MaterialPageRoute(
builder: (context) {
return MaterialApp(
home: HomeKYC());
}));
},
child: Text(
'Masuk',
style: GoogleFonts.roboto(
fontSize: 14,
fontWeight:
FontWeight.bold),
),
style: ElevatedButton.styleFrom(
primary: primary)),
),
)
],
)
])))
],
),
),
],
),
),
),
));
}
}
import 'package:flutter/material.dart';
import 'package:fundex_app/main.dart';
import 'package:fundex_app/pages/login/Login.dart';
import 'package:google_fonts/google_fonts.dart';
class ActivationSuccess extends StatefulWidget {
......@@ -59,7 +59,7 @@ class _ActivationSuccessState extends State<ActivationSuccess> {
context,
new MaterialPageRoute(
builder: (BuildContext context) =>
MyApp()));
Login()));
},
child: Text('Masuk',
style: GoogleFonts.roboto(
......
......@@ -15,6 +15,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
carousel_slider:
dependency: "direct main"
description:
name: carousel_slider
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.0"
characters:
dependency: transitive
description:
......@@ -43,6 +50,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0"
convert:
dependency: transitive
description:
name: convert
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
crypto:
dependency: transitive
description:
......@@ -83,11 +97,51 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
flutter_keyboard_visibility:
dependency: transitive
description:
name: flutter_keyboard_visibility
url: "https://pub.dartlang.org"
source: hosted
version: "5.0.0"
flutter_keyboard_visibility_platform_interface:
dependency: transitive
description:
name: flutter_keyboard_visibility_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
flutter_keyboard_visibility_web:
dependency: transitive
description:
name: flutter_keyboard_visibility_web
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
flutter_svg:
dependency: "direct main"
description:
name: flutter_svg
url: "https://pub.dartlang.org"
source: hosted
version: "0.19.3"
flutter_test:
dependency: "direct dev"
description: flutter
source: sdk
version: "0.0.0"
flutter_typeahead:
dependency: "direct main"
description:
name: flutter_typeahead
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.0"
flutter_web_plugins:
dependency: transitive
description: flutter
source: sdk
version: "0.0.0"
google_fonts:
dependency: "direct main"
description:
......@@ -109,6 +163,20 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.0"
intl:
dependency: "direct main"
description:
name: intl
url: "https://pub.dartlang.org"
source: hosted
version: "0.17.0"
js:
dependency: transitive
description:
name: js
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.3"
matcher:
dependency: transitive
description:
......@@ -130,6 +198,20 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
path_drawing:
dependency: transitive
description:
name: path_drawing
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.1+1"
path_parsing:
dependency: transitive
description:
name: path_parsing
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.4"
path_provider:
dependency: transitive
description:
......@@ -172,6 +254,20 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.11.0"
percent_indicator:
dependency: "direct main"
description:
name: percent_indicator
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.9+1"
petitparser:
dependency: transitive
description:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.0"
platform:
dependency: transitive
description:
......@@ -192,7 +288,7 @@ packages:
name: process
url: "https://pub.dartlang.org"
source: hosted
version: "4.1.1"
version: "4.2.1"
sky_engine:
dependency: transitive
description: flutter
......@@ -268,6 +364,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.0"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "4.5.1"
sdks:
dart: ">=2.12.0 <3.0.0"
flutter: ">=1.20.0"
flutter: ">=1.24.0-10.1.pre"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment