Adding primevue to project

.vscode/settings.json

@@ -1,4 +1,4 @@
 {
-  "rust-analyzer.check.features": "all",
+    "rust-analyzer.check.features": "all",
-  "rust-analyzer.cargo.features": "all"
+    "rust-analyzer.cargo.features": "all"
-}
+}

.woodpecker/check_fmt.yaml

@@ -1,8 +1,15 @@
 when:
-  - event: pull_request
+  - event: push
+    branch: main
 
 steps:
   - name: "Run nix flake check"
     image: docker.nix-community.org/nixpkgs/nix-flakes
     commands:
-      - nix fmt -- --fail-on-change
+      - nix fmt
+  - name: push commit
+    image: appleboy/drone-git-push
+    settings:
+      remote_name: origin
+      branch: main
+      local_ref: main

README.md

@@ -1,3 +1,2 @@
 # peer-group-grading
-
+Wir sind cool
-Wir sind cool

bruno/bruno.json

@@ -2,5 +2,8 @@
   "version": "1",
   "name": "pgg-bruno",
   "type": "collection",
-  "ignore": ["node_modules", ".git"]
+  "ignore": [
-}
+    "node_modules",
+    ".git"
+  ]
+}

crates/backend/src/controller/auth.rs

@@ -1,12 +1,11 @@
 use actix_session::Session;
 use actix_web::{
-    post,
+    HttpResponse, Responder, post,
     web::{self, ServiceConfig},
-    HttpResponse, Responder,
 };
 use serde::Deserialize;
 
-use crate::{error::ApiError, Database};
+use crate::{Database, error::ApiError};
 
 #[derive(Deserialize)]
 struct LoginRequest {

crates/backend/src/controller/class.rs

@@ -1,4 +1,4 @@
-use actix_web::{delete, get, post, put, Responder};
+use actix_web::{Responder, delete, get, post, put};
 
 pub fn setup(cfg: &mut actix_web::web::ServiceConfig) {
     cfg.service(get_classes)

crates/backend/src/controller/group.rs

@@ -1,4 +1,4 @@
-use actix_web::{delete, get, post, put, Responder};
+use actix_web::{Responder, delete, get, post, put};
 
 pub fn setup(cfg: &mut actix_web::web::ServiceConfig) {
     cfg.service(get_groups)

crates/backend/src/controller/project.rs

@@ -1,9 +1,9 @@
-use actix_web::{delete, get, post, put, web, Result};
+use actix_web::{Result, delete, get, post, put, web};
 use uuid::Uuid;
 use validator::Validate;
 
-use crate::db::project::CreateProject;
 use crate::db::Database;
+use crate::db::project::CreateProject;
 use crate::entity;
 use crate::error::ApiError;
 

crates/backend/src/controller/template.rs

@@ -1,4 +1,4 @@
-use actix_web::{delete, get, post, put, Responder};
+use actix_web::{Responder, delete, get, post, put};
 
 pub fn setup(cfg: &mut actix_web::web::ServiceConfig) {
     cfg.service(get_templates)

crates/backend/src/controller/user.rs

@@ -1,5 +1,5 @@
-use crate::{entity, error::ApiError, Database};
+use crate::{Database, entity, error::ApiError};
-use actix_web::{delete, get, post, put, web, Responder};
+use actix_web::{Responder, delete, get, post, put, web};
 use serde::Deserialize;
 use validator::Validate;
 

crates/backend/src/db/user.rs

@@ -1,7 +1,7 @@
 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,
@@ -10,7 +10,7 @@ use sea_orm::{
 };
 use uuid::Uuid;
 
-use crate::{entity, Database};
+use crate::{Database, entity};
 
 impl Database {
     pub async fn create_user(

crates/backend/src/error.rs

@@ -1,4 +1,4 @@
-use actix_web::{cookie::time::error, http::StatusCode, HttpResponse, ResponseError};
+use actix_web::{HttpResponse, ResponseError, cookie::time::error, http::StatusCode};
 use sea_orm::TransactionError;
 use thiserror::Error;
 

crates/backend/src/main.rs

@@ -1,14 +1,14 @@
 use actix_files::NamedFile;
-use actix_session::{storage::RedisSessionStore, SessionMiddleware};
+use actix_session::{SessionMiddleware, storage::RedisSessionStore};
-use actix_web::{cookie::Key, middleware::Logger, web, App, HttpResponse, HttpServer};
+use actix_web::{App, HttpResponse, HttpServer, cookie::Key, middleware::Logger, web};
 use log::debug;
 
 mod controller;
 mod db;
 mod error;
 
-pub use db::entity;
 pub use db::Database;
+pub use db::entity;
 
 #[derive(Clone)]
 struct AppConfig {

crates/ldap/src/ldap.rs

@@ -30,19 +30,17 @@ fn authenticate_user(username: &str, password: &str) -> Result<bool, Box<dyn std
     let ldap = LdapConn::new(&ldap_server)?;
 
     // Search for the user in the LDAP directory
-    let (rs, _res) = ldap
+    let (rs, _res) = ldap.search(
-        .search(
+        &format!("ou=users,{}", base_dn), // Search under "ou=users"
-            &format!("ou=users,{}", base_dn), // Search under "ou=users"
+        Scope::Subtree,                  // Search all levels
-            Scope::Subtree,                   // Search all levels
+        &format!("(uid={})", username),  // Filter by username
-            &format!("(uid={})", username),   // Filter by username
+        vec!["dn"],                      // Retrieve the distinguished name (DN)
-            vec!["dn"],                       // Retrieve the distinguished name (DN)
+    )?.success()?;
-        )?
-        .success()?;
 
     // If user is found, attempt to authenticate with their DN and password
     if let Some(entry) = rs.into_iter().next() {
         let user_dn = SearchEntry::construct(entry).dn; // Extract user DN
-
+        
         // Reconnect and bind with user credentials
         let user_ldap = LdapConn::new(&ldap_server)?;
         let auth_result = user_ldap.simple_bind(&user_dn, password)?.success();
@@ -62,4 +60,4 @@ async fn main() -> std::io::Result<()> {
         .bind(("127.0.0.1", 8080))?
         .run()
         .await
-}
+}

dev-compose.yml

@@ -39,21 +39,13 @@ services:
       - ./crates/ldap/src/users.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/users.ldif
 
     healthcheck:
-      test:
+      test: ["CMD", "ldapsearch", "-x", "-H", "ldap://localhost", "-b", "dc=Schule,dc=intern"]
-        [
-          "CMD",
-          "ldapsearch",
-          "-x",
-          "-H",
-          "ldap://localhost",
-          "-b",
-          "dc=Schule,dc=intern",
-        ]
       interval: 30s
       retries: 3
 
+
 volumes:
   postgres_data:
   redis:
   openldap_data:
-  openldap_config:
+  openldap_config: