1
0
mirror of https://github.com/gilbN/theme.park.git synced 2024-10-03 22:17:08 +02:00

Merge pull request #515 from themepark-dev/develop

1.14
This commit is contained in:
GilbN 2023-09-30 14:38:51 +02:00 committed by GitHub
commit 8d8589c023
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 74 additions and 126 deletions

View File

@ -94,50 +94,3 @@ jobs:
docker build docker-mods/$app --tag ghcr.io/${{ secrets.GHCR_USER }}/theme.park:$app${{ github.event.inputs.append-tag }}
docker push ghcr.io/${{ secrets.GHCR_USER }}/theme.park:$app${{ github.event.inputs.append-tag }}
done
push_to_dockerhub:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3.1.0
with:
fetch-depth: 0
- name: Login to Docker Hub
uses: docker/login-action@v2.1.0
with:
username: ${{ secrets.DH_USER }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Extract branch name
shell: bash
run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
id: extract_branch
- name: build all on push
if: ${{ github.event_name == 'push' }}
run: |
branch=${{ steps.extract_branch.outputs.branch }}
if [ "$branch" = "master" ]; then
branch=""
else
branch="-$branch"
fi
for dir in docker-mods/*;
do
app="$( echo "$dir" | cut -d'/' -f2 -s )"
docker build docker-mods/$app --tag ${{ secrets.DH_USER }}/theme.park:$app$branch
docker push ${{ secrets.DH_USER }}/theme.park:$app$branch
done
- name: manually build
if: ${{ github.event.inputs.app && github.event.inputs.app != 'build-all-the-mods' }}
run: |
docker build docker-mods/${{ github.event.inputs.app }} --tag ${{ secrets.DH_USER }}/theme.park:${{ github.event.inputs.app }}${{ github.event.inputs.append-tag }}
docker push ${{ secrets.DH_USER }}/theme.park:${{ github.event.inputs.app }}${{ github.event.inputs.append-tag }}
- name: manually build all mods
if: ${{ github.event.inputs.app == 'build-all-the-mods' }}
run: |
for dir in docker-mods/*;
do
app="$( echo "$dir" | cut -d'/' -f2 -s )"
docker build docker-mods/$app --tag ${{ secrets.DH_USER }}/theme.park:$app${{ github.event.inputs.append-tag }}
docker push ${{ secrets.DH_USER }}/theme.park:$app${{ github.event.inputs.append-tag }}
done

View File

@ -64,22 +64,15 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ secrets.GH_PAT }}
- name: Login to Docker Hub
uses: docker/login-action@v2.1.0
with:
username: ${{ secrets.DH_USER }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: build&push
uses: docker/build-push-action@v3.2.0
with:
push: ${{ github.event_name != 'pull_request' }}
platforms: ${{ env.platform }}
file: ./${{ matrix.architecture }}.Dockerfile
cache-from: docker.io/${{ env.cache }}
cache-to: docker.io/${{ env.cache }}
cache-from: ghcr.io/${{ env.cache }}
cache-to: ghcr.io/${{ env.cache }}
tags: |
docker.io/${{ env.tag }}
ghcr.io/${{ env.tag }}
labels: |
org.opencontainers.image.created=${{ env.created }}
@ -98,20 +91,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
registry: [docker.io, ghcr.io]
registry: [ghcr.io]
needs: [build-and-push-it-to-the-limit]
steps:
- name: Checkout
uses: actions/checkout@v3.1.0
- name: Login to DockerHub
if: matrix.registry == 'docker.io'
uses: docker/login-action@v2.1.0
with:
registry: docker.io
username: ${{ secrets.DH_USER }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Login to GitHub Container Registry
if: matrix.registry == 'ghcr.io'
uses: docker/login-action@v2.1.0

View File

@ -1,4 +1,5 @@
name: Minify CSS and deploy to live branch
permissions: write-all
on:
push:
branches:
@ -23,7 +24,7 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.1.0
- uses: actions/checkout@v4.1.0
with:
fetch-depth: 0
- name: Wrong domain check
@ -34,7 +35,7 @@ jobs:
exit 1
fi
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4.3.0
uses: actions/setup-python@v4.7.0
with:
python-version: '3.10'
- name: Run themes.py
@ -65,7 +66,7 @@ jobs:
fi
done
- name: Deploy
uses: peaceiris/actions-gh-pages@v3.8.0
uses: peaceiris/actions-gh-pages@v3.9.3
if: ${{ github.ref == 'refs/heads/master' || github.event.inputs.branch == 'master' }}
with:
publish_dir: ./
@ -73,7 +74,7 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
exclude_assets: ''
- name: Deploy Develop
uses: peaceiris/actions-gh-pages@v3.8.0
uses: peaceiris/actions-gh-pages@v3.9.3
if: ${{ github.ref == 'refs/heads/develop' || github.event.inputs.branch == 'develop' }}
with:
publish_dir: ./
@ -81,7 +82,7 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
exclude_assets: ''
- name: Deploy Testing
uses: peaceiris/actions-gh-pages@v3.8.0
uses: peaceiris/actions-gh-pages@v3.9.3
if: ${{ github.ref == 'refs/heads/testing' || github.event.inputs.branch == 'testing' }}
with:
publish_dir: ./

View File

@ -100,9 +100,22 @@ pre {
border-radius: 0px 0px 0px 25px;
}
.nav-tile {
background-color: var(--transparency-dark-50);
}
div.title {
border-bottom: 1px solid var(--transparency-light-15);
background-color: var(--transparency-dark-45);
}
#nav-block #nav-item:focus:after,
#nav-block #nav-item:hover:after,
#nav-block #nav-item.active:after {
#nav-block #nav-item.active:after,
.nav-item:focus:after,
.nav-item:hover:after,
.nav-user.show:hover:after {
background-color: var(--accent-color-hover);
background: var(--accent-color-hover);
}
@ -129,14 +142,18 @@ textarea {
/*DASHBOARD*/
table.share_status.dashboard {
background: var(--transparency-dark-15);
border: 1px solid rgba(255, 255, 255, .25);
border: 1px solid var(--transparency-light-25);
}
table.share_status.dashboard tr>td.next {
border-top: 1px solid rgba(255, 255, 255, .25);
border-top: 1px solid var(--transparency-light-25);
color: var(--text-hover);
}
table.share_status.dashboard tbody {
border: 1px solid var(--transparency-light-15);
}
span.outer.solid {
background-color: transparent;
}
@ -177,7 +194,7 @@ table.tablesorter thead tr th {
/*MAIN*/
#title {
border-bottom: 1px solid rgba(255, 255, 255, .25);
border-bottom: 1px solid var(--transparency-light-25);
background: var(--transparency-dark-50);
color: var(--text-hover);
}
@ -202,15 +219,15 @@ table.disk_status tbody tr:nth-child(even) {
}
table.disk_status thead tr:last-child {
border-bottom: 1px solid rgb(160, 160, 160);
border-bottom: 1px solid var(--transparency-light-25);
}
table.tablesorter thead tr {
border-bottom: rgba(255, 255, 255, .25) 1px solid;
border-bottom: var(--transparency-light-25) 1px solid;
}
table tbody tr.tr_last {
border-top: 1px solid rgba(255, 255, 255, .25);
border-top: 1px solid var(--transparency-light-25);
}
table.share_status tbody tr.warn {
@ -286,7 +303,7 @@ a.button:hover,
/* USERS */
div.user-list {
border: 1px solid rgba(255, 255, 255, .15);
border: 1px solid var(--transparency-light-15);
background: var(--transparency-light-05);
}
@ -458,7 +475,7 @@ li.caMenuItem:hover {
.ca_holder {
background: var(--transparency-dark-25) !important;
border-color: rgba(255, 255, 255, 0.1) !important;
border-color: var(--transparency-light-10) !important;
}
.ca_holder:hover {
@ -656,9 +673,13 @@ div.shade-black {
/* MODAL */
/* .sweet-alert {
background: var(--modal-bg-color) !important;
} */
.sweet-alert, .sweet-alert .sa-icon.sa-success .sa-fix {
background-color: var(--modal-bg-color);
}
.sweet-alert.nchan h2 {
background-color: var(--transparency-light-15);
}
.showSweetAlert:not([data-has-cancel-button="false"]),
.swal-overlay--show-modal .swal-modal {

View File

@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
done
fi
sed -i "s!<body>!<body>${sheets}!g" "${APP_FILEPATH}"
sed -i "s!<body>!<body>${sheets}!g" "${LOGIN_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${APP_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${LOGIN_FILEPATH}"
printf 'Stylesheets inserted.'
fi

View File

@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
done
fi
sed -i "s!<body>!<body>${sheets}!g" "${APP_FILEPATH}"
sed -i "s!<body>!<body>${sheets}!g" "${LOGIN_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${APP_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${LOGIN_FILEPATH}"
printf 'Stylesheets inserted.'
fi

View File

@ -11,12 +11,6 @@ echo -e "Variables set:\\n\
'TP_SCHEME'=${TP_SCHEME}\\n\
'TP_THEME'=${TP_THEME}\\n"
APP_FILEPATH=''
if [ "${TP_HOTIO}" = true ]; then
echo 'Changing to Hotio file path!'
APP_FILEPATH='/app'
fi
# Set default
if [[ -z ${TP_DOMAIN} ]]; then
echo 'No domain set, defaulting to theme-park.dev'
@ -45,16 +39,16 @@ if [[ -z ${TP_THEME} ]]; then
fi
# Adding stylesheets
if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html; then
if ! grep -q "${TP_DOMAIN}/css/base" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html; then
echo '---------------------------'
echo '| Adding the stylesheet |'
echo '---------------------------'
sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/plex\/plex-base.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/plex\/plex-base.css'><\/head> /g" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
printf 'Stylesheet set to %s\n' "${TP_THEME}"
if [[ -n ${TP_ADDON} ]]; then
for addon in $(echo "$TP_ADDON" | tr "|" " "); do
sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/addons\/plex\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/addons\/plex\/${addon}\/${addon}.css'><\/head> /g" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
printf 'Added custom addon: %s\n\n' "${addon}"
done
fi

View File

@ -11,12 +11,6 @@ echo -e "Variables set:\\n\
'TP_SCHEME'=${TP_SCHEME}\\n\
'TP_THEME'=${TP_THEME}\\n"
APP_FILEPATH=''
if [ "${TP_HOTIO}" = true ]; then
echo 'Changing to Hotio file path!'
APP_FILEPATH='/app'
fi
# Set default
if [[ -z ${TP_DOMAIN} ]]; then
echo 'No domain set, defaulting to theme-park.dev'
@ -45,16 +39,16 @@ if [[ -z ${TP_THEME} ]]; then
fi
# Adding stylesheets
if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html; then
if ! grep -q "${TP_DOMAIN}/css/base" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html; then
echo '---------------------------'
echo '| Adding the stylesheet |'
echo '---------------------------'
sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/plex\/plex-base.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/plex\/plex-base.css'><\/head> /g" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
printf 'Stylesheet set to %s\n' "${TP_THEME}"
if [[ -n ${TP_ADDON} ]]; then
for addon in $(echo "$TP_ADDON" | tr "|" " "); do
sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/addons\/plex\/${addon}\/${addon}.css'><\/head> /g" "${APP_FILEPATH}"/usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/addons\/plex\/${addon}\/${addon}.css'><\/head> /g" /usr/lib/plexmediaserver/Resources/Plug-ins-*/WebClient.bundle/Contents/Resources/index.html
printf 'Added custom addon: %s\n\n' "${addon}"
done
fi

View File

@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
done
fi
sed -i "s!<body>!<body>${sheets}!g" "${APP_FILEPATH}"
sed -i "s!<body>!<body>${sheets}!g" "${LOGIN_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${APP_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${LOGIN_FILEPATH}"
printf 'Stylesheets inserted.'
fi

View File

@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
done
fi
sed -i "s!<body>!<body>${sheets}!g" "${APP_FILEPATH}"
sed -i "s!<body>!<body>${sheets}!g" "${LOGIN_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${APP_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${LOGIN_FILEPATH}"
printf 'Stylesheets inserted.'
fi

View File

@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
done
fi
sed -i "s!<body>!<body>${sheets}!g" "${APP_FILEPATH}"
sed -i "s!<body>!<body>${sheets}!g" "${LOGIN_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${APP_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${LOGIN_FILEPATH}"
printf 'Stylesheets inserted.'
fi

View File

@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
done
fi
sed -i "s!<body>!<body>${sheets}!g" "${APP_FILEPATH}"
sed -i "s!<body>!<body>${sheets}!g" "${LOGIN_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${APP_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${LOGIN_FILEPATH}"
printf 'Stylesheets inserted.'
fi

View File

@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
done
fi
sed -i "s!<body>!<body>${sheets}!g" "${APP_FILEPATH}"
sed -i "s!<body>!<body>${sheets}!g" "${LOGIN_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${APP_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${LOGIN_FILEPATH}"
printf 'Stylesheets inserted.'
fi

View File

@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
done
fi
sed -i "s!<body>!<body>${sheets}!g" "${APP_FILEPATH}"
sed -i "s!<body>!<body>${sheets}!g" "${LOGIN_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${APP_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${LOGIN_FILEPATH}"
printf 'Stylesheets inserted.'
fi

View File

@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
done
fi
sed -i "s!<body>!<body>${sheets}!g" "${APP_FILEPATH}"
sed -i "s!<body>!<body>${sheets}!g" "${LOGIN_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${APP_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${LOGIN_FILEPATH}"
printf 'Stylesheets inserted.'
fi

View File

@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
done
fi
sed -i "s!<body>!<body>${sheets}!g" "${APP_FILEPATH}"
sed -i "s!<body>!<body>${sheets}!g" "${LOGIN_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${APP_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${LOGIN_FILEPATH}"
printf 'Stylesheets inserted.'
fi

View File

@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
done
fi
sed -i "s!<body>!<body>${sheets}!g" "${APP_FILEPATH}"
sed -i "s!<body>!<body>${sheets}!g" "${LOGIN_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${APP_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${LOGIN_FILEPATH}"
printf 'Stylesheets inserted.'
fi

View File

@ -65,7 +65,7 @@ if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
done
fi
sed -i "s!<body>!<body>${sheets}!g" "${APP_FILEPATH}"
sed -i "s!<body>!<body>${sheets}!g" "${LOGIN_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${APP_FILEPATH}"
sed -i "s!</body>!${sheets}</body>!g" "${LOGIN_FILEPATH}"
printf 'Stylesheets inserted.'
fi