Merge branch 'development' into deployment

SELab-2 · Mar 24, 2024 · 2839a02 · 2839a02
2 parents 4bad27f + 54e2614
commit 2839a02
Show file tree

Hide file tree

Showing 34 changed files with 761 additions and 96 deletions.
diff --git a/backend/api/views/project_view.py b/backend/api/views/project_view.py
@@ -100,7 +100,7 @@ def structure_checks(self, request, **_):
     @structure_checks.mapping.put
     @swagger_auto_schema(request_body=StructureCheckAddSerializer)
     def _add_structure_check(self, request: Request, **_):
-        """Add a structure check to the project"""
+        """Add a structure_check to the project"""
 
         project: Project = self.get_object()
 

diff --git a/data/nginx/nginx.dev.conf b/data/nginx/nginx.dev.conf
@@ -12,7 +12,7 @@ http {
     }
 
     upstream hmr {
-        server frontend:5174;
+        server frontend:443;
     }
 
     server {
@@ -50,6 +50,14 @@ http {
             proxy_redirect off;
         }
 
+        location /hmr {
+            proxy_pass http://hmr;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host $host;
+        }
+
 
         location / {
             proxy_pass http://frontend;
@@ -58,18 +66,4 @@ http {
             proxy_redirect off;
         }
     }
-
-    server {
-        listen 5174 ssl;
-
-	ssl_certificate ssl/certificate.crt;
-        ssl_certificate_key ssl/private.key;        
-
-        location / {
-            proxy_pass http://hmr;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
-        }
-    }
 }
diff --git a/development.sh b/development.sh
@@ -26,8 +26,7 @@ echo "Checking environment file..."
 
 if ! [ -f .env ]; then
     cp .dev.env .env
-    read -s -p "Enter a random string for the django secret (just smash keyboard): " new_secret
-    sed -i "s/^DJANGO_SECRET_KEY=.*/DJANGO_SECRET_KEY=$new_secret/" .env
+    sed -i "s/^DJANGO_SECRET_KEY=.*/DJANGO_SECRET_KEY=totally_random_key_string/" .env
     echo "Created environment file"
 fi
 

diff --git a/development.yml b/development.yml
@@ -37,10 +37,9 @@ services:
       - 80:80
       - 443:443
       - 8080:8080
-      - 5174:5174
     volumes:
-      - $DATA_DIR/nginx/nginx.dev.conf:/etc/nginx/nginx.conf:ro
-      - $SSL_DIR:/etc/nginx/ssl:ro
+      - ${DATA_DIR}/nginx/nginx.dev.conf:/etc/nginx/nginx.conf:ro
+      - ${SSL_DIR}:/etc/nginx/ssl:ro
     depends_on:
       - backend
       - frontend
@@ -55,7 +54,7 @@ services:
     expose:
       - 8080
     volumes:
-      - $BACKEND_DIR:/code
+      - ${BACKEND_DIR}:/code
 
   celery:
     <<: *common-keys-selab
@@ -65,7 +64,7 @@ services:
       dockerfile: Dockerfile.dev
     command: celery -A ypovoli worker -l DEBUG
     volumes:
-      - $BACKEND_DIR:/code
+      - ${BACKEND_DIR}:/code
     depends_on:
       - backend
       - redis
@@ -80,7 +79,7 @@ services:
     expose:
       - 5173
     volumes:
-      - $FRONTEND_DIR:/app
+      - ${FRONTEND_DIR}:/app
     depends_on:
       - backend
 
@@ -95,5 +94,5 @@ services:
       - $REDIS_PORT
     entrypoint: redis-server --appendonly yes --maxmemory 512mb --maxmemory-policy allkeys-lru
     volumes:
-      - $DATADIR/redis:/data
+      - ${DATA_DIR}/redis:/data
 
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "axios": "^1.6.8",
+    "moment": "^2.30.1",
     "pinia": "^2.1.7",
     "primeflex": "^3.3.1",
     "primeicons": "^6.0.1",

