Skip to content

Commit

Permalink
Merge branch 'hoarder-app:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
kamtschatka authored Oct 20, 2024
2 parents c4bce80 + a822ff2 commit b9f9b06
Show file tree
Hide file tree
Showing 50 changed files with 1,853 additions and 138 deletions.
61 changes: 61 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Bug Report
description: Create a report to help us fix bugs & issues in existing supported functionality
labels: [":bug: Bug"]
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out a bug report!
Please note that this form is for reporting bugs in existing supported functionality.
If you are reporting something that's not an issue in functionality we've previously supported and/or is simply something different to your expectations, then it may be more appropriate to raise via a feature or support request instead.
- type: textarea
id: description
attributes:
label: Describe the Bug
description: Provide a clear and concise description of what the bug is.
validations:
required: true
- type: textarea
id: reproduction
attributes:
label: Steps to Reproduce
description: Detail the steps that would replicate this issue.
placeholder: |
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
validations:
required: true
- type: textarea
id: expected
attributes:
label: Expected Behaviour
description: Provide clear and concise description of what you expected to happen.
validations:
required: true
- type: textarea
id: context
attributes:
label: Screenshots or Additional Context
description: Provide any additional context and screenshots here to help us solve this issue.
validations:
required: false
- type: input
id: devicedetails
attributes:
label: Device Details
description: |
If this is an issue that occurs when using the Hoarder interface, please provide details of the device/browser used which presents the reported issue.
placeholder: (eg. Firefox 97 (64-bit) on Windows 11)
validations:
required: false
- type: input
id: bsversion
attributes:
label: Exact Hoarder Version
description: This can be found in the bottom left of the page (eg Hoarder v0.18.0)
placeholder: (eg. v0.18.0)
validations:
required: true
46 changes: 46 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Feature Request
description: Request a new feature or idea to be added to Hoarder
labels: [":hammer: Feature Request"]
body:
- type: textarea
id: description
attributes:
label: Describe the feature you'd like
description: Provide a clear description of the feature you'd like implemented in Hoarder
validations:
required: true
- type: textarea
id: benefits
attributes:
label: Describe the benefits this would bring to existing Hoarder users
description: |
Explain the measurable benefits this feature would achieve for existing Hoarder users.
These benefits should details outcomes in terms of what this request solves/achieves, and should not be specific to implementation.
This helps us understand the core desired goal so that a variety of potential implementations could be explored.
This field is important. Lack if input here may lead to early issue closure.
validations:
required: true
- type: textarea
id: already_achieved
attributes:
label: Can the goal of this request already be achieved via other means?
description: |
Yes/No. If yes, please describe how the requested approach fits in with the existing method.
validations:
required: true
- type: checkboxes
id: confirm-search
attributes:
label: Have you searched for an existing open/closed issue?
description: |
To help us keep these issues under control, please ensure you have first [searched our issue list](https://github.com/hoarder-app/Hoarder/issues?q=is%3Aissue) for any existing issues that cover the fundamental benefit/goal of your request.
options:
- label: I have searched for existing issues and none cover my fundamental request
required: true
- type: textarea
id: context
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
validations:
required: false
6 changes: 3 additions & 3 deletions apps/mobile/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Hoarder App",
"slug": "hoarder",
"scheme": "hoarder",
"version": "1.6.3",
"version": "1.6.4",
"orientation": "portrait",
"icon": "./assets/icon.png",
"userInterfaceStyle": "automatic",
Expand All @@ -30,7 +30,7 @@
"NSAllowsLocalNetworking": true
}
},
"buildNumber": "12"
"buildNumber": "13"
},
"android": {
"adaptiveIcon": {
Expand All @@ -48,7 +48,7 @@
}
},
"package": "app.hoarder.hoardermobile",
"versionCode": 12
"versionCode": 13
},
"plugins": [
"expo-router",
Expand Down
21 changes: 19 additions & 2 deletions apps/mobile/app/test-connection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import CustomSafeAreaView from "@/components/ui/CustomSafeAreaView";
import { Input } from "@/components/ui/Input";
import useAppSettings from "@/lib/settings";
import { cn } from "@/lib/utils";
import { z } from "zod";

export default function TestConnection() {
const { settings, isLoading } = useAppSettings();
Expand Down Expand Up @@ -43,15 +44,31 @@ export default function TestConnection() {
appendText("Got the following response:");
appendText(request.responseText);
setStatus("error");
return;
}
if (request.status === 200) {
try {
const schema = z.object({
status: z.string(),
});
const data = schema.parse(JSON.parse(request.responseText));
if (data.status !== "ok") {
appendText(`Server is not healthy: ${data.status}`);
setStatus("error");
return;
}
appendText("ALL GOOD");
setStatus("success");
} catch (e) {
appendText(`Failed to parse response as JSON: ${e}`);
appendText("Got the following response:");
appendText(request.responseText);
setStatus("error");
return;
}
};

appendText("Using address: " + settings.address);
request.open("GET", `${settings.address}`);
request.open("GET", `${settings.address}/api/health`);
request.send();
}
runTest();
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/dashboard/settings/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default async function Settings() {
orientation="horizontal"
className="flex flex-col gap-1"
>
<TabsList className="flex justify-start">
<TabsList className="flex justify-start overflow-x-auto overflow-y-hidden">
<TabsTrigger className="flex items-center gap-2 p-3" value="info">
<User className="size-4" />
User Info
Expand Down
Loading

0 comments on commit b9f9b06

Please sign in to comment.