Commit Graph
100 Commits
Author SHA1 Message Date
ajurnaandGitHub 2af8e18f0a Delete codacy.yml 2022-09-07 14:55:18 +01:00
ajurnaandGitHub 739aaefb08 Update codeql-analysis.yml 2022-08-31 15:29:22 +01:00
ajurnaandGitHub 09888fd9d9 Create codacy.yml 2022-08-31 12:09:32 +01:00
ajurnaandGitHub 24b33be53c Update README.md 2022-08-31 09:42:42 +01:00
ajurnaandGitHub 45a95120f4 Update .readthedocs.yaml 2022-08-30 23:42:45 +01:00
ajurnaandGitHub e8a193c73b Update docker-image.yml 2022-08-30 12:46:18 +01:00
ajurnaandGitHub c9547ed89f Update docker-image.yml 2022-08-30 12:38:02 +01:00
ajurnaandGitHub cfaed17bf7 Create docker-image.yml 2022-08-30 12:36:29 +01:00
5ca3c396ea Docker optimisation (#74)
* optimised docker image.

* bump version

Co-authored-by: Peter Dwyer <peter.dwyer@clanwilliamhealth.com>
2022-08-26 16:08:48 +01:00
40b79c2f5d V1 cleanup (#73)
* removed obsolete code

* removed obsolete code

* removed obsolete code and added type annotations

* removed obsolete code and added type annotations

* version bump

Co-authored-by: Peter Dwyer <peter.dwyer@clanwilliamhealth.com>
2022-08-26 13:11:29 +01:00
1c5779e5b1 fix: upgrade pdfjs-dist from 2.13.216 to 2.15.349 (#71)
Snyk has created this PR to upgrade pdfjs-dist from 2.13.216 to 2.15.349.

See this package in npm:
https://www.npmjs.com/package/pdfjs-dist

See this project in Snyk:
https://app.snyk.io/org/ajurna/project/127292ba-f6a3-4db6-aa37-06b046e6c7a2?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
2022-08-25 15:50:03 +01:00
c5633bf54a New Frontend in Vue with drf interface (#72)
* frontend rewrite with vie initial commit

* got ComicCard.vue working nice.

* got TheComicList.vue working.

* added router and basic config

* getting jwt stuff working.

* login with jwt now working.

* implemented browse api call

* implemented browse api recievers

* jwt token is now updating automatically.

* removed code for jwt testing.

* enabled browsing

* breadcrumbs working

* adding django webpack loader

* linking up navigation

* fixes for ComicCard.vue stying

* added thumbnail view

* added thumbnail generation and handling.

* detached breadcrumbs

* fix breadcrumbs

* added first stages of reader

* reader view is working.

* reader is now working with keyboard shortcuts

* implemented setting read page.

* implemented pagination on comic reader.

* hide elements that shouldn't be shown.

* fixed the ComicCard.vue to use as little space as possible.

* fix navbar browse link

* added RecentView.vue and added manual option for breadcrumbs

* updated rest api to handle recent comics.

* most functionality of recent comics done

* modified comicstatus relation to use uuid relation and implemented mark read and unread for batches.

* added functions to TheRecentTable.vue

* added feed link to TheRecentTable.vue

* fixes for comicstatus updates.

* added constraints to comicstatus

* update to python packages.

* some changes for django 4, also removed django-recaptcha2 as it doesnt support django 4.

* some fixes and updates to ComicCard.vue

* cleaned up generate_directory. fixed bug where pages not visible on first call.

* cleaned up generate_directory. fixed bug where pages not visible on first call.

* cleaned up generate_directory. fixed bug where pages not visible on first call.

* cleaned up generate_directory.

* added silk stubs

* fix for re-requesting thumbnail after getting it already.

* fix for removing stale comics.
adding leeway to access token.

* mark read and unread

* added filtering to comic list.

* stored filtering state.

* stored filtering state.

* added next functionality to login.

* cleanup LoginView.vue

* bump font-awesome.

* working on AccountView.vue

* fixed form submission on LoginView.vue

* account page should now be working.

* hide users option if not superuser.

* added pdf support

* make pdf resize.

* added touch controls to pdf reader

* added touch controls to comic reader

* beginnings of routing between issues.

* fixes for navigating pages.

* fixes for navigating pages.

* fixes for navigating pages.

* renamed HomeView.vue to BrowseView.vue

* stubs for users page added. api ready

* users page further functinality

* fix for notification

* fix for notification

* moved messages to parent.

* form to add users

* added error handling

* removed console logging

* classification in base directory should be lowest

* renamed usermisc to classification to be more consistent with what it does.

* renamed usermisc to classification to be more consistent with what it does.

* added functionality to change classification of directories.

* merged rss_id api into account api.

* merged breadcrumbs api into browse api.

* clears some warnings from console.

* fixed read/unread rendering.

* added build script and starting lint

* fixing lint errors

* fixing lint errors

* fixing lint errors

* fixing lint errors

* fixing lint errors

* fixing lint errors

* fixing lint errors

* fixing lint errors

* fixing navigation bugs

* cleanup and fixes

* fixed generated tooltips over calling.

* fixed classifications.

* initial setup now working

* fix navbar branding

* fix favicon

* added beta build script.

* fixes to get ready for production

* optimisations for loading new comics.

* added loading indicators to TheComicList.vue

* lint fixes

* made two methods static. may use them elsewhere.

* fix for scanning files.

* version updates.

* fixes for production

* fixes for production

Co-authored-by: Peter Dwyer <peter.dwyer@clanwilliamhealth.com>
2022-08-25 15:42:20 +01:00
ajurna cb199668fb security fix 2022-07-06 08:47:32 +01:00
ajurna 113b9c0896 Merge remote-tracking branch 'origin/master' 2022-07-06 08:38:26 +01:00
da4383be9f fix: upgrade datatables.net-bs4 from 1.12.0 to 1.12.1 (#65)
Snyk has created this PR to upgrade datatables.net-bs4 from 1.12.0 to 1.12.1.

See this package in npm:
https://www.npmjs.com/package/datatables.net-bs4

See this project in Snyk:
https://app.snyk.io/org/ajurna/project/127292ba-f6a3-4db6-aa37-06b046e6c7a2?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
2022-07-06 08:36:29 +01:00
e09e0116ab fix: requirements.txt to reduce vulnerabilities (#66)
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-DJANGO-2940618

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
2022-07-06 08:36:09 +01:00
ajurna 67ad6e441a Merge branch 'master' of https://github.com/ajurna/cbwebreader 2022-06-03 08:29:23 +01:00
ajurna 481ae18de2 fix for out of date comicpage references on thumbnail generation 2022-06-02 17:07:31 +01:00
ajurna b45e667c86 changed image base to debian as alpine doesnt have unrar any more. 2022-06-02 17:06:50 +01:00
ajurna 79d2f67ca9 changed image base to debian as alpine doesnt have unrar any more. 2022-06-02 14:24:48 +01:00
ajurna 3940c0667e ignore node_modules folder. 2022-06-02 12:03:09 +01:00
5679cbd9ef fix: requirements.txt to reduce vulnerabilities (#61)
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-PILLOW-2838873

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
2022-06-01 16:37:34 +01:00
ajurnaandGitHub 8fbc797a66 Delete docs directory 2022-04-12 14:31:54 +01:00
ajurna 95a23854ef tighten security 2022-04-02 08:39:01 +01:00
ajurna 201e032636 tighten security 2022-04-02 08:38:24 +01:00
ajurna 82981482df tighten security 2022-04-02 08:37:47 +01:00
ajurna 8f0eb5d23c tighter security 2022-04-01 21:07:57 +01:00
ajurna 0da7ef82b2 fix for recent comics not loading. 2022-04-01 20:40:39 +01:00
ajurna 115fb66b01 updating and adding more security 2022-04-01 20:08:53 +01:00
ajurna 5d0b0dd50a updating and adding more security 2022-04-01 08:53:02 +01:00
ajurna e0bf3f41eb Merge remote-tracking branch 'origin/master' 2022-03-31 22:57:48 +01:00
ajurna fb8bbe65a4 update reveal.js 2022-03-31 22:57:32 +01:00
ajurna 3e5f884db0 thumb options update 2022-03-12 14:24:16 +00:00
ajurna 4e3d4dbffb more version bumps and added build script. 2022-01-13 14:38:03 +00:00
ajurna af8bb494d2 removed unued database Dockerfile 2022-01-13 14:06:49 +00:00
ajurna bf4484e391 fix for django-sri or static files not detecting new files. not sure which but clearing files on collectstatic fixes it. 2022-01-13 13:40:27 +00:00
ajurna 4077ed303a removed azure-pipelines.yml becasue that doesn't do anything.
updated Dockerfile to lock to alpine 3.14 as unrar isnt in alpine 3.15
general bumping of dependancies.
2022-01-13 11:17:33 +00:00
ajurna d85710dd07 removed azure-pipelines.yml becasue that doesn't do anything.
updated Dockerfile to lock to alpine 3.14 as unrar isnt in alpine 3.15
general bumping of dependancies.
2022-01-13 11:02:29 +00:00
ajurna b77f307d6e downgraded python version for readthedocs 2021-11-01 13:54:42 +00:00
ajurna 8057b07653 added requirements.txt for docs 2021-11-01 13:53:51 +00:00
ajurna ed97f84b13 update for security issues with sqlparse. 2021-09-13 11:08:05 +01:00
ajurna 8665973d0c update for security issues with pillw. 2021-09-08 14:44:40 +01:00
ajurna 99697f4eab fix for error where db cursor closes when looking for usermisc objects by relation. 2021-05-25 09:21:04 +01:00
ajurna 39222118ab fix for error where db cursor closes when looking for usermisc objects by relation. 2021-05-25 09:10:06 +01:00
ajurnaandGitHub 715f0838b9 Node assets (#36)
* moved all static files to node_modules

* updating Dockerfile

* updating Dockerfile

* updating Dockerfile

* updating Dockerfile

* fixed fontawesome

* added psql client in case it's needed.

* removed some debug stuff from scan_comics.py

* fixed generete_directory to cover missing thumbnails
2021-05-17 09:38:47 +01:00
ajurnaandGitHub 76a1863b73 Update __init__.py
fixed typo
2021-05-16 16:21:09 +01:00
ajurna a3ba0e459a fixed settings import. 2021-05-16 12:47:51 +01:00
ajurnaandGitHub cd58379326 Sri (#35)
* added django-sri and updated templates.

* updated requirements.txt

* datatables with integrity

* fixed recent comics not showing when related comicstatus doesnt exist.

* fixed classifications on recent comcis.

* fixed classifications on recent comcis.

* fixed classifications on recent comcis.

* fixed classifications on recent comcis.

* fixed classifications on recent comcis.

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fixes for pymupdy 1.18.13

* fix for pdf's not switching properly

* fix for comics's not switching properly

* fix for comics's not switching properly
2021-05-16 10:54:14 +01:00
ajurna d5c53cd889 Merge remote-tracking branch 'origin/master' 2021-05-11 16:27:29 +01:00
ajurna 18cc3f0f23 fixed comics not working in the base directory. 2021-05-11 16:27:16 +01:00
ajurnaandGitHub ce38340a22 Classification (#32)
* added some code cleanup for views.py

* added some code cleanup for views.py

* fixed comics not working in the base directory.
2021-05-11 15:52:56 +01:00
ajurna 443e43e3f0 update to Dockerfile to make the build much smaller. 2021-05-05 21:27:36 +01:00
ajurnaandGitHub 1bb272e07f Docker compress (#31)
* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.

* update to Dockerfile to make the build much smaller.
2021-05-05 20:07:02 +01:00
ajurna d7821fab78 fixes for tests and update to README.md 2021-05-05 11:51:37 +01:00
ajurnaGitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
808e69c2ec Deps pr (#30)
* Bump y18n from 3.2.1 to 3.2.2 in /static/reveal.js/plugin/menu

Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>

* Bump ini from 1.3.5 to 1.3.8 in /static/reveal.js/plugin/menu

Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8)

Signed-off-by: dependabot[bot] <support@github.com>

* URL redirection from remote source

* URL redirection from remote source

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-04 18:22:05 +01:00
ajurnaandGitHub 659862a628 URL redirection from remote source (#29) 2021-05-04 18:21:12 +01:00
ajurnaandGitHub 96f90469cf Create codeql-analysis.yml 2021-05-04 15:58:26 +01:00
ajurnaandGitHub c0a1160bc1 Dotenv (#28)
* docker-compose.yml fixes

* docker-compose.yml fixes

* docker-compose.yml fixes

* docker-compose.yml fixes

* docker-compose.yml fixes

* docker-compose.yml fixes

* docker-compose.yml fixes

* docker-compose.yml fixes

* docker-compose.yml fixes

* docker-compose.yml fixes

* docker-compose.yml fixes

* docker-compose.yml fixes
2021-05-04 15:46:40 +01:00
ajurna d175a790fa docker-compose.yml fixes 2021-05-04 14:23:57 +01:00
ajurna 1fa5005c69 docker-compose.yml fixes 2021-05-04 13:48:14 +01:00
ajurna 0bf923d548 docker-compose.yml fixes 2021-05-04 13:38:46 +01:00
ajurna a7d51825cc docker-compose.yml fixes 2021-05-04 12:53:52 +01:00
ajurna 736b16ee7a docker-compose.yml fixes 2021-05-04 12:53:15 +01:00
ajurna 567726d031 docker-compose.yml fixes 2021-05-04 12:48:05 +01:00
ajurna 94a1dd0e01 docker-compose.yml fixes 2021-05-04 12:45:31 +01:00
ajurna 95f2fb8fb0 docker-compose.yml fixes 2021-05-04 12:39:57 +01:00
ajurna 3984eec1c8 updated README.md 2021-05-04 09:47:06 +01:00
ajurna cd43355da4 updated favicon to use SVG. 2021-05-04 09:40:32 +01:00
ajurna e238b307f2 removed excess files. 2021-05-04 09:32:58 +01:00
ajurna 0c12fe3b92 post merge commit 2021-05-04 09:31:44 +01:00
ajurna 776abe5374 Merge branch 'csp_hell'
# Conflicts:
#	static/css/base.min.css
2021-05-04 09:31:09 +01:00
ajurna 7ce086ed10 pre merge commit 2021-05-04 09:30:52 +01:00
ajurna 10ffd01a2e adding csp 2021-05-04 09:21:13 +01:00
ajurna d21ec61f06 adding csp 2021-04-30 19:37:56 +01:00
ajurna 5eecbf1075 adding csp 2021-04-29 23:07:57 +01:00
ajurna c8ffb55bbe fix for dropdowns not working. 2021-04-29 21:53:01 +01:00
ajurna 3f8a41504f fix for dropdowns not working. 2021-04-29 16:55:03 +01:00
ajurnaandGitHub 6f538f05f5 Pymupdf (#27)
* added icons.

* change to from pypdf4 to pumupdf so i can render pages for thumbnails.
2021-04-29 16:33:03 +01:00
ajurna f92b96191a added option to verify_pages on scan_comics.py 2021-04-23 20:47:44 +01:00
ajurna 3a28302318 Rewrite of Comic lists so that tehy have thumbnails. 2021-04-23 20:26:49 +01:00
ajurnaandGitHub d40c8e270c Rewrite of Comic lists so that tehy have thumbnails. (#26) 2021-04-23 18:21:25 +01:00
ajurna 5b0a1c7c14 fix scan_comics job to use pathlib. 2021-04-21 09:40:00 +01:00
ajurna 9fb2a1c15c added django_extensions and updated admin settings. 2021-04-21 09:11:28 +01:00
ajurna c14049ec54 remove settings. everything should be configured via the .env file. 2021-04-21 09:01:18 +01:00
ajurna 64acde19db fixed tests working. 2021-04-15 14:05:45 +01:00
ajurna 43fc877445 fixed tests working. 2021-04-15 11:33:36 +01:00
ajurna 99e8077d8b fixed tests working. 2021-04-10 09:37:44 +01:00
ajurna 41dc7c49b8 removed proccess_comic_pages and replaced with verify pages as that is far superior 2021-04-09 18:45:31 +01:00
ajurna 2bbdd7c2a1 add timeout to scroll to make it more consistant. 2021-04-09 15:16:37 +01:00
ajurna 0138df933e add timeout to scroll to make it more consistant. 2021-04-09 14:12:04 +01:00
ajurna 1d5dcb90c0 added a lock on a critical path when regenerating pages. this should allow all images to load correctly 2021-04-09 11:29:03 +01:00
ajurna c1f5d80ff7 added a lock on a critical path when regenerating pages. this should allow all images to load correctly 2021-04-08 16:43:39 +01:00
ajurna b502d8164b added a lock on a critical path when regenerating pages. this should allow all images to load correctly 2021-04-08 16:14:42 +01:00
ajurna dd806f0bce added a lock on a critical path when regenerating pages. this should allow all images to load correctly 2021-04-08 16:10:28 +01:00
ajurna 53d1ae6364 fixed bug where if duplicate pages exist comic will be rescanned. 2021-04-08 15:51:30 +01:00
ajurna b19d3aeaa2 fixed bug where if page is missing it will regenerate page records and serve it correctly. 2021-04-08 14:07:41 +01:00
ajurna b96deb3512 bumping version 2021-04-08 12:17:16 +01:00
ajurna bf63d5f743 remove log line 2021-04-08 12:04:11 +01:00
ajurna d556cf3ff8 reverted change becasue slidetransitioned doesn't seem to actually fire. 2021-04-08 11:59:59 +01:00
ajurna 2185b69500 changed event on slide changed to transitioned as sometimes the scroll would not fire correctly. 2021-04-08 11:32:35 +01:00