Merge branch 'frontend/creating-a-sidebar' of https://git.mixel.cloud/Turbo/peer-group-grading into frontend/creating-a-sidebar

Reviewed-on: #58
Reviewed-by: Fargan von Pfargan Pfadfinder Tampon Tamplate <123@123.de>

bruno/user/Get user.bru

@@ -0,0 +1,15 @@
+meta {
+  name: Get user
+  type: http
+  seq: 2
+}
+
+get {
+  url: {{api_base}}/user/:id
+  body: none
+  auth: inherit
+}
+
+params:path {
+  id: 293ef329-91b2-4912-ad5d-0277490c7b55
+}

bruno/user/Get users.bru

@@ -0,0 +1,11 @@
+meta {
+  name: Get users
+  type: http
+  seq: 1
+}
+
+get {
+  url: {{api_base}}/user
+  body: none
+  auth: inherit
+}

crates/backend/src/controller/user.rs

@@ -1,5 +1,5 @@
-use crate::{entity, error::ApiError, Database};
-use actix_web::{delete, get, post, put, web, Responder};
+use crate::{Database, entity, error::ApiError};
+use actix_web::{Responder, delete, get, post, put, web};
 use serde::Deserialize;
 use validator::Validate;
 
@@ -20,13 +20,21 @@ struct CreateUser {
 }
 
 #[get("")]
