Skip to content

Commit

Permalink
resolved conflicts?
Browse files Browse the repository at this point in the history
  • Loading branch information
@jxmoose
jxmoose committed Mar 17, 2024
1 parent e98b5e2 commit 60bd085
Showing 1 changed file with 0 additions and 291 deletions.
291 changes: 0 additions & 291 deletions src/types/supabase.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ export type Database = {
title?: string;
updated_at?: string | null;
};
<<<<<<< HEAD
Update: {
coordinates?: Json | null;
created_at?: string;
Expand All @@ -70,52 +69,6 @@ export type Database = {
};
Relationships: [];
};
emails: {
Row: {
emails: string | null;
id: number;
};
Insert: {
emails?: string | null;
id?: number;
};
Update: {
coordinates?: Json | null
created_at?: string
description?: string
id?: string
title?: string
updated_at?: string | null
}
Relationships: []
}
emails: {
Row: {
emails: string | null
id: number
}
Insert: {
emails?: string | null
id?: number
}
Update: {
emails?: string | null
id?: number
}
Relationships: []
}
=======
Update: {
coordinates?: Json | null;
created_at?: string;
description?: string;
id?: string;
title?: string;
updated_at?: string | null;
};
Relationships: [];
};
>>>>>>> 5f80cb5 (style changes)
media: {
Row: {
created_at: string;
Expand All @@ -134,41 +87,6 @@ export type Database = {
url?: string;
};
Update: {
<<<<<<< HEAD
created_at?: string
id?: string
text?: string | null
title?: string | null
type?: string | null
url?: string
}
Relationships: []
}
news: {
Row: {
content_link: string | null
created_at: string
id: string
title: string | null
updated_at: string | null
}
Insert: {
content_link?: string | null
created_at?: string
id?: string
title?: string | null
updated_at?: string | null
}
Update: {
content_link?: string | null
created_at?: string
id?: string
title?: string | null
updated_at?: string | null
}
Relationships: []
}
=======
created_at?: string;
id?: string;
text?: string | null;
Expand All @@ -178,7 +96,6 @@ export type Database = {
};
Relationships: [];
};
>>>>>>> 5f80cb5 (style changes)
spotlight_recommendations: {
Row: {
source_display_id: string;
Expand Down Expand Up @@ -274,42 +191,6 @@ export type Database = {
};
tours: {
Row: {
<<<<<<< HEAD
category: Database["public"]["Enums"]["tour_category"]
coordinates: Json | null
created_at: string
description: string | null
id: string
name: string
preview_text: string | null
spotlight: boolean
stop_count: number | null
}
Insert: {
category?: Database["public"]["Enums"]["tour_category"]
coordinates?: Json | null
created_at?: string
description?: string | null
id?: string
name: string
preview_text?: string | null
spotlight?: boolean
stop_count?: number | null
}
Update: {
category?: Database["public"]["Enums"]["tour_category"]
coordinates?: Json | null
created_at?: string
description?: string | null
id?: string
name?: string
preview_text?: string | null
spotlight?: boolean
stop_count?: number | null
}
Relationships: []
}
=======
created_at: string;
description: string | null;
id: string;
Expand All @@ -335,7 +216,6 @@ export type Database = {
};
Relationships: [];
};
>>>>>>> 5f80cb5 (style changes)
news: {
Row: {
content_link: string;
Expand Down Expand Up @@ -367,68 +247,6 @@ export type Database = {
Functions: {
fetchimagesfordisplay: {
Args: {
<<<<<<< HEAD
displayid: string
}
Returns: {
id: string
url: string
type: string
title: string
text: string
created_at: string
}[]
}
fetchimagesfortour: {
Args: {
tourid: string
}
Returns: {
id: string
url: string
type: string
title: string
text: string
created_at: string
}[]
}
join_spotlights_with_media: {
Args: Record<PropertyKey, never>
Returns: {
id: string
name: string
description: string
created_at: string
stop_count: number
spotlight: boolean
preview_text: string
coordinates: Json
category: Database["public"]["Enums"]["tour_category"]
media_url: string
}[]
}
join_tours_with_media: {
Args: Record<PropertyKey, never>
Returns: {
id: string
name: string
description: string
created_at: string
stop_count: number
spotlight: boolean
preview_text: string
url: string
}[]
}
}
Enums: {
media_type: "image" | "video" | "link"
tour_category:
| "BuildingsAndServices"
| "ParksAviariesEnclosures"
| "SiteFeatures"
}
=======
display_id: string;
};
Returns: Record<string, unknown>;
Expand All @@ -449,117 +267,8 @@ export type Database = {
Enums: {
media_type: 'image' | 'video' | 'link';
};
>>>>>>> 5f80cb5 (style changes)
CompositeTypes: {
[_ in never]: never;
};
};
<<<<<<< HEAD
};

export type Tables<
PublicTableNameOrOptions extends
| keyof (Database['public']['Tables'] & Database['public']['Views'])
| { schema: keyof Database },
TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
? keyof (Database[PublicTableNameOrOptions['schema']]['Tables'] &
Database[PublicTableNameOrOptions['schema']]['Views'])
: never = never,
> = PublicTableNameOrOptions extends { schema: keyof Database }
? (Database[PublicTableNameOrOptions['schema']]['Tables'] &
Database[PublicTableNameOrOptions['schema']]['Views'])[TableName] extends {
Row: infer R;
}
? R
: never
: PublicTableNameOrOptions extends keyof (Database['public']['Tables'] &
Database['public']['Views'])
? (Database['public']['Tables'] &
Database['public']['Views'])[PublicTableNameOrOptions] extends {
Row: infer R;
}
}
}

