Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v3.5.1 #1171

Merged
merged 23 commits into from
Sep 5, 2024
Merged

v3.5.1 #1171

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
00d34d7
hack to get emujs working in dev mode
gantoine Aug 30, 2024
ba41e99
fix open game in a new tab in gallery/collection
zurdi15 Aug 31, 2024
57bb9e6
add little UX romm accent
zurdi15 Aug 31, 2024
6465713
Merge pull request #1139 from rommapp/dev-mode-env
gantoine Sep 1, 2024
0ce3549
[ROMM-1123] Limit returned roms to 2500
gantoine Sep 1, 2024
a3308fc
remove open in new tab code
gantoine Sep 1, 2024
2be1cbc
Merge pull request #1144 from rommapp/fix-open-new-tab
gantoine Sep 1, 2024
dc65370
[ROMM-1150] Fix multi select in table view
gantoine Sep 1, 2024
c761694
Merge pull request #1151 from rommapp/romm-1150
gantoine Sep 1, 2024
a11dc74
Merge pull request #1149 from rommapp/romm-1123-2
gantoine Sep 2, 2024
00c8771
[ROMM0-1155] Patch zipfil + catch more 7zip errors
gantoine Sep 2, 2024
ae05c6b
[ROMM-1154] fix setting main sibling
gantoine Sep 2, 2024
dc7719d
Merge pull request #1156 from rommapp/romm-1155
gantoine Sep 2, 2024
b470bfa
Merge pull request #1157 from rommapp/romm-1154
gantoine Sep 2, 2024
5029062
Generate pack of favicons
gantoine Sep 2, 2024
a5abc69
use png in homepage
gantoine Sep 2, 2024
33bdb0f
Remove unraid template
gantoine Sep 3, 2024
1ffe63a
Merge pull request #1161 from rommapp/rm-unraid-template
gantoine Sep 3, 2024
6211ad1
build(deps): bump cryptography from 42.0.8 to 43.0.1
dependabot[bot] Sep 4, 2024
deae0b9
set docs and recod paths
gantoine Sep 4, 2024
4dcf3ba
Merge pull request #1164 from rommapp/dependabot/pip/cryptography-43.0.1
gantoine Sep 4, 2024
67e4378
Merge pull request #1159 from rommapp/romm-1153
gantoine Sep 4, 2024
3094d46
Merge pull request #1166 from rommapp/romm-1165
gantoine Sep 4, 2024
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
79 changes: 40 additions & 39 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,42 @@
{
"tasks": [
{
"label": "Launch frontend",
"type": "npm",
"path": "frontend",
"script": "dev",
"problemMatcher": []
},
{
"label": "Launch backend",
"type": "shell",
"command": "cd backend && poetry run python3 main.py",
"problemMatcher": []
},
{
"label": "Launch worker",
"type": "shell",
"command": "cd backend && poetry run python3 worker.py",
"problemMatcher": []
},
{
"label": "Execute tests",
"type": "shell",
"command": "cd backend && poetry run pytest -vv -c ../pytest.ini",
"problemMatcher": []
},
{
"label": "Setup development environment",
"type": "shell",
"command": "docker compose up -d",
"problemMatcher": []
},
{
"label": "Setup testing environment",
"type": "shell",
"command": "export $(cat .env | grep DB_ROOT_PASSWD | xargs) && docker exec -i mariadb mariadb -u root -p$DB_ROOT_PASSWD < backend/romm_test/setup.sql",
"problemMatcher": []
}
]
"version": "2.0.0",
"tasks": [
{
"label": "Launch frontend",
"type": "npm",
"path": "frontend",
"script": "dev",
"problemMatcher": []
},
{
"label": "Launch backend",
"type": "shell",
"command": "cd backend && poetry run python3 main.py",
"problemMatcher": []
},
{
"label": "Launch worker",
"type": "shell",
"command": "cd backend && poetry run python3 worker.py",
"problemMatcher": []
},
{
"label": "Execute tests",
"type": "shell",
"command": "cd backend && poetry run pytest -vv -c ../pytest.ini",
"problemMatcher": []
},
{
"label": "Setup development environment",
"type": "shell",
"command": "docker compose up -d",
"problemMatcher": []
},
{
"label": "Setup testing environment",
"type": "shell",
"command": "export $(cat .env | grep DB_ROOT_PASSWD | xargs) && docker exec -i mariadb mariadb -u root -p$DB_ROOT_PASSWD < backend/romm_test/setup.sql",
"problemMatcher": []
}
]
}
1 change: 1 addition & 0 deletions backend/handler/metadata/igdb_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ async def wrapper(*args):

return wrapper

