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

Dev #72

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open

Dev #72

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
45647e8
Very various code revork and refactoring (#29)
leechwort Dec 6, 2023
6531848
Delete file, forgotten from previous commit
leechwort Dec 6, 2023
98dd5c5
Fixed docker file and add ci for build docker images
VovaStelmashchuk Dec 7, 2023
98b5700
change to correct tag
VovaStelmashchuk Dec 7, 2023
4120558
Implement build docker image with correct tags
VovaStelmashchuk Dec 7, 2023
1e8e139
Merge pull request #36 from hacklabkyiv/fix_docker
VovaStelmashchuk Dec 7, 2023
7dca0cb
Implement creating database on start if not exist
VovaStelmashchuk Dec 14, 2023
e737cb3
Flash RFID readers from admin panel (#42)
leechwort Dec 18, 2023
02ce2e8
Fix problem with settings editor
leechwort Dec 19, 2023
78ce56a
Docker configuration changed
leechwort Dec 20, 2023
8886144
Improve plugin subsystem
leechwort Dec 21, 2023
e6c1c87
Fix UUID generator
leechwort Dec 21, 2023
169084b
Fix AddUser() bug
leechwort Dec 21, 2023
4816b7c
Some changes to login and database create logic
leechwort Dec 21, 2023
58c1099
UI fixes (#53)
temhota Jan 6, 2024
b8b51ad
Docker-related stuff changed
leechwort Jan 13, 2024
00f421b
Fix add user functionality
leechwort Jan 13, 2024
c0c9408
Some fixes (#57)
leechwort Jan 15, 2024
a9874a9
Add image and other fix (#58)
leechwort Jan 21, 2024
be74e5e
Another fixes
leechwort Jan 22, 2024
f701e77
Several changes, revealed during smoke test on final stages (#61)
leechwort Feb 5, 2024
15cf169
Merge branch 'master' into dev
leechwort Feb 5, 2024
41783a5
Tool door split (#65)
leechwort Feb 10, 2024
26a2ea6
Latest activity added (#66)
leechwort Feb 11, 2024
5640b86
Slack notifier separately notify door and tool (#67)
leechwort Feb 11, 2024
6909ce8
Merge branch 'master' into dev
leechwort Feb 14, 2024
6450653
Make device name editable (#69)
temhota Feb 20, 2024
439811f
Added margin in settings editor
leechwort Feb 20, 2024
217ede0
Merge branch 'master' into dev
leechwort Feb 22, 2024
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
Prev Previous commit
Next Next commit
Merge branch 'master' into dev
  • Loading branch information
leechwort authored Feb 14, 2024
commit 6909ce8a546da3c3f26ba6fa9d03f2a2906ea735
2 changes: 1 addition & 1 deletion app/config_default.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"slack_notifier": {
"SLACK_TOOL_CHANNEL": "#prismo-debug",
"SLACK_DOOR_CHANNEL": "#prismo-door-channel",
"SLACK_TOKEN": "xoxb-this-is-not-areal-slack-token"
"SLACK_TOKEN": "xoxb-this-is-not-areal-slack-token"
}
},
"READER_FIRMWARE_FLASHING_SCRIPT_PATH": "/home/artsin/Dev/prismo-reader/src/flasher.sh",
Expand Down
1 change: 1 addition & 0 deletions app/templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<title>Prismo</title>
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/intro.js/2.7.0/intro.js"></script>

<script src="https://cdn.jsdelivr.net/npm/[email protected]/js/bootstrap5-toggle.ecmas.min.js"></script>
<script src="static/js/rfid.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
Expand Down
1 change: 1 addition & 0 deletions app/utils/fimware_updater.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ def update_firmware_full(socket, device_id, device_type):
run_environment["HOST_WIFI_PASSWORD"] = app.config["PRISMO"]["WIFI_PASSWORD"]
script_cwd = script_path.parent
process = subprocess.Popen([script_path, device_id, device_type], cwd=script_cwd,

stdout=subprocess.PIPE, env=run_environment)
except FileNotFoundError:
data["text"] = "Cannot find firmware update script"
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.