behnam/radio-station
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

feature/version-1 #1

Open
behnam wants to merge 9 commits from feature/version-1 into main
pull from: feature/version-1
merge into: behnam:main
Conversation 0 Commits 9 Files Changed 15 +7 -7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 048af34e8f - Show all commits

4
app/components/page-layout.tsx
View File

@ -3,7 +3,7 @@ import type { RemixLinkProps, RemixNavLinkProps } from "@remix-run/react/dist/co
import type { ReactNode, RefAttributes } from "react"; import type { ReactNode, RefAttributes } from "react";
import { createContext, useContext } from "react"; import { createContext, useContext } from "react";
import { SideNav } from "~/components/side-nav"; import { SideNav } from "~/components/side-nav";
import { TopNavbar } from "~/components/top-navbar"; // import { TopNavbar } from "~/components/top-navbar";
import type { StationWithTagsClientSide } from "~/models/station.server"; import type { StationWithTagsClientSide } from "~/models/station.server";
import type { TagWithStationsClientSide } from "~/models/tag.server"; import type { TagWithStationsClientSide } from "~/models/tag.server";
import type { UserWithFavoriteStationsClientSide } from "~/models/user.server"; import type { UserWithFavoriteStationsClientSide } from "~/models/user.server";
@ -54,7 +54,7 @@ export function PageLayout({ children, tags, user, station }: PageLayoutProps) {
<div className="drawer drawer-mobile"> <div className="drawer drawer-mobile">
<input id="primary-drawer" type="checkbox" className="drawer-toggle" /> <input id="primary-drawer" type="checkbox" className="drawer-toggle" />
<div className="drawer-content flex flex-col"> <div className="drawer-content flex flex-col">
<TopNavbar user={user} /> {/* <TopNavbar user={user} /> */}
<div className="py-2 px-6"> <div className="py-2 px-6">
{children} {children}
</div> </div>

2
package.json
View File

@ -39,7 +39,7 @@
"isbot": "^3.6.8", "isbot": "^3.6.8",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-radio-player": "^0.1.1", "react-radio-player": "^0.1.3",
"tiny-invariant": "^1.3.1" "tiny-invariant": "^1.3.1"
}, },
"devDependencies": { "devDependencies": {

8
yarn.lock
View File

@ -7712,10 +7712,10 @@ react-is@^18.0.0, react-is@^18.2.0:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
react-radio-player@^0.1.1: react-radio-player@^0.1.3:
version "0.1.1" version "0.1.3"
resolved "https://registry.yarnpkg.com/react-radio-player/-/react-radio-player-0.1.1.tgz#fa521403a6e83f4812662d4cf0cfdd493563a914" resolved "https://registry.yarnpkg.com/react-radio-player/-/react-radio-player-0.1.3.tgz#3a1d7c55bfe11a7b692e335795586998db163f2a"
integrity sha512-reZ2LH+emrauqZjOLJqo6jA+uNq05U0dpvXJuQXOqbs8AY1iuq+4rSvjT6P+tSTgjY4ELr1JQuxCyJ1nGAkBYA== integrity sha512-XUx+x6cCff8htH/cD4ftLjWAoHIW5ciGOVUpnHOxQaoSkERRlR90TxSo/8grVGgkvCldeRaBgFmPMbdpBk5MTg==
dependencies: dependencies:
rc-slider "^10.5.0" rc-slider "^10.5.0"
styled-components "^6.1.1" styled-components "^6.1.1"