Skip to content

Commit

Permalink
fork cleanup
Browse files Browse the repository at this point in the history
renovate update

add pre-commit

tone down renovate

fix pre-commit issues
  • Loading branch information
harrisony committed Jun 15, 2024
1 parent f9fe00d commit a451134
Show file tree
Hide file tree
Showing 33 changed files with 152 additions and 136 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
ARG VARIANT=16-bullseye
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}

RUN sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b ~/.local/bin
RUN sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b ~/.local/bin
122 changes: 61 additions & 61 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
---
name: "Bug Report"
description: "Submit a bug report for the current release"
labels: ["bug"]
body:
- type: checkboxes
id: checks
attributes:
label: First Check
description: Please confirm and check all the following options.
options:
- label: This is not a feature request
required: true
- label: I added a very descriptive title to this issue.
required: true
- label: I used the GitHub search to find a similar issue and didn't find it.
required: true
- label: I searched the documentation, with the integrated search.
required: true
- label: I already read the docs and didn't find an answer.
required: true
- type: input
id: homebox-version
attributes:
label: Homebox Version
validations:
required: true
- type: textarea
id: description
attributes:
label: What is the issue you are experiencing?
placeholder: A clear and concise description of what the bug is.
validations:
required: true
- type: textarea
id: reproduction
attributes:
description: If you do not provide a way to reproduce the issue, your issue will likely be closed.
label: How can the maintainer reproduce the issue?
placeholder: A clear step-by-step guide on how to reproduce the issue.
validations:
required: true
- type: dropdown
id: os
attributes:
label: Deployment
description: What Deployment system are you using?
multiple: true
options:
- Docker (Linux)
- Docker (Windows)
- Docker (Synology)
- Unraid
- Other
validations:
required: true
- type: textarea
id: os-details
attributes:
label: Deployment Details
description: You can add more details about your operating system here, in particular if you chose "Other". If you are experiencing issues with deployment, please provide your docker-compose or docker commands
# ---
# name: "Bug Report"
# description: "Submit a bug report for the current release"
# labels: ["bug"]
# body:
# - type: checkboxes
# id: checks
# attributes:
# label: First Check
# description: Please confirm and check all the following options.
# options:
# - label: This is not a feature request
# required: true
# - label: I added a very descriptive title to this issue.
# required: true
# - label: I used the GitHub search to find a similar issue and didn't find it.
# required: true
# - label: I searched the documentation, with the integrated search.
# required: true
# - label: I already read the docs and didn't find an answer.
# required: true
# - type: input
# id: homebox-version
# attributes:
# label: Homebox Version
# validations:
# required: true
# - type: textarea
# id: description
# attributes:
# label: What is the issue you are experiencing?
# placeholder: A clear and concise description of what the bug is.
# validations:
# required: true
# - type: textarea
# id: reproduction
# attributes:
# description: If you do not provide a way to reproduce the issue, your issue will likely be closed.
# label: How can the maintainer reproduce the issue?
# placeholder: A clear step-by-step guide on how to reproduce the issue.
# validations:
# required: true
# - type: dropdown
# id: os
# attributes:
# label: Deployment
# description: What Deployment system are you using?
# multiple: true
# options:
# - Docker (Linux)
# - Docker (Windows)
# - Docker (Synology)
# - Unraid
# - Other
# validations:
# required: true
# - type: textarea
# id: os-details
# attributes:
# label: Deployment Details
# description: You can add more details about your operating system here, in particular if you chose "Other". If you are experiencing issues with deployment, please provide your docker-compose or docker commands
74 changes: 37 additions & 37 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
---
name: "Feature Request"
description: "Submit a feature request for the current release"
labels: ["feature-request"]
body:
- type: textarea
id: problem-statement
attributes:
label: What is the problem you are trying to solve with this feature?
placeholder: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
- type: textarea
id: feature-solution
attributes:
label: What is the solution you are proposing?
placeholder: A clear and concise description of what you want to happen.
- type: textarea
id: feature-alternatives
attributes:
label: What alternatives have you considered?
placeholder: A clear and concise description of any alternative solutions or features you've considered.
- type: textarea
id: feature-details
attributes:
label: Additional context
placeholder: Add any other context or screenshots about the feature request here.
- type: checkboxes
id: checks
attributes:
label: Contributions
description: Please confirm the following
options:
- label: I have searched through existing issues and feature requests to see if my idea has already been proposed.
required: true
- label: If this feature is accepted, I would be willing to help implement and maintain this feature.
required: false
- label: If this feature is accepted, I'm willing to sponsor the development of this feature.
required: false
# ---
# name: "Feature Request"
# description: "Submit a feature request for the current release"
# labels: ["feature-request"]
# body:
# - type: textarea
# id: problem-statement
# attributes:
# label: What is the problem you are trying to solve with this feature?
# placeholder: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
# - type: textarea
# id: feature-solution
# attributes:
# label: What is the solution you are proposing?
# placeholder: A clear and concise description of what you want to happen.
# - type: textarea
# id: feature-alternatives
# attributes:
# label: What alternatives have you considered?
# placeholder: A clear and concise description of any alternative solutions or features you've considered.
# - type: textarea
# id: feature-details
# attributes:
# label: Additional context
# placeholder: Add any other context or screenshots about the feature request here.
# - type: checkboxes
# id: checks
# attributes:
# label: Contributions
# description: Please confirm the following
# options:
# - label: I have searched through existing issues and feature requests to see if my idea has already been proposed.
# required: true
# - label: If this feature is accepted, I would be willing to help implement and maintain this feature.
# required: false
# - label: If this feature is accepted, I'm willing to sponsor the development of this feature.
# required: false
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ _(REQUIRED)_
-->

