Edit project

backend/README.md

@@ -6,7 +6,7 @@
 
 ```sh
 # Create a python virtual environment
-python -m venv venv
+python3.12 -m venv venv
 # Activate the environment
 source venv/bin/activate
 # Install dependencies

backend/src/docker_tests/dependencies.py

@@ -9,10 +9,7 @@
 
 def get_docker_client() -> Generator[DockerClient, Any, None]:
     """Creates docker client, which is closed afterwards"""
-    try:
-        client = docker.from_env()
-    except DockerException:
-        raise DockerDeamonNotFound()
+    client = docker.DockerClient(base_url='unix://var/run/docker.sock')
 
     try:
         yield client

backend/src/project/schemas.py

@@ -20,6 +20,8 @@ class ProjectBase(BaseModel):
     is_visible: bool = Field(default=True)
     capacity: int = Field(gt=0)
     requirements: List[Requirement] = []
+    enroll_deadline: Optional[datetime]
+    publish_date: datetime
 
 
 class ProjectCreate(ProjectBase):

frontend/package.json

@@ -22,6 +22,7 @@
         "@vueup/vue-quill": "^1.2.0",
         "@vueuse/core": "^10.9.0",
         "clonedeep": "^2.0.0",
+        "luxon": "^3.4.4",
         "pinia": "^2.1.7",
         "roboto-fontface": "*",
         "vue": "^3.4.15",

frontend/src/App.vue

@@ -30,10 +30,10 @@
 onBeforeMount(() => {
     const { locale } = useI18n();
     const { selectedLocale } = useLocale();
     const { storedTheme } = useThemeStore();
     const theme = useTheme();
     locale.value = selectedLocale;
-    theme.global.name.value = storedTheme;
+    // theme.global.name.value = storedTheme;
 });
 </script>
 

frontend/src/components/project/DatePicker.vue

@@ -16,29 +16,58 @@
             ></v-text-field>
         </template>
         <v-date-picker v-model="date" no-title></v-date-picker>
+        <v-time-picker v-model="time" format="24hr"></v-time-picker>
     </v-menu>
 </template>
 
 <script setup lang="ts">
-import { ref, computed } from "vue";
+import { ref, watch, computed, defineProps, defineEmits } from "vue";
+import { VTimePicker } from "vuetify/labs/VTimePicker";
 
-const date = defineModel<Date>({});
-
-defineProps<{
+// Define props and emits
+const props = defineProps<{
+    modelValue: Date;
     label: string;
 }>();
+const emit = defineEmits(["update:modelValue"]);
 
 const menuVisible = ref(false);
+const date = ref(new Date(props.modelValue || Date.now()));
+const time = ref(formatTime(props.modelValue || new Date()));
+watch(
+    () => props.modelValue,
+    (newValue) => {
+        if (newValue) {
+            date.value = new Date(newValue);
+        }
+    },
+    { immediate: true }
+);
+function formatTime(date: Date): string {
+    return `${date.getHours().toString().padStart(2, "0")}:${date.getMinutes().toString().padStart(2, "0")}`;
+}
+
+watch(
+    [date, time],
+    () => {
+        const [hours, minutes] = time.value.split(":").map(Number);
+        const updatedDate = new Date(date.value);
+        updatedDate.setHours(hours, minutes, 0, 0);
+        emit("update:modelValue", new Date(updatedDate));
+    },
+    { deep: true }
+);
 
-// Computed to format the date as ISO string (just the date part)
 const displayDate = computed(() => {
-    if (date.value) {
-        const selectedDate = new Date(date.value.getTime());
-        selectedDate.setMinutes(selectedDate.getMinutes() - selectedDate.getTimezoneOffset());
-        return selectedDate.toISOString().substring(0, 10);
+    if (date.value && time.value) {
+        const selectedDate = new Date(date.value);
+        const [hours, minutes] = time.value.split(":").map(Number);
+        selectedDate.setHours(hours, minutes);
+        return `${selectedDate.getFullYear()}-${(selectedDate.getMonth() + 1).toString().padStart(2, "0")}-${selectedDate.getDate().toString().padStart(2, "0")} ${selectedDate.getHours().toString().padStart(2, "0")}:${selectedDate.getMinutes().toString().padStart(2, "0")}`;
     }
     return "";
 });
+const displayTime = computed(() => time.value);
 
 function toggleDatePicker() {
     menuVisible.value = !menuVisible.value;

frontend/src/components/project/DisplayTestFiles.vue

@@ -0,0 +1,91 @@
+<template>
+    <v-card class="file-display-container" outlined>
+        <v-card-title> Project Files </v-card-title>
+        <v-card-text>
+            <v-treeview v-model="tree" :items="treeItems" activatable hoverable open-on-click>
+                <template v-slot:prepend="{ item }">
+                    <v-icon>{{ getFileIcon(item.title) }}</v-icon>
+                </template>
+            </v-treeview>
+        </v-card-text>
+    </v-card>
+</template>
+
+<script setup>
+import { computed, ref } from "vue";
+import { VTreeview } from "vuetify/labs/VTreeview";
+
+const props = defineProps({
+    files: Array,
+});
+
+const tree = ref([]);
+const treeItems = computed(() => {
+    const rootNode = {};
+    props.files.forEach((file) => {
+        const parts = file.filename.split("/").filter(Boolean);
+        let current = rootNode;
+
+        parts.forEach((part, index) => {
+            if (!current[part]) {
+                current[part] = {
+                    _isFile: index === parts.length - 1,
+                    children: {},
+                    title: part,
+                };
+            }
+            if (index === parts.length - 1) {
+                current[part]._isFile = true;
+                current[part].title = parts.slice(-1)[0];
+                current[part].id = file.path;
+                current[part].children = undefined;
+            } else {
+                current = current[part].children;
+            }
+        });
+    });
+    return buildTree(rootNode);
+});
+
+function buildTree(node, path = "") {
+    const result = [];
+    Object.keys(node).forEach((key) => {
+        if (!node[key]._isFile && node[key].children) {
+            const fullPath = path ? `${path}/${key}` : key;
+            result.push({
+                title: node[key].title,
+                id: fullPath,
+                children: buildTree(node[key].children, fullPath),
+            });
+        } else if (node[key]._isFile) {
+            result.push({
+                title: node[key].title,
+                id: node[key].id,
+            });
+        }
+    });
+    return result;
+}
+
+const icons = ref({
+    html: "mdi-language-html5",
+    js: "mdi-nodejs",
+    json: "mdi-code-json",
+    md: "mdi-language-markdown",
+    pdf: "mdi-file-pdf-box",
+    png: "mdi-file-image",
+    txt: "mdi-file-document-outline",
+    xls: "mdi-file-excel",
+    folder: "mdi-folder",
+    folderOpen: "mdi-folder-open",
+});
+
+function getFileIcon(filename) {
+    const extension = filename.split(".").pop();
+    if (extension === filename) {
+        return "mdi-folder";
+    } else {
+        return icons.value[extension] || "mdi-file";
+    }
+}
+</script>

frontend/src/components/project/RadiobuttonList.vue

@@ -15,7 +15,6 @@
                 v-model="radio_date"
                 label="Group Selection Deadline"
             ></DatePicker>
-            <!-- Numeric input for Capacity -->
             <v-text-field
                 v-if="selectedOption === 'student' || selectedOption === 'random'"
                 v-model="capacity"
@@ -45,22 +44,28 @@ defineProps<{
 
 const isToggled = ref(true);
 const selectedOption = ref(model);
-const radio_date = ref(new Date());
+const radio_date = ref<Date | null>(null);
 const capacity = ref(1); // Default capacity
 
 const emit = defineEmits<{
-    (e: "update:radio_date", value: Date): void;
+    (e: "update:radio_date", value: Date | null): void;
     (e: "update:capacity", value: number): void;
 }>();
 
-watch(capacity, (newCapacity) => {
-    emit("update:capacity", newCapacity);
-});
-
 watch(selectedOption, (newValue) => {
-    if (newValue === "course") {
-        capacity.value = 1; // Reset capacity when 'student' is not selected
-        emit("update:capacity", capacity.value);
+    if (newValue === "student") {
+        // Ensure radio_date can be set
+        radio_date.value = new Date(); // or keep the existing date
+    } else {
+        // Reset radio_date when 'student' is not selected
+        radio_date.value = null;
+    }
+    emit("update:radio_date", radio_date.value);
+
+    // Adjust capacity based on the selected option
+    if (newValue !== "student" && newValue !== "random") {
+        capacity.value = 1; // Reset capacity
     }
+    emit("update:capacity", capacity.value);
 });
 </script>

frontend/src/models/Project.ts

@@ -8,6 +8,8 @@ export default interface Project {
     requirements: [];
     description: string;
     capacity: number;
+    enroll_deadline: Date;
+    publish_date: Date;
 }
 
 export interface ProjectForm {