diff --git a/frontend/src/assets/lang/en.json b/frontend/src/assets/lang/en.json
@@ -19,6 +19,9 @@
         "dashboard": {
             "courses": "My courses",
             "projects": "Current projects"
+        },
+        "calendar": {
+            "title": "Calendar"
         }
     },
     "components": {
@@ -28,5 +31,155 @@
         "card": {
             "open": "Details"
         }
-    }
+    },
+
+    "primevue": {
+        "startsWith": "Starts with",
+        "contains": "Contains",
+        "notContains": "Not contains",
+        "endsWith": "Ends with",
+        "equals": "Equals",
+        "notEquals": "Not equals",
+        "noFilter": "No Filter",
+        "lt": "Less than",
+        "lte": "Less than or equal to",
+        "gt": "Greater than",
+        "gte": "Greater than or equal to",
+        "dateIs": "Date is",
+        "dateIsNot": "Date is not",
+        "dateBefore": "Date is before",
+        "dateAfter": "Date is after",
+        "clear": "Clear",
+        "apply": "Apply",
+        "matchAll": "Match All",
+        "matchAny": "Match Any",
+        "addRule": "Add Rule",
+        "removeRule": "Remove Rule",
+        "accept": "Yes",
+        "reject": "No",
+        "choose": "Choose",
+        "upload": "Upload",
+        "cancel": "Cancel",
+        "completed": "Completed",
+        "pending": "Pending",
+        "dayNames": [
+          "Sunday",
+          "Monday",
+          "Tuesday",
+          "Wednesday",
+          "Thursday",
+          "Friday",
+          "Saturday"
+        ],
+        "dayNamesShort": ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
+        "dayNamesMin": ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"],
+        "monthNames": [
+          "January",
+          "February",
+          "March",
+          "April",
+          "May",
+          "June",
+          "July",
+          "August",
+          "September",
+          "October",
+          "November",
+          "December"
+        ],
+        "monthNamesShort": [
+          "Jan",
+          "Feb",
+          "Mar",
+          "Apr",
+          "May",
+          "Jun",
+          "Jul",
+          "Aug",
+          "Sep",
+          "Oct",
+          "Nov",
+          "Dec"
+        ],
+        "chooseYear": "Choose Year",
+        "chooseMonth": "Choose Month",
+        "chooseDate": "Choose Date",
+        "prevDecade": "Previous Decade",
+        "nextDecade": "Next Decade",
+        "prevYear": "Previous Year",
+        "nextYear": "Next Year",
+        "prevMonth": "Previous Month",
+        "nextMonth": "Next Month",
+        "prevHour": "Previous Hour",
+        "nextHour": "Next Hour",
+        "prevMinute": "Previous Minute",
+        "nextMinute": "Next Minute",
+        "prevSecond": "Previous Second",
+        "nextSecond": "Next Second",
+        "am": "am",
+        "pm": "pm",
+        "today": "Today",
+        "weekHeader": "Wk",
+        "firstDayOfWeek": 0,
+        "dateFormat": "mm/dd/yy",
+        "weak": "Weak",
+        "medium": "Medium",
+        "strong": "Strong",
+        "passwordPrompt": "Enter a password",
+        "searchMessage": "{0} results are available",
+        "selectionMessage": "{0} items selected",
+        "emptySelectionMessage": "No selected item",
+        "emptySearchMessage": "No results found",
+        "emptyMessage": "No available options",
+        "aria": {
+          "trueLabel": "True",
+          "falseLabel": "False",
+          "nullLabel": "Not Selected",
+          "star": "1 star",
+          "stars": "{star} stars",
+          "selectAll": "All items selected",
+          "unselectAll": "All items unselected",
+          "close": "Close",
+          "previous": "Previous",
+          "next": "Next",
+          "navigation": "Navigation",
+          "scrollTop": "Scroll Top",
+          "moveTop": "Move Top",
+          "moveUp": "Move Up",
+          "moveDown": "Move Down",
+          "moveBottom": "Move Bottom",
+          "moveToTarget": "Move to Target",
+          "moveToSource": "Move to Source",
+          "moveAllToTarget": "Move All to Target",
+          "moveAllToSource": "Move All to Source",
+          "pageLabel": "{page}",
+          "firstPageLabel": "First Page",
+          "lastPageLabel": "Last Page",
+          "nextPageLabel": "Next Page",
+          "previousPageLabel": "Previous Page",
+          "rowsPerPageLabel": "Rows per page",
+          "jumpToPageDropdownLabel": "Jump to Page Dropdown",
+          "jumpToPageInputLabel": "Jump to Page Input",
+          "selectRow": "Row Selected",
+          "unselectRow": "Row Unselected",
+          "expandRow": "Row Expanded",
+          "collapseRow": "Row Collapsed",
+          "showFilterMenu": "Show Filter Menu",
+          "hideFilterMenu": "Hide Filter Menu",
+          "filterOperator": "Filter Operator",
+          "filterConstraint": "Filter Constraint",
+          "editRow": "Row Edit",
+          "saveEdit": "Save Edit",
+          "cancelEdit": "Cancel Edit",
+          "listView": "List View",
+          "gridView": "Grid View",
+          "slide": "Slide",
+          "slideNumber": "{slideNumber}",
+          "zoomImage": "Zoom Image",
+          "zoomIn": "Zoom In",
+          "zoomOut": "Zoom Out",
+          "rotateRight": "Rotate Right",
+          "rotateLeft": "Rotate Left"
+        }
+      }
 }