-async fn get_users() -> impl Responder {
-    ""
+async fn get_users(
+    db: web::Data<Database>,
+) -> Result<web::Json<Vec<entity::user::Model>>, ApiError> {
+    let users = db.get_users().await?;
+    Ok(web::Json(users))
 }
 
 #[get("/{id}")]
-async fn get_user() -> impl Responder {
-    ""
+async fn get_user(
+    db: web::Data<Database>,
+    id: web::Path<uuid::Uuid>,
+) -> Result<web::Json<entity::user::Model>, ApiError> {
+    let user = db.get_user(id.into_inner()).await?;
+
+    Ok(web::Json(user.unwrap()))
 }
 
 #[post("")]
@@ -48,6 +56,11 @@ async fn update_user() -> impl Responder {
 }
 
 #[delete("/{id}")]
-async fn delete_user() -> impl Responder {
-    ""
+async fn delete_user(
+    db: web::Data<Database>,
+    id: web::Path<uuid::Uuid>,
+) -> Result<web::Json<String>, ApiError> {
+    let id = id.into_inner();
+    db.delete_user(id).await?;
+    Ok(web::Json(format!("User {} deleted", id)))
 }

crates/backend/src/db/user.rs

@@ -1,18 +1,37 @@
 use crate::error::ApiError;
 use argon2::{
-    password_hash::{rand_core::OsRng, PasswordHasher, SaltString},
     Argon2, PasswordHash, PasswordVerifier,
+    password_hash::{PasswordHasher, SaltString, rand_core::OsRng},
 };
 use sea_orm::{
     ActiveModelTrait,
     ActiveValue::{NotSet, Set},
-    ColumnTrait, DbErr, EntityTrait, ModelTrait, QueryFilter, TransactionTrait,
+    ColumnTrait, DbErr, DeleteResult, EntityTrait, ModelTrait, QueryFilter, TransactionTrait,
 };
 use uuid::Uuid;
 
-use crate::{entity, Database};
+use crate::{Database, entity};
 
 impl Database {
+    pub async fn get_users(&self) -> Result<Vec<entity::user::Model>, ApiError> {
+        let users = entity::user::Entity::find().all(&self.conn).await?;
+
+        Ok(users)
+    }
+
+    pub async fn get_user(&self, id: Uuid) -> Result<Option<entity::user::Model>, ApiError> {
+        let user = entity::user::Entity::find()
+            .filter(entity::user::Column::Id.eq(id))
+            .one(&self.conn)
+            .await?;
+
+        if user.is_none() {
+            return Err(ApiError::NotFound);
+        }
+
+        Ok(user)
+    }
+
     pub async fn create_user(
         &self,
         name: String,
@@ -82,6 +101,18 @@ impl Database {
         Ok(user.id)
     }
 
+    pub async fn delete_user(&self, id: Uuid) -> Result<DeleteResult, ApiError> {
+        let user = entity::user::Entity::delete_by_id(id)
+            .exec(&self.conn)
+            .await?;
+
+        if user.rows_affected == 0 {
+            return Err(ApiError::NotFound);
+        }
+
+        Ok(user)
+    }
+
     pub async fn verify_ldap_user() {}
 
     pub async fn change_user_password() {}

crates/backend/src/main.rs

@@ -92,31 +92,31 @@ fn build_database_url() -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use temp_env::with_vars;
+    use temp_env::{with_vars, with_vars_unset};
 
     #[test]
     fn build_database_url_with_defaults() {
-        temp_env::with_vars([("DB_HOST", None::<&str>)], || {
-            // Was sieht die direkte Umgebung? (Sollte Err sein)
-            println!(
-                "Inside temp_env (unset): std::env::var(\"DB_HOST\") is {:?}",
-                std::env::var("DB_HOST")
-            );
-
-            // Was sieht dotenvy? (Ist wahrscheinlich Ok(...) wegen .env)
-            println!(
-                "Inside temp_env (unset): dotenvy::var(\"DB_HOST\") is {:?}",
-                dotenvy::var("DB_HOST")
-            );
-
-            // Jetzt der Aufruf, der panicen sollte
-            build_database_url();
-        });
+        temp_env::with_vars(
+            [
+                ("DB_USER", None::<&str>),
+                ("DB_NAME", None::<&str>),
+                ("DB_PASSWORD", None::<&str>),
+                ("DB_HOST", Some("localhost")),
+                ("DB_PORT", None::<&str>),
+            ],
+            || {
+                let expected_url = "postgresql://pgg:pgg@localhost:5432/pgg";
+                let actual_url = build_database_url();
+                assert_eq!(
+                    actual_url, expected_url,
+                    "Database URL should use default values for unset env vars."
+                );
+            },
+        );
     }
 
     #[test]
     fn build_database_url_with_all_vars() {
-        dotenvy::dotenv().ok();
         with_vars(
             [
                 ("DB_USER", Some("testuser")),
@@ -139,7 +139,8 @@ mod tests {
     #[test]
     #[should_panic(expected = "DB_HOST must be set in .env")]
     fn build_database_url_missing_host_panics() {
-        dotenvy::dotenv().ok();
-        build_database_url();
+        with_vars_unset(["DB_HOST"], || {
+            build_database_url();
+        });
     }
 }

frontend/src/App.vue

@@ -1,9 +1,23 @@
 <script setup lang="ts">
+import HeaderNav from './components/HeaderNav.vue'
 import SideBar from './components/SideBar.vue'
 import { RouterLink, RouterView } from 'vue-router'
+
+const isTeacher = false
+const isLoggedIn = true
 </script>
 
 <template>
+  <div class="sticky top-0">
+    <header>
+      <HeaderNav :isLoggedIn="isLoggedIn" :isTeacher="isTeacher">
+        <template #left-icon>
+          <BoltIcon class="icon" />
+          <!--Hier dann ein richtiges Logo rein-->
+        </template>
+      </HeaderNav>
+    </header>
+  </div>
   <SideBar />
   <div>
     <RouterView />

frontend/src/components/HeaderNav.vue

@@ -0,0 +1,71 @@
+<template>
+    <nav class="header-container">
+      <div class="left-icon">
+        <!-- Platzhalter für ein Icon -->
+        <slot name="left-icon"></slot>
+      </div>
+      <div class="nav-items">
+        <button
+          v-if="!isLoggedIn"
+          class="nav-button"
+        >
+          <component :is="LogInIcon" class="icon" />
+          Login
+        </button>
+  
+        <template v-else>
+          <button class="nav-button">
+            <component :is="LogOutIcon" class="icon" />
+            Logout
+          </button>
+  
+          <button
+            v-if="isTeacher"
+            class="nav-button"
+          >
+            <component :is="BoltIcon" class="icon" />
+            Lehrerverwaltung
+          </button>
+        </template>
+      </div>
+    </nav>
+  </template>
+  
+  <script setup lang="ts">
+  import { LogInIcon, LogOutIcon, BoltIcon } from 'lucide-vue-next';
+  
+  defineProps<{
+    isLoggedIn: boolean;
+    isTeacher: boolean;
+  }>();
+  </script>
+  
+  <style scoped>
+  .header-container {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 1rem;
+  }
+  
+  .nav-items {
+    display: flex;
+    gap: 1rem;
+  }
+  
+  .nav-button {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    background: none;
+    border: none;
+    cursor: pointer;
+    font-weight: bold;
+  }
+  
+  .icon {
+    width: 1rem;
+    height: 1rem;
+  }
+  </style>
+  

frontend/src/components/MenuBar.vue

@@ -1,75 +0,0 @@
-<template>
-    <div class="card">
-        <Menubar :model="items">
-            <template #item="{ item, props, hasSubmenu }">
-                <router-link v-if="item.route" v-slot="{ href, navigate }" :to="item.route" custom>
-                    <a v-ripple :href="href" v-bind="props.action" @click="navigate">
-                        <span :class="item.icon" />
-                        <span>{{ item.label }}</span>
-                    </a>
-                </router-link>
-                <a v-else v-ripple :href="item.url" :target="item.target" v-bind="props.action">
-                    <span :class="item.icon" />
-                    <span> n/A {{ item.label }}</span>
-                    <span v-if="hasSubmenu" class="pi pi-fw pi-angle-down" />
-                </a>
-            </template>
-        </Menubar>
-    </div>
-</template>
-
-<script setup>
-import Menubar from 'primevue/menubar';
-
-import { ref } from "vue";
-import { useRouter } from 'vue-router';
-
-const items = ref([
-    {
-        label: 'Home',
-        icon: 'pi pi-home',
-        route: '/'
-    },
-    {
-        label: 'Student',
-        icon: 'pi pi-graduation-cap',
-        route: '/Student'
-    },
-    {
-        label: 'Projects',
-        icon: 'pi pi-search',
-        items: [
-            {
-                label: 'Components',
-                icon: 'pi pi-bolt'
-            },
-            {
-                label: 'Blocks',
-                icon: 'pi pi-server'
-            },
-            {
-                label: 'UI Kit',
-                icon: 'pi pi-pencil'
-            },
-            {
-                label: 'Templates',
-                icon: 'pi pi-palette',
-                items: [
-                    {
-                        label: 'Apollo',
-                        icon: 'pi pi-palette'
-                    },
-                    {
-                        label: 'Ultima',
-                        icon: 'pi pi-palette'
-                    }
-                ]
-            }
-        ]
-    },
-    {
-        label: 'Contact',
-        icon: 'pi pi-envelope'
-    }
-]);
-</script>

frontend/src/main.ts

@@ -5,6 +5,7 @@ import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 import PrimeVue from 'primevue/config'
 import Aura from '@primeuix/themes/aura'
+import Ripple from 'primevue/ripple'
 
 import App from './App.vue'
 import router from './router'
@@ -18,5 +19,6 @@ app.use(PrimeVue, {
 })
 app.use(createPinia())
 app.use(router)
+app.directive('ripple', Ripple) 
 
 app.mount('#app')