diff --git a/.github/workflows/close_blank_issues.yaml b/.github/workflows/close_blank_issues.yaml
deleted file mode 100644
index 7190546a..00000000
--- a/.github/workflows/close_blank_issues.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Close Issues not using a template
-
-on:
- issues:
- types:
- - opened
-
-permissions:
- issues: write
-
-jobs:
- close_issue:
- runs-on: ubuntu-latest
-
- steps:
- - name: Check issue headings
- uses: actions/github-script@v7
- with:
- script: |
- const issueBody = context.payload.issue.body || "";
-
- // Match Markdown headings (e.g., # Heading, ## Heading)
- const headingRegex = /^(#{1,6})\s.+/gm;
- const headings = [...issueBody.matchAll(headingRegex)];
-
- if (headings.length < 3) {
- // Post a comment
- await github.rest.issues.createComment({
- owner: context.repo.owner,
- repo: context.repo.repo,
- issue_number: context.payload.issue.number,
- body: "Thank you for opening an issue! To help us review your request efficiently, please use one of the provided issue templates. If you're seeking information or have a general question, consider opening a Discussion or joining the conversation on our Discord. Thanks!"
- });
-
- // Close the issue
- await github.rest.issues.update({
- owner: context.repo.owner,
- repo: context.repo.repo,
- issue_number: context.payload.issue.number,
- state: "closed"
- });
- }
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 2e5f4bce..8d43311b 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -43,7 +43,7 @@ jobs:
steps:
- name: Checkout repository
- uses: actions/checkout@v4
+ uses: actions/checkout@v3
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
diff --git a/.github/workflows/component-tests.yml b/.github/workflows/component-tests.yml
deleted file mode 100644
index fcc2c213..00000000
--- a/.github/workflows/component-tests.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: Run Component Tests
-
-on:
- workflow_dispatch:
- inputs:
- ref:
- description: 'Branch/Tag/SHA to test'
- required: true
- pull_request:
- paths:
- - 'client/**'
- - '.github/workflows/component-tests.yml'
- push:
- paths:
- - 'client/**'
- - '.github/workflows/component-tests.yml'
-
-jobs:
- run-component-tests:
- name: Run Component Tests
- runs-on: ubuntu-latest
-
- steps:
- - name: Checkout (push/pull request)
- uses: actions/checkout@v4
- if: github.event_name != 'workflow_dispatch'
-
- - name: Checkout (workflow_dispatch)
- uses: actions/checkout@v4
- with:
- ref: ${{ inputs.ref }}
- if: github.event_name == 'workflow_dispatch'
-
- - name: Set up Node.js
- uses: actions/setup-node@v4
- with:
- node-version: 20
- cache: 'npm'
-
- - name: Install dependencies
- run: |
- cd client
- npm ci
-
- - name: Run tests
- run: |
- cd client
- npm test
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index fdb57fbc..846a5563 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -1,4 +1,5 @@
---
+
name: Build and Push Docker Image
on:
@@ -10,7 +11,7 @@ on:
required: true
default: 'latest'
push:
- branches: [main, master]
+ branches: [main,master]
tags:
- 'v*.*.*'
# Only build when files in these directories have been changed
@@ -22,16 +23,16 @@ on:
jobs:
build:
- if: ${{ !contains(github.event.head_commit.message, 'skip ci') && github.repository == 'advplyr/audiobookshelf' }}
- runs-on: ubuntu-24.04
+ if: "!contains(github.event.head_commit.message, 'skip ci')"
+ runs-on: ubuntu-20.04
steps:
- name: Check out
- uses: actions/checkout@v4
+ uses: actions/checkout@v3
- name: Docker meta
id: meta
- uses: docker/metadata-action@v5
+ uses: docker/metadata-action@v4
with:
images: advplyr/audiobookshelf,ghcr.io/${{ github.repository_owner }}/audiobookshelf
tags: |
@@ -39,13 +40,13 @@ jobs:
type=semver,pattern={{version}}
- name: Setup QEMU
- uses: docker/setup-qemu-action@v3
+ uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v3
+ uses: docker/setup-buildx-action@v2
- name: Cache Docker layers
- uses: actions/cache@v4
+ uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -53,20 +54,20 @@ jobs:
${{ runner.os }}-buildx-
- name: Login to Dockerhub
- uses: docker/login-action@v3
+ uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Login to ghcr
- uses: docker/login-action@v3
+ uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GHCR_PASSWORD }}
- name: Build image
- uses: docker/build-push-action@v6
+ uses: docker/build-push-action@v3
with:
tags: ${{ github.event.inputs.tags || steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/i18n-integration.yml b/.github/workflows/i18n-integration.yml
index 8b3a4678..fc844154 100644
--- a/.github/workflows/i18n-integration.yml
+++ b/.github/workflows/i18n-integration.yml
@@ -20,8 +20,7 @@ jobs:
- name: Set up node
uses: actions/setup-node@v4
with:
- node-version: 20
- cache: 'npm'
+ node-version: '20'
# The only argument is the `directory`, which is where the i18n files are
# stored.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 18c1d2da..580c0f50 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -18,15 +18,14 @@ jobs:
name: build and test
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v4
+ - uses: actions/checkout@v3
- - name: setup node
- uses: actions/setup-node@v4
+ - name: setup nade
+ uses: actions/setup-node@v3
with:
node-version: 20
- cache: 'npm'
- - name: install pkg (using yao-pkg fork for targeting node20)
+ - name: install pkg (using yao-pkg fork for targetting node20)
run: npm install -g @yao-pkg/pkg
- name: get client dependencies
diff --git a/.github/workflows/lint-openapi.yml b/.github/workflows/lint-openapi.yml
index ec08ecb3..817e94b9 100644
--- a/.github/workflows/lint-openapi.yml
+++ b/.github/workflows/lint-openapi.yml
@@ -18,22 +18,15 @@ jobs:
# Check out the repository
- name: Checkout
uses: actions/checkout@v4
-
# Set up node to run the javascript
- name: Set up node
uses: actions/setup-node@v4
- with:
- node-version: 20
- cache: 'npm'
-
# Install Redocly CLI
- name: Install Redocly CLI
run: npm install -g @redocly/cli@latest
-
# Perform linting for exploded spec
- name: Run linting for exploded spec
run: redocly lint docs/root.yaml --format=github-actions
-
# Perform linting for bundled spec
- name: Run linting for bundled spec
run: redocly lint docs/openapi.json --format=github-actions
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 91a22c71..695696c6 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -29,7 +29,6 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: 20
- cache: 'npm'
- name: Install dependencies
run: npm ci
diff --git a/client/assets/app.css b/client/assets/app.css
index 36b3b4ba..7daf74ff 100644
--- a/client/assets/app.css
+++ b/client/assets/app.css
@@ -5,7 +5,7 @@
@import './absicons.css';
:root {
- --bookshelf-texture-img: url(~static/textures/wood_default.jpg);
+ --bookshelf-texture-img: url(/textures/wood_default.jpg);
--bookshelf-divider-bg: linear-gradient(180deg, rgba(149, 119, 90, 1) 0%, rgba(103, 70, 37, 1) 17%, rgba(103, 70, 37, 1) 88%, rgba(71, 48, 25, 1) 100%);
}
@@ -92,10 +92,11 @@
}
/* Firefox */
-input[type='number'] {
+input[type=number] {
-moz-appearance: textfield;
}
+
.tracksTable {
border-collapse: collapse;
width: 100%;
@@ -176,10 +177,6 @@ input[type='number'] {
box-shadow: 4px 1px 8px #11111166, -4px 1px 8px #11111166, 1px -4px 8px #11111166;
}
-.box-shadow-progressbar {
- box-shadow: 0px -1px 4px rgb(62, 50, 2, 0.5);
-}
-
.shadow-height {
height: calc(100% - 4px);
}
@@ -207,6 +204,7 @@ Bookshelf Label
color: #fce3a6;
}
+
.cover-bg {
width: calc(100% + 40px);
height: calc(100% + 40px);
@@ -249,4 +247,4 @@ Bookshelf Label
.abs-btn:disabled::before {
background-color: rgba(0, 0, 0, 0.2);
-}
+}
\ No newline at end of file
diff --git a/client/assets/defaultStyles.css b/client/assets/defaultStyles.css
index e0ca79e2..027ccdf2 100644
--- a/client/assets/defaultStyles.css
+++ b/client/assets/defaultStyles.css
@@ -52,17 +52,4 @@
text-indent: 0px !important;
text-align: start !important;
text-align-last: start !important;
-}
-
-.default-style.less-spacing p {
- margin-block-start: 0;
-}
-
-.default-style.less-spacing ul {
- margin-block-start: 0;
-}
-
-.default-style.less-spacing ol {
- margin-block-start: 0;
-}
-
+}
\ No newline at end of file
diff --git a/client/assets/tailwind.css b/client/assets/tailwind.css
index 7883f32f..bd6213e1 100644
--- a/client/assets/tailwind.css
+++ b/client/assets/tailwind.css
@@ -1,85 +1,3 @@
-@import 'tailwindcss';
-
-/*
- The default border color has changed to `currentColor` in Tailwind CSS v4,
- so we've added these compatibility styles to make sure everything still
- looks the same as it did with Tailwind CSS v3.
-
- If we ever want to remove these styles, we need to add an explicit border
- color utility to any element that depends on these defaults.
-*/
-@layer base {
- *,
- ::after,
- ::before,
- ::backdrop,
- ::file-selector-button {
- border-color: var(--color-gray-200, currentColor);
- }
-
- [role='button'],
- button {
- cursor: pointer;
- }
-}
-
-@theme {
- --spacing-0\.5e: 0.125em;
- --spacing-1e: 0.25em;
- --spacing-1\.5e: 0.375em;
- --spacing-2e: 0.5em;
- --spacing-2\.5e: 0.625em;
- --spacing-3e: 0.75em;
- --spacing-3\.5e: 0.875em;
- --spacing-4e: 1em;
- --spacing-5e: 1.25em;
- --spacing-6e: 1.5em;
- --spacing-7e: 1.75em;
- --spacing-8e: 2em;
- --spacing-9e: 2.25em;
- --spacing-10e: 2.5em;
- --spacing-11e: 2.75em;
- --spacing-12e: 3em;
- --spacing-14e: 3.5em;
- --spacing-16e: 4em;
- --spacing-20e: 5em;
- --spacing-24e: 6em;
- --spacing-28e: 7em;
- --spacing-32e: 8em;
- --spacing-36e: 9em;
- --spacing-40e: 10em;
- --spacing-44e: 11em;
- --spacing-48e: 12em;
- --spacing-52e: 13em;
- --spacing-56e: 14em;
- --spacing-60e: 15em;
- --spacing-64e: 16em;
- --spacing-72e: 18em;
- --spacing-80e: 20em;
- --spacing-96e: 24em;
-
- --color-bg: #373838;
- --color-primary: #232323;
- --color-accent: #1ad691;
- --color-error: #ff5252;
- --color-info: #2196f3;
- --color-success: #4caf50;
- --color-warning: #fb8c00;
- --color-darkgreen: rgb(34, 127, 35);
- --color-black-50: #bbbbbb;
- --color-black-100: #666666;
- --color-black-200: #555555;
- --color-black-300: #444444;
- --color-black-400: #333333;
- --color-black-500: #222222;
- --color-black-600: #111111;
- --color-black-700: #101010;
-
- --font-sans: 'Source Sans Pro';
- --font-mono: 'Ubuntu Mono';
-
- --text-xxs: 0.625rem;
- --text-1\.5xl: 1.375rem;
- --text-2\.5xl: 1.6875rem;
- --text-4\.5xl: 2.625rem;
-}
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
\ No newline at end of file
diff --git a/client/assets/trix.css b/client/assets/trix.css
index 7432b25f..8f88c61f 100644
--- a/client/assets/trix.css
+++ b/client/assets/trix.css
@@ -446,7 +446,7 @@ trix-editor .attachment__metadata .attachment__size {
}
.trix-content {
- line-height: inherit;
+ line-height: 1.5;
}
.trix-content * {
@@ -455,13 +455,6 @@ trix-editor .attachment__metadata .attachment__size {
padding: 0;
}
-.trix-content p {
- box-sizing: border-box;
- margin-top: 0;
- margin-bottom: 0.5em;
- padding: 0;
-}
-
.trix-content h1 {
font-size: 1.2em;
line-height: 1.2;
@@ -567,4 +560,4 @@ trix-editor .attachment__metadata .attachment__size {
.trix-content .attachment-gallery.attachment-gallery--4 .attachment {
flex-basis: 50%;
max-width: 50%;
-}
+}
\ No newline at end of file
diff --git a/client/components/app/Appbar.vue b/client/components/app/Appbar.vue
index f7413404..bb452526 100644
--- a/client/components/app/Appbar.vue
+++ b/client/components/app/Appbar.vue
@@ -13,10 +13,10 @@
{{ $getString('MessageXLibraryIsEmpty', [libraryName]) }}
{{ $strings.ButtonHome }}
{{ $strings.ButtonLibrary }}
{{ $strings.ButtonLatest }}
{{ $strings.ButtonSeries }}
{{ $strings.ButtonPlaylists }}
{{ $strings.ButtonCollections }}
{{ $strings.ButtonAuthors }}
{{ $strings.ButtonAdd }}
{{ $strings.ButtonDownloadQueue }}
{{ seriesName }}
-{{ $formatNumber(numShowing) }} {{ entityName }}
- +{{ $strings.MessageSearchResultsFor }} "{{ searchQuery }}"
- +{{ $formatNumber(numShowing) }} {{ entityName }}
- -