Upload Final Fix #1

Isinya udh fungsi semua mulai dari login, cek daftar, daftar, lupa password
TheKingTermux · Mar 16, 2023 · bb2a9f8 · bb2a9f8
1 parent 9d3b466
commit bb2a9f8
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 184 deletions.
diff --git a/README.md b/README.md
@@ -1,110 +1,5 @@
-# *Daftar Isi*
-- [Status](#status)
-- [Pengertian](#projects-ukk-rpl)
-- [Cara Penggunaan](#cara-penggunaan)
-- [Cara Ngefork](#cara-ngefork)
-- [Cara Terbaik Buat Kontribusi](#cara-terbaik-buat-kontribusi)
-- [Caranya Buat Kontribusi](#caranya-buat-kontribusi)
-- [Struktur Organisasi UKKWarriors](#struktur-organisasi-ukkwarriors)
+# portfolio
 
-# Status
-| Nama | Status |
-| --- | --- |
-| CodeQL | [![CodeQL](https://github.com/UKKWariors/Website-Pengaduan-Masyarakat-Remake/actions/workflows/codeql.yml/badge.svg?branch=main)](https://github.com/UKKWariors/Website-Pengaduan-Masyarakat/actions/workflows/codeql.yml) |
-| Dependency Review | [![Dependency Review](https://github.com/UKKWariors/Website-Pengaduan-Masyarakat-Remake/actions/workflows/dependency-review.yml/badge.svg)](https://github.com/UKKWariors/Website-Pengaduan-Masyarakat-Remake/actions/workflows/dependency-review.yml) |
-| PHPMD | [![PHPMD](https://github.com/UKKWariors/Website-Pengaduan-Masyarakat-Remake/actions/workflows/phpmd.yml/badge.svg)](https://github.com/UKKWariors/Website-Pengaduan-Masyarakat-Remake/actions/workflows/phpmd.yml) |
+## Portfolio Using Tailwindcss
 
-# Projects UKK RPL
-Disini tempatnya projects UKK tentang `Pembuatan Website Pengaduan Masyarakat` buat tahun ini ╮⁠(⁠.⁠ ⁠❛⁠ ⁠ᴗ⁠ ⁠❛⁠.⁠)⁠╭
-
-# Cara penggunaan!
-1. Fork repo ini
-- [Klik disini mas bro buat ngefork](https://github.com/UKKWariors/Website-Pengaduan-Masyarakat-Remake/fork)
-2. Coding dulu di VSCode
-3. Klo dan fix langsung push ke Fork tadi
-4. Klo dah yakin langsung Compare & Pull Request ke sini. ***Caranya ?*** Baca dlu ae sekalian pahami 
-
-# Cara ngefork
-1. Klik disini
-
-![IMG_20230121_155942](https://user-images.githubusercontent.com/50316075/213859977-adf7bc4a-db62-4a01-943d-6e5bd41dcc19.jpg)
-
-2. Langsung klik `Create Fork`
-
-![IMG_20230121_155957](https://user-images.githubusercontent.com/50316075/213859971-46b7bb88-9aab-4680-a896-a16c4d060e9f.jpg)
-
-
-# Cara terbaik buat kontribusi
-1. Jangan lupa selalu `Sync Fork` biar Up to Date
-
-![IMG_20230120_160915](https://user-images.githubusercontent.com/50316075/213658075-0bcf28d9-8a31-4a97-bfdb-4d67b2ca9855.jpg)
-
-2. Pilih disini
-
-![IMG_20230120_160929](https://user-images.githubusercontent.com/50316075/213658087-eca8d5e0-8375-4b5d-8f9c-7025f3aa950c.jpg)
-
-3. Kasih nama biar GK bingung
-
-![IMG_20230120_160942](https://user-images.githubusercontent.com/50316075/213658097-e468cc3c-dad6-46d7-9ca8-1620cfdd90bf.jpg)
-
-4. Jangan lupa buat `Branch Baru` biar klo ada apa" `Main Branch` masih nyediain backup dan bikin `Pull Request` jadi mudah
-
-![IMG_20230120_160958](https://user-images.githubusercontent.com/50316075/213658102-64f4581f-0b90-42e8-a612-3078e389f208.jpg)
-
-5. Nah disini boleh klean acak"
-
-![IMG_20230120_161008](https://user-images.githubusercontent.com/50316075/213658107-4b778e5a-b97d-4cdc-93bd-48384cfa618a.jpg)
-
-
-# Caranya buat kontribusi 
-1. Pilih `Contribute / Compare & Pull Request`
-
-![IMG_20230120_154645](https://user-images.githubusercontent.com/50316075/213654461-aed01793-d706-4b8e-9f67-c39551d2355a.jpg)
-
-![IMG_20230120_162304](https://user-images.githubusercontent.com/50316075/213660483-8863fd56-2980-4285-966d-70075d4e87f9.jpg)
-
-2. Pilih `Open Pull Request`
-
-![IMG_20230120_154712](https://user-images.githubusercontent.com/50316075/213654474-c825daa1-845a-4c01-aa1c-ce1eca547c87.jpg)
-
-3. Pilih `Create Pull Request`
-
-![IMG_20230120_154734](https://user-images.githubusercontent.com/50316075/213654481-19879235-c4db-408b-b8d9-62365623e2ce.jpg)
-
-4. Done
-
-# Struktur Organisasi UKKWarriors
-
-```console
-CEO (@Akinazee)
-├── Chief Officer
-│   └── @Keisukenimb
-│        └── Projects Manager
-│             └── @Keisukenimb @ckckckcz @Akinazee @VansDav
-│                  └── Division
-│                       ├── UI / UX Editor
-│                       │   └── @VansDav
-│                       ├── Database Mastering
-│                       │   └── @KenzienID
-│                       ├── Main Idea
-│                       │   └── @TheKingTermux @KenzienID
-│                       ├── Website Remaker
-│                       │   └── @Akinazee @VansDav
-│                       ├── Website Development 
-│                       │   └── @ckckckcz @Akinazee
-│                       ├── Help Desk
-│                       │   └── @ckckckcz @TheKingTermux @VansDav
-│                       ├── Security
-│                       │   └── @ckckckcz @KenzienID 
-│                       ├── Debugging
-│                       │   └── @ckckckcz @TheKingTermux @KenzienID
-│                       └── Alpha Tester 
-│                            └── @TheKingTermux @KenzienID @ckckckcz
-│                                 └── Beta Tester 
-│                                      └── @TheKingTermux @KenzienID @Keisukenimb
-│                                           └── ACC Projects                           
-└────────── CEO  Approval ──────────┘
-                        ││
-                   Projects Done
-#NOTE: Struktur dapat berubah sewaktu - waktu 
-```
+View : [Here](https://rivalfdla.github.io/portfolio)
diff --git a/daftar.php b/daftar.php
@@ -88,7 +88,7 @@
     <link rel="icon" href="../image/register.png">
 </head>
 
-<body style="background: #23242a">
+<body style="background: #0b111e">
     <div class="box" style="height: 800px">
         <div class="form">
             <form action="#" method="POST" onsubmit="return verifyPassword()">

diff --git a/lupa_password.php b/lupa_password.php
@@ -4,26 +4,18 @@
 
 <?php 
     if(isset($_POST["recover"])){
-        include('connect/connection.php');
+        include('conn/koneksi.php');
         $email = $_POST["email"];
 
-        $sql = mysqli_query($connect, "SELECT * FROM login WHERE email='$email'");
+        $sql = mysqli_query($koneksi, "SELECT * FROM masyarakat WHERE email='$email'");
         $query = mysqli_num_rows($sql);
         $fetch = mysqli_fetch_assoc($sql);
-        $name = $fetch["name"];
+        $name = $fetch["nama"];
 
         if(mysqli_num_rows($sql) <= 0){
-            ?>
-            <script>
-                window.location.replace("./popup/password_gayk.php");
-            </script>
-            <?php
-        }else if($fetch["status"] == 0){
-            ?>
-                <script>
-                    window.location.replace("./popup/password_atv.php");
-                </script>
-            <?php
+            echo "<script>alert('Maaf, tidak ada akun yang terdaftar dengan email tersebut / alamat email tidak valid!')</script>";
+        }else if($fetch["verif"] == 0){
+            echo "<script>alert('Maaf, anda harus memverifikasi akun anda terlebih dahulu sebelum memulihkan kata sandi!')</script>";
         }else{
             // generate token by binaryhexa 
             $token = bin2hex(random_bytes(50));
@@ -56,19 +48,15 @@
             // HTML body
             $mail->isHTML(true);
             $mail->Subject="Memulihkan Kata Sandi Anda";
-            $mail->Body="<b>Dear $name</b>
+            $mail->Body="<b>Dear $nama</b>
             <h3>Kami menerima anda meminta untuk mengubah kata sandi.</h3>
             <p>Silahkan masukkan Kode verifikasi pemulihan akun anda $otp</p>
             <br><br>
             <p>Hormat Kami</p>
             <b>Sekolah Kari Jeneng</b>";
 
-            if(!$mail->send()){
-                ?>
-                    <script>
-                        window.location.replace("./popup/password_etv.php");
-                    </script>
-                <?php
+            if(!$mail->send()){ 
+                echo "<script>alert('Alamat Email Tidak Valid!')</script>";
             }else{
                 ?>
                     <script>
@@ -88,18 +76,18 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta charset="UTF-8">
     <title>Pemulihan Kata Sandi</title>
-    <link rel="stylesheet" href="./css/lupa_password.css">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/all.min.css">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
-    <script src="./js/main.js"></script>
+    <link rel="stylesheet" href="css/lupa_password.css">
+    <link rel="stylesheet" href="css/all.min.css">
+    <script src="js/jquery.min.js"></script>
+    <script src="js/main.js"></script>
     <link rel="icon" href="../image/forget.png">
 </head>
 
 <body>
     <div class="box">
         <div class="form">
             <form action="#" method="POST">
-                <h2>Lali password barang kah</h2>
+                <h2>Lupa Kata Sandi ?</h2>
                     <div class="inputBox">
                         <input type="text" id="email_address" name="email" required="required" autocomplete="off">
                         <span>Email</span>
@@ -110,9 +98,9 @@
                     <br>
                     <br>
                     <div class="cr">
-                        <p align="center" color="#28292d">Sudah ingat passwordnya LOL? </p>
-                        <br>  
-                        <a align="center" href="masuk.php">Balek kesini</a>
+                        <p align="center">Sudah ingat kata sandi? </p>
+                        <br>
+                        <a align="center" href="cek.php">Masuk disini</a>
                     </div>
                 </form>
         </div>

diff --git a/masuk.php b/masuk.php
@@ -15,18 +15,19 @@
 		$data2 = mysqli_fetch_assoc($sql2);
 
         if($cek>0){
-            if($data["verif"] == 0){
+            if($data['verif'] == 0){
                 echo "<script>alert('Silahkan verifikasi akun anda terlebih dahulu!')</script>";
                 echo "<script>location='telat.php'</script>";
             }
-            elseif($data["verif"] == 1){
+            elseif($data['verif'] == 1){
                 session_start();
                 $_SESSION['username']=$username;
                 $_SESSION['data']=$data;
                 $_SESSION['level']='masyarakat';
                 header('location:masyarakat/');
             }
-        elseif($cek2>0){
+        }
+        if($cek2>0){
             if($data2['level']=="admin"){
                 session_start();
                 $_SESSION['username']=$username;
@@ -44,7 +45,6 @@
 			echo "<script>alert('Gagal Login Sob')</script>";
 		}
 	}
-}
 ?>
 
 <!DOCTYPE html>

diff --git a/password_baru.php b/password_baru.php
@@ -1,13 +1,13 @@
 <?php 
 session_start() ;
-include('connect/connection.php');
+include('conn/koneksi.php');
 ?>
 
 <?php
     if(isset($_POST["reset"])){
-        include('connect/connection.php');
-        $psw = $_POST["password"];
-        $cpsw = $_POST["cpassword"];
+        include('conn/koneksi.php');
+        $psw = md5($_POST["password"]);
+        $cpsw = md5($_POST["cpassword"]);
 
         if($psw !== $cpsw){
             $errors['password'] = "Password tidak sama";
@@ -18,31 +18,20 @@
 
         $hash = password_hash( $psw , PASSWORD_DEFAULT );
 
-        $sql = mysqli_query($connect, "SELECT * FROM login WHERE email='$Email'");
+        $sql = mysqli_query($koneksi, "SELECT * FROM masyarakat WHERE email='$Email'");
         $query = mysqli_num_rows($sql);
   	    $fetch = mysqli_fetch_assoc($sql);
 
         if($psw !== $cpsw){
-            ?>
-            <script>
-                window.location.replace('./popup/password_pts.php');
-            </script>
-            <?php
+            echo "<script>alert('Kata sandi tidak sama')</script>";
         }
         if($Email){
             $new_pass = $hash;
-            mysqli_query($connect, "UPDATE login SET password='$new_pass' WHERE email='$Email'");
-            ?>
-            <script>
-                window.location.replace("./popup/password_berhasil.php");
-            </script>
-            <?php
+            mysqli_query($koneksi, "UPDATE masyarakat SET password='$psw' WHERE email='$Email'");
+            echo "<script>alert('Sandi sudah dirubah, anda bisa masuk sekarang')</script>";
+            echo "<script>location='cek.php'</script>";
         }else{
-            ?>
-            <script>
-                window.location.replace("./popup/password_err.php");
-            </script>
-            <?php
+            echo "<script>alert('Ubah kata sandi gagal, silahkan ulangi lagi')</script>";
         }
     }
 
@@ -55,7 +44,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta charset="UTF-8">
     <title>Pemulihan Kata Sandi</title>
-    <link rel="stylesheet" href="./css/password_baru.css">
+    <link rel="stylesheet" href="./css/verifikasi.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/all.min.css">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
     <script src="./js/main.js"></script>
@@ -66,18 +55,18 @@
     <div class="box">
         <div class="form">
             <form action="#" method="POST">
-                <h2>Balikin Kata Sandi Lu</h2>
+                <h2>Ketikkan Kata Sandi Baru</h2>
                     <div class="inputBox">
                         <input type="password" id="password"  name="password" required="required" autocomplete="off" autofocus>
-                        <span>Password Baru</span>
+                        <span>Sandi Baru</span>
                         <i></i>
                     </div>
                     <div class="inputBox">
                         <input type="password" id="password"  name="cpassword" required="required" autocomplete="off" autofocus>
-                        <span>Konfirmasi Password Baru</span>
+                        <span>Konfirmasi Sandi Baru</span>
                         <i></i>
                     </div>
-                    <input type="submit" value="Balikin" name="reset">
+                    <input type="submit" value="Kirim" name="reset">
                     <br>
                 </form>
         </div>

diff --git a/verifikasi_lupa_password.php b/verifikasi_lupa_password.php
@@ -1,6 +1,6 @@
 <?php 
 session_start() ;
-include('connect/connection.php');
+include('conn/koneksi.php');
 ?>
 
 <?php 
@@ -10,17 +10,10 @@
         $otp = $_SESSION['otp'];
 
         if($otp != $otp_code){
-            ?>
-            <script>
-                window.location.replace("./popup/otp_gagal.php");
-            </script>
-            <?php
+            echo "<script>alert('Maaf, Kode Verifikasi Salah')</script>";
         }else{
-            ?>
-            <script>
-                window.location.replace("./popup/otp_berhasil.php");
-            </script>
-            <?php
+            echo "<script>alert('Verifikasi berhasil')</script>";
+            echo "<script>location='password_baru.php'</script>";
         }
 
     }
@@ -34,18 +27,18 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta charset="UTF-8">
     <title>Verifikasi Lupa Password</title>
-    <link rel="stylesheet" href="./css/verifikasi.css">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/all.min.css">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
-    <script src="./js/main.js"></script>
+    <link rel="stylesheet" href="css/verifikasi.css">
+    <link rel="stylesheet" href="css/all.min.css">
+    <script src="js/jquery.min.js"></script>
+    <script src="js/main.js"></script>
     <link rel="icon" href="../image/otp.png">
 </head>
 
 <body>
     <div class="box">
         <div class="form">
             <form action="#" method="POST">
-                <h2>Mana kode verifikasi ubah password lu?</h2>
+                <h2>Silahkan masukkan kode verifikasi untuk mengubah kata sandi</h2>
                     <div class="inputBox">
                         <input type="text" id="otp" name="otp_code" required="required" autocomplete="off" autofocus>
                         <span>Kode Verifikasi</span>