Skip to content

Commit

Permalink
Merge branch 'dev' into widget/add-ad-guard-home
Browse files Browse the repository at this point in the history
  • Loading branch information
manuel-rw committed May 20, 2023
2 parents 22f7b67 + 85dfb5b commit ee94778
Show file tree
Hide file tree
Showing 325 changed files with 7,365 additions and 2,263 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/docker.yml
Expand Up @@ -19,6 +19,9 @@ env:
REGISTRY: ghcr.io
# github.repository as <account>/<repo>
IMAGE_NAME: ${{ github.repository }}
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}


jobs:
# Push image to GitHub Packages.
Expand Down Expand Up @@ -49,7 +52,7 @@ jobs:
${{ runner.os }}-yarn-
- name: Restore NextJS cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
# See here for caching with `yarn` https://github.com/actions/cache/blob/main/examples.md#node---yarn or you can leverage caching with actions/setup-node https://github.com/actions/setup-node
path: |
Expand Down
124 changes: 110 additions & 14 deletions .github/workflows/docker_dev.yml
@@ -1,8 +1,5 @@
name: Development CI
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

on:
push:
branches: [dev]
Expand All @@ -19,6 +16,10 @@ on:
required: true
description: 'Tag to deploy to'

defaults:
run:
working-directory: ./

env:
# Use docker.io for Docker Hub if empty
REGISTRY: ghcr.io
Expand All @@ -27,6 +28,10 @@ env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}

permissions:
contents: read # for checkout repository
actions: read # for fetching base branch bundle stats
pull-requests: write # for comments

