Skip to content

Commit

Permalink
Merge branch 'develop' into live
Browse files Browse the repository at this point in the history
  • Loading branch information
wilburx9 committed Aug 20, 2023
2 parents 8fbf9a7 + 9070193 commit aa51081
Show file tree
Hide file tree
Showing 26 changed files with 165 additions and 150 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
push:
tags:
- 'v*'
paths:
- 'backend/**'

jobs:
deploy-backend:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/frontend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
push:
tags:
- 'v*'
paths:
- 'frontend/**'

jobs:
deploy-frontend:
Expand Down
2 changes: 1 addition & 1 deletion backend/broadcast.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func processBroadcastRequest(ctx context.Context, body string) (int, string) {
var reqData lambdaReqBody
err := json.Unmarshal([]byte(body), &reqData)
if err != nil {
return http.StatusBadRequest, fmt.Sprintf("invalid request body")
return http.StatusBadRequest, "invalid request body"
}

// Validate the request body
Expand Down
8 changes: 4 additions & 4 deletions backend/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ require (
github.com/google/go-querystring v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/leodido/go-urn v1.2.3 // indirect
golang.org/x/crypto v0.7.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/crypto v0.10.0 // indirect
golang.org/x/net v0.11.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/text v0.10.0 // indirect
)
16 changes: 8 additions & 8 deletions backend/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand All @@ -62,8 +62,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
Expand All @@ -74,8 +74,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
Expand Down
29 changes: 14 additions & 15 deletions frontend/assets/css/components.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
.chip {
@apply
flex flex-row gap-x-1 items-center
px-4 py-2
px-4 py-2 text-center
bg-bgSet dark:bg-bgSet-dark
border rounded-full border-blackSet dark:border-blackSet-dark
stroke-greySet dark:stroke-greySet-dark
hover:border-orangeSet dark:hover:border-orangeSet-dark
active:border-orangeSet dark:active:border-orangeSet-dark
focus:border-orangeSet dark:focus:border-orangeSet-dark
checked:border-orangeSet dark:focus:border-orangeSet-dark
text-body1 font-normal text-greySet dark:text-greySet-dark
checked:border-orangeSet dark:checked:border-orangeSet-dark
text-body1 font-light text-greySet dark:text-greySet-dark
no-underline transition duration-300 ease-in-out motion-reduce:transition-none motion-reduce:hover:transform-none
}

Expand Down Expand Up @@ -59,8 +59,7 @@
.primary-button svg,
.secondary-button svg {
@apply
stroke-blackSet dark:stroke-blackSet-dark
stroke-current
dark:stroke-blackSet-dark stroke-current
}

.secondary-button.copied {
Expand Down Expand Up @@ -124,18 +123,18 @@
.gh-card-image > .gh-card-image-hover {
@apply
flex flex-row justify-center items-center gap-2
bg-black/60 text-body1 font-bold text-white backdrop-blur-[2px]
bg-black/60 text-body1 font-semibold text-white backdrop-blur-[2px]
opacity-0 group-hover:opacity-100 group-focus:opacity-100
transition-opacity ease-in-out motion-reduce:transition-none motion-reduce:hover:transform-none
}

.gh-card-title {
@apply w-full text-body1 font-bold text-blackSet dark:text-blackSet-dark line-clamp-3 min-h-[60px]
@apply w-full text-body1 font-semibold text-blackSet dark:text-blackSet-dark line-clamp-3 min-h-[60px]
}

.gh-card-excerpt {
@apply w-full text-greySet
dark:text-greySet-dark text-body2 font-normal
dark:text-greySet-dark text-body2 font-light
line-clamp-2 min-h-[32px]
}

Expand All @@ -161,7 +160,7 @@ figure.kg-bookmark-card a.kg-bookmark-container {
figure.kg-bookmark-card .kg-bookmark-thumbnail {
@apply
flex grow min-w-[22%] sm:min-w-[15%] md:min-w-[10%] relative
aspect-square grid
aspect-square
}

figure.kg-bookmark-card .kg-bookmark-thumbnail > img {
Expand All @@ -174,7 +173,7 @@ figure.kg-bookmark-card .kg-bookmark-thumbnail > div {
@apply
w-full h-full absolute rounded row-start-1 row-end-2 col-start-1 col-end-2
opacity-0 bg-black/60 backdrop-blur-sm flex flex-row gap-x-1
justify-center items-center text-body1 font-bold text-white group-hover:opacity-100
justify-center items-center text-body1 font-semibold text-white group-hover:opacity-100
transition-opacity ease-in-out motion-reduce:transition-none motion-reduce:hover:transform-none
}

Expand All @@ -186,12 +185,12 @@ figure.kg-bookmark-card .kg-bookmark-content {

figure.kg-bookmark-card .kg-bookmark-title {
@apply
text-body1 font-bold text-blackSet dark:text-blackSet-dark
text-body1 font-semibold text-blackSet dark:text-blackSet-dark
}

figure.kg-bookmark-card .kg-bookmark-description {
@apply
text-body2 font-normal text-greySet dark:text-greySet-dark
text-body2 font-light text-greySet dark:text-greySet-dark
line-clamp-2 opacity-100 m-0 max-h-none
}

Expand All @@ -207,7 +206,7 @@ figure.kg-bookmark-card .kg-bookmark-icon {

figure.kg-bookmark-card .kg-bookmark-author {
@apply
text-text3 underline font-normal text-greySet dark:text-greySet-dark
text-text3 underline font-light text-greySet dark:text-greySet-dark
}

figure.kg-bookmark-card .kg-bookmark-publisher {
Expand All @@ -219,14 +218,14 @@ figure.kg-bookmark-card .kg-bookmark-publisher {
blockquote:not(.kg-blockquote-alt) {
border-image: linear-gradient(to bottom, #F69301, #C41CFF) 1 100%;
@apply
font-semibold italic
font-medium italic
p-4 my-3 border-l-4 border-transparent
}

blockquote.kg-blockquote-alt {
font-size: inherit;
@apply
font-semibold text-[inherit] italic leading-[inherit] text-center
font-medium text-[inherit] italic leading-[inherit] text-center
p-4 my-3 relative
}

Expand Down
4 changes: 2 additions & 2 deletions frontend/assets/css/error.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

.error-page-content h1 {
@apply
text-headline1 font-bold md:text-title text-center
text-headline1 font-semibold md:text-title text-center
mt-9 text-blackSet dark:text-blackSet-dark
}

.error-page-content p {
@apply
text-body1 font-normal text-center max-w-prose
text-body1 font-light text-center max-w-prose
mt-2 mb-8 text-greyLightSet dark:text-greyLightSet-dark
}
2 changes: 1 addition & 1 deletion frontend/assets/css/footer.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

.gh-footer p {
@apply
text-center md:text-left text-body3 font-normal text-blackSet dark:text-blackSet-dark py-4
text-center md:text-left text-body3 font-light text-blackSet dark:text-blackSet-dark py-4
}

.gh-footer-icon {
Expand Down
4 changes: 2 additions & 2 deletions frontend/assets/css/header.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

.gh-tag-nav-container {
@apply
flex flex-row gap-x-1
flex flex-row gap-x-1 flex-wrap sm:flex-nowrap
items-center justify-center w-full lg:w-min
}

Expand All @@ -19,7 +19,7 @@
@apply
flex flex-row gap-x-1 items-center
px-2.5 py-3.5
text-body1 font-normal text-greySet dark:text-greySet-dark
text-body1 font-light text-greySet dark:text-greySet-dark
stroke-greySet dark:stroke-greySet-dark
}

Expand Down
4 changes: 2 additions & 2 deletions frontend/assets/css/home.css
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@
.home-content h1 {
@apply
text-center sm:text-left text-blackSet dark:text-blackSet-dark
text-headline1 font-bold sm:text-title md:text-largeTitle max-w-prose
text-headline1 font-semibold sm:text-title md:text-largeTitle max-w-prose
}

.home-content h2 {
@apply
text-center sm:text-left pt-2
text-greySet dark:text-greySet-dark max-w-prose
text-body2 font-normal sm:text-body1 md:text-headline2
text-body2 font-light sm:text-body1 md:text-headline2
}
Loading

0 comments on commit aa51081

Please sign in to comment.