Skip to content

Commit

Permalink
fixed git for erikpersson0884 github repo
Browse files Browse the repository at this point in the history
  • Loading branch information
erikpersson0884 committed Apr 23, 2024
1 parent de11318 commit c28f0d1
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
5 changes: 2 additions & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
data/adminkeys.json
data/images.json
data/logs.json
data/
public/img/eventImages/
2 changes: 1 addition & 1 deletion .github/vevit.yml → .github/workflows/vevit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ jobs:
uses: docker/[email protected]
with:
push: ${{ github.ref == 'refs/heads/main' }}
tags: ghcr.io/cthit/screenit:latest
tags: ghcr.io/erikpersson0884/screenit:latest
2 changes: 1 addition & 1 deletion backend/peopleRouter.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ peopleRouter.post('/getPeople', (req, res) => {
peopleRouter.post('/updatePerson', (req, res) => {
const adminKey = req.body.adminKey;
if (!isAdminKeyValid(adminKey)) return res.status(403).send("Adminkey not valid");
if(userHasPermission(adminKey, "pr") && req.body.id !== getUserIdFromAdminKey(adminKey)) return res.status(403).send("User does not have permission to update account type to admin");
if(userHasPermission(adminKey, "pr") && req.body.userId !== getUserIdFromAdminKey(adminKey)) return res.status(403).send("User does not have permission to update account type to admin");

let people = fs.readFileSync(pathToUsersFile, 'utf8');
people = JSON.parse(people);
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
vevit:
image: ghcr.io/cthit/screenit:latest
image: ghcr.io/erikpersson0884/screenit:latest
ports:
- 3000:3000
volumes:
Expand Down
6 changes: 5 additions & 1 deletion public/js/gallery.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,11 @@ function showMenus() {

settingsDiv.addEventListener('mouseenter', function() {
showMenus();
hideMenus();

settingsDiv.addEventListener('mouseleave', function() {
settingsDiv.removeEventListener('mouseleave', this);
hideMenus();
});
});


Expand Down

0 comments on commit c28f0d1

Please sign in to comment.