mirror of
https://github.com/ajurna/cbwebreader.git
synced 2025-12-06 22:27:19 +00:00
Compare commits
9 Commits
faf3841f06
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f083936aad | ||
|
|
bccbff8b33 | ||
|
|
05e3db9e42 | ||
|
|
a47153b917 | ||
|
|
df01235325 | ||
|
|
7d20447526 | ||
|
|
0dfe551b66 | ||
|
|
94171ec548 | ||
|
|
1fbe359448 |
1273
frontend/package-lock.json
generated
1273
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -23,7 +23,7 @@
|
|||||||
"vue-toast-notification": "3.0",
|
"vue-toast-notification": "3.0",
|
||||||
"vuejs-paginate-next": "^1.0.2",
|
"vuejs-paginate-next": "^1.0.2",
|
||||||
"vuex": "^4.0.0",
|
"vuex": "^4.0.0",
|
||||||
"webpack": "^5.74.0"
|
"webpack": "^5.76.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.12.16",
|
"@babel/core": "^7.12.16",
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ async function get_access_token() {
|
|||||||
let refresh = jwtDecode(store.state.jwt.refresh)
|
let refresh = jwtDecode(store.state.jwt.refresh)
|
||||||
if (access.exp - Date.now()/1000 < 5) {
|
if (access.exp - Date.now()/1000 < 5) {
|
||||||
if (refresh.exp - Date.now()/1000 < 5) {
|
if (refresh.exp - Date.now()/1000 < 5) {
|
||||||
await router.push({name: 'login', params: { username: 'eduardo' }})
|
await router.push({name: 'login'})
|
||||||
return null
|
return null
|
||||||
} else {
|
} else {
|
||||||
return store.dispatch('refreshToken').then(() => {return store.state.jwt.access})
|
return store.dispatch('refreshToken').then(() => {return store.state.jwt.access})
|
||||||
|
|||||||
@@ -73,14 +73,22 @@ export default createStore({
|
|||||||
if ('next' in router.currentRoute.value.query) {
|
if ('next' in router.currentRoute.value.query) {
|
||||||
router.push(router.currentRoute.value.query.next)
|
router.push(router.currentRoute.value.query.next)
|
||||||
} else {
|
} else {
|
||||||
router.push('/')
|
router.push('browse')
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
.catch((error)=>{
|
.catch((error)=>{
|
||||||
// console.log(error);
|
|
||||||
const $toast = useToast();
|
const $toast = useToast();
|
||||||
|
if (error.response.data.detail) {
|
||||||
$toast.error(error.response.data.detail, {position:'top'});
|
$toast.error(error.response.data.detail, {position:'top'});
|
||||||
|
}
|
||||||
|
if (error.response.data.username) {
|
||||||
|
$toast.error("Username: " + error.response.data.username, {position:'top'});
|
||||||
|
}
|
||||||
|
if (error.response.data.password) {
|
||||||
|
$toast.error("Password: " + error.response.data.password, {position:'top'});
|
||||||
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
refreshToken(){
|
refreshToken(){
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<div class="row" v-if="!initialSetupRequired">
|
<div class="row" v-if="!initialSetupRequired">
|
||||||
<div class="col col-lg-4" />
|
<div class="col col-lg-4" />
|
||||||
<div class="col col-lg-4" id="login-col">
|
<div class="col col-lg-4" id="login-col">
|
||||||
<form @submit="login">
|
<form @submit="login" v-on:submit.prevent="onSubmit">
|
||||||
<label class="form-label" for="username">Username</label>
|
<label class="form-label" for="username">Username</label>
|
||||||
<input id="username" placeholder="username" aria-describedby="loginFormControlInputHelpInline" class="form-control" type="text" v-model="username" />
|
<input id="username" placeholder="username" aria-describedby="loginFormControlInputHelpInline" class="form-control" type="text" v-model="username" />
|
||||||
<div class="form-text" id="loginFormControlInputHelpInline">Please enter your username</div>
|
<div class="form-text" id="loginFormControlInputHelpInline">Please enter your username</div>
|
||||||
|
|||||||
1131
poetry.lock
generated
1131
poetry.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -3,14 +3,14 @@ line_length = 119
|
|||||||
|
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "cbwebreader"
|
name = "cbwebreader"
|
||||||
version = "1.1.2"
|
version = "1.1.5"
|
||||||
description = "CBR/Z Web Reader"
|
description = "CBR/Z Web Reader"
|
||||||
authors = ["ajurna <ajurna@gmail.com>"]
|
authors = ["ajurna <ajurna@gmail.com>"]
|
||||||
license = "Creative Commons Attribution-ShareAlike 4.0 International License"
|
license = "Creative Commons Attribution-ShareAlike 4.0 International License"
|
||||||
|
|
||||||
[tool.poetry.dependencies]
|
[tool.poetry.dependencies]
|
||||||
python = "^3.10"
|
python = "^3.10"
|
||||||
Django = "4.1.6"
|
Django = "^4.1"
|
||||||
gunicorn = "^20.0.4"
|
gunicorn = "^20.0.4"
|
||||||
dj-database-url = "^1.0.0"
|
dj-database-url = "^1.0.0"
|
||||||
python-dotenv = "^0.21.0"
|
python-dotenv = "^0.21.0"
|
||||||
@@ -35,16 +35,16 @@ djangorestframework-simplejwt = "^5.2.0"
|
|||||||
django-webpack-loader = "^1.6.0"
|
django-webpack-loader = "^1.6.0"
|
||||||
drf-yasg = "^1.20.0"
|
drf-yasg = "^1.20.0"
|
||||||
drf-extensions = "^0.7.1"
|
drf-extensions = "^0.7.1"
|
||||||
flake8 = "^5.0.4"
|
|
||||||
flake8-annotations = "^2.9.1"
|
|
||||||
|
|
||||||
[tool.poetry.dev-dependencies]
|
[tool.poetry.dev-dependencies]
|
||||||
mypy = "^0.971"
|
mypy = "^1.0.0"
|
||||||
Werkzeug = "^2.2"
|
Werkzeug = "^2.2"
|
||||||
pyOpenSSL = "^22.0.0"
|
pyOpenSSL = "^22.0.0"
|
||||||
ipython = "^8.4.0"
|
ipython = "^8.4.0"
|
||||||
coverage = "^6.2"
|
coverage = "^7.1.0"
|
||||||
pre-commit = "^2.20.0"
|
pre-commit = "^3.0.4"
|
||||||
|
flake8 = "^6.0.0"
|
||||||
|
flake8-annotations = "^3.0.0"
|
||||||
|
|
||||||
[tool.poetry.group.dev.dependencies]
|
[tool.poetry.group.dev.dependencies]
|
||||||
pylint = "^2.15.0"
|
pylint = "^2.15.0"
|
||||||
|
|||||||
@@ -1,32 +1,29 @@
|
|||||||
asgiref==3.5.2 ; python_version >= "3.10" and python_version < "4.0"
|
asgiref==3.6.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
attrs==22.1.0 ; python_version >= "3.10" and python_version < "4.0"
|
autopep8==2.0.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
autopep8==2.0.0 ; python_version >= "3.10" and python_version < "4.0"
|
beautifulsoup4==4.11.2 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
beautifulsoup4==4.11.1 ; python_version >= "3.10" and python_version < "4.0"
|
certifi==2022.12.7 ; python_version >= "3.10" and python_version < "4"
|
||||||
certifi==2022.9.24 ; python_version >= "3.10" and python_version < "4"
|
charset-normalizer==3.0.1 ; python_version >= "3.10" and python_version < "4"
|
||||||
charset-normalizer==2.1.1 ; python_version >= "3.10" and python_version < "4"
|
|
||||||
colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
|
colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
|
||||||
coreapi==2.3.3 ; python_version >= "3.10" and python_version < "4.0"
|
coreapi==2.3.3 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
coreschema==0.0.4 ; python_version >= "3.10" and python_version < "4.0"
|
coreschema==0.0.4 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
dj-database-url==1.0.0 ; python_version >= "3.10" and python_version < "4.0"
|
dj-database-url==1.2.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-appconf==1.0.5 ; python_version >= "3.10" and python_version < "4.0"
|
django-appconf==1.0.5 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-boost==2.1 ; python_version >= "3.10" and python_version < "4.0"
|
django-boost==2.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-bootstrap4==22.2 ; python_version >= "3.10" and python_version < "4.0"
|
django-bootstrap4==22.3 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-cors-headers==3.13.0 ; python_version >= "3.10" and python_version < "4.0"
|
django-cors-headers==3.13.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-csp==3.7 ; python_version >= "3.10" and python_version < "4.0"
|
django-csp==3.7 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-extensions==3.2.1 ; python_version >= "3.10" and python_version < "4.0"
|
django-extensions==3.2.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-filter==22.1 ; python_version >= "3.10" and python_version < "4.0"
|
django-filter==22.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-imagekit==4.1.0 ; python_version >= "3.10" and python_version < "4.0"
|
django-imagekit==4.1.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-permissions-policy==4.13.0 ; python_version >= "3.10" and python_version < "4.0"
|
django-permissions-policy==4.14.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-silk==5.0.2 ; python_version >= "3.10" and python_version < "4.0"
|
django-silk==5.0.3 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-sri==0.5.0 ; python_version >= "3.10" and python_version < "4.0"
|
django-sri==0.5.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django-webpack-loader==1.7.0 ; python_version >= "3.10" and python_version < "4.0"
|
django-webpack-loader==1.8.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
django==4.1.2 ; python_version >= "3.10" and python_version < "4.0"
|
django==4.1.7 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
djangorestframework-simplejwt==5.2.2 ; python_version >= "3.10" and python_version < "4.0"
|
djangorestframework-simplejwt==5.2.2 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
djangorestframework==3.14.0 ; python_version >= "3.10" and python_version < "4.0"
|
djangorestframework==3.14.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
drf-extensions==0.7.1 ; python_version >= "3.10" and python_version < "4.0"
|
drf-extensions==0.7.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
drf-yasg==1.21.4 ; python_version >= "3.10" and python_version < "4.0"
|
drf-yasg==1.21.5 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
flake8-annotations==2.9.1 ; python_version >= "3.10" and python_version < "4.0"
|
|
||||||
flake8==5.0.4 ; python_version >= "3.10" and python_version < "4.0"
|
|
||||||
gprof2dot==2022.7.29 ; python_version >= "3.10" and python_version < "4.0"
|
gprof2dot==2022.7.29 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
gunicorn==20.1.0 ; python_version >= "3.10" and python_version < "4.0"
|
gunicorn==20.1.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
idna==3.4 ; python_version >= "3.10" and python_version < "4"
|
idna==3.4 ; python_version >= "3.10" and python_version < "4"
|
||||||
@@ -34,33 +31,29 @@ inflection==0.5.1 ; python_version >= "3.10" and python_version < "4.0"
|
|||||||
itypes==1.2.0 ; python_version >= "3.10" and python_version < "4.0"
|
itypes==1.2.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
jinja2==3.1.2 ; python_version >= "3.10" and python_version < "4.0"
|
jinja2==3.1.2 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
loguru==0.6.0 ; python_version >= "3.10" and python_version < "4.0"
|
loguru==0.6.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
markupsafe==2.1.1 ; python_version >= "3.10" and python_version < "4.0"
|
markupsafe==2.1.2 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
mccabe==0.7.0 ; python_version >= "3.10" and python_version < "4.0"
|
|
||||||
mysqlclient==2.1.1 ; python_version >= "3.10" and python_version < "4.0"
|
mysqlclient==2.1.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
packaging==21.3 ; python_version >= "3.10" and python_version < "4.0"
|
packaging==23.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
pilkit==2.0 ; python_version >= "3.10" and python_version < "4.0"
|
pilkit==2.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
pillow==9.3.0 ; python_version >= "3.10" and python_version < "4.0"
|
pillow==9.4.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
psycopg2==2.9.5 ; python_version >= "3.10" and python_version < "4.0"
|
psycopg2==2.9.5 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
pycodestyle==2.9.1 ; python_version >= "3.10" and python_version < "4.0"
|
pycodestyle==2.10.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
pyflakes==2.5.0 ; python_version >= "3.10" and python_version < "4.0"
|
|
||||||
pyjwt==2.6.0 ; python_version >= "3.10" and python_version < "4.0"
|
pyjwt==2.6.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
pymupdf==1.20.2 ; python_version >= "3.10" and python_version < "4.0"
|
pymupdf==1.20.2 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
pyparsing==3.0.9 ; python_version >= "3.10" and python_version < "4.0"
|
python-dotenv==0.21.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
python-dateutil==2.8.2 ; python_version >= "3.10" and python_version < "4.0"
|
pytz==2022.7.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
python-dotenv==0.21.0 ; python_version >= "3.10" and python_version < "4.0"
|
|
||||||
pytz==2022.6 ; python_version >= "3.10" and python_version < "4.0"
|
|
||||||
rarfile==4.0 ; python_version >= "3.10" and python_version < "4.0"
|
rarfile==4.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
requests==2.28.1 ; python_version >= "3.10" and python_version < "4"
|
requests==2.28.2 ; python_version >= "3.10" and python_version < "4"
|
||||||
ruamel-yaml-clib==0.2.7 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.10"
|
ruamel-yaml-clib==0.2.7 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.10"
|
||||||
ruamel-yaml==0.17.21 ; python_version >= "3.10" and python_version < "4.0"
|
ruamel-yaml==0.17.21 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
setuptools==65.5.1 ; python_version >= "3.10" and python_version < "4.0"
|
setuptools==67.3.2 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
six==1.16.0 ; python_version >= "3.10" and python_version < "4.0"
|
six==1.16.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
soupsieve==2.3.2.post1 ; python_version >= "3.10" and python_version < "4.0"
|
soupsieve==2.4 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
sqlparse==0.4.3 ; python_version >= "3.10" and python_version < "4.0"
|
sqlparse==0.4.3 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
tomli==2.0.1 ; python_version >= "3.10" and python_version < "4.0"
|
tomli==2.0.1 ; python_version >= "3.10" and python_version < "3.11"
|
||||||
tzdata==2022.6 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
|
tzdata==2022.7 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
|
||||||
ua-parser==0.16.1 ; python_version >= "3.10" and python_version < "4.0"
|
ua-parser==0.16.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
uritemplate==4.1.1 ; python_version >= "3.10" and python_version < "4.0"
|
uritemplate==4.1.1 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
urllib3==1.26.12 ; python_version >= "3.10" and python_version < "4"
|
urllib3==1.26.14 ; python_version >= "3.10" and python_version < "4"
|
||||||
user-agents==2.2.0 ; python_version >= "3.10" and python_version < "4.0"
|
user-agents==2.2.0 ; python_version >= "3.10" and python_version < "4.0"
|
||||||
win32-setctime==1.1.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
|
win32-setctime==1.1.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
|
||||||
|
|||||||
Reference in New Issue
Block a user