Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/(auth)/login/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
FormMessage,
} from "@/components/ui/form";
import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
import { loginClientUser } from "@/client/services/loginService";
import { loginClientUser } from "@/lib/services/loginService";
import Link from "next/link";

// Login form schema
Expand Down
8 changes: 4 additions & 4 deletions app/(main)/events/page.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"use client";
import { useGetEvents } from "@/client/queries/eventQueries";
import { useGetEvents } from "@/lib/api/queries/eventQueries";
import {
useGetOrganizationParents,
useGetOrganizations,
} from "@/client/queries/organizationQueries";
import type { EventQueryParams } from "@/client/services/eventsService";
} from "@/lib/api/queries/organizationQueries";
import type { EventQueryParams } from "@/lib/services/eventsService";
import type { Event, OrganizationParent } from "@/client/types/entities";
import { Input } from "@/components/ui/input";
import {
Expand All @@ -16,7 +16,7 @@ import {
} from "@/components/ui/select";
import { useEffect, useRef, useState, Suspense } from "react";
import { debounce } from "lodash";
import { EventCard } from "@/components/EventCard";
import { EventCard } from "@/components/features/events/EventCard";
import { Search, Filter, Calendar, ChevronLeft, ChevronRight } from "lucide-react";
import { Skeleton } from "@/components/ui/skeleton";
import { Button } from "@/components/ui/button";
Expand Down
6 changes: 3 additions & 3 deletions app/(main)/home/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

import Link from "next/link";
import { Button } from "@/components/ui/button";
import HeroHeader from "@/components/home/HeroHeader";
import { useGetFeaturedEvents } from "@/client/queries/eventQueries";
import HeroHeader from "@/components/layout/HeroHeader";
import { useGetFeaturedEvents } from "@/lib/api/queries/eventQueries";
import {
Carousel,
CarouselContent,
CarouselItem,
CarouselNext,
CarouselPrevious,
} from "@/components/ui/carousel";
import { EventCard } from "@/components/EventCard";
import { EventCard } from "@/components/features/events/EventCard";
import type { Event } from "@/client/types/entities";
import { formatDate } from "date-fns";
import { Skeleton } from "@/components/ui/skeleton";
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion components/ui/sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Slot } from "@radix-ui/react-slot"
import { VariantProps, cva } from "class-variance-authority"
import { PanelLeft } from "lucide-react"

import { useIsMobile } from "@/hooks/use-mobile"
import { useIsMobile } from "@/lib/hooks/use-mobile"
import { cn } from "@/lib/utils"
import { Button } from "@/components/ui/button"
import { Input } from "@/components/ui/input"
Expand Down
2 changes: 1 addition & 1 deletion components/ui/toaster.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use client"

import { useToast } from "@/hooks/use-toast"
import { useToast } from "@/lib/hooks/use-toast"
import {
Toast,
ToastClose,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
EventQueryParams,
getAllPublishedEvents,
getEventbyId,
} from "../services/eventsService";
} from "@/lib/services/eventsService";

export const useGetEvents = (filters?: EventQueryParams) => {
return useQuery({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useQuery } from "@tanstack/react-query";
import {
getAllOrganizationParents,
getAllOrganizations,
} from "../services/organizationsService";
} from "@/lib/services/organizationsService";

export const useGetOrganizations = () => {
return useQuery({
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// filepath: /Users/miggy.alino/Desktop/Personal/adto-client/client/services/eventsService.ts
import { ADTO_SERVICE_BASE_URL } from "../config";
import { ADTO_SERVICE_BASE_URL } from "../../client/config";
import { buildQueryString } from "./utils";

export const EVENTS_BASE_URL = `${ADTO_SERVICE_BASE_URL}/events`;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ADTO_SERVICE_BASE_URL } from "../config";
import { ClientLoginRequest } from "../types/dto/auth.type";
import { ADTO_SERVICE_BASE_URL } from "../../client/config";
import { ClientLoginRequest } from "../../client/types/dto/auth.type";

const AUTH_BASE_URL = `${ADTO_SERVICE_BASE_URL}/auth`;
export const loginClientUser = async (loginData: ClientLoginRequest) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ADTO_SERVICE_BASE_URL } from "../config";
import { ADTO_SERVICE_BASE_URL } from "../../client/config";

export const getAllOrganizations = async () => {
const response = await fetch(`${ADTO_SERVICE_BASE_URL}/organizations/all`, {
Expand Down
File renamed without changes.