```release-note
```
```
2 changes: 0 additions & 2 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,3 @@ jobs:
tag: nightly
secrets:
GH_TOKEN: ${{ secrets.CR_PAT }}


5 changes: 2 additions & 3 deletions .github/workflows/pull-requests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: Pull Request CI

on:
pull_request:
branches:
- main
types: [opened, reopened]

jobs:
backend-tests:
Expand All @@ -12,4 +11,4 @@ jobs:

frontend-tests:
name: "Frontend and End-to-End Tests"
uses: ./.github/workflows/partial-frontend.yaml
uses: ./.github/workflows/partial-frontend.yaml
2 changes: 1 addition & 1 deletion .github/workflows/tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CONFIG_FILE: docs/mkdocs.yml
EXTRA_PACKAGES: build-base
EXTRA_PACKAGES: build-base
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ dist/
# Nuxt Publish Dir
backend/app/api/static/public/*
!backend/app/api/static/public/.gitkeep
backend/api
backend/api
11 changes: 11 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
args: ["--unsafe"]
- id: check-added-large-files
2 changes: 1 addition & 1 deletion .scaffold/model/templates/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ func ({{ .Scaffold.model }}) Indexes() []ent.Index {
return []ent.Index{
// index.Fields("token"),
}
}
}
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@
}
}
]
}
}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ start command `task: ui:dev`

Create a new tag in GitHub with the version number vX.X.X. This will trigger a new release to be created.

Test -> Goreleaser -> Publish Release -> Trigger Docker Builds -> Deploy Docs + Fly.io Demo
Test -> Goreleaser -> Publish Release -> Trigger Docker Builds -> Deploy Docs + Fly.io Demo
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -658,4 +658,4 @@ specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<https://www.gnu.org/licenses/>.
<https://www.gnu.org/licenses/>.
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
You probably don't want to use this, unless you're me.

Big thanks to the original author @hay-kot.

---

<div align="center">
<img src="/docs/docs/assets/img/lilbox.svg" height="200"/>
</div>
Expand All @@ -16,7 +22,7 @@
[Configuration & Docker Compose](https://hay-kot.github.io/homebox/quick-start)

```bash
# If using the rootless image, ensure data
# If using the rootless image, ensure data
# folder has correct permissions
mkdir -p /path/to/data/folder
chown 65532:65532 -R /path/to/data/folder
Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Since this software is still considered beta/WIP support is always only given fo

## Reporting a Vulnerability

Please open a normal public issue if you have any security related concerns.
Please open a normal public issue if you have any security related concerns.
2 changes: 1 addition & 1 deletion backend/.golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ issues:
exclude-use-default: false
fix: true
exclude-dirs:
- internal/data/ent.*
- internal/data/ent.*
2 changes: 1 addition & 1 deletion backend/app/api/static/docs/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -3038,4 +3038,4 @@
"in": "header"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ HB.location,HB.name,HB.quantity,HB.description,HB.field.Custom Field 1,HB.field.
loc,Item 1,1,Description 1,Value 1[1],Value 1[2],Value 1[3]
loc,Item 2,2,Description 2,Value 2[1],Value 2[2],Value 2[3]
loc,Item 3,3,Description 3,Value 3[1],Value 3[2],Value 3[3]

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
HB.location,HB.name,HB.quantity,HB.description
loc,Item 1,1,Description 1
loc,Item 2,2,Description 2
loc,Item 3,3,Description 3
loc,Item 3,3,Description 3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
HB.name,HB.asset_id,HB.location,HB.labels
Item 1,1,Path / To / Location 1,L1 ; L2 ; L3
Item 2,000-002,Path /To/ Location 2,L1;L2;L3
Item 3,1000-003,Path / To /Location 3 , L1;L2; L3
Item 3,1000-003,Path / To /Location 3 , L1;L2; L3
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
PRAGMA foreign_keys = off;
DROP TABLE `document_tokens`;
-- enable back the enforcement of foreign-keys constraints
PRAGMA foreign_keys = on;
PRAGMA foreign_keys = on;
12 changes: 6 additions & 6 deletions backend/internal/data/repo/repo_locations.go
Original file line number Diff line number Diff line change
Expand Up @@ -280,14 +280,14 @@ func (r *LocationRepository) PathForLoc(ctx context.Context, groupID, locID uuid
FROM locations
WHERE id = ?
AND group_locations = ?
UNION ALL
SELECT loc.id, loc.name, loc.location_children
FROM locations loc
JOIN location_path lp ON loc.id = lp.location_children
)
SELECT id, name
FROM location_path`,
locID, groupID)
Expand Down Expand Up @@ -337,7 +337,7 @@ func (r *LocationRepository) Tree(ctx context.Context, groupID uuid.UUID, tq Tre
FROM locations
WHERE location_children IS NULL
AND group_locations = ?
UNION ALL
SELECT c.id,
c.NAME,
Expand All @@ -362,9 +362,9 @@ func (r *LocationRepository) Tree(ctx context.Context, groupID uuid.UUID, tq Tre
FROM items
WHERE item_children IS NULL
AND location_items IN (SELECT id FROM location_tree)
UNION ALL
SELECT c.id,
c.NAME,
c.item_children AS parent_id,
Expand Down
Loading

0 comments on commit a451134

Please sign in to comment.