Skip to content

Commit 75005cd

Browse files
committed
Revert leftover Deno config
1 parent 486dcf5 commit 75005cd

25 files changed

+268
-106
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.3
1+
3.4.3

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ENV NODE_ENV=production
88
COPY web ./web
99
RUN cd web && bun run build
1010

11-
FROM ruby:3.2.3-slim as base
11+
FROM ruby:3.4.3-slim as base
1212

1313
LABEL fly_launch_runtime="rails"
1414

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
ruby "3.2.3"
3+
ruby "3.4.3"
44

55
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
66
gem "rails", "~> 7.1.3"

Gemfile.lock

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ GEM
135135
marcel (1.0.2)
136136
method_source (1.0.0)
137137
mini_mime (1.1.5)
138+
mini_portile2 (2.8.9)
138139
minitest (5.21.2)
139140
msgpack (1.7.2)
140141
mutex_m (0.2.0)
@@ -150,17 +151,8 @@ GEM
150151
net-smtp (0.4.0.1)
151152
net-protocol
152153
nio4r (2.7.0)
153-
nokogiri (1.16.0-aarch64-linux)
154-
racc (~> 1.4)
155-
nokogiri (1.16.0-arm-linux)
156-
racc (~> 1.4)
157-
nokogiri (1.16.0-arm64-darwin)
158-
racc (~> 1.4)
159-
nokogiri (1.16.0-x86-linux)
160-
racc (~> 1.4)
161-
nokogiri (1.16.0-x86_64-darwin)
162-
racc (~> 1.4)
163-
nokogiri (1.16.0-x86_64-linux)
154+
nokogiri (1.16.0)
155+
mini_portile2 (~> 2.8.2)
164156
racc (~> 1.4)
165157
openssl (3.2.0)
166158
openssl-signature_algorithm (1.3.0)
@@ -305,7 +297,7 @@ DEPENDENCIES
305297
webauthn (~> 3.1)
306298

307299
RUBY VERSION
308-
ruby 3.2.3p157
300+
ruby 3.4.3p32
309301

310302
BUNDLED WITH
311303
2.5.3

bun.lockb

7.85 KB
Binary file not shown.

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,8 @@
1717
"typecheck": "cd web && bun typecheck",
1818
"lint": "cd web && bun lint"
1919
},
20-
"workspaces": ["web"]
20+
"workspaces": [
21+
"web"
22+
],
23+
"packageManager": "pnpm@10.13.1+sha512.37ebf1a5c7a30d5fabe0c5df44ee8da4c965ca0c5af3dbab28c3a1681b70a256218d05c81c9c0dcf767ef6b8551eb5b960042b9ed4300c59242336377e01cfad"
2124
}

schema.graphql

Lines changed: 70 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,35 @@
11
type Account {
22
createdAt: ISO8601DateTime!
33
currency: Currency!
4+
hasTransactions: Boolean!
45
id: ID!
56
name: String!
67
updatedAt: ISO8601DateTime!
78
}
89

