React added, logbooks in progress (all model, backend, and frontend)

- React added as a separate container
- Homepage, Navbar, Login rewrite in react (including auth)
- Logbook pages initialized (react)
- API logbooks (only which was needed in react pages)
- rename of Dockerfiles (because are multiple)

Author: cisar2218

DOSPORTAL/migrations/0036_alter_record_data_file_alter_record_log_file_and_more.py

@@ -0,0 +1,29 @@
+# Generated by Django 6.0 on 2026-01-05 17:07
+
+import DOSPORTAL.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('DOSPORTAL', '0035_record_time_internal_start'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='record',
+            name='data_file',
+            field=models.FileField(blank=True, help_text='Processed spectral file', null=True, upload_to=DOSPORTAL.models.Record.user_directory_path_data, validators=[DOSPORTAL.models._validate_data_file], verbose_name='Log file'),
+        ),
+        migrations.AlterField(
+            model_name='record',
+            name='log_file',
+            field=models.FileField(blank=True, help_text='Upload recorded data file form your detector', upload_to=DOSPORTAL.models.Record.user_directory_path, validators=[DOSPORTAL.models._validate_log_file], verbose_name='File log'),
+        ),
+        migrations.AlterField(
+            model_name='record',
+            name='metadata_file',
+            field=models.FileField(blank=True, help_text='Processed metadata file', null=True, upload_to=DOSPORTAL.models.Record.user_directory_path_data, validators=[DOSPORTAL.models._validate_metadata_file], verbose_name='Metadata file'),
+        ),
+    ]

DOSPORTAL/migrations/0037_alter_detectorlogbook_options_and_more.py

@@ -0,0 +1,37 @@
+# Generated by Django 6.0 on 2026-01-05 17:40
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('DOSPORTAL', '0036_alter_record_data_file_alter_record_log_file_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='detectorlogbook',
+            options={'ordering': ['-created']},
+        ),
+        migrations.RemoveField(
+            model_name='record',
+            name='data_policy',
+        ),
+        migrations.AddField(
+            model_name='detectorlogbook',
+            name='entry_type',
+            field=models.CharField(choices=[('reset', 'Reset'), ('sync', 'Sync'), ('maintenance', 'Maintenance'), ('note', 'Note'), ('location_update', 'Location update'), ('calibration', 'Calibration'), ('other', 'Other')], default='note', help_text='Category of the logbook entry.', max_length=30),
+        ),
+        migrations.AddField(
+            model_name='detectorlogbook',
+            name='source',
+            field=models.CharField(choices=[('web', 'Web'), ('api', 'API'), ('qr', 'QR'), ('auto', 'Automatic'), ('other', 'Other')], default='web', help_text='Origin of the logbook entry.', max_length=20),
+        ),
+        migrations.AlterField(
+            model_name='record',
+            name='belongs',
+            field=models.ForeignKey(choices=[('PR', 'Private'), ('PU', 'Public'), ('NV', 'Non-public')], default='PU', help_text='Data policy of this record. Field can be overridden depending by setting of the organisation, that owns this record.', max_length=2, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='records_owning', to='DOSPORTAL.organization'),
+        ),
+    ]

DOSPORTAL/migrations/0038_detectorlogbook_altitude_detectorlogbook_latitude_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 6.0 on 2026-01-06 21:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('DOSPORTAL', '0037_alter_detectorlogbook_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='detectorlogbook',
+            name='altitude',
+            field=models.FloatField(blank=True, help_text='Altitude of the location in meters', null=True, verbose_name='Altitude'),
+        ),
+        migrations.AddField(
+            model_name='detectorlogbook',
+            name='latitude',
+            field=models.FloatField(blank=True, help_text='GPS latitude of the location', null=True, verbose_name='Latitude'),
+        ),
+        migrations.AddField(
+            model_name='detectorlogbook',
+            name='longitude',
+            field=models.FloatField(blank=True, help_text='GPS longitude of the location', null=True, verbose_name='Longitude'),
+        ),
+    ]

