Skip to content

Commit

Permalink
packages bumped
Browse files Browse the repository at this point in the history
  • Loading branch information
wmalarski committed Feb 18, 2023
1 parent ad8d44f commit 5179398
Show file tree
Hide file tree
Showing 17 changed files with 437 additions and 446 deletions.
788 changes: 395 additions & 393 deletions package-lock.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"qwik": "qwik"
},
"devDependencies": {
"@builder.io/qwik": "0.17.5",
"@builder.io/qwik-city": "0.1.1",
"@types/eslint": "8.21.0",
"@types/node": "^18.13.0",
"@builder.io/qwik": "0.18.1",
"@builder.io/qwik-city": "0.2.1",
"@types/eslint": "8.21.1",
"@types/node": "^18.14.0",
"@types/node-fetch": "latest",
"@typescript-eslint/eslint-plugin": "5.51.0",
"@typescript-eslint/parser": "5.51.0",
"@typescript-eslint/eslint-plugin": "5.52.0",
"@typescript-eslint/parser": "5.52.0",
"autoprefixer": "10.4.13",
"eslint": "8.34.0",
"eslint-config-prettier": "^8.6.0",
Expand All @@ -39,23 +39,23 @@
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-qwik": "0.17.5",
"eslint-plugin-qwik": "0.18.1",
"eslint-plugin-sort-keys-fix": "^1.1.2",
"eslint-plugin-tailwindcss": "^3.8.3",
"node-fetch": "3.3.0",
"postcss": "^8.4.21",
"prettier": "2.8.4",
"prettier-plugin-tailwindcss": "^0.2.2",
"tailwindcss": "^3.2.6",
"prettier-plugin-tailwindcss": "^0.2.3",
"tailwindcss": "^3.2.7",
"ts-prune": "^0.10.3",
"typescript": "4.9.5",
"undici": "5.18.0",
"vite": "4.1.1",
"undici": "5.20.0",
"vite": "4.1.2",
"vite-tsconfig-paths": "4.0.5"
},
"dependencies": {
"clsx": "^1.2.1",
"daisyui": "^2.50.0",
"daisyui": "^2.50.1",
"zod": "^3.20.6"
}
}
10 changes: 3 additions & 7 deletions src/routes/genre/[genreId]/movie/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ import { MediaGrid } from "~/modules/MediaGrid/MediaGrid";
import { getMediaByGenre } from "~/services/tmdb";
import type { ProductionMedia } from "~/services/types";
import { paths } from "~/utils/paths";
import type { LoaderContent } from "~/utils/types";

