Skip to content

Commit cba9623

Browse files
authored
Merge branch 'develop' into fix/ssr-search
2 parents b9537e8 + 8fd4429 commit cba9623

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ jobs:
3333
run: bun install
3434

3535
- name: Run linter
36-
run: bun run lint
36+
run: bun run lint:check

apps/frontend/src/modules/browse/WelcomeBanner.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Link from 'next/link';
33

44
export const WelcomeBanner = () => {
55
return (
6-
<div className='flex flex-col md:flex-row mx-auto w-fit justify-between items-center text-center text-balance gap-1 py-4 px-2 sm:px-8 text-sm rounded-xl mb-10 bg-top backdrop-filter backdrop-blur-lg bg-opacity-50 bg-gradient-to-br from-15% from-green-700 via-cyan-800 to-85% to-blue-900 border-2 border-white border-opacity-20'>
6+
<div className='flex flex-col md:flex-row mx-auto w-fit justify-between items-center text-center text-balance gap-1 py-4 px-2 sm:px-8 text-sm rounded-xl mb-10 bg-top backdrop-filter backdrop-blur-lg bg-opacity-50 bg-gradient-to-br from-15% from-green-700 via-cyan-800 to-85% to-blue-900 border-2 border-white/20'>
77
<div
88
className='absolute h-full w-full top-0 left-0 z-[-1] rounded-xl opacity-20 brightness-50 hue-rotate-90'
99
style={{
@@ -29,7 +29,7 @@ export const WelcomeBanner = () => {
2929
blocks, where you can discover, share and listen to note block music
3030
from all around the world.
3131
</p>
32-
<p className='mb-2'>
32+
<p className='mb-2 text-green-100'>
3333
Start by browsing some of the songs uploaded by the community, or
3434
check out some of our useful resources below!
3535
</p>

apps/frontend/src/modules/shared/components/client/GenericModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const GenericModal = ({
5454
leaveFrom='opacity-100 scale-100'
5555
leaveTo='opacity-0 scale-90'
5656
>
57-
<Dialog.Panel className='w-full max-w-md transform overflow-hidden rounded-2xl bg-zinc-800 p-6 text-left align-middle shadow-xl transition-all'>
57+
<Dialog.Panel className='relative w-full max-w-md transform overflow-hidden rounded-2xl bg-zinc-800 p-6 text-left align-middle shadow-xl transition-all'>
5858
<Dialog.Title
5959
as='h3'
6060
className='text-2xl font-semibold leading-6 text-white mb-5'
@@ -67,7 +67,7 @@ const GenericModal = ({
6767
<button
6868
type='button'
6969
aria-label='Close'
70-
className='absolute top-3 right-4 w-4 h-4 text-white text-xl'
70+
className='absolute top-3 right-4 w-4 h-4 text-white text-xl'
7171
onClick={() => setIsOpen(false)}
7272
>
7373
<FontAwesomeIcon icon={faClose} />

apps/frontend/src/modules/song/components/client/SongThumbnailInput.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const ThumbnailSliders: React.FC<ThumbnailSlidersProps> = ({
3131
isLocked,
3232
maxTick,
3333
maxLayer,
34-
}) => {
34+
}: ThumbnailSlidersProps) => {
3535
const { setValue } = formMethods;
3636

3737
const [zoomLevel, startTick, startLayer] = formMethods.watch([
@@ -117,7 +117,7 @@ const ColorButton: React.FC<ColorButtonProps> = ({
117117
active,
118118
onClick,
119119
disabled,
120-
}) => (
120+
}: ColorButtonProps) => (
121121
<Tooltip>
122122
<TooltipTrigger asChild>
123123
<button
@@ -143,7 +143,7 @@ type SongThumbnailInputProps = {
143143
export const SongThumbnailInput: React.FC<SongThumbnailInputProps> = ({
144144
type,
145145
isLocked,
146-
}) => {
146+
}: SongThumbnailInputProps) => {
147147
const { song, formMethods } = useSongProvider(type);
148148

149149
const [notes, maxTick, maxLayer] = useMemo(() => {

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
"dev:apps": "bun run --filter './apps/*' dev",
5656
"dev": "concurrently --names 'backend,frontend' --prefix-colors 'cyan,magenta' 'cd apps/backend && bun run start:dev' 'cd apps/frontend && bun run dev'",
5757
"lint": "eslint \"**/*.{ts,tsx}\" --fix",
58+
"lint:check": "eslint \"**/*.{ts,tsx}\"",
5859
"format": "prettier --write .",
5960
"cy:open": "bun run test:cy",
6061
"test:cy": "bun run --filter 'tests' cy:open",

0 commit comments

Comments
 (0)