Merge pull request #233 from naturerobots/dev

add current changes

.devcontainer/.dockerfilelintrc

@@ -1,2 +1,3 @@
 rules:
   sudo_usage: off
+  latest_tag: off

.devcontainer/Dockerfile

@@ -58,12 +58,12 @@ RUN useradd -u 1001 --create-home --shell /bin/bash docker && echo "docker:docke
 
 RUN mkdir -p /home/docker/.vscode-server/extensions \
     && chown -R docker /home/docker/.vscode-server \
-    && mkdir -p /PlantMap \
-    && chown -R docker /PlantMap
+    && mkdir -p /workdir \
+    && chown -R docker /workdir
 
 # Run as user 'docker' after here
 USER docker
 
-RUN echo 'export PYTHONPATH="${PYTHONPATH}:/workdir/build/gRPC"' >> /home/docker/.bashrc
+ENV PYTHONPATH="/workdir/build/gRPC"
 
-ENTRYPOINT [ "/bin/sh", "-c", "while sleep 1000; do :; done" ]
+CMD while sleep 1000; do :; done

.devcontainer/Dockerfile.preview

@@ -0,0 +1,20 @@
+FROM ghcr.io/naturerobots/plant-map-digital-logbook:latest
+
+USER docker
+
+WORKDIR /workdir
+
+COPY --chown=docker:docker django django
+COPY --chown=docker:docker vue vue
+COPY --chown=docker:docker protobuf-msgs protobuf-msgs
+COPY --chown=docker:docker Makefile Makefile
+
+RUN cd vue && npm install
+
+RUN mkdir -p build/gRPC
+RUN python3 -m grpc_tools.protoc -I=protobuf-msgs --python_out=build/gRPC --grpc_python_out=build/gRPC protobuf-msgs/*
+
+EXPOSE 8000
+EXPOSE 5050
+
+ENTRYPOINT make run-preview

.devcontainer/docker-compose.preview.yml

@@ -0,0 +1,41 @@
+version: "3.8"
+services:
+  plant-map-dev:
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile.preview
+    ports:
+      - 8000:8000
+      - 5050:5050
+    depends_on:
+      - postgres
+      - rabbitmq
+
+  rabbitmq:
+    image: rabbitmq:3.10.7
+    ports:
+      - 5672:5672
+  #    healthcheck:
+  #      interval: 10s
+  #      timeout: 5s
+  #      retries: 5
+  #      test: [ "CMD", "rabbitmqctl", "status" ]
+
+  postgres:
+    image: postgres:14
+    restart: unless-stopped
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_DB: postgres
+      POSTGRES_PASSWORD: postgres
+    healthcheck:
+      test: ["CMD", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+volumes:
+  postgres-data:

.dockerignore

@@ -13,3 +13,5 @@ venv/
 
 # Local PostgreSQL data
 data/
+
+vue/node_modules/

.github/workflows/mkdocs.yml

@@ -7,7 +7,7 @@ on:
     paths:
       - docs/**
       - mkdocs.yml
-    workflow_dispatch:
+  workflow_dispatch:
 
 jobs:
   deploy:

Makefile

@@ -1,8 +1,8 @@
 run-django:
 	@cd django && python3 manage.py makemigrations \
 		&& python3 manage.py migrate \
-		&& python3 manage.py loaddata user company garden bed permissions coordinate \
-		&& python3 manage.py runserver
+		&& python3 manage.py loaddata user company garden bed permissions coordinate widget \
+		&& python3 manage.py runserver 0.0.0.0:8000
 
 run-celery:
 	@cd django && celery -A restapi.tasks worker --loglevel=info
@@ -24,3 +24,6 @@ run-frontend-prod:
 	@echo "# Build and run vite for production #"
 	@echo "#####################################"
 	@cd vue && npm run build && npm run preview
+
+run-preview:
+	@make run-backend & make run-frontend-prod

django/restapi/fixtures/widget.json

@@ -0,0 +1,97 @@
+[
+  {
+    "model": "restapi.widget",
+    "pk": 1,
+    "fields": {
+      "user": 1,
+      "data": {
+        "widgets": [
+          "3d-table",
+          "3d-map",
+          "weather",
+          "soil-parameter",
+          "garden-map",
+          "notifications",
+          "crops-map",
+          "crops-table"
+        ]
+      }
+    }
+  },
+  {
+    "model": "restapi.widget",
+    "pk": 2,
+    "fields": {
+      "user": 2,
+      "data": {
+        "widgets": [
+          "3d-table",
+          "3d-map",
+          "weather",
+          "soil-parameter",
+          "garden-map",
+          "notifications",
+          "crops-map",
+          "crops-table"
+        ]
+      }
+    }
+  },
+  {
+    "model": "restapi.widget",
+    "pk": 3,
+    "fields": {
+      "user": 3,
+      "data": {
+        "widgets": [
+          "3d-table",
+          "3d-map",
+          "weather",
+          "soil-parameter",
+          "garden-map",
+          "notifications",
+          "crops-map",
+          "crops-table"
+        ]
+      }
+    }
+  },
+  {
+    "model": "restapi.widget",
+    "pk": 4,
+    "fields": {
+      "user": 4,
+      "data": {
+        "widgets": [
+          "3d-table",
+          "3d-map",
+          "weather",
+          "soil-parameter",
+          "garden-map",
+          "notifications",
+          "crops-map",
+          "crops-table"
+        ]
+      }
+    }
+  },
+  {
+    "model": "restapi.widget",
+    "pk": 5,
+    "fields": {
+      "user": 5,
+      "data": {
+        "widgets": [
+          "3d-table",
+          "3d-map",
+          "weather",
+          "soil-parameter",
+          "garden-map",
+          "notifications",
+          "crops-map",
+          "crops-table"
+        ]
+      }
+    }
+  }
+]

django/restapi/views/bed_plants.py

@@ -189,6 +189,8 @@ def streamGen(beds):
                 'plants-resource', kwargs={'company_id': company_id, 'garden_id': garden_id, 'bed_id': bed.id}
             )
 
+            avg_plant_lat = None
+            avg_plant_lon = None
             if len(plant_coords) > 0:
                 avg_plant_lat = float(sum(i['lat'] for i in plant_coords)) / len(plant_coords)
                 avg_plant_lon = float(sum(i['lon'] for i in plant_coords)) / len(plant_coords)