export const genreMoviesLoader = loader$((event) => {
export const useGenreMovies = loader$((event) => {
const parseResult = z
.object({ genreId: z.coerce.number().min(0).step(1) })
.safeParse(event.params);
Expand All @@ -28,7 +27,7 @@ export default component$(() => {

const containerRef = useSignal<Element | null>(null);

const movies = genreMoviesLoader.use();
const movies = useGenreMovies();

const store = useStore(
{
Expand Down Expand Up @@ -66,10 +65,7 @@ export default component$(() => {
});

export const head: DocumentHead = (event) => {
const data = event.getData<Awaited<LoaderContent<typeof genreMoviesLoader>>>(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
genreMoviesLoader as any
);
const data = event.resolveValue(useGenreMovies);
return data.genre
? { title: `${data.genre.name} Tv Shows - Qwik City Movies` }
: {};
Expand Down
10 changes: 3 additions & 7 deletions src/routes/genre/[genreId]/tv/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ import { MediaGrid } from "~/modules/MediaGrid/MediaGrid";
import { getMediaByGenre } from "~/services/tmdb";
import type { ProductionMedia } from "~/services/types";
import { paths } from "~/utils/paths";
import { LoaderContent } from "~/utils/types";

export const genreTvShowsLoader = loader$((event) => {
export const useGenreTvShowsLoader = loader$((event) => {
const parseResult = z
.object({ genreId: z.coerce.number().min(0).step(1) })
.safeParse(event.params);
Expand All @@ -28,7 +27,7 @@ export default component$(() => {

const containerRef = useSignal<Element | null>(null);

const tvShows = genreTvShowsLoader.use();
const tvShows = useGenreTvShowsLoader();

const store = useStore(
{
Expand Down Expand Up @@ -66,10 +65,7 @@ export default component$(() => {
});

export const head: DocumentHead = (event) => {
const data = event.getData<Awaited<LoaderContent<typeof genreTvShowsLoader>>>(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
genreTvShowsLoader as any
);
const data = event.resolveValue(useGenreTvShowsLoader);
return data.genre
? { title: `${data.genre.name} Tv Shows - Qwik City Movies` }
: {};
Expand Down
4 changes: 2 additions & 2 deletions src/routes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import type { ProductionMedia } from "~/services/types";
import { getListItem } from "~/utils/format";
import { paths } from "~/utils/paths";

export const contentLoader = loader$(async (event) => {
export const useContentLoader = loader$(async (event) => {
try {
const [movies, tv] = await Promise.all([
getTrendingMovie({ page: 1 }),
Expand All @@ -39,7 +39,7 @@ export const contentLoader = loader$(async (event) => {
});

export default component$(() => {
const resource = contentLoader.use();
const resource = useContentLoader();

return (
<div class="flex max-h-screen flex-col gap-4 overflow-y-scroll">
Expand Down
4 changes: 2 additions & 2 deletions src/routes/movie/(all)/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { getMovie, getMovies, getRandomMedia } from "~/services/tmdb";
import { getListItem } from "~/utils/format";
import { paths } from "~/utils/paths";

export const allMoviesLoader = loader$(async () => {
export const useAllMoviesLoader = loader$(async () => {
const [popular, topRated, nowPlaying] = await Promise.all([
getMovies({ page: 1, query: "popular" }),
getMovies({ page: 1, query: "top_rated" }),
Expand All @@ -24,7 +24,7 @@ export const allMoviesLoader = loader$(async () => {
});

export default component$(() => {
const resource = allMoviesLoader.use();
const resource = useAllMoviesLoader();

return (
<div class="flex max-h-screen flex-col gap-4 overflow-y-scroll">
Expand Down
4 changes: 2 additions & 2 deletions src/routes/movie/[movieId]/(overview)/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { component$ } from "@builder.io/qwik";
import { DocumentHead } from "@builder.io/qwik-city";
import { MovieInfoCard } from "~/modules/MovieInfoCard/MovieInfoCard";
import { PersonCarousel } from "~/modules/PersonCarousel/PersonCarousel";
import { movieLoader } from "../layout";
import { useMovieLoader } from "../layout";

export default component$(() => {
const resource = movieLoader.use();
const resource = useMovieLoader();

return (
<flex class="flex flex-col">
Expand Down
4 changes: 2 additions & 2 deletions src/routes/movie/[movieId]/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { MovieHero } from "~/modules/MovieHero/MovieHero";
import { getMovie } from "~/services/tmdb";
import { paths } from "~/utils/paths";

export const movieLoader = loader$(async (event) => {
export const useMovieLoader = loader$(async (event) => {
const parseResult = z
.object({ movieId: z.coerce.number().min(0).step(1) })
.safeParse(event.params);
Expand All @@ -28,7 +28,7 @@ export const movieLoader = loader$(async (event) => {
export default component$(() => {
const location = useLocation();

const movie = movieLoader.use();
const movie = useMovieLoader();

const overviewHref = paths.media("movie", +location.params.movieId);
const videoHref = paths.movieVideo(+location.params.movieId);
Expand Down
4 changes: 2 additions & 2 deletions src/routes/movie/[movieId]/photos/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { component$ } from "@builder.io/qwik";
import { DocumentHead } from "@builder.io/qwik-city";
import { getImage, getImageSet } from "~/services/images";
import { movieLoader } from "../layout";
import { useMovieLoader } from "../layout";

export default component$(() => {
const resource = movieLoader.use();
const resource = useMovieLoader();

return (
<section class="flex flex-col gap-8 px-16 py-4">
Expand Down
4 changes: 2 additions & 2 deletions src/routes/movie/[movieId]/videos/index.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { component$ } from "@builder.io/qwik";
import { DocumentHead } from "@builder.io/qwik-city";
import { movieLoader } from "../layout";
import { useMovieLoader } from "../layout";

export default component$(() => {
const resource = movieLoader.use();
const resource = useMovieLoader();

return (
<section class="grid grid-cols-[repeat(auto-fill,minmax(20rem,1fr))] gap-6 px-16 py-4">
Expand Down
4 changes: 2 additions & 2 deletions src/routes/movie/categories/[name]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { ProductionMedia } from "~/services/types";
import { getListItem } from "~/utils/format";
import { paths } from "~/utils/paths";

export const categoryLoader = loader$(async (event) => {
export const useCategoryLoader = loader$(async (event) => {
const parseResult = z
.object({ name: z.string().min(1) })
.safeParse(event.params);
Expand All @@ -33,7 +33,7 @@ export default component$(() => {

const containerRef = useSignal<Element | null>(null);

const resource = categoryLoader.use();
const resource = useCategoryLoader();

const store = useStore(
{
Expand Down
4 changes: 2 additions & 2 deletions src/routes/person/[personId]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { PersonHero } from "~/modules/PersonHero/PersonHero";
import { getPerson } from "~/services/tmdb";
import { paths } from "~/utils/paths";

export const personLoader = loader$(async (event) => {
export const usePersonLoader = loader$(async (event) => {
const parseResult = z
.object({ personId: z.coerce.number().min(0).step(1) })
.safeParse(event.params);
Expand All @@ -25,7 +25,7 @@ export const personLoader = loader$(async (event) => {
});

export default component$(() => {
const resource = personLoader.use();
const resource = usePersonLoader();

return (
<div style="max-h-screen overflow-y-scroll flex flex-col">
Expand Down
4 changes: 2 additions & 2 deletions src/routes/search/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { MediaGrid } from "~/modules/MediaGrid/MediaGrid";
import { search } from "~/services/tmdb";
import type { ProductionMedia } from "~/services/types";

export const searchLoader = loader$(async (event) => {
export const useSearchLoader = loader$(async (event) => {
const query = event.url.searchParams.get("query");

if (!query) {
Expand All @@ -21,7 +21,7 @@ export default component$(() => {

const containerRef = useSignal<Element | null>(null);

const resource = searchLoader.use();
const resource = useSearchLoader();

const store = useStore(
{
Expand Down
4 changes: 2 additions & 2 deletions src/routes/tv/(all)/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { getRandomMedia, getTvShow, getTvShows } from "~/services/tmdb";
import { getListItem } from "~/utils/format";
import { paths } from "~/utils/paths";

export const tvShowsLoader = loader$(async () => {
export const useTvShowsLoader = loader$(async () => {
const [popular, topRated, onTheAir, airingToday] = await Promise.all([
getTvShows({ page: 1, query: "popular" }),
getTvShows({ page: 1, query: "top_rated" }),
Expand All @@ -25,7 +25,7 @@ export const tvShowsLoader = loader$(async () => {
});

export default component$(() => {
const resource = tvShowsLoader.use();
const resource = useTvShowsLoader();

return (
<div class="flex max-h-screen flex-col gap-4 overflow-y-scroll">
Expand Down
4 changes: 2 additions & 2 deletions src/routes/tv/[tvId]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { TvHero } from "~/modules/TvHero/TvHero";
import { getTvShow } from "~/services/tmdb";
import { paths } from "~/utils/paths";

export const tvShowLoader = loader$(async (event) => {
export const useTvShowLoader = loader$(async (event) => {
const parseResult = z
.object({ tvId: z.coerce.number().min(0).step(1) })
.safeParse(event.params);
Expand All @@ -26,7 +26,7 @@ export const tvShowLoader = loader$(async (event) => {
});

export default component$(() => {
const resource = tvShowLoader.use();
const resource = useTvShowLoader();

return (
<flex class="flex max-h-screen flex-col overflow-y-scroll">
Expand Down
4 changes: 2 additions & 2 deletions src/routes/tv/categories/[name]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { ProductionMedia } from "~/services/types";
import { getListItem } from "~/utils/format";
import { paths } from "~/utils/paths";

export const tvShowCategoryLoader = loader$(async (event) => {
export const useTvShowCategoryLoader = loader$(async (event) => {
const parseResult = z
.object({ name: z.string().min(1) })
.safeParse(event.params);
Expand All @@ -33,7 +33,7 @@ export default component$(() => {

const containerRef = useSignal<Element | null>(null);

const resource = tvShowCategoryLoader.use();
const resource = useTvShowCategoryLoader();

const store = useStore(
{
Expand Down
3 changes: 0 additions & 3 deletions src/utils/types.ts

This file was deleted.

0 comments on commit 5179398

Please sign in to comment.