jobs:
# Push image to GitHub Packages.
Expand Down Expand Up @@ -56,22 +61,21 @@ jobs:
restore-keys: |
${{ runner.os }}-yarn-
- name: Restore NextJS cache
uses: actions/cache@v2
- name: Restore next build
uses: actions/cache@v3
id: restore-build-cache
env:
cache-name: cache-next-build
with:
# See here for caching with `yarn` https://github.com/actions/cache/blob/main/examples.md#node---yarn or you can leverage caching with actions/setup-node https://github.com/actions/setup-node
path: |
${{ github.workspace }}/.next/cache
# Generate a new cache whenever packages or source files change.
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
# If source files changed but packages didn't, rebuild from a prior cache.
restore-keys: |
${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
path: .next/cache
key: ${{ runner.os }}-build-${{ env.cache-name }}

- run: yarn install --immutable

- run: yarn turbo build

- run: yarn test:run

- name: Docker meta
if: github.event_name != 'pull_request'
id: meta
Expand Down Expand Up @@ -110,3 +114,95 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max

analyze:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: 18

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"

- uses: actions/cache@v3
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Restore next build
uses: actions/cache@v3
id: restore-build-cache
env:
cache-name: cache-next-build
with:
# if you use a custom build directory, replace all instances of `.next` in this file with your build directory
# ex: if your app builds to `dist`, replace `.next` with `dist`
path: .next/cache
# change this if you prefer a more strict cache
key: ${{ runner.os }}-build-${{ env.cache-name }}

- run: yarn install

- name: Build next.js app
# change this if your site requires a custom build command
run: yarn turbo build

# Here's the first place where next-bundle-analysis' own script is used
# This step pulls the raw bundle stats for the current bundle
- name: Analyze bundle
run: npx -p nextjs-bundle-analysis report

- name: Upload bundle
uses: actions/upload-artifact@v3
with:
name: bundle
path: .next/analyze/__bundle_analysis.json

- name: Download base branch bundle stats
uses: dawidd6/action-download-artifact@v2
continue-on-error: true
if: success() && github.event.number
with:
workflow: nextjs_bundle_analysis.yml
branch: ${{ github.event.pull_request.base.ref }}
path: .next/analyze/base

# And here's the second place - this runs after we have both the current and
# base branch bundle stats, and will compare them to determine what changed.
# There are two configurable arguments that come from package.json:
#
# - budget: optional, set a budget (bytes) against which size changes are measured
# it's set to 350kb here by default, as informed by the following piece:
# https://infrequently.org/2021/03/the-performance-inequality-gap/
#
# - red-status-percentage: sets the percent size increase where you get a red
# status indicator, defaults to 20%
#
# Either of these arguments can be changed or removed by editing the `nextBundleAnalysis`
# entry in your package.json file.
- name: Compare with base branch bundle
if: success() && github.event.number
run: ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare

- name: Get Comment Body
id: get-comment-body
if: success() && github.event.number
# https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
run: |
echo "body<<EOF" >> $GITHUB_OUTPUT
echo "$(cat .next/analyze/__bundle_analysis_comment.txt)" >> $GITHUB_OUTPUT
echo EOF >> $GITHUB_OUTPUT
- name: Comment
uses: marocchino/sticky-pull-request-comment@v2
with:
header: next-touched-pages
message: ${{ steps.get-comment-body.outputs.body }}
6 changes: 5 additions & 1 deletion .gitignore
Expand Up @@ -51,4 +51,8 @@ data/configs
!.yarn/versions

#envfiles
.env
.env

#Languages other than 'en'
public/locales/*
!public/locales/en
786 changes: 0 additions & 786 deletions .yarn/releases/yarn-3.2.1.cjs

This file was deleted.

873 changes: 873 additions & 0 deletions .yarn/releases/yarn-3.5.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.2.1.cjs
yarnPath: .yarn/releases/yarn-3.5.1.cjs
44 changes: 44 additions & 0 deletions checkly.config.ts
@@ -0,0 +1,44 @@
import { defineConfig } from 'checkly'

/**
* See https://www.checklyhq.com/docs/cli/project-structure/
*/
const config = defineConfig({
/* A human friendly name for your project */
projectName: 'homarr',
/** A logical ID that needs to be unique across your Checkly account,
* See https://www.checklyhq.com/docs/cli/constructs/ to learn more about logical IDs.
*/
logicalId: 'homarr',
/* An optional URL to your Git repo */
repoUrl: 'https://github.com/checkly/checkly-cli',
/* Sets default values for Checks */
checks: {
/* A default for how often your Check should run in minutes */
frequency: 10,
/* Checkly data centers to run your Checks as monitors */
locations: ['us-east-1', 'eu-west-1'],
/* An optional array of tags to organize your Checks */
tags: ['mac'],
/** The Checkly Runtime identifier, determining npm packages and the Node.js version available at runtime.
* See https://www.checklyhq.com/docs/cli/npm-packages/
*/
runtimeId: '2023.02',
/* A glob pattern that matches the Checks inside your repo, see https://www.checklyhq.com/docs/cli/using-check-test-match/ */
checkMatch: '**/__checks__/**/*.check.ts',
browserChecks: {
/* A glob pattern matches any Playwright .spec.ts files and automagically creates a Browser Check. This way, you
* can just write native Playwright code. See https://www.checklyhq.com/docs/cli/using-check-test-match/
* */
testMatch: '**/__checks__/**/*.spec.ts',
},
},
cli: {
/* The default datacenter location to use when running npx checkly test */
runLocation: 'eu-west-1',
/* An array of default reporters to use when a reporter is not specified with the "--reporter" flag */
reporters: ['list'],
},
})

export default config
32 changes: 20 additions & 12 deletions package.json
Expand Up @@ -25,7 +25,7 @@
},
"dependencies": {
"@ctrl/deluge": "^4.1.0",
"@ctrl/qbittorrent": "^4.1.0",
"@ctrl/qbittorrent": "^6.0.0",
"@ctrl/shared-torrent": "^4.1.1",
"@ctrl/transmission": "^4.1.1",
"@emotion/react": "^11.10.6",
Expand All @@ -42,15 +42,15 @@
"@nivo/core": "^0.80.0",
"@nivo/line": "^0.80.0",
"@react-native-async-storage/async-storage": "^1.18.1",
"@tabler/icons": "^1.106.0",
"@tabler/icons-react": "^2.18.0",
"@tanstack/query-async-storage-persister": "^4.27.1",
"@tanstack/query-sync-storage-persister": "^4.27.1",
"@tanstack/react-query": "^4.2.1",
"@tanstack/react-query-devtools": "^4.24.4",
"@tanstack/react-query-persist-client": "^4.28.0",
"@vitejs/plugin-react": "^3.1.0",
"axios": "^0.27.2",
"consola": "^2.15.3",
"axios": "^1.0.0",
"consola": "^3.0.0",
"cookies-next": "^2.1.1",
"dayjs": "^1.11.7",
"dockerode": "^3.3.2",
Expand All @@ -59,7 +59,7 @@
"html-entities": "^2.3.3",
"i18next": "^21.9.1",
"js-file-download": "^0.4.12",
"next": "^13.2.1",
"next": "^13.4.2",
"next-i18next": "^11.3.0",
"nzbget-api": "^0.0.3",
"prismjs": "^1.29.0",
Expand All @@ -75,20 +75,21 @@
"zustand": "^4.3.7"
},
"devDependencies": {
"@next/bundle-analyzer": "^12.1.4",
"@next/eslint-plugin-next": "^12.1.4",
"@next/bundle-analyzer": "^13.0.0",
"@next/eslint-plugin-next": "^13.0.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
"@types/dockerode": "^3.3.9",
"@types/node": "17.0.1",
"@types/prismjs": "^1.26.0",
"@types/react": "17.0.1",
"@types/react": "17.0.59",
"@types/uuid": "^8.3.4",
"@types/video.js": "^7.3.51",
"@typescript-eslint/eslint-plugin": "^5.30.7",
"@typescript-eslint/parser": "^5.30.7",
"@vitest/coverage-c8": "^0.29.3",
"@vitest/ui": "^0.29.3",
"checkly": "latest",
"eslint": "^8.20.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.0.0",
Expand All @@ -104,15 +105,22 @@
"node-mocks-http": "^1.12.2",
"prettier": "^2.7.1",
"sass": "^1.56.1",
"ts-node": "latest",
"turbo": "latest",
"typescript": "^4.7.4",
"typescript": "^5.0.4",
"video.js": "^8.0.3",
"vitest": "^0.29.3",
"vitest-fetch-mock": "^0.2.2"
},
"resolutions": {
"@types/react": "17.0.2",
"@types/react-dom": "17.0.2"
"@types/react": "17.0.59",
"@types/react-dom": "17.0.20"
},
"packageManager": "yarn@3.2.1"
"packageManager": "yarn@3.5.1",
"nextBundleAnalysis": {
"budget": null,
"budgetPercentIncreaseRed": 20,
"minimumChangeThreshold": 0,
"showDetails": true
}
}
4 changes: 4 additions & 0 deletions public/locales/da/common.json
Expand Up @@ -6,6 +6,10 @@
"delete": "Slet",
"ok": "OK",
"edit": "Rediger",
"enabled": "Aktiveret",
"disabled": "Deaktiveret",
"enableAll": "Aktiver alle",
"disableAll": "Deaktiver alle",
"version": "Version",
"changePosition": "Ændre placering",
"remove": "Fjern",
Expand Down
21 changes: 21 additions & 0 deletions public/locales/da/modules/bookmark.json
@@ -0,0 +1,21 @@
{
"descriptor": {
"name": "Bogmærke",
"description": "Viser en statisk liste over strenge eller links",
"settings": {
"title": "Bogmærke indstillinger",
"items": {
"label": "Elementer"
},
"layout": {
"label": "Layout"
}
}
},
"card": {
"noneFound": {
"title": "Bogmærkelisten er tom",
"text": "Tilføj nye elementer til denne liste i redigeringstilstand"
}
}
}
3 changes: 3 additions & 0 deletions public/locales/da/modules/dashdot.json
Expand Up @@ -4,6 +4,9 @@
"description": "Viser graferne for en ekstern Dash. instans i Homarr.",
"settings": {
"title": "Indstillinger for Dash. widget",
"dashName": {
"label": "Dash. Navn"
},
"url": {
"label": "Dash. URL"
},
Expand Down
6 changes: 6 additions & 0 deletions public/locales/da/modules/dns-hole-controls.json
@@ -0,0 +1,6 @@
{
"descriptor": {
"name": "DNS hole kontrol",
"description": "Kontroller PiHole eller AdGuard fra dit dashboard"
}
}

0 comments on commit ee94778

Please sign in to comment.