10+
"""
11+
Autogenerated input type of AccountArchive
12+
"""
13+
input AccountArchiveInput {
14+
"""
15+
A unique identifier for the client performing the mutation.
16+
"""
17+
clientMutationId: String
18+
id: ID!
19+
}
20+
21+
"""
22+
Autogenerated return type of AccountArchive.
23+
"""
24+
type AccountArchivePayload {
25+
account: Account!
26+
27+
"""
28+
A unique identifier for the client performing the mutation.
29+
"""
30+
clientMutationId: String
31+
}
32+
933
"""
1034
Autogenerated input type of AccountCreate
1135
"""
@@ -121,6 +145,7 @@ type Category {
121145
budgets: [CategoryBudget!]!
122146
color: String!
123147
createdAt: ISO8601DateTime!
148+
hasTransactions: Boolean!
124149
icon: String!
125150
id: ID!
126151
isRegular: Boolean!
@@ -129,6 +154,29 @@ type Category {
129154
updatedAt: ISO8601DateTime!
130155
}
131156

157+
"""
158+
Autogenerated input type of CategoryArchive
159+
"""
160+
input CategoryArchiveInput {
161+
"""
162+
A unique identifier for the client performing the mutation.
163+
"""
164+
clientMutationId: String
165+
id: ID!
166+
}
167+
168+
"""
169+
Autogenerated return type of CategoryArchive.
170+
"""
171+
type CategoryArchivePayload {
172+
category: Category!
173+
174+
"""
175+
A unique identifier for the client performing the mutation.
176+
"""
177+
clientMutationId: String
178+
}
179+
132180
type CategoryBudget {
133181
budget(currencyId: ID, date: ISO8601Date): Money!
134182
createdAt: ISO8601DateTime!
@@ -461,6 +509,16 @@ type MonthBudget {
461509
}
462510

463511
type Mutation {
512+
"""
513+
Archives a account by ID
514+
"""
515+
accountArchive(
516+
"""
517+
Parameters for AccountArchive
518+
"""
519+
input: AccountArchiveInput!
520+
): AccountArchivePayload!
521+
464522
"""
465523
Creates a new account
466524
"""
@@ -501,6 +559,16 @@ type Mutation {
501559
input: CategoriesReorderInput!
502560
): CategoriesReorderPayload!
503561

562+
"""
563+
Archives a category by ID
564+
"""
565+
categoryArchive(
566+
"""
567+
Parameters for CategoryArchive
568+
"""
569+
input: CategoryArchiveInput!
570+
): CategoryArchivePayload!
571+
504572
"""
505573
Creates a new category
506574
"""
@@ -641,10 +709,10 @@ type PageInfo {
641709

642710
type Query {
643711
account(id: ID!): Account
644-
accounts: [Account!]!
712+
accounts(archived: Boolean = false): [Account!]!
645713
balance(currencyId: ID, year: Int!): AnnualBalance!
646714
budget(currencyId: ID, month: Int!, year: Int!): MonthBudget!
647-
categories: [Category!]!
715+
categories(archived: Boolean = false): [Category!]!
648716
category(id: ID!): Category
649717
currencies: [Currency!]!
650718
currency(id: ID!): Currency

web/src/components/accounts/AccountForm.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { createForm, Field, Form, required, setValue } from "@modular-forms/solid"
22
import { IconSelector } from "@tabler/icons-solidjs"
33
import { Component } from "solid-js"
4-
import { AccountInput, FullAccountFragment } from "../../graphql-types.ts"
5-
import { Button } from "../base/Button.tsx"
6-
import { FormControl, FormLabel } from "../base/FormControl.tsx"
7-
import { CurrencySelect } from "../currencies/CurrencySelect.tsx"
8-
import FormInput from "../forms/FormInput.tsx"
4+
import { AccountInput, FullAccountFragment } from "../../graphql-types"
5+
import { Button } from "../base/Button"
6+
import { FormControl, FormLabel } from "../base/FormControl"
7+
import { CurrencySelect } from "../currencies/CurrencySelect"
8+
import FormInput from "../forms/FormInput"
99

1010
type AccountFormValues = AccountInput
1111

web/src/components/accounts/AccountsList.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { IconArchive, IconAsterisk, IconEdit, IconTrash } from "@tabler/icons-solidjs"
22
import { Component, For } from "solid-js"
33
import toast from "solid-toast"
4-
import { AccountsQuery, CurrentUserQuery } from "../../graphql-types.ts"
5-
import { useArchiveAccount } from "../../graphql/mutations/archiveAccountMutation.ts"
6-
import { useDeleteAccount } from "../../graphql/mutations/deleteAccountMutation.ts"
7-
import { useSetDefaultAccount } from "../../graphql/mutations/setDefaultAccount.ts"
8-
import { Button, LinkButton } from "../base/Button.tsx"
4+
import { AccountsQuery, CurrentUserQuery } from "../../graphql-types"
5+
import { useArchiveAccount } from "../../graphql/mutations/archiveAccountMutation"
6+
import { useDeleteAccount } from "../../graphql/mutations/deleteAccountMutation"
7+
import { useSetDefaultAccount } from "../../graphql/mutations/setDefaultAccount"
8+
import { Button, LinkButton } from "../base/Button"
99

1010
const AccountsList: Component<{
1111
data: AccountsQuery

web/src/components/balance/AnnualBalance.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ export const AnnualBalance: Component<{
1919

2020
return (
2121
<>
22-
<BudgetSummary
23-
showDifference
24-
filteredTransactions={filteredTransactions}
25-
budget={props.data.balance}
26-
/>
22+
<BudgetSummary filteredTransactions={filteredTransactions} budget={props.data.balance} />
2723
<BalanceGraph
2824
year={props.year}
2925
currencySymbol={props.data.balance.currency.symbol}

0 commit comments

Comments
 (0)