Commit Graph

184 Commits

Author SHA1 Message Date
c4lyp5o
3ffb21f8b8 feat: change webpack to vite
changed all extensions from js to jsx
added proxies in vite config
set up chunk for smaller distribution size
remove setupProxy
remove reportWebVitals
2023-11-07 16:44:45 +08:00
Thegan Govender
db3b354af5 Merge pull request #123 from DaftFuzz/feature/geolocate-ip
Feature/geolocate ip
2023-11-04 23:35:24 +02:00
Thegan Govender
c9b64aea1e Update session-card.js
Removed Tooltip as it was unnecessary
Also added a check in the frontend. if the env variables where not set for the GEOLITE API, it would disable the option entirely
2023-11-04 23:34:29 +02:00
fuzz
3089cb2c3f use table-style for modal
more consistent with stream info modal from activity table
2023-11-03 18:01:28 +00:00
fuzz
300c6d5dfd update ipv4 regex
- filter out local ip addresses
- do not show modal for local ip addresses, only remote
- tooltip to show local/remote
2023-11-03 17:03:50 +00:00
fuzz
3126d636f8 explicitly move to new row
otherwise ends up on same line as subtitle info
2023-11-03 13:03:42 +00:00
fuzz
ba6a885e40 merge fix 2023-11-03 12:51:57 +00:00
fuzz
699ec2f83b Merge branch 'unstable' into feature/geolocate-ip 2023-11-03 12:50:08 +00:00
fuzz
e1c628900e increase stat card size
add padding to image
2023-11-03 12:40:32 +00:00
Thegan Govender
c4463285c1 Update session-card.js
css fixes
moved ETA to contextual hover function
moved subtitles to be grouped with other info to correct scaling issues
2023-10-29 04:08:20 +02:00
Thegan Govender
1ace28088c Update Tasks.js
Fix for 100% cpu usage on browsers when loading this page
2023-10-28 23:11:17 +02:00
Thegan Govender
87b69aa944 added axios caching 2023-10-25 22:30:15 +02:00
Thegan Govender
b7ae4ca5db Update sessions.js 2023-10-25 20:57:33 +02:00
fuzz
c1d3dec173 use proxy, set up modal in frontend
Add row to session card with IP Address. Clickable, opens modal.

Modal WIP - displays general info about IP location (maybe can include a map within this modal?)
2023-10-25 18:07:47 +01:00
fuzz
5e238fdad2 initial commit
needs work - currently just an api endpoint that will return geolocation data for a given IP.
ToDo:
- Display IP in session-card
- Clicking IP opens modal with geolocation info
2023-10-25 16:23:25 +01:00
Thegan Govender
1fddf8d4d1 Merge pull request #120 from DaftFuzz/feature/last-card-link-to-item
add links to last-watched-card
2023-10-25 16:15:13 +02:00
fuzz
f4da3a964a add links to last-watched-card
QoL changes:
- Show/Movie title will take you to the show/movie in Jellystat
- Episode title will take you to the episode in Jellystat
Aesthetic changes:
- Small margin added between user pic and username on session card
2023-10-25 15:08:32 +01:00
Thegan Govender
186ef87635 Merge pull request #113 from CyferShepard/CyferShepard-patch-docker-workflow
Update docker-image.yml
2023-10-23 16:50:02 +02:00
Thegan Govender
3195008bf1 Update docker-image.yml
update docker build ext version in workflow
2023-10-23 16:47:37 +02:00
Thegan Govender
651a5829fa Update sessions.js
small Fix for === operator
2023-10-23 16:31:58 +02:00
Thegan Govender
fbb4d6a6cb Merge pull request #112 from foux/sessions-eta
Show sessions ETA
2023-10-23 16:30:44 +02:00
François-Xavier Payet
6fa95f27d7 Hide seconds from the ETA 2023-10-23 14:55:11 +02:00
François-Xavier Payet
f7383d0308 Show ETA for sessions 2023-10-23 14:37:21 +02:00
Thegan Govender
cccecbd5f1 Update session-card.js
Fix Subtitle label as row was nested within another row
2023-10-19 23:01:55 +02:00
Thegan Govender
9ae192f308 Merge pull request #109 from DaftFuzz/bugfix/variables-casing
Bugfix/variables casing
2023-10-18 13:05:35 +02:00
fuzz
0158edb3e3 fix casing
Variables were not defined with correct casing, resulting in exceptions
2023-10-18 11:39:44 +01:00
Thegan Govender
b6dcaad966 Merge pull request #108 from DaftFuzz/feature/show-subtitle-stream-in-session
Display the subtitle stream for a given session
2023-10-17 19:58:14 +02:00
fuzz
fae4246fb9 Display the subtitle stream for a given session
If no subtitles, display this in the sessions card.