export type Tables<
PublicTableNameOrOptions extends
| keyof (Database["public"]["Tables"] & Database["public"]["Views"])
| { schema: keyof Database },
TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
? keyof (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
Database[PublicTableNameOrOptions["schema"]]["Views"])
: never = never
> = PublicTableNameOrOptions extends { schema: keyof Database }
? (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
Database[PublicTableNameOrOptions["schema"]]["Views"])[TableName] extends {
Row: infer R
}
? R
: never
: PublicTableNameOrOptions extends keyof (Database["public"]["Tables"] &
Database["public"]["Views"])
? (Database["public"]["Tables"] &
Database["public"]["Views"])[PublicTableNameOrOptions] extends {
Row: infer R
}
? R
: never
: never

export type TablesInsert<
PublicTableNameOrOptions extends
| keyof Database["public"]["Tables"]
| { schema: keyof Database },
TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
: never = never
> = PublicTableNameOrOptions extends { schema: keyof Database }
? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
Insert: infer I
}
? I
: never
: PublicTableNameOrOptions extends keyof Database["public"]["Tables"]
? Database["public"]["Tables"][PublicTableNameOrOptions] extends {
Insert: infer I
}
? I
: never
: never

export type TablesUpdate<
PublicTableNameOrOptions extends
| keyof Database["public"]["Tables"]
| { schema: keyof Database },
TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
: never = never
> = PublicTableNameOrOptions extends { schema: keyof Database }
? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
Update: infer U
}
? U
: never
: PublicTableNameOrOptions extends keyof Database["public"]["Tables"]
? Database["public"]["Tables"][PublicTableNameOrOptions] extends {
Update: infer U
}
? U
: never
: never

export type Enums<
PublicEnumNameOrOptions extends
| keyof Database["public"]["Enums"]
| { schema: keyof Database },
EnumName extends PublicEnumNameOrOptions extends { schema: keyof Database }
? keyof Database[PublicEnumNameOrOptions["schema"]]["Enums"]
: never = never
> = PublicEnumNameOrOptions extends { schema: keyof Database }
? Database[PublicEnumNameOrOptions["schema"]]["Enums"][EnumName]
: PublicEnumNameOrOptions extends keyof Database["public"]["Enums"]
? Database["public"]["Enums"][PublicEnumNameOrOptions]
: never
=======
}
>>>>>>> 5f80cb5 (style changes)

0 comments on commit 60bd085

Please sign in to comment.