Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .zed/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
},
"completion": {
"enabled": true,
"enableFragmentAutocomplete": false,
"imports": {
"enabled": true,
"separateGroupsWithLine": true,
Expand All @@ -66,12 +67,12 @@
"enabled": true,
"download_api_documentation": true,
"download_definitions": true
},
"fflags": {
"enable_by_default": true,
"enable_new_solver": false,
"sync": true
}
// "fflags": {
// "enable_by_default": true,
// "enable_new_solver": true,
// "sync": true
// }
}
}
}
Expand Down
75 changes: 49 additions & 26 deletions backend/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ authors = ["Brooke Rhodes <hello@brooke.sh>"]
crate-type = ["cdylib", "rlib"]

[dependencies]
worker = { version = "0.7", features = ['http', 'axum'] }
worker-macros = { version = "0.7", features = ['http'] }
worker = { version = "0.8", features = ['http', 'axum'] }
worker-macros = { version = "0.8", features = ['http'] }
axum = { version = "0.8", features = [
'json',
'query',
Expand Down
8 changes: 4 additions & 4 deletions plugin/src/ActivityPreview/ActivityDetails.luau
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ local function ActivityDetails(props: Props)
local nextOrder = createNextOrder()

return e(View, {
tag = "auto-xy col gap-xxsmall",
tag = "size-full-0 auto-y col gap-xxsmall",
LayoutOrder = props.LayoutOrder,
}, {
Name = e(Text, {
tag = "auto-xy text-title-medium content-emphasis",
tag = "size-full-0 auto-y text-align-x-left text-wrap text-title-medium content-emphasis",
Text = props.activity.name,
LayoutOrder = nextOrder(),
}),

Details = props.activity.details and e(Text, {
tag = "auto-xy text-body-small content-default",
tag = "size-full-0 auto-y text-align-x-left text-wrap text-body-small content-default",
Text = props.activity.details,
LayoutOrder = nextOrder(),
}),

State = props.activity.state and e(Text, {
tag = "auto-xy text-body-small content-default",
tag = "size-full-0 auto-y text-align-x-left text-wrap text-body-small content-default",
Text = props.activity.state,
LayoutOrder = nextOrder(),
}),
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/ActivityPreview/ActivityImage.luau
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ local ReactCharm = require(Packages.ReactCharm)

local AppAssetsStore = require(Plugin.Source.Api.AppAssetsStore)
local Types = require(script.Parent.Types)
local WebImage = require(script.Parent.WebImage)
local WebImage = require(Plugin.Source.Common.WebImage)

local View = Foundation.View
local Tooltip = Foundation.Tooltip
Expand Down
9 changes: 6 additions & 3 deletions plugin/src/ActivityPreview/ActivityPreview.luau
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ local function ActivityPreview(props: Props)
local nextOrder = createNextOrder()

return e(View, {
tag = "size-full-0 auto-y bg-surface-300 col padding-small gap-medium radius-small stroke-emphasis stroke-thick",
tag = "size-full-0 auto-y bg-surface-300 clip col padding-small gap-medium radius-small stroke-emphasis stroke-thick",
LayoutOrder = props.LayoutOrder,
}, {
Shadow = Flags.isShadowAvailable and e("UIShadow", {
Expand All @@ -42,7 +42,10 @@ local function ActivityPreview(props: Props)
}),

Activity = e(View, {
tag = "auto-xy row gap-large padding-x-xsmall align-y-center",
tag = "size-full-0 auto-y row gap-large padding-x-xsmall align-y-top",
sizeConstraint = {
MaxSize = Vector2.new(math.huge, 300),
},
LayoutOrder = nextOrder(),
}, {
ActivityImage = e(ActivityImage, {
Expand All @@ -51,7 +54,7 @@ local function ActivityPreview(props: Props)
}),

DetailsBlock = e(View, {
tag = "auto-xy col gap-xsmall",
tag = "grow auto-y col gap-xsmall",
LayoutOrder = nextOrder(),
}, {
ActivityDetails = e(ActivityDetails, {
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/AddAccountFlow/AddAccountFlow.luau
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ local function AddAccountFlow(props: Props)
return e(Sheet.Root, {
isOpen = props.isOpen,
preferCenterSheet = true,
size = DialogSize.Small,
size = DialogSize.Medium,
onClose = props.onClose,
}, {
Header = e(Sheet.Header, {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ local e = React.createElement
local useState = React.useState

type Props = {
title: string,
title: string?,
hasDivider: boolean,
canToggleExpand: boolean,
LayoutOrder: number?,
Expand All @@ -36,10 +36,10 @@ local function Section(props: Props)
LayoutOrder = props.LayoutOrder,
}, {
LayoutContainer = e(View, {
tag = "size-full-0 auto-y col gap-small padding-x-small padding-y-medium",
tag = "size-full-0 auto-y col gap-small padding-y-medium",
LayoutOrder = nextOrder(),
}, {
HeaderBlock = e(View, {
HeaderBlock = props.title and e(View, {
tag = "size-full-0 auto-y row radius-small align-y-center padding-x-small padding-y-xsmall",
LayoutOrder = nextOrder(),
onActivated = if props.canToggleExpand
Expand Down
Loading
Loading