diff --git a/src/components/CardsDaftarPesanan/CardsDaftarPesanan.css b/src/components/CardsDaftarPesanan/CardsDaftarPesanan.css
index 44cd7d4db667d2d143d47d28a38d1e08fd996250..09a7e65bd9895514cd44e929aadee52a4842bf7e 100644
--- a/src/components/CardsDaftarPesanan/CardsDaftarPesanan.css
+++ b/src/components/CardsDaftarPesanan/CardsDaftarPesanan.css
@@ -123,7 +123,7 @@ div#card-footer.row{
background-image: linear-gradient(rgba(0, 0, 0, 0.2) 0 0);
}
-.forum-button {
+.status-button {
border-radius: 8px;
border: 0;
font-family: 'Manrope', sans-serif;
diff --git a/src/components/CardsDaftarPesanan/CardsDaftarPesanan.js b/src/components/CardsDaftarPesanan/CardsDaftarPesanan.js
index faa76c65005fc0f8e284f0d7864826b856b23452..df8d1310c6a4fb18720686b66e7ab7fd20fcf680 100644
--- a/src/components/CardsDaftarPesanan/CardsDaftarPesanan.js
+++ b/src/components/CardsDaftarPesanan/CardsDaftarPesanan.js
@@ -117,7 +117,7 @@ const CardsDaftarPesanan = ({
statusTag = "Dikirim"
label = "Pesanan Diterima"
confirmationMessage = "Apakah Pesan Ini Telah Diterima?"
- buttonColor = "forum-user-only forum-button wkd-dark-blue-button"
+ buttonColor = "status-button wkd-dark-blue-button"
/>
}
{statusTag === "Belum Diproses" && user.role === "Supplier" &&
@@ -126,7 +126,7 @@ const CardsDaftarPesanan = ({
statusTag = "Belum Diproses"
label = "Proses Pesanan"
confirmationMessage = "Proses Pesanan Ini?"
- buttonColor = "forum-user-only forum-button wkd-red-button"
+ buttonColor = "status-button wkd-red-button"
/>
}
{statusTag === "Diproses" && user.role === "Supplier" &&
@@ -135,7 +135,7 @@ const CardsDaftarPesanan = ({
statusTag = "Diproses"
label = "Kirim Pesanan"
confirmationMessage = "Kirim Pesanan Ini?"
- buttonColor = "forum-user-only forum-button wkd-blue-button"
+ buttonColor = "status-button wkd-blue-button"
/>
}
</Col>
diff --git a/src/components/CardsJadwal/CardsJadwal.css b/src/components/CardsJadwal/CardsJadwal.css
index 44aeaecbe6b608288867038a72d698ba359fbaa9..63db245556917a7c885ff4b8642f4499b7ca898c 100644
--- a/src/components/CardsJadwal/CardsJadwal.css
+++ b/src/components/CardsJadwal/CardsJadwal.css
@@ -168,4 +168,13 @@ div.detail{
font-size: 25px;
font-weight: bold;
margin-right: -60%;
+}
+
+#date-comp{
+ color: white;
+ margin:-1.3rem 1.3rem -1.3rem -1.3rem;
+}
+
+#button-container{
+ margin-left: -1rem;
}
\ No newline at end of file
diff --git a/src/components/CardsJadwal/CardsJadwal.js b/src/components/CardsJadwal/CardsJadwal.js
index 1d7852d73c6acee396ebb3bd15f3c94a1e275178..4cf59ba1dc3ec4fa777f329d05b7ea76ae468d9d 100644
--- a/src/components/CardsJadwal/CardsJadwal.js
+++ b/src/components/CardsJadwal/CardsJadwal.js
@@ -93,7 +93,7 @@ const CardsJadwal = ({
return (
<div className="jadwal-card-object" >
<Row>
- <Col xs={rasio[0]} style={{backgroundColor:bgColor}}>
+ <Col xs={rasio[0]} style={{backgroundColor:bgColor}} id="date-comp">
<Row className="hari">
<b>{spiltedDate[0]}</b>
</Row>
@@ -141,7 +141,7 @@ const CardsJadwal = ({
<Row>{deskripsi}</Row>
</div>
</Col>
- <Col xs={rasio[2]}>
+ <Col xs={rasio[2]} id="button-container">
<Link to={"/list-forum-rupt/"+pk}>
{filter=="FIN" &&
<div className="jadwal-button">
diff --git a/src/hooks/jadwalHooks.js b/src/hooks/jadwalHooks.js
index 8396efaf9bde997b139e48e3b1d8c518cd7397df..2d6d72911125a4ae664b09be8bad5f989eaf6e27 100644
--- a/src/hooks/jadwalHooks.js
+++ b/src/hooks/jadwalHooks.js
@@ -12,12 +12,13 @@ function getConfig() {
function fetchJadwal(setJadwal, filter) {
const config = getConfig();
var today = new Date();
- var date = today.getFullYear()+'-0'+(today.getMonth()+1)+'-'+today.getDate();
- var time = ("0" + today.getHours()).slice(-2) + ":" + ("0" + today.getMinutes()).slice(-2) + "0" + ("0" + today.getSeconds()).slice(-2);
+ var date = today.getFullYear()+'-0'+(today.getMonth()+1)+'-'+("0" + today.getDate()).slice(-2);
+ var time = ("0" + today.getHours()).slice(-2) + ":" + ("0" + today.getMinutes()).slice(-2) + ":" + ("0" + today.getSeconds()).slice(-2); console.log(date);
axios.get(`${process.env.REACT_APP_BACKEND_API_URL}/api/list_jadwal`, config)
.then(res => {
var filteredData = res.data.filter(d => {
+ console.log(d["tanggal"]);
switch(filter) {
case "INC":
return d['tanggal'] > date;
@@ -30,8 +31,7 @@ function fetchJadwal(setJadwal, filter) {
let sortedData = filteredData
if(filter=="INC"){
- sortedData.sort((a, b) =>
- a.tanggal < b.tanggal ? -1 : (a.tanggal < b.tanggal ? 1: (a.tanggal > b.tanggal ? 1: a.waktuMulai < b.waktuMulai ? -1:1 )));
+ sortedData.sort((a, b) => a.tanggal < b.tanggal ? -1 : (a.tanggal < b.tanggal ? 1: (a.waktuMulai < b.waktuMulai ? -1:1 )));
}else if(filter=="ONG"){
sortedData.sort((a, b) => a.waktuMulai > b.waktuMulai ? 1 : -1);
}else{
diff --git a/src/page/FormRUPT/FormRUPT.css b/src/page/FormRUPT/FormRUPT.css
index b004f48b425f163016ff55fe0c8580a2c02755e4..08e1eafc352a3eb28c1c2fc45bd3d4a1eb0e2111 100644
--- a/src/page/FormRUPT/FormRUPT.css
+++ b/src/page/FormRUPT/FormRUPT.css
@@ -52,10 +52,6 @@ h5.semi-title{
margin: 0.7rem 2rem 4rem 2rem;
}
-.centered{
- padding-left: 5rem;
- padding-right: 5rem;
-}
#img-rupt{
margin-top: -3rem;
diff --git a/src/page/PengadaanMainan/PengadaanMainan.css b/src/page/PengadaanMainan/PengadaanMainan.css
index 7ab79e2f57e256b0d4603b7eff15baf90dad2f81..1f415f98b068442c6051fb4726c8a10564fb0a83 100644
--- a/src/page/PengadaanMainan/PengadaanMainan.css
+++ b/src/page/PengadaanMainan/PengadaanMainan.css
@@ -239,10 +239,8 @@
color: #0CB6D8;
}
-
-
-.card-columns {
- column-count: 3;
+div#card-pengadaan.card-columns {
+ column-count: 4;
}
.next-container {
diff --git a/src/page/PengadaanMainan/PengadaanMainanFirstPage.js b/src/page/PengadaanMainan/PengadaanMainanFirstPage.js
index 0ead42cf0c594a455fffccc0481c47dc021e959c..26de5d1ee0e45e9b1cdf527c78dd162aef22bdad 100644
--- a/src/page/PengadaanMainan/PengadaanMainanFirstPage.js
+++ b/src/page/PengadaanMainan/PengadaanMainanFirstPage.js
@@ -110,7 +110,7 @@ const PengadaanMainanFirstPage = ({ daftarMainan, setState, formData, navigation
<br></br>
<p>Pilih pengadaan mainan yang Anda inginkan!</p>
<br></br>
- <CardColumns>
+ <CardColumns id='card-pengadaan'>
{daftarMainan.map(mainan => (
<Card className="card-flex-item2"
diff --git a/src/page/Produk/Produk.css b/src/page/Produk/Produk.css
index 039a9f29c1095d9281ed52408dc1ca0561581406..2f62a33838cbfbc9f014e4f78052a42887bc402f 100644
--- a/src/page/Produk/Produk.css
+++ b/src/page/Produk/Produk.css
@@ -27,8 +27,9 @@
margin-bottom: 5rem;
}
-.text-left{
+.text-left-title{
padding-left: 3rem;
+ text-align: left!important;
}
#d-t-form{
diff --git a/src/page/Produk/Produk.js b/src/page/Produk/Produk.js
index 1def56996e9b08722e67016c6b0fe8f6f3f8d6a3..574e8ff9524cee0862265d072bc9c2c3cfcfbce6 100644
--- a/src/page/Produk/Produk.js
+++ b/src/page/Produk/Produk.js
@@ -16,7 +16,7 @@ const Produk = ({ isAuthenticated, user }) => {
</div>
<div className="produk-content">
<Card className='card-produk'>
- <div className='text-left'>
+ <div className='text-left-title'>
<h3 className='font-weight-bold'>Tambah Produk</h3>
<p>Tentukan Detail yang Tepat untuk Produkmu!</p>
</div>
diff --git a/src/page/Produk/ProdukUpdate.js b/src/page/Produk/ProdukUpdate.js
index 2f00f6ed1a3a6c8a05c79b53b9e35a5cbd3d1cdd..4959e23d20ca222761140aeda369b474e293932c 100644
--- a/src/page/Produk/ProdukUpdate.js
+++ b/src/page/Produk/ProdukUpdate.js
@@ -16,7 +16,7 @@ const ProdukUpdate = ({ isAuthenticated, user, match }) => {
</div>
<div className="produk-content">
<Card className='card-produk'>
- <div className='text-left'>
+ <div className='text-left-title'>
<h3 className='font-weight-bold'>Update Produk</h3>
<p>Tentukan Detail yang Tepat untuk Produkmu!</p>
</div>