Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor codes, add more pages protection #14

Merged
merged 37 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
a7c6845
Add page protection using Session Status
GesangPJ Jul 9, 2024
4e4d674
Add page protection using Session Status
GesangPJ Jul 9, 2024
fbb06f1
Add page protection using Session Status
GesangPJ Jul 9, 2024
5eee125
Add page protection using Session Status
GesangPJ Jul 9, 2024
efaaed4
Add page protection using Session Status
GesangPJ Jul 9, 2024
ce95f7f
Add page protection using Session Status
GesangPJ Jul 9, 2024
15e845e
Add page protection using Session Status
GesangPJ Jul 9, 2024
8c56f91
Update package-lock.json
GesangPJ Jul 10, 2024
a2b29e5
Update package.json
GesangPJ Jul 10, 2024
549f406
Update package-lock.json
GesangPJ Jul 10, 2024
c1e1018
Delete page.jsx
GesangPJ Jul 10, 2024
7aaf970
Delete page.jsx
GesangPJ Jul 10, 2024
4e0c281
Delete page.jsx
GesangPJ Jul 10, 2024
17c18f6
update sidebar
GesangPJ Jul 10, 2024
181398f
refactor codes
GesangPJ Jul 10, 2024
9fd5a71
refactor codes
GesangPJ Jul 10, 2024
c07dd52
refactor codes
GesangPJ Jul 10, 2024
cf9bfec
refactor codes
GesangPJ Jul 10, 2024
6691866
refactor codes
GesangPJ Jul 10, 2024
2054f99
refactor codes
GesangPJ Jul 10, 2024
cc7a839
refactor codes
GesangPJ Jul 10, 2024
5791d5d
refactor codes
GesangPJ Jul 10, 2024
e635e0f
refactor codes
GesangPJ Jul 10, 2024
bb308b3
refactor codes
GesangPJ Jul 10, 2024
555fe4c
refactor codes
GesangPJ Jul 10, 2024
05688f9
refactor codes
GesangPJ Jul 10, 2024
8c7c732
refactor codes
GesangPJ Jul 10, 2024
fb6d133
refactor codes
GesangPJ Jul 10, 2024
865b476
refactor codes
GesangPJ Jul 10, 2024
0eeaef3
refactor codes
GesangPJ Jul 10, 2024
9aa2c44
refactor codes
GesangPJ Jul 10, 2024
e5924ac
refactor codes
GesangPJ Jul 10, 2024
95a5997
refactor codes
GesangPJ Jul 10, 2024
49e3349
refactor codes
GesangPJ Jul 10, 2024
8ba30ad
refactor codes
GesangPJ Jul 10, 2024
6a008af
Update .env.example
GesangPJ Jul 10, 2024
8cf0646
Merge branch 'main' into test
GesangPJ Jul 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ NEXTAUTH_SECRET= #use openssl to generate key, base64 recomended
BASEPATH=
NEXT_PUBLIC_APP_URL=http://localhost:3000${BASEPATH}

# PRISMA MYSQL CONNECTION
# PRISMA CONNECTION
DATABASE_URL= #<mysql or postgresql>://<account name>:<password>@localhost:<port>/<databasename>

#Vercel PostgreSQL
Expand All @@ -22,3 +22,6 @@ POSTGRES_USER=
POSTGRES_HOST=
POSTGRES_PASSWORD=
POSTGRES_DATABASE=