# trunk-ignore(ruff/ASYNC109): timeout is used for request
async def _request(self, url: str, data: str, timeout: int = 120) -> list:
httpx_client = ctx_httpx_client.get()
try:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ function closeDialog() {
imagePreviewUrl
? imagePreviewUrl
: user.avatar_path
? `/assets/romm/assets/${user.avatar_path}?ts=${user.updated_at}`
: defaultAvatarPath
? `/assets/romm/assets/${user.avatar_path}?ts=${user.updated_at}`
: defaultAvatarPath
"
>
<v-fade-transition>
Expand Down
10 changes: 3 additions & 7 deletions frontend/src/components/Details/Notes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const romUser = ref(
note_raw_markdown: "",
note_is_public: false,
is_main_sibling: false,
}
},
);
const publicNotes =
props.rom.user_notes?.filter((note) => note.user_id !== auth.user?.id) ?? [];
Expand Down Expand Up @@ -61,7 +61,7 @@ watch(
note_is_public: false,
is_main_sibling: false,
};
}
},
);
</script>
<template>
Expand Down Expand Up @@ -131,11 +131,7 @@ watch(
</v-card-text>
</v-card>

<v-card
rounded="0"
v-if="publicNotes && publicNotes.length > 0"
class="mt-2"
>
<v-card rounded="0" v-if="publicNotes && publicNotes.length > 0" class="mt-2">
<v-card-title class="bg-terciary">
<v-list-item class="pl-2 pr-0">
<span class="text-h6">Public notes</span>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Details/Saves.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ async function downloasSaves() {
function updateDataTablePages() {
if (props.rom.user_saves) {
pageCount.value = Math.ceil(
props.rom.user_saves.length / itemsPerPage.value
props.rom.user_saves.length / itemsPerPage.value,
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Details/States.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ async function downloasStates() {
function updateDataTablePages() {
if (props.rom.user_states) {
pageCount.value = Math.ceil(
props.rom.user_states.length / itemsPerPage.value
props.rom.user_states.length / itemsPerPage.value,
);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function deleteSelectedFirmware() {

function updateDataTablePages() {
pageCount.value = Math.ceil(
Number(currentPlatform.value?.firmware?.length) / itemsPerPage.value
Number(currentPlatform.value?.firmware?.length) / itemsPerPage.value,
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,7 @@ function closeDialog() {
<v-row class="justify-center mb-2" no-gutters>
<v-btn-group divided density="compact">
<v-btn class="bg-terciary" @click="closeDialog"> Cancel </v-btn>
<v-btn
class="bg-terciary text-romm-red"
@click="deleteBindPlatform"
>
<v-btn class="bg-terciary text-romm-red" @click="deleteBindPlatform">
Confirm
</v-btn>
</v-btn-group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,15 @@ function closeDialog() {
<template #append-inner>
<v-btn-group rounded="0" divided density="compact">
<v-btn
:disabled="!heartbeat.value.METADATA_SOURCES?.STEAMGRIDDB_ENABLED"
:disabled="
!heartbeat.value.METADATA_SOURCES?.STEAMGRIDDB_ENABLED
"
size="small"
class="translucent-dark"
@click="
emitter?.emit(
'showSearchCoverDialog',
collection.name as string
collection.name as string,
)
"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,11 @@ function closeDialog() {
<v-col>
<v-switch
v-model="collection.is_public"
:label="collection.is_public ? 'Public (visible to everyone)' : 'Private (only visible to me)'"
:label="
collection.is_public
? 'Public (visible to everyone)'
: 'Private (only visible to me)'
"
color="romm-accent-1"
class="px-2"
hide-details
Expand All @@ -155,13 +159,15 @@ function closeDialog() {
<template #append-inner>
<v-btn-group rounded="0" divided density="compact">
<v-btn
:disabled="!heartbeat.value.METADATA_SOURCES?.STEAMGRIDDB_ENABLED"
:disabled="
!heartbeat.value.METADATA_SOURCES?.STEAMGRIDDB_ENABLED
"
size="small"
class="translucent-dark"
@click="
emitter?.emit(
'showSearchCoverDialog',
collection.name as string
collection.name as string,
)
"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const PER_PAGE_OPTIONS = [10, 25, 50, 100];
async function removeRomsFromCollection() {
if (!selectedCollection.value) return;
selectedCollection.value.roms = selectedCollection.value.roms.filter(
(id) => !roms.value.map((r) => r.id).includes(id)
(id) => !roms.value.map((r) => r.id).includes(id),
);
await collectionApi
.updateCollection({ collection: selectedCollection.value })
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/Game/Dialog/MatchRom.vue
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ function confirm() {
updateRom(
Object.assign(selectedMatchRom.value, {
url_cover: selectedCover.value.url_cover,
})
}),
);
closeDialog();
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/Game/FavBtn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ async function switchFromFavourites() {
} else {
if (favCollection.value) {
favCollection.value.roms = favCollection.value.roms.filter(
(id) => id !== props.rom.id
(id) => id !== props.rom.id,
);
if (romsStore.currentCollection?.name.toLowerCase() == "favourites") {
romsStore.remove([props.rom]);
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/RDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ withDefaults(
icon: null,
width: "",
height: "",
}
},
);
const emit = defineEmits(["update:modelValue", "close"]);
const hasToolbarSlot = ref(false);
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/common/SearchCover.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ async function searchCovers() {
coverType.value === "all"
? game.resources
: game.resources.filter(
(resource) => resource.type === coverType.value
(resource) => resource.type === coverType.value,
),
};
})
Expand Down Expand Up @@ -81,7 +81,7 @@ function filterCovers() {
coverType.value === "all"
? game.resources
: game.resources.filter(
(resource) => resource.type === coverType.value
(resource) => resource.type === coverType.value,
),
};
})
Expand Down
1 change: 1 addition & 0 deletions frontend/src/services/api/rom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ async function getRoms({
search_term: searchTerm,
order_by: orderBy,
order_dir: orderDir,
limit: 2500,
},
});
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/GameDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ watch(
() => route.fullPath,
async () => {
await fetchDetails();
}
},
);
</script>

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ onBeforeMount(async () => {
collectionsStore.set(collections);
collectionsStore.setFavCollection(
collections.find(
(collection) => collection.name.toLowerCase() === "favourites"
)
(collection) => collection.name.toLowerCase() === "favourites",
),
);
})
.catch((error) => {
Expand Down
Loading