diff options
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/client/ui/core/frequencycreation/frequencycreation.go | 5 | ||||
| -rw-r--r-- | internal/client/ui/core/network/network.go | 6 | ||||
| -rw-r--r-- | internal/data/frequencies.sql.go | 4 | ||||
| -rw-r--r-- | internal/data/models.go | 2 | ||||
| -rw-r--r-- | internal/packet/models.go | 1 | ||||
| -rw-r--r-- | internal/server/api/api.go | 5 |
6 files changed, 11 insertions, 12 deletions
diff --git a/internal/client/ui/core/frequencycreation/frequencycreation.go b/internal/client/ui/core/frequencycreation/frequencycreation.go index 43fca8f..bb4d398 100644 --- a/internal/client/ui/core/frequencycreation/frequencycreation.go +++ b/internal/client/ui/core/frequencycreation/frequencycreation.go @@ -60,10 +60,10 @@ const ( const ( NameField = iota - ColorField ReadWriteField ReadOnlyField NoAccessField + ColorField CreateField FieldCount ) @@ -108,7 +108,7 @@ func New(network snowflake.ID) Model { } return nil } - color.SetValue(string(colors.White)[1:]) + color.SetValue(string(packet.DefaultFrequencyColor)[1:]) return Model{ name: name, @@ -116,6 +116,7 @@ func New(network snowflake.ID) Model { lastColor: lipgloss.Color("#" + color.Value()), perms: packet.PermReadWrite, create: blurredCreate, + network: network, nameWidth: nameWidth, precomputedStyle: lipgloss.NewStyle().Width(nameWidth / 3), diff --git a/internal/client/ui/core/network/network.go b/internal/client/ui/core/network/network.go index 2d7b44f..69d85c0 100644 --- a/internal/client/ui/core/network/network.go +++ b/internal/client/ui/core/network/network.go @@ -61,11 +61,7 @@ func (m Model) View() string { builder.WriteString("\n") for i, frequency := range m.Network().Frequencies { - color := colors.White - if frequency.HexColor != nil { - color = lipgloss.Color(*frequency.HexColor) - } - frequencyStyle := frequencyStyle.Foreground(color) + frequencyStyle := frequencyStyle.Foreground(lipgloss.Color(frequency.HexColor)) if m.index == i { frequencyStyle = frequencyStyle.Background(colors.BackgroundHighlight) } diff --git a/internal/data/frequencies.sql.go b/internal/data/frequencies.sql.go index 4487ac0..024c069 100644 --- a/internal/data/frequencies.sql.go +++ b/internal/data/frequencies.sql.go @@ -27,7 +27,7 @@ type CreateFrequencyParams struct { ID snowflake.ID NetworkID snowflake.ID Name string - HexColor *string + HexColor string Perms int64 } @@ -123,7 +123,7 @@ RETURNING id, network_id, name, hex_color, perms, position ` type SetFrequencyColorParams struct { - HexColor *string + HexColor string ID snowflake.ID } diff --git a/internal/data/models.go b/internal/data/models.go index f53d726..3b5425f 100644 --- a/internal/data/models.go +++ b/internal/data/models.go @@ -13,7 +13,7 @@ type Frequency struct { ID snowflake.ID NetworkID snowflake.ID Name string - HexColor *string + HexColor string Perms int64 Position int64 } diff --git a/internal/packet/models.go b/internal/packet/models.go index 5e4a70b..e0b39d7 100644 --- a/internal/packet/models.go +++ b/internal/packet/models.go @@ -3,6 +3,7 @@ package packet const ( MaxIconBytes = 16 DefaultFrequencyName = "main" + DefaultFrequencyColor = "#FFFFFF" MaxFrequencyName = 32 ) diff --git a/internal/server/api/api.go b/internal/server/api/api.go index 4370d90..533a9b0 100644 --- a/internal/server/api/api.go +++ b/internal/server/api/api.go @@ -130,7 +130,7 @@ func CreateNetwork(ctx context.Context, sess *session.Session, request *packet.C ID: sess.Manager().Node().Generate(), NetworkID: network.ID, Name: packet.DefaultFrequencyName, - HexColor: nil, + HexColor: packet.DefaultFrequencyColor, Perms: packet.PermReadWrite, }) if err != nil { @@ -259,6 +259,7 @@ func CreateFrequency(ctx context.Context, sess *session.Session, request *packet NetworkID: request.Network, }) if err == sql.ErrNoRows { + log.Println("Err", err) return &packet.Error{Error: "user entry in network doesn't exist"} } if err != nil { @@ -290,7 +291,7 @@ func CreateFrequency(ctx context.Context, sess *session.Session, request *packet ID: sess.Manager().Node().Generate(), NetworkID: request.Network, Name: request.Name, - HexColor: &request.HexColor, + HexColor: request.HexColor, Perms: int64(request.Perms), }) if err != nil { |