Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
d4c91cd
Alpha dev ci (#3)
ajslater Aug 25, 2020
3a72756
fix tagged version name
ajslater Aug 25, 2020
1629e9d
Squashed commit of the following:
ajslater Aug 26, 2020
5ce2d2a
Squashed commit of the following:
ajslater Aug 26, 2020
8fa5dd7
Merge branch 'release' into develop
ajslater Aug 26, 2020
ba71f66
oops forgot to bump docker-env version
ajslater Aug 26, 2020
0f4c5a2
Merge branch 'release' into develop
ajslater Aug 26, 2020
3a24029
Merge branch 'release' into develop
ajslater Aug 26, 2020
425eb13
V0.5.2 (#8)
ajslater Aug 27, 2020
ceb331a
Merge branch 'develop' of github.com:ajslater/codex into develop
ajslater Aug 27, 2020
4fb8c80
Merge branch 'release' into develop
ajslater Aug 27, 2020
5b5e6db
v0.5.3 (#10)
ajslater Aug 28, 2020
2e6180d
Merge branch 'develop' of github.com:ajslater/codex into develop
ajslater Aug 28, 2020
24e0ae4
fix tests on docker where whitenoise complains about missing static dir
ajslater Aug 28, 2020
1cd3bf6
Merge branch 'release' into develop
ajslater Aug 28, 2020
e3b0b4a
ensure all STATIC_DIRS exist for whitenoise
ajslater Aug 28, 2020
49b8e6b
new black. update poetry, npm & lint
ajslater Aug 28, 2020
607e949
0.5.4 version bump
ajslater Aug 28, 2020
e459bdf
only use the build type static files in dev mode. always should've be…
ajslater Aug 28, 2020
1064bff
collect static needs dev marker to actually collect the dev static dirs
ajslater Aug 28, 2020
e2dfb59
revert whitenoise
ajslater Aug 28, 2020
08799cc
codex v0.5.5
ajslater Aug 28, 2020
97bed0e
fix logging error
ajslater Aug 28, 2020
cee3461
Merge branch 'release' into develop
ajslater Aug 28, 2020
d0b58fe
borders on browse-cards
ajslater Aug 28, 2020
dbb9f1c
fix border interference with unread flag
ajslater Aug 28, 2020
b0f5f69
v0.5.6
ajslater Aug 28, 2020
65afbe3
Merge branch 'release' into develop
ajslater Aug 28, 2020
c5d3011
Merge branch 'release' into develop
ajslater Aug 29, 2020
aa5110c
comicbox 1.3
ajslater Aug 31, 2020
5d41239
allow null credit roles
ajslater Aug 31, 2020
37a75b6
V0.5.7 (#35)
ajslater Sep 4, 2020
ca9c836
Merge branch 'release' into develop
ajslater Sep 4, 2020
84e5597
bump codex version oops
ajslater Sep 4, 2020
45d6307
v0.5.8
ajslater Sep 4, 2020
8a1481f
Merge branch 'release' into develop
ajslater Sep 4, 2020
deaf980
poetry update
ajslater Sep 4, 2020
6485d18
Merge branch 'release' into develop
ajslater Sep 4, 2020
6685304
more helpful 404 page
ajslater Sep 5, 2020
514f7b5
V0.5.9 (#50)
ajslater Sep 6, 2020
1e4af0e
Merge branch 'develop' of github.com:ajslater/codex into develop
ajslater Sep 6, 2020
298139c
Merge branch 'release' into develop
ajslater Sep 6, 2020
41727bf
Squashed commit of the following:
ajslater Sep 8, 2020
9492bd7
V0.5.10 (#53)
ajslater Sep 9, 2020
37cd454
update poetry
ajslater Sep 9, 2020
bf923ba
npm update
ajslater Sep 9, 2020
4b4d449
Merge branch 'release' into develop
ajslater Sep 9, 2020
4e034bc
simpler image labels
ajslater Sep 9, 2020
5536ffd
V0.5.11 (#55)
ajslater Sep 12, 2020
04c27f6
Merge branch 'develop' of github.com:ajslater/codex into develop
ajslater Sep 12, 2020
fe8aff8
Merge branch 'release' into develop
ajslater Sep 12, 2020
9b1858b
admin failed imports list
ajslater Sep 14, 2020
946ac44
Squashed commit of the following:
ajslater Sep 15, 2020
3b30103
bump version and news
ajslater Sep 15, 2020
0db9671
lint and cleanup prints
ajslater Sep 15, 2020
2506c93
Squashed commit of the following:
ajslater Sep 15, 2020
941db51
Squashed commit of the following:
ajslater Sep 16, 2020
04a2c5e
change failed import comment
ajslater Sep 16, 2020
1023bde
Merge branch 'release' into develop
ajslater Sep 16, 2020
c3f0fd8
v0.5.13
ajslater Sep 18, 2020
5dd9a23
Merge branch 'release' into develop
ajslater Sep 18, 2020
6965174
crap i'm sure now
ajslater Sep 18, 2020
fafc57e
Squashed commit of the following:
ajslater Sep 26, 2020
c8285d7
speed up metadata by 50%
ajslater Sep 26, 2020
0d4d138
Merge branch 'release' into develop
ajslater Sep 26, 2020
3d6ff77
Squashed commit of the following:
ajslater Oct 1, 2020
c025ab1
bump version
ajslater Oct 1, 2020
3372a29
Squashed commit of the following:
ajslater Oct 3, 2020
da6f09d
massive rename of containers and browse for consistency
ajslater Oct 3, 2020
baa475e
docstyle linting
ajslater Oct 4, 2020
b036f34
lint
ajslater Oct 4, 2020
1e40cca
remove mypy and vulture. i don't use them.
ajslater Oct 4, 2020
23bfffc
Squashed commit of the following:
ajslater Oct 5, 2020
dfe4fdb
Squashed commit of the following:
ajslater Oct 5, 2020
c909792
lint
ajslater Oct 5, 2020
605ab41
stop pytest from testing migrations
ajslater Oct 5, 2020
67a07b8
oops broke flake8
ajslater Oct 5, 2020
296d042
Squashed commit of the following:
ajslater Oct 5, 2020
9554598
lint
ajslater Oct 5, 2020
ed5531b
componentize reader
ajslater Oct 5, 2020
094685d
remove todo suggestion
ajslater Oct 5, 2020
0612fdc
more metadata fields
ajslater Oct 5, 2020
2a1bf29
update news
ajslater Oct 5, 2020
02d37f7
fix restarts
ajslater Oct 5, 2020
14cf3e2
its closer to 5 seconds in practice
ajslater Oct 5, 2020
e628eb6
update poetry and npm packages
ajslater Oct 5, 2020
17f7e84
change order of stop and start daemons a bit
ajslater Oct 5, 2020
81a1bd4
fix finding webpack files. Use regex instead of glob
ajslater Oct 5, 2020
f6434bb
bump news and version
ajslater Oct 5, 2020
43ad5ba
Merge branch 'release' into develop
ajslater Oct 5, 2020
35655a0
Merge branch 'release' into develop
ajslater Oct 6, 2020
f84fc02
fix root_path bug. v0.5.17
ajslater Oct 6, 2020
b6a64d9
Merge branch 'release' into develop
ajslater Oct 6, 2020
f9e3780
renaming some variables fixes settings changing
ajslater Oct 6, 2020
384bafd
bump version and news
ajslater Oct 6, 2020
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
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
v0.5.18
* Fix filters not changing display bug

v0.5.17
* Fix root_path not parsing bug

Expand Down
2 changes: 1 addition & 1 deletion docker-env
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ REPO=ajslater/codex
IMAGE=ajslater/codex
INSTALL_BASE_VERSION=python3.8.5-alpine3.12_0.1.0-3fb89fc
RUNNABLE_BASE_VERSION=python3.8.5-alpine3.12_0.2.0-a88d3d9_0.1.0-3328e8e
PKG_VERSION=0.5.17
PKG_VERSION=0.5.18
PUID=501
PGID=20
2 changes: 1 addition & 1 deletion frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codex",
"version": "0.5.17",
"version": "0.5.18",
"private": true,
"description": "ui for codex api",
"scripts": {
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/api/v1/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ const debug = process.env.NODE_ENV !== "production";

// REST ENDPOINTS

const getBrowseOpened = ({ group, pk, page }) => {
const getBrowserOpened = ({ group, pk, page }) => {
return ajax("get", `${BROWSE_BASE}/${group}/${pk}/${page}`);
};

const getBrowseObjects = ({ route, settings }) => {
const getBrowserPage = ({ route, settings }) => {
const { group, pk, page } = route;
return ajax("put", `${BROWSE_BASE}/${group}/${pk}/${page}`, settings);
};

const getBrowseChoices = ({ group, pk, choice_type }) => {
const getBrowserChoices = ({ group, pk, choice_type }) => {
return ajax("get", `${BROWSE_BASE}/${group}/${pk}/choices/${choice_type}`);
};

Expand Down Expand Up @@ -77,9 +77,9 @@ export const getSocket = (isAdmin) => {
};

export default {
getBrowseOpened,
getBrowseObjects,
getBrowseChoices,
getBrowserOpened,
getBrowserPage,
getBrowserChoices,
getScanInProgress,
setMarkRead,
getSocket,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/browser-main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default {
showPlaceHolder: function (state) {
return (
this.enableNonUsers === undefined ||
(!state.browsePageLoaded && this.isOpenToSee)
(!state.browserPageLoaded && this.isOpenToSee)
);
},
}),
Expand Down
19 changes: 10 additions & 9 deletions frontend/src/store/modules/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const state = {
},
objList: [],
filterMode: "base",
browsePageLoaded: false,
browserPageLoaded: false,
librariesExist: null,
scanNotify: false,
numPages: 1,
Expand Down Expand Up @@ -97,7 +97,7 @@ const getters = {

const mutations = {
setBrowsePageLoaded(state, value) {
state.browsePageLoaded = value;
state.browserPageLoaded = value;
},
setBrowserRoute(state, route) {
state.routes.current = route;
Expand Down Expand Up @@ -290,7 +290,7 @@ const scanNotifyCheck = (commit, state) => {
})
.catch((error) => {
console.error(error);
console.log("scanNotifyCheck() Response", error.response);
console.warn("scanNotifyCheck() Response", error.response);
});
}, wait);
};
Expand All @@ -300,7 +300,7 @@ const actions = {
// Gets everything needed to open the component.
commit("setBrowsePageLoaded", false);
commit("setBrowserRoute", route);
await API.getBrowseOpened(route)
await API.getBrowserOpened(route)
.then((response) => {
const data = response.data;
commit("setVersions", data.versions);
Expand All @@ -319,13 +319,13 @@ const actions = {
error.response.data.group
) {
const data = error.response.data;
console.log(data.message);
console.log("Valid group is", data.group);
console.warn(data.message);
console.warn("Valid group is", data.group);
const route = topGroupRoute(data.group);
dispatch("browserOpened", route.params);
} else {
console.error(error);
console.log("browserOpened response:", error.response);
console.warn("browserOpened response:", error.response);
}
return handleBrowseError({ state, commit }, error);
});
Expand All @@ -337,6 +337,7 @@ const actions = {
isNeedValidate(changedData) &&
!validateState({ state, commit, dispatch })
) {
console.warning("NOT VALIDATED");
return;
}
dispatch("getBrowserPage");
Expand All @@ -352,7 +353,7 @@ const actions = {
},
async getBrowserPage({ commit, dispatch, state }) {
// Get objects for the current route and setttings.
if (!state.browseLoaded) {
if (!state.browserPageLoaded) {
return dispatch("browserOpened", state.routes.current);
}
await API.getBrowserPage({
Expand All @@ -372,7 +373,7 @@ const actions = {
},
async setFilterMode({ commit, state }, { group, pk, mode }) {
if (mode && mode !== "base" && state.formChoices[mode] == null) {
await API.getBrowseChoices({ group, pk, choice_type: mode })
await API.getBrowserChoices({ group, pk, choice_type: mode })
.then((response) => {
response.data.key = mode;
return commit("setBrowseChoice", response.data);
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = ["poetry.masonry.api"]

[tool.poetry]
name = "codex"
version = "0.5.17"
version = "0.5.18"
description = "A comic archive web server."
license = "GPL-2.0-only"
authors = ["AJ Slater <aj@slater.net>"]
Expand Down