Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.9.0 #61

Merged
merged 70 commits into from
Jul 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
2c58f9c
chore: remove unused express routes code
jakowenko Jul 8, 2021
eb862cd
chore(logger): use winston as logger
jakowenko Jul 8, 2021
d105843
feat: support for home assistant mqtt auto discovery #38
jakowenko Jul 8, 2021
f2184fa
refactor: read config file location from constants path
jakowenko Jul 8, 2021
a100244
chore: change default camera name
jakowenko Jul 8, 2021
2e4f58c
refactor(api:config): refactored config with support for override file
jakowenko Jul 8, 2021
1f3691e
chore: support for legacy config bind mount
jakowenko Jul 8, 2021
6d4ea3e
refactor: don't let logger use config
jakowenko Jul 8, 2021
654b32e
chore: require logger first
jakowenko Jul 9, 2021
de37e3a
revert: remove config.override.yml logic for now
jakowenko Jul 9, 2021
a4353ac
refactor: store system config constants in new file
jakowenko Jul 9, 2021
11353c8
build: update entry command to write config.yml file before nodemon s…
jakowenko Jul 9, 2021
a5ef591
build: package update
jakowenko Jul 9, 2021
c3f92e5
build: local development with docker-compose
jakowenko Jul 9, 2021
9fe9e0c
chore: remove docker-compose.yml
jakowenko Jul 9, 2021
4ef4437
chore: update api script for local container
jakowenko Jul 9, 2021
61ab916
chore: version bump
jakowenko Jul 9, 2021
1754371
fix: watch legacy config location for restart
jakowenko Jul 9, 2021
e1285e6
fix: reset home assistant camera topic person count after 30sec
jakowenko Jul 9, 2021
ccbc6ec
fix: check to see if config.yml exists before creating it
jakowenko Jul 9, 2021
18f6288
refactor: use entrypoint.sh instead of command
jakowenko Jul 9, 2021
2455d3e
chore: allow entrypoint.sh
jakowenko Jul 9, 2021
e7a66c8
fix(frigate): check for camera name in zones during name check
jakowenko Jul 12, 2021
384d74c
chore: entrypoint.dev.sh for local container development
jakowenko Jul 14, 2021
f26ad0c
style: single command to multiple for readability
jakowenko Jul 14, 2021
65894af
chore: require constants first
jakowenko Jul 14, 2021
13c7625
refactor(storage): load training images from controller
jakowenko Jul 14, 2021
8b17248
chore: update tile on ui routes
jakowenko Jul 15, 2021
d40cb8e
fix: toggle all when a match was disabled
jakowenko Jul 15, 2021
dd48b50
feat: allow uploading, retraining, and untraining from UI
jakowenko Jul 15, 2021
cda8238
chore: move components out of match folder to parent folder
jakowenko Jul 15, 2021
d0e334f
refactor: move folder get/post calls to header component
jakowenko Jul 15, 2021
e619db4
chore: remove inline style
jakowenko Jul 15, 2021
99f347c
chore: update ui nav names / routes
jakowenko Jul 15, 2021
3f281c1
refactor: updates to asset, grid, header component for training feature
jakowenko Jul 15, 2021
a308fb8
chore: set max-width on confirm dialog
jakowenko Jul 15, 2021
40cd69d
feat: api updates to support training from ui
jakowenko Jul 15, 2021
fcf406b
build: multer for file uploads
jakowenko Jul 15, 2021
fec114e
fix: include unique_id and prefix for HA MQTT discovery #38
jakowenko Jul 15, 2021
2b6bf45
fix: use exec command when starting api
jakowenko Jul 15, 2021
ac054c5
build: package updates
jakowenko Jul 15, 2021
8277f77
fix: add metadata to images for orientation when displaying
jakowenko Jul 16, 2021
99e8d57
chore: make ui content a little smaller on mobile
jakowenko Jul 16, 2021
99a8251
feat: ability to train an untrained image for a different person
jakowenko Jul 16, 2021
e803686
refactor: when adding new training images, only process those and not…
jakowenko Jul 16, 2021
4ee6487
chore: header styling and button labels
jakowenko Jul 16, 2021
51757a2
chore: training sort and removing redundant detector prop from result
jakowenko Jul 16, 2021
760c397
chore: change acceptClass for untrain confirmation
jakowenko Jul 16, 2021
30d7369
fix(ui): areAllSelected state header button
jakowenko Jul 16, 2021
2a69495
chore: make responsive-button class for hiding text on mobile
jakowenko Jul 16, 2021
e69d307
chore(ui): include docker tag in version
jakowenko Jul 16, 2021
4d10e31
build: package updates
jakowenko Jul 16, 2021
bd20f67
fix(ui): only reset disabled array when new images come in
jakowenko Jul 16, 2021
a27321c
fix: proxy frigate status check through api for docker dns resolution
jakowenko Jul 17, 2021
49a6078
chore: typo
jakowenko Jul 20, 2021
0a60939
refactor: remove patch /match in favor of updated /train/add
jakowenko Jul 20, 2021
eef0f9b
refactor(ui): updates for api changes
jakowenko Jul 20, 2021
32b9104
refactor(api): refactored /train/* and db helper functions
jakowenko Jul 20, 2021
093651a
chore: include dev build tag for local
jakowenko Jul 20, 2021
d7876d8
build: package updates
jakowenko Jul 20, 2021
1fde7e0
fix: add missing get.trained util
jakowenko Jul 20, 2021
3bdfc3d
fix: return untrained files for detectors that were never untrained b…
jakowenko Jul 20, 2021
76d183a
chore: update global detectors variable to follow constants syntax
jakowenko Jul 20, 2021
acb54b0
chore: update training logs and location of execution-time
jakowenko Jul 20, 2021
6347ee3
chore: remove unused file id
jakowenko Jul 21, 2021
ae84369
chore: hide type label if manual
jakowenko Jul 21, 2021
e6f715f
fix: catch empty cameras config
jakowenko Jul 21, 2021
b98b181
docs: remove api docs from readme in favor of postman docs
jakowenko Jul 21, 2021
60e3c74
docs: add donation section
jakowenko Jul 21, 2021
374e4d9
refactor: decrease image quality on matches and train page to reduce …
jakowenko Jul 21, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .develop/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
FROM node:14-alpine
RUN apk --update add --no-cache bash python make g++ libpng libpng-dev jpeg-dev pango-dev cairo-dev giflib-dev libheif-dev
RUN apk add libimagequant-dev --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
RUN apk add vips-dev --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community

WORKDIR /double-take/api
COPY /api/package.json .
RUN npm install --production

WORKDIR /double-take/frontend
COPY /frontend/package.json .
RUN npm install

WORKDIR /double-take/api
COPY /api/server.js .
COPY /api/src ./src

WORKDIR /double-take/frontend
COPY /frontend/src ./src
COPY /frontend/public ./public
COPY /frontend/.env.production ./frontend/vue.config.js ./

WORKDIR /
RUN mkdir /.storage
RUN ln -s /.storage /double-take/.storage

WORKDIR /double-take

RUN npm install nodemon -g
5 changes: 5 additions & 0 deletions .develop/entrypoint.dev.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

mkdir -p ./.storage/config
[ -f ./.storage/config/config.yml ] || echo $'# Double Take' > ./.storage/config/config.yml
exec npm run api
2 changes: 2 additions & 0 deletions .develop/mosquitto.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
listener 1883
allow_anonymous true
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*

!entrypoint.sh
!frontend/*
!api/*

Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.DS_Store
node_modules
docker-compose.yml

# frontend
frontend/dist
Expand Down
19 changes: 10 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ RUN apk add libimagequant-dev --repository=http://dl-cdn.alpinelinux.org/alpine/
RUN apk add vips-dev --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community

WORKDIR /double-take/api
COPY ./api/package.json .
COPY /api/package.json .
RUN npm install --production

WORKDIR /double-take/frontend
COPY ./frontend/package.json .
COPY /frontend/package.json .
RUN npm install

WORKDIR /double-take/api
COPY ./api/server.js .
COPY ./api/src ./src
COPY /api/server.js .
COPY /api/src ./src

WORKDIR /double-take/frontend
COPY ./frontend/src ./src
COPY ./frontend/public ./public
COPY ./frontend/.env.production ./frontend/vue.config.js ./
COPY /frontend/src ./src
COPY /frontend/public ./public
COPY /frontend/.env.production ./frontend/vue.config.js ./

RUN npm run build
RUN mv dist /tmp/dist && rm -r * && mv /tmp/dist/* .
Expand All @@ -28,8 +28,9 @@ RUN mkdir /.storage
RUN ln -s /.storage /double-take/.storage

WORKDIR /double-take
RUN echo "# Double Take\n\n\n" >> config.yml

RUN npm install nodemon -g

CMD nodemon --watch config.yml api/server.js
COPY /entrypoint.sh .

ENTRYPOINT ["/bin/bash", "./entrypoint.sh"]
Loading