diff --git a/docker-compose.yml b/docker-compose.yml index ec81a30..ddeaddd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,6 +26,8 @@ services: timeout: 3s retries: 3 start_period: 30s + networks: + - appnet db: image: mysql:8 @@ -39,12 +41,18 @@ services: - "42000:3306" volumes: - ./mysql_data:/var/lib/mysql - entrypoint: ["sh", "-c", "mkdir -p /var/lib/mysql && chown -R 1000:998 /var/lib/mysql && chmod -R 770 /var/lib/mysql && exec docker-entrypoint.sh mysqld"] + entrypoint: > + sh -c "mkdir -p /var/lib/mysql && + chown -R 1000:998 /var/lib/mysql && + chmod -R 770 /var/lib/mysql && + exec docker-entrypoint.sh mysqld" healthcheck: test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] interval: 10s timeout: 5s retries: 5 + networks: + - appnet adminer: image: adminer @@ -55,6 +63,8 @@ services: - ADMINER_DEFAULT_SERVER=db depends_on: - db + networks: + - appnet neo4j: image: neo4j:5.18 @@ -66,6 +76,12 @@ services: - NEO4J_AUTH=neo4j/your_secure_password volumes: - neo4j_data:/data + networks: + - appnet volumes: neo4j_data: + +networks: + appnet: + driver: bridge diff --git a/LineageCheck.md b/docs/LineageCheck.md similarity index 100% rename from LineageCheck.md rename to docs/LineageCheck.md diff --git a/main-app.txt b/docs/main-app.txt similarity index 100% rename from main-app.txt rename to docs/main-app.txt diff --git a/plant.csv b/docs/plant.csv similarity index 100% rename from plant.csv rename to docs/plant.csv diff --git a/plant_converted.csv b/docs/plant_converted.csv similarity index 100% rename from plant_converted.csv rename to docs/plant_converted.csv diff --git a/subapp.txt b/docs/subapp.txt similarity index 100% rename from subapp.txt rename to docs/subapp.txt diff --git a/migrations/versions/19e2a1b15b5e_auto_migrate.py b/migrations/versions/19e2a1b15b5e_auto_migrate.py new file mode 100644 index 0000000..8c1b8e0 --- /dev/null +++ b/migrations/versions/19e2a1b15b5e_auto_migrate.py @@ -0,0 +1,28 @@ +"""auto-migrate + +Revision ID: 19e2a1b15b5e +Revises: f00a9585a348 +Create Date: 2025-06-27 22:59:54.162560 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '19e2a1b15b5e' +down_revision = 'f00a9585a348' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### diff --git a/migrations/versions/85b7ca21ec19_auto_migrate.py b/migrations/versions/85b7ca21ec19_auto_migrate.py new file mode 100644 index 0000000..a9405a6 --- /dev/null +++ b/migrations/versions/85b7ca21ec19_auto_migrate.py @@ -0,0 +1,28 @@ +"""auto-migrate + +Revision ID: 85b7ca21ec19 +Revises: 8c1e8db7b3cb +Create Date: 2025-06-27 23:34:04.669553 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '85b7ca21ec19' +down_revision = '8c1e8db7b3cb' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### diff --git a/migrations/versions/8c1e8db7b3cb_auto_migrate.py b/migrations/versions/8c1e8db7b3cb_auto_migrate.py new file mode 100644 index 0000000..3b8d215 --- /dev/null +++ b/migrations/versions/8c1e8db7b3cb_auto_migrate.py @@ -0,0 +1,28 @@ +"""auto-migrate + +Revision ID: 8c1e8db7b3cb +Revises: 19e2a1b15b5e +Create Date: 2025-06-27 23:21:19.031362 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '8c1e8db7b3cb' +down_revision = '19e2a1b15b5e' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### diff --git a/nip.zip b/nip.zip index 54feb40..150116b 100644 Binary files a/nip.zip and b/nip.zip differ diff --git a/plugins/plant/templates/plant/index.html b/plugins/plant/templates/plant/index.html index 2e2066c..7764954 100644 --- a/plugins/plant/templates/plant/index.html +++ b/plugins/plant/templates/plant/index.html @@ -16,107 +16,123 @@

View Entries

- {# ── Import / Export, Stats, Filters & View Toggle ─────────────────────── #} -
- -
- - - Export My Data - - - + {# ── Import / Export / Stats & Filters / View Toggle ───────────────────── #} +
+ {# LEFT: Import/Export + Stats toggles #} + - + {# RIGHT: filter form + view toggle #}
-
- Search - +
+
+ Search + +
- +
+ +
- +
+ +
- {# keep the current view so Apply doesn’t reset it #} + {# preserve current view so Apply doesn’t reset it #} - +
+ +
-
- - - +
+