#Admin KEY
ADMIN_KEY=
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Kasbon-Manager",
"version": "1.1.7",
"version": "1.1.8",
"license": "Commercial",
"private": true,
"scripts": {
Expand Down
22 changes: 0 additions & 22 deletions src/app/dashboard/account-settings/page.jsx

This file was deleted.

23 changes: 22 additions & 1 deletion src/app/dashboard/bayar/page.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,29 @@
'use client'

import StatusBayar from "@/views/status-bayar/StatusBayar"
import { useEffect } from "react"

import { useRouter } from "next/navigation"

import { useSession } from "next-auth/react"

import StatusBayar from "@/views/status-bayar/StatusBayar"

const BayarKasbon = () =>{
const {data: session, status} = useSession()
const router = useRouter()

useEffect(()=>{
if(status==='loading') return

if(!session){
router.push('/error/401')
}
},[session, status, router])

if(!session){
return null
}

return(
<div>
<h1>Halaman Status Bayar Kasbon</h1>
Expand Down
21 changes: 21 additions & 0 deletions src/app/dashboard/cetak/page.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,29 @@
'use client'

import { useEffect } from "react"

import { useRouter } from "next/navigation"

import { useSession } from "next-auth/react"

import PrintLaporan from "@/views/print-laporan/PrintLaporan"

const CetakKasbon = () =>{
const {data:session, status} = useSession()
const router = useRouter()

useEffect(()=>{
if (status === 'loading') return

if(!session){
router.push('/error/401')
}
}, [session, status, router])

if(!session){
return null
}

return(
<div>
<div>
Expand Down
32 changes: 25 additions & 7 deletions src/app/dashboard/daftar-akun/page.jsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,40 @@
import dynamic from 'next/dynamic'
'use client'

import TabelAkunAdmin from '@/views/tabel-akun/TabelAdmin'
import { useEffect } from "react"

import { useRouter } from "next/navigation"

//Membuat komponen yang diimport menjadi dynamic page
const TabelAkun = dynamic(()=>import('@views/tabel-akun/TabelAkun'), {ssr:false})
import { useSession } from "next-auth/react"

import TabelAkunAdmin from '@/views/tabel-akun/TabelAdmin'

import TabelAkun from "@/views/tabel-akun/TabelAkun"

const DaftarAkun = () => {
const {data: session, status} = useSession()
const router = useRouter()

useEffect(()=>{
if (status === 'loading') return

if(!session){
router.push('/error/401')
}
}, [session, status, router])

if(!session){
return null
}

return (
<div className="">
<div>
<h1>Tabel Daftar Akun</h1>
<br />
<div className="">
<div>
<TabelAkun/>
</div>
<br />
<div className="">
<div>
<TabelAkunAdmin/>
</div>
<br />
Expand Down
11 changes: 0 additions & 11 deletions src/app/dashboard/kasbon/page.jsx

This file was deleted.

12 changes: 0 additions & 12 deletions src/app/dashboard/laporan/page.jsx

This file was deleted.

34 changes: 25 additions & 9 deletions src/app/dashboard/registrasi-akun/page.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

import { useState, useEffect, useRef } from 'react'

import { useRouter } from 'next/navigation'

import { useSession } from 'next-auth/react'

import Card from '@mui/material/Card'
import Grid from '@mui/material/Grid'
import Button from '@mui/material/Button'
Expand All @@ -15,20 +19,32 @@ import FormControl from '@mui/material/FormControl'
import Alert from '@mui/material/Alert'

const RegistrasiAkun = () => {
const [status, setStatus] = useState(null)
const {data: session, status} = useSession()
const [alert, setAlert] = useState(null)
const [message, setMessage] = useState('')
const formRef = useRef(null)
const router = useRouter()

useEffect(() => {
if (status) {
if (status === 'loading') return // Jangan lakukan apa pun saat sesi sedang dimuat

if (!session) {
router.push('/error/401')
}

if (alert) {
const timer = setTimeout(() => {
setStatus(null)
setAlert(null)
setMessage('')
}, 5000)

return () => clearTimeout(timer)
}
}, [status])
}, [session, status, router, alert])

if (!session) {
return null
}

const handleSubmit = async (event) => {
event.preventDefault()
Expand All @@ -53,15 +69,15 @@ const RegistrasiAkun = () => {
const result = await response.json()

if (response.ok) {
setStatus('success')
setAlert('success')
setMessage('Akun berhasil didaftarkan!')
formRef.current.reset() // Kosongkan form setelah berhasil didaftarkan
} else {
setStatus('error')
setAlert('error')
setMessage(result.error || 'Terjadi kesalahan saat mendaftarkan akun.')
}
} catch (error) {
setStatus('error')
setAlert('error')
setMessage('Terjadi kesalahan saat mendaftarkan akun.')
}
}
Expand All @@ -71,8 +87,8 @@ const RegistrasiAkun = () => {
<Card>
<CardHeader title='Registrasi Akun' />
<CardContent>
{status && (
<Alert severity={status} style={{ marginBottom: '1rem' }}>
{alert && (
<Alert severity={alert} style={{ marginBottom: '1rem' }}>
{message}
</Alert>
)}
Expand Down
22 changes: 22 additions & 0 deletions src/app/dashboard/request/page.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,29 @@
'use client'

import { useEffect } from "react"

import { useRouter } from "next/navigation"

import { useSession } from "next-auth/react"

import StatusRequest from "@/views/status-request/StatusRequest"

const RequestKasbon = () =>{
const {data:session,status} = useSession()
const router = useRouter()

useEffect(()=>{
if(status === 'loading') return

if(!session){
router.push('/error/401')
}
},[session,status,router])

if(!session){
return null
}

return(
<div>
<h1>Status Request Kasbon</h1>
Expand Down
1 change: 0 additions & 1 deletion src/app/dashboard/reset-password-akun/page.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { useSession } from 'next-auth/react'
import ResetPasswordKaryawan from "@/views/reset-password/resetpassword-karyawan"
import ResetPasswordAdmin from '@/views/reset-password/resetpassword-admin'


const ResetPasswordAkun = () =>{
const { data: session, status } = useSession()
const router = useRouter()
Expand Down
35 changes: 24 additions & 11 deletions src/app/dashboard/tambah-kasbon/page.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import { useState, useEffect, useRef } from 'react'

import { useRouter } from 'next/navigation'

import { useSession } from 'next-auth/react'

import Card from '@mui/material/Card'
Expand All @@ -17,29 +19,40 @@ import InputLabel from '@mui/material/InputLabel'
import FormControl from '@mui/material/FormControl'

const TambahKasbon = () =>{
const { data: session } = useSession()
const [status, setStatus] = useState(null)
const { data: session, status } = useSession()
const [alert, setAlert] = useState(null)
const [message, setMessage] = useState('')
const formRef = useRef(null)
const router = useRouter()

useEffect(() => {
if (status) {
if(status === 'loading') return

if(!session){
router.push('/error/401')
}

if (alert) {
const timer = setTimeout(() => {
setStatus(null)
setAlert(null)
setMessage('')
}, 5000)

return () => clearTimeout(timer)
}
}, [status])
}, [alert, session, status, router])

if(!session){
return null
}

const handleSubmit = async (event) => {
event.preventDefault()
const data = new FormData(event.target)

// Validasi form sebelum mengirimkan
if (!data.get('jumlah') || !data.get('keterangan') || !data.get('metode')) {
setStatus('error')
setAlert('error')
setMessage('Semua bidang harus diisi.')

return
Expand All @@ -64,15 +77,15 @@ const TambahKasbon = () =>{
const result = await response.json()

if (response.ok) {
setStatus('success')
setAlert('success')
setMessage('Permintaan Kasbon berhasil dikirim!')
formRef.current.reset() // Kosongkan form setelah berhasil didaftarkan
} else {
setStatus('error')
setAlert('error')
setMessage(result.error || 'Terjadi kesalahan saat mengirim data permintaan kasbon.')
}
} catch (error) {
setStatus('error')
setAlert('error')
setMessage('Terjadi kesalahan saat mengirim data.')
}
}
Expand All @@ -82,8 +95,8 @@ const TambahKasbon = () =>{
<Card>
<CardHeader title='Form Permintaan Kasbon' />
<CardContent>
{status && (
<Alert severity={status} style={{ marginBottom: '1rem' }}>
{alert && (
<Alert severity={alert} style={{ marginBottom: '1rem' }}>
{message}
</Alert>
)}
Expand Down
Loading