DOSPORTAL/settings.py

@@ -30,7 +30,14 @@
 
 ALLOWED_HOSTS = ["*", "localhost", "127.0.0.1", "0.0.0.0"]
 
-CSRF_TRUSTED_ORIGINS = ["https://portal.dos.ust.cz", "https://eurados-demo.dos.ust.cz"]
+CSRF_TRUSTED_ORIGINS = [
+    "https://portal.dos.ust.cz",
+    "https://eurados-demo.dos.ust.cz",
+    # Local dev (Vite)
+    "http://localhost:5173",
+    "http://127.0.0.1:5173",
+    "http://frontend:5173",
+]
 
 # Application definition
 
@@ -70,14 +77,13 @@
 
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
+    "corsheaders.middleware.CorsMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
-    "corsheaders.middleware.CorsMiddleware",
-    "django.middleware.common.CommonMiddleware",
 ]
 
 CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5"
@@ -164,7 +170,20 @@
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 
-# CORS_ORIGIN_ALLOW_ALL = True
+# CORS Configuration - React frontend
+CORS_ORIGIN_ALLOW_ALL = False
+CORS_ALLOWED_ORIGINS = [
+    "http://localhost:3000",
+    "http://127.0.0.1:3000",
+    "http://frontend:3000",
+    "http://0.0.0.0:3000",
+    "http://localhost:5173",
+    "http://127.0.0.1:5173",
+    "http://frontend:5173",
+    "http://0.0.0.0:5173",
+]
+
+CORS_ALLOW_CREDENTIALS = True
 
 STATICFILES_DIRS = [
     Path(__file__).resolve().parent / "static",

api/serializers.py

@@ -1,8 +1,46 @@
 from rest_framework import serializers
-from DOSPORTAL.models import measurement, Record, Detector, DetectorLogbook
+from DOSPORTAL.models import (
+    measurement,
+    Record,
+    Detector,
+    DetectorLogbook,
+    DetectorType,
+    DetectorManufacturer,
+    Organization,
+    User,
+)
+
+
+class DetectorManufacturerSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = DetectorManufacturer
+        fields = ("id", "name", "url")
+
+
+class DetectorTypeSerializer(serializers.ModelSerializer):
+    manufacturer = DetectorManufacturerSerializer(read_only=True)
+
+    class Meta:
+        model = DetectorType
+        fields = ("id", "name", "manufacturer", "url", "description")
+
+
+class OrganizationSummarySerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Organization
+        fields = ("id", "name", "slug")
+
+
+class UserSummarySerializer(serializers.ModelSerializer):
+    class Meta:
+        model = User
+        fields = ("id", "username", "first_name", "last_name")
 
 
 class DetectorSerializer(serializers.ModelSerializer):
+    type = DetectorTypeSerializer(read_only=True)
+    owner = OrganizationSummarySerializer(read_only=True)
+
     class Meta:
         model = Detector
         fields = "__all__"
@@ -17,9 +55,12 @@ class Meta:
 
 
 class DetectorLogbookSerializer(serializers.ModelSerializer):
+    author = UserSummarySerializer(read_only=True)
+
     class Meta:
         model = DetectorLogbook
         fields = "__all__"
+        read_only_fields = ["id", "author", "created"]
 
 
 class MeasurementsSerializer(serializers.ModelSerializer):

api/views.py

@@ -1,6 +1,7 @@
 from rest_framework.response import Response
-from rest_framework.permissions import AllowAny
+from rest_framework.permissions import AllowAny, IsAuthenticated
 from rest_framework.decorators import api_view, permission_classes
+from rest_framework import status
 
 from django.utils.dateparse import parse_datetime
 from DOSPORTAL.models import measurement, Record, DetectorLogbook, Detector
@@ -38,15 +39,15 @@ def RecordGet(request):
 
 
 @api_view(["GET"])
-@permission_classes((AllowAny,))
+@permission_classes((IsAuthenticated,))
 def DetectorGet(request):
-    items = Detector.objects.all()
+    items = Detector.objects.select_related("type__manufacturer", "owner").all()
     serializer = DetectorSerializer(items, many=True)
     return Response(serializer.data)
 
 
 @api_view(["GET"])
-@permission_classes((AllowAny,))
+@permission_classes((IsAuthenticated,))
 def DetectorLogbookGet(request):
     items = DetectorLogbook.objects.select_related("detector", "author").all()
 
@@ -76,10 +77,32 @@ def DetectorLogbookGet(request):
 
 
 @api_view(["POST"])
-@permission_classes((AllowAny,))
+@permission_classes((IsAuthenticated,))
 def DetectorLogbookPost(request):
-    serializer = DetectorLogbookSerializer(data=request.data)
+
+    data = dict(request.data)
+    data["author"] = request.user.id
+
+    detector_id = data.get("detector")
+    if detector_id:
+        try:
+            detector = Detector.objects.get(id=detector_id)
+            user_has_access = (
+                detector.owner and request.user in detector.owner.users.all()
+            ) or detector.access.filter(users=request.user).exists()
+
+            if not user_has_access:
+                return Response(
+                    {"detail": "Access to the detector denied."},
+                    status=status.HTTP_403_FORBIDDEN,
+                )
+        except Detector.DoesNotExist:
+            return Response(
+                {"detail": "Detektor not found."}, status=status.HTTP_404_NOT_FOUND
+            )
+
+    serializer = DetectorLogbookSerializer(data=data)
     if serializer.is_valid():
         serializer.save()
-        return Response(serializer.data)
-    return Response(serializer.errors, status=400)
+        return Response(serializer.data, status=status.HTTP_201_CREATED)
+    return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

Dockerfile backend.DockerfileDockerfile renamed to backend.Dockerfile

@@ -1,3 +1,5 @@
+# Django backend
+
 FROM python:3.13-alpine
 
 ENV PYTHONDONTWRITEBYTECODE=1

docker-compose.yml

@@ -37,9 +37,10 @@ services:
       inet:
         ipv4_address: 10.5.0.5
 
-  web:
+  backend:
     build:
       context: .
+      dockerfile: backend.Dockerfile
       network: host
     #    platform: linux/amd64
     #    command: python manage.py runserver 0.0.0.0:8000
@@ -60,12 +61,14 @@ services:
   #      default:
 
   worker:
-    build: .
+    build:
+      context: .
+      dockerfile: backend.Dockerfile
     entrypoint: python3 manage.py qcluster
     volumes:
       - .:/DOSPORTAL
     depends_on:
-      - web
+      - backend
       - db_dosportal
       - redis
     networks:
@@ -98,3 +101,25 @@ services:
     networks:
       inet:
         ipv4_address: 10.5.0.9
+
+  frontend:
+    build:
+      context: .
+      dockerfile: frontend.Dockerfile
+    ports:
+      - "5173:5173"
+    volumes:
+      - ./frontend:/app/frontend
+      - /app/frontend/node_modules
+    environment:
+      - NODE_ENV=development
+    depends_on:
+      - backend
+    networks:
+      inet:
+        ipv4_address: 10.5.0.10
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:5173"]
+      interval: 10s
+      timeout: 5s
+      retries: 5

frontend.Dockerfile

@@ -0,0 +1,18 @@
+# Django frontend
+
+FROM node:20-alpine
+
+WORKDIR /app/frontend
+
+COPY frontend/package*.json ./
+
+RUN npm install
+
+COPY frontend/ ./
+
+COPY frontend/entrypoint.sh /usr/local/bin/frontend-entrypoint.sh
+RUN chmod +x /usr/local/bin/frontend-entrypoint.sh
+
+EXPOSE 5173
+
+ENTRYPOINT ["/usr/local/bin/frontend-entrypoint.sh"]

frontend/.env.example

@@ -0,0 +1 @@
+VITE_API_URL=http://localhost:8100/api