Reduced the font size of playback details to prevent the card getting too crowded.

MINOR: Fixed readme instruction for installing npm packages
2023-10-17 18:40:46 +01:00
Thegan Govender
f789fc4185 Update README.md 2023-10-17 19:37:29 +02:00
Thegan Govender
aef4a08e32 Merge pull request #105 from CyferShepard/main
bring in new changes to unstable
2023-10-14 16:04:16 +02:00
Thegan Govender
34f22b91fd Merge pull request #100 from LaSylv/fix-sal-injection-vulnerabilities
sql injection fixes
2023-10-13 12:03:54 +02:00
Sylvain Blanc
e443ee55bf sql injection is openbar 2023-10-13 08:38:00 +02:00
Thegan Govender
d81f589cb8 Sync optimisations + fix for Fetch Users 2023-10-09 16:43:49 +02:00
Thegan Govender
0746386bb0 Update .gitignore 2023-10-07 22:26:25 +02:00
Thegan Govender
e6b04e41a1 Merge pull request #92 from LaSylv/add-release-process
improve release
2023-10-06 22:15:19 +02:00
Sylvain Blanc
3d63d09891 improve release
add workflow
2023-10-06 18:08:35 +02:00
Thegan Govender
b56419880c Merge pull request #88 from LaSylv/fix-sort-TotalWatchTime
fix sort totalWatchTime
2023-10-06 13:49:50 +02:00
Sylvain Blanc
73ef9e6001 fix sort totalWatchTime 2023-10-06 13:41:48 +02:00
Thegan Govender
e220c9d657 Merge pull request #79 from CyferShepard/main
Merge from main to unstable
2023-09-18 16:09:41 +02:00
Thegan Govender
3090dd5130 Merge pull request #78 from lucas-dclrcq/mult-arch-docker
Build & Push multi-arch docker image
2023-09-18 16:08:25 +02:00
Lucas Declercq
8a111fb1b5 ci: build multi-arch image 2023-09-18 13:08:32 +02:00
Thegan Govender
c21b2f2c65 Added Override Credential Params + Swagger
Added JS_USER  and JS_PASSWORD to env variables so that these credentials can be used to access jellystat incase of forgotten credentials

Added swagger implementation + swag doc auto-generator
2023-09-11 22:00:44 +02:00
Thegan Govender
5fc69d2e6c Update FUNDING.yml 2023-09-05 08:49:40 +02:00
Thegan Govender
876c104145 Create FUNDING.yml 2023-09-05 08:49:04 +02:00
Thegan Govender
aeb46f2a08 Task and Logging Changes
Reworked Tasks and logging to prevent overlapping tasks from executing. This is done by reworking the logging process so that the task state is stored and accurately tracked allowing us to check for currently running tasks.

Backup and sync tasks also reworked to reduce code redundancy and allow for better error handling

Websockets finally fixed and implementation has begun

Added Toast notifications
2023-09-03 20:47:52 +02:00
Thegan Govender
5014a6e5a9 Merge pull request #71 from CyferShepard/main
Update to main
2023-08-20 11:38:40 +02:00
Thegan Govender
3282e43e65 Merge pull request #70 from CyferShepard/dependabot/npm_and_yarn/tough-cookie-4.1.3
Bump tough-cookie from 4.1.2 to 4.1.3
2023-08-20 11:29:40 +02:00
dependabot[bot]
6e6be3eda9 Bump tough-cookie from 4.1.2 to 4.1.3
Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](https://github.com/salesforce/tough-cookie/compare/v4.1.2...v4.1.3)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-20 09:28:45 +00:00
Thegan Govender
b345040f2c Merge pull request #69 from CyferShepard/dependabot/npm_and_yarn/word-wrap-1.2.5
Bump word-wrap from 1.2.3 to 1.2.5
2023-08-20 11:27:14 +02:00
dependabot[bot]
a1cb21683f Bump word-wrap from 1.2.3 to 1.2.5
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.5)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-20 09:23:43 +00:00