@@ -128,6 +156,13 @@ export default function AdminPanel() {
)}
+ {activeTab === 'user1' && (
+ <>
+
+
+
+ )}
{successMessage &&
+
+
+
+ Användare {username} har loggat in!
+
+
+ Hej {username}!
+
+
+ )
+ }
+}
diff --git a/src/app/login/page.jsx b/src/app/login/page.jsx
index d5c46c8..7957c12 100644
--- a/src/app/login/page.jsx
+++ b/src/app/login/page.jsx
@@ -1,14 +1,68 @@
+'use client'
+import { useState } from 'react'
+import { useRouter } from 'next/navigation'
+
export default function Login() {
+ const [Username, setUsername] = useState('')
+ const [Password, setPassword] = useState('')
+ const [Error, setError] = useState('')
+ const router = useRouter()
+
return (
Du är inte inloggad!
+ Logga in +
-
-
diff --git a/src/app/register/page.jsx b/src/app/register/page.jsx
new file mode 100644
index 0000000..04ba256
--- /dev/null
+++ b/src/app/register/page.jsx
@@ -0,0 +1,58 @@
+'use client'
+import { useState } from 'react'
+import { useRouter } from 'next/navigation'
+
+export default function Register() {
+ const [Username, setUsername] = useState('')
+ const [Password, setPassword] = useState('')
+ const [Error, setError] = useState(false)
+ const router = useRouter()
+
+ return (
+
+ )
+}
diff --git a/src/components/LogoutButton.jsx b/src/components/LogoutButton.jsx
new file mode 100644
index 0000000..78f2520
--- /dev/null
+++ b/src/components/LogoutButton.jsx
@@ -0,0 +1,18 @@
+'use client'
+import { useRouter } from 'next/navigation'
+
+export default function LogoutButton() {
+ const router = useRouter()
+
+ async function handleLogout() {
+ await fetch('/api/logout', { method: 'POST' })
+ window.dispatchEvent(new Event('loginStatusChanged'))
+ router.push('/login')
+ }
+
+ return (
+
+ )
+}
diff --git a/src/components/NavMenu.jsx b/src/components/NavMenu.jsx
index 01ee7e6..8ec424d 100644
--- a/src/components/NavMenu.jsx
+++ b/src/components/NavMenu.jsx
@@ -1,6 +1,7 @@
'use client'
-import { useState } from 'react'
-import { useRouter } from 'next/navigation'
+import { useEffect, useState } from 'react'
+import { useRouter, usePathname } from 'next/navigation'
+import { jwtDecode } from 'jwt-decode'
export default function NavMenu() {
const [homeClass, setHomeClass] = useState('header__nav-item')
@@ -8,7 +9,35 @@ export default function NavMenu() {
const [aboutClass, setAboutClass] = useState('header__nav-item')
const [adminClass, setAdminClass] = useState('header__nav-item')
const [loginClass, setLoginClass] = useState('header__nav-item')
+ const [isLoggedIn, setIsLoggedIn] = useState(false)
+ const [Admin, setAdmin] = useState(false)
const router = useRouter()
+ const pathname = usePathname()
+
+ // Checks if user is logged in by checking cookies
+ useEffect(() => {
+ const checkLogin = () => {
+ const cookies = document.cookie.split(';').map((c) => c.trim())
+ const jwtCookie = cookies.find((c) => c.startsWith('JWT='))
+ if (jwtCookie) {
+ const token = jwtCookie.split('=')[1]
+ try {
+ const decoded = jwtDecode(token)
+ setIsLoggedIn(!!decoded.username)
+ setAdmin(decoded.admin)
+ } catch (e) {
+ setIsLoggedIn(false)
+ setAdmin(false)
+ }
+ } else {
+ setIsLoggedIn(false)
+ setAdmin(false)
+ }
+ }
+ checkLogin()
+ window.addEventListener('loginStatusChanged', checkLogin)
+ return () => window.removeEventListener('loginStatusChanged', checkLogin)
+ }, [])
const handleHomeClick = () => {
setHomeClass('header__nav-item menu-active')
@@ -78,7 +107,7 @@ export default function NavMenu() {
>
OM OSS
- {process.env.NODE_ENV === 'development' && (
+ {(process.env.NODE_ENV === 'development' || Admin === true) && (
{
@@ -89,14 +118,31 @@ export default function NavMenu() {
)}
{
- handleLoginClick()
+ if (isLoggedIn) {
+ setHomeClass('header__nav-item')
+ setMoviesClass('header__nav-item')
+ setAboutClass('header__nav-item')
+ setAdminClass('header__nav-item')
+ setLoginClass('header__nav-item menu-active')
+ router.push('/login/account')
+ } else {
+ handleLoginClick()
+ }
}}
>
- LOGIN
+ {isLoggedIn ? 'KONTO' : 'LOGGA IN'}
+ {process.env.NODE_ENV === 'development' &&
+ console.log(`isLoggedIn:${isLoggedIn} NODE_ENV:${process.env.NODE_ENV} Admin:${Admin}`)}
)
}
diff --git a/src/components/admin/AdminCreateUser.jsx b/src/components/admin/AdminCreateUser.jsx
new file mode 100644
index 0000000..ab75ed4
--- /dev/null
+++ b/src/components/admin/AdminCreateUser.jsx
@@ -0,0 +1,128 @@
+'use client'
+import { useState } from 'react'
+
+export default function AdminCreate() {
+ const [username, setUsername] = useState('')
+ const [password, setPassword] = useState('')
+ const [error, setError] = useState(null)
+ const [success, setSuccess] = useState(null)
+ const [users, setUsers] = useState([]) // <-- Lägg till denna
+ const [userError, setUserError] = useState(null)
+
+ async function handleSubmit(e) {
+ e.preventDefault()
+ setError(null)
+ setSuccess(null)
+ try {
+ const response = await fetch('/api/register', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ Username: username, Password: password }),
+ })
+ if (!response.ok) throw new Error('Failed to create user')
+ setSuccess('Användare skapad!')
+ setUsername('')
+ setPassword('')
+ } catch (err) {
+ setError('Kunde inte skapa användare')
+ }
+ }
+
+ async function fetchUsers() {
+ setUserError(null)
+ try {
+ const response = await fetch('/api/getusers')
+ if (!response.ok) throw new Error('Kunde inte hämta användare')
+ const data = await response.json()
+ setUsers(data)
+ } catch (err) {
+ setUserError('Kunde inte hämta användare')
+ }
+ }
+
+ async function handleToggleAdmin(username) {
+ try {
+ const res = await fetch('/api/toggleadmin', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ username }),
+ })
+ if (!res.ok) throw new Error('Kunde inte toggla admin')
+ // Uppdatera användarlistan efter toggling
+ fetchUsers()
+ } catch (err) {
+ setUserError('Kunde inte toggla admin')
+ }
+ }
+
+ async function handleDeleteUser(username) {
+ try {
+ const res = await fetch('/api/deleteuser', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ username }),
+ })
+ if (!res.ok) throw new Error('Kunde inte ta bort användare')
+ fetchUsers()
+ } catch (err) {
+ setUserError('Kunde inte ta bort användare')
+ }
+ }
+
+ return (
+
+
+
+
+
+
+ )
+}
diff --git a/src/components/admin/AdminTabNav.jsx b/src/components/admin/AdminTabNav.jsx
index 3650d05..5a2c095 100644
--- a/src/components/admin/AdminTabNav.jsx
+++ b/src/components/admin/AdminTabNav.jsx
@@ -18,6 +18,9 @@ export default function AdminTabNav({ activeTab, setActiveTab }) {
+
)
}
diff --git a/src/lib/db/models/User.js b/src/lib/db/models/User.js
new file mode 100644
index 0000000..78bf249
--- /dev/null
+++ b/src/lib/db/models/User.js
@@ -0,0 +1,9 @@
+import mongoose from 'mongoose'
+
+const userSchema = new mongoose.Schema({
+ Username: { type: String, required: true },
+ Password: { type: String, required: true },
+ Admin: { type: Boolean, default: false },
+})
+
+export default mongoose.models.User || mongoose.model('User', userSchema)
diff --git a/src/lib/db/userDbService.js b/src/lib/db/userDbService.js
new file mode 100644
index 0000000..e89c64a
--- /dev/null
+++ b/src/lib/db/userDbService.js
@@ -0,0 +1,72 @@
+import User from './models/User'
+import connectDB from './connectDB'
+import hashPassword from '@/lib/utils/hashPassword'
+
+// Work in progress: testing.
+export async function getAllUsers() {
+ await connectDB()
+ console.log('Fetching all users from the database...')
+ return await User.find().select('Username Admin')
+}
+
+// Work in progress: testing.
+export async function findUserByUsername(username) {
+ await connectDB()
+
+ const findUser = await User.findOne({ Username: username }).select('Username Password Admin')
+ console.log(`User found: ${findUser ? findUser.Username : 'No user found'}`)
+ if (!findUser) {
+ console.log(`User with username ${username} not found.`)
+ throw new Error('Användaren kunde inte hittas.')
+ }
+ return findUser
+}
+
+// Creates a new user.
+// Password is in plain text, work in progress to hash it.
+export async function createUser(username, password) {
+ hashPassword(password)
+ await connectDB()
+
+ const existingUser = await User.findOne({ Username: username })
+ if (username && existingUser) {
+ console.log(`User with username ${username} already exists.`)
+ throw new Error('Användarnamnet finns redan, vänligen välj ett annat.')
+ }
+
+ const newUser = await User.create({ Username: username, Password: password, Admin: false })
+ return newUser
+}
+
+// Work in progress: testing.
+export async function deleteUserByUsername(username) {
+ await connectDB()
+ console.log(`Attempting to delete user with username: ${username}`)
+ return await User.findOneAndDelete({ Username: username })
+}
+
+// Work in progress: testing.
+export async function updateUserPassword(username, newPassword) {
+ await connectDB()
+ newPassword = await hashPassword(newPassword)
+ return await User.findOneAndUpdate({ Username: username }, { Password: newPassword }, { new: true })
+}
+
+// Work in progress: testing.
+export async function userExists(username) {
+ await connectDB()
+ const user = await User.findOne({ Username: username })
+ return !!user
+}
+
+export async function toggleAdmin(username) {
+ await connectDB()
+ const user = await User.findOne({ Username: username })
+ if (!user) {
+ throw new Error(`User with username ${username} not found.`)
+ }
+ console.log(`Toggling admin status for user: ${username}. Current admin status: ${user.Admin}`)
+ user.Admin = !user.Admin
+ await user.save()
+ return user
+}
diff --git a/src/lib/utils/hashPassword.js b/src/lib/utils/hashPassword.js
new file mode 100644
index 0000000..a80c4fa
--- /dev/null
+++ b/src/lib/utils/hashPassword.js
@@ -0,0 +1,7 @@
+import bcrypt from 'bcrypt'
+
+export default async function hashPassword(password) {
+ const salt = await bcrypt.genSalt(15)
+ const hashedPassword = await bcrypt.hash(password, salt)
+ return hashedPassword
+}
diff --git a/src/styles/loginPage.scss b/src/styles/loginPage.scss
index cdea79d..10ffe3a 100644
--- a/src/styles/loginPage.scss
+++ b/src/styles/loginPage.scss
@@ -46,6 +46,10 @@
color: #295377;
}
+ &__error_text {
+ color: red;
+ }
+
&__form_password {
color: #295377;
}
Login
+Logga in
Skapa konto
+ + {error &&{error}
}
+ {success && {success}
}
+
+
+ {userError && Användare
+Här kan du hantera befintliga användare.
+ +{userError}
}
+
+
+ {Array.isArray(users) &&
+ users.map((user) => (
+