diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/schedule.ts b/src/app/core/interfaces/site/schedule/schedule.ts index e69de29..e6df930 100644 --- a/src/app/core/interfaces/site/schedule/schedule.ts +++ b/src/app/core/interfaces/site/schedule/schedule.ts @@ -0,0 +1,6 @@ +import { DaySchedule } from './day-schedule'; + +export interface Schedule { + name?: string; + day?: DaySchedule; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/schedule.ts b/src/app/core/interfaces/site/schedule/schedule.ts index e69de29..e6df930 100644 --- a/src/app/core/interfaces/site/schedule/schedule.ts +++ b/src/app/core/interfaces/site/schedule/schedule.ts @@ -0,0 +1,6 @@ +import { DaySchedule } from './day-schedule'; + +export interface Schedule { + name?: string; + day?: DaySchedule; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/site.ts b/src/app/core/interfaces/site/site.ts index e6e38da..97f2724 100644 --- a/src/app/core/interfaces/site/site.ts +++ b/src/app/core/interfaces/site/site.ts @@ -1,20 +1,23 @@ +import { Galery } from './galery'; import { Address } from './address'; import { Owner } from './owner'; -import { Image } from './image'; import { Valoration } from './valoration'; -import { RangeDay } from './schedule/range-day'; import { TypeCategory } from './category/type-category'; +import { Schedule } from './schedule/schedule'; export interface Site { id: string; name: string; owner?: Owner; - galery?: Image[]; + galery?: Galery; description?: string; - location: Address; - schedule?: RangeDay[]; + address?: Address; + schedule?: Schedule; category?: TypeCategory[]; valoration?: Valoration; - phone_number?: number; - email?: number; -} \ No newline at end of file + phone_number?: string; + phone_number_2?: string; + phone_number_3?: string; + email?: string; +} + diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/schedule.ts b/src/app/core/interfaces/site/schedule/schedule.ts index e69de29..e6df930 100644 --- a/src/app/core/interfaces/site/schedule/schedule.ts +++ b/src/app/core/interfaces/site/schedule/schedule.ts @@ -0,0 +1,6 @@ +import { DaySchedule } from './day-schedule'; + +export interface Schedule { + name?: string; + day?: DaySchedule; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/site.ts b/src/app/core/interfaces/site/site.ts index e6e38da..97f2724 100644 --- a/src/app/core/interfaces/site/site.ts +++ b/src/app/core/interfaces/site/site.ts @@ -1,20 +1,23 @@ +import { Galery } from './galery'; import { Address } from './address'; import { Owner } from './owner'; -import { Image } from './image'; import { Valoration } from './valoration'; -import { RangeDay } from './schedule/range-day'; import { TypeCategory } from './category/type-category'; +import { Schedule } from './schedule/schedule'; export interface Site { id: string; name: string; owner?: Owner; - galery?: Image[]; + galery?: Galery; description?: string; - location: Address; - schedule?: RangeDay[]; + address?: Address; + schedule?: Schedule; category?: TypeCategory[]; valoration?: Valoration; - phone_number?: number; - email?: number; -} \ No newline at end of file + phone_number?: string; + phone_number_2?: string; + phone_number_3?: string; + email?: string; +} + diff --git a/src/app/core/mocks/data.ts b/src/app/core/mocks/data.ts index 6e3e5c7..8e279e5 100644 --- a/src/app/core/mocks/data.ts +++ b/src/app/core/mocks/data.ts @@ -4,7 +4,8 @@ { id: "f", name: "El recuerdo", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.3734021386687365, length: -72.64797890311478 } @@ -12,7 +13,8 @@ { id: "f", name: "Deposito", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.372737130482743, length: -72.6485850825132 } @@ -20,7 +22,8 @@ { id: "f", name: "Leoporinos", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.373793162733723, length: -72.64887476144403 } diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/schedule.ts b/src/app/core/interfaces/site/schedule/schedule.ts index e69de29..e6df930 100644 --- a/src/app/core/interfaces/site/schedule/schedule.ts +++ b/src/app/core/interfaces/site/schedule/schedule.ts @@ -0,0 +1,6 @@ +import { DaySchedule } from './day-schedule'; + +export interface Schedule { + name?: string; + day?: DaySchedule; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/site.ts b/src/app/core/interfaces/site/site.ts index e6e38da..97f2724 100644 --- a/src/app/core/interfaces/site/site.ts +++ b/src/app/core/interfaces/site/site.ts @@ -1,20 +1,23 @@ +import { Galery } from './galery'; import { Address } from './address'; import { Owner } from './owner'; -import { Image } from './image'; import { Valoration } from './valoration'; -import { RangeDay } from './schedule/range-day'; import { TypeCategory } from './category/type-category'; +import { Schedule } from './schedule/schedule'; export interface Site { id: string; name: string; owner?: Owner; - galery?: Image[]; + galery?: Galery; description?: string; - location: Address; - schedule?: RangeDay[]; + address?: Address; + schedule?: Schedule; category?: TypeCategory[]; valoration?: Valoration; - phone_number?: number; - email?: number; -} \ No newline at end of file + phone_number?: string; + phone_number_2?: string; + phone_number_3?: string; + email?: string; +} + diff --git a/src/app/core/mocks/data.ts b/src/app/core/mocks/data.ts index 6e3e5c7..8e279e5 100644 --- a/src/app/core/mocks/data.ts +++ b/src/app/core/mocks/data.ts @@ -4,7 +4,8 @@ { id: "f", name: "El recuerdo", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.3734021386687365, length: -72.64797890311478 } @@ -12,7 +13,8 @@ { id: "f", name: "Deposito", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.372737130482743, length: -72.6485850825132 } @@ -20,7 +22,8 @@ { id: "f", name: "Leoporinos", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.373793162733723, length: -72.64887476144403 } diff --git a/src/app/modules/public/discover/components/map/map.component.html b/src/app/modules/public/discover/components/map/map.component.html index d4f51b6..f39d0d3 100644 --- a/src/app/modules/public/discover/components/map/map.component.html +++ b/src/app/modules/public/discover/components/map/map.component.html @@ -20,18 +20,18 @@
-
+
-

{{ info_window_content.name }}

+

{{ info_window_content!.name }}

-

{{ info_window_content!.phone_number }}

-

{{ info_window_content!.email }}

+
{{ info_window_content!.email }}
+
{{ info_window_content!.phone_number }}
+
{{ info_window_content!.email }}
- diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/schedule.ts b/src/app/core/interfaces/site/schedule/schedule.ts index e69de29..e6df930 100644 --- a/src/app/core/interfaces/site/schedule/schedule.ts +++ b/src/app/core/interfaces/site/schedule/schedule.ts @@ -0,0 +1,6 @@ +import { DaySchedule } from './day-schedule'; + +export interface Schedule { + name?: string; + day?: DaySchedule; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/site.ts b/src/app/core/interfaces/site/site.ts index e6e38da..97f2724 100644 --- a/src/app/core/interfaces/site/site.ts +++ b/src/app/core/interfaces/site/site.ts @@ -1,20 +1,23 @@ +import { Galery } from './galery'; import { Address } from './address'; import { Owner } from './owner'; -import { Image } from './image'; import { Valoration } from './valoration'; -import { RangeDay } from './schedule/range-day'; import { TypeCategory } from './category/type-category'; +import { Schedule } from './schedule/schedule'; export interface Site { id: string; name: string; owner?: Owner; - galery?: Image[]; + galery?: Galery; description?: string; - location: Address; - schedule?: RangeDay[]; + address?: Address; + schedule?: Schedule; category?: TypeCategory[]; valoration?: Valoration; - phone_number?: number; - email?: number; -} \ No newline at end of file + phone_number?: string; + phone_number_2?: string; + phone_number_3?: string; + email?: string; +} + diff --git a/src/app/core/mocks/data.ts b/src/app/core/mocks/data.ts index 6e3e5c7..8e279e5 100644 --- a/src/app/core/mocks/data.ts +++ b/src/app/core/mocks/data.ts @@ -4,7 +4,8 @@ { id: "f", name: "El recuerdo", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.3734021386687365, length: -72.64797890311478 } @@ -12,7 +13,8 @@ { id: "f", name: "Deposito", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.372737130482743, length: -72.6485850825132 } @@ -20,7 +22,8 @@ { id: "f", name: "Leoporinos", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.373793162733723, length: -72.64887476144403 } diff --git a/src/app/modules/public/discover/components/map/map.component.html b/src/app/modules/public/discover/components/map/map.component.html index d4f51b6..f39d0d3 100644 --- a/src/app/modules/public/discover/components/map/map.component.html +++ b/src/app/modules/public/discover/components/map/map.component.html @@ -20,18 +20,18 @@
-
+
-

{{ info_window_content.name }}

+

{{ info_window_content!.name }}

-

{{ info_window_content!.phone_number }}

-

{{ info_window_content!.email }}

+
{{ info_window_content!.email }}
+
{{ info_window_content!.phone_number }}
+
{{ info_window_content!.email }}
- diff --git a/src/app/modules/public/discover/components/map/map.component.scss b/src/app/modules/public/discover/components/map/map.component.scss index 2e0588e..ab12961 100644 --- a/src/app/modules/public/discover/components/map/map.component.scss +++ b/src/app/modules/public/discover/components/map/map.component.scss @@ -9,6 +9,7 @@ .map__info-window-marker{ width: 25rem; padding: 0; + color: white; img{ position: absolute; } diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/schedule.ts b/src/app/core/interfaces/site/schedule/schedule.ts index e69de29..e6df930 100644 --- a/src/app/core/interfaces/site/schedule/schedule.ts +++ b/src/app/core/interfaces/site/schedule/schedule.ts @@ -0,0 +1,6 @@ +import { DaySchedule } from './day-schedule'; + +export interface Schedule { + name?: string; + day?: DaySchedule; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/site.ts b/src/app/core/interfaces/site/site.ts index e6e38da..97f2724 100644 --- a/src/app/core/interfaces/site/site.ts +++ b/src/app/core/interfaces/site/site.ts @@ -1,20 +1,23 @@ +import { Galery } from './galery'; import { Address } from './address'; import { Owner } from './owner'; -import { Image } from './image'; import { Valoration } from './valoration'; -import { RangeDay } from './schedule/range-day'; import { TypeCategory } from './category/type-category'; +import { Schedule } from './schedule/schedule'; export interface Site { id: string; name: string; owner?: Owner; - galery?: Image[]; + galery?: Galery; description?: string; - location: Address; - schedule?: RangeDay[]; + address?: Address; + schedule?: Schedule; category?: TypeCategory[]; valoration?: Valoration; - phone_number?: number; - email?: number; -} \ No newline at end of file + phone_number?: string; + phone_number_2?: string; + phone_number_3?: string; + email?: string; +} + diff --git a/src/app/core/mocks/data.ts b/src/app/core/mocks/data.ts index 6e3e5c7..8e279e5 100644 --- a/src/app/core/mocks/data.ts +++ b/src/app/core/mocks/data.ts @@ -4,7 +4,8 @@ { id: "f", name: "El recuerdo", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.3734021386687365, length: -72.64797890311478 } @@ -12,7 +13,8 @@ { id: "f", name: "Deposito", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.372737130482743, length: -72.6485850825132 } @@ -20,7 +22,8 @@ { id: "f", name: "Leoporinos", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.373793162733723, length: -72.64887476144403 } diff --git a/src/app/modules/public/discover/components/map/map.component.html b/src/app/modules/public/discover/components/map/map.component.html index d4f51b6..f39d0d3 100644 --- a/src/app/modules/public/discover/components/map/map.component.html +++ b/src/app/modules/public/discover/components/map/map.component.html @@ -20,18 +20,18 @@
-
+
-

{{ info_window_content.name }}

+

{{ info_window_content!.name }}

-

{{ info_window_content!.phone_number }}

-

{{ info_window_content!.email }}

+
{{ info_window_content!.email }}
+
{{ info_window_content!.phone_number }}
+
{{ info_window_content!.email }}
- diff --git a/src/app/modules/public/discover/components/map/map.component.scss b/src/app/modules/public/discover/components/map/map.component.scss index 2e0588e..ab12961 100644 --- a/src/app/modules/public/discover/components/map/map.component.scss +++ b/src/app/modules/public/discover/components/map/map.component.scss @@ -9,6 +9,7 @@ .map__info-window-marker{ width: 25rem; padding: 0; + color: white; img{ position: absolute; } diff --git a/src/app/modules/public/discover/components/map/map.component.ts b/src/app/modules/public/discover/components/map/map.component.ts index ed3be48..e04db4d 100644 --- a/src/app/modules/public/discover/components/map/map.component.ts +++ b/src/app/modules/public/discover/components/map/map.component.ts @@ -27,7 +27,7 @@ info_window_content: Site = { name: "", id: "", - location: { + address: { latitude: 1234, length: 123 } @@ -41,7 +41,8 @@ noClear: false, styles: [ { - "elementType": "labels", + "featureType": "poi", + "elementType": "labels.text", "stylers": [ { "visibility": "off" @@ -49,7 +50,7 @@ ] }, { - "featureType": "administrative.land_parcel", + "featureType": "poi.business", "stylers": [ { "visibility": "off" @@ -57,7 +58,16 @@ ] }, { - "featureType": "administrative.neighborhood", + "featureType": "road", + "elementType": "labels.icon", + "stylers": [ + { + "visibility": "off" + } + ] + }, + { + "featureType": "transit", "stylers": [ { "visibility": "off" @@ -81,20 +91,20 @@ this.sites.forEach((site: Site) => { this.markers.push({ position: { - lat: site.location.latitude, - lng: site.location.length + lat: site.address!.latitude, + lng: site.address!.length }, label: { - color: 'blue', + color: '', text: site.name, }, title: site.name, info: { ...site }, - icon: { + /* icon: { url: "https://upload.wikimedia.org/wikipedia/commons/thumb/6/69/How_to_use_icon.svg/2214px-How_to_use_icon.svg.png" - } + } */ }) }) } diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/schedule.ts b/src/app/core/interfaces/site/schedule/schedule.ts index e69de29..e6df930 100644 --- a/src/app/core/interfaces/site/schedule/schedule.ts +++ b/src/app/core/interfaces/site/schedule/schedule.ts @@ -0,0 +1,6 @@ +import { DaySchedule } from './day-schedule'; + +export interface Schedule { + name?: string; + day?: DaySchedule; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/site.ts b/src/app/core/interfaces/site/site.ts index e6e38da..97f2724 100644 --- a/src/app/core/interfaces/site/site.ts +++ b/src/app/core/interfaces/site/site.ts @@ -1,20 +1,23 @@ +import { Galery } from './galery'; import { Address } from './address'; import { Owner } from './owner'; -import { Image } from './image'; import { Valoration } from './valoration'; -import { RangeDay } from './schedule/range-day'; import { TypeCategory } from './category/type-category'; +import { Schedule } from './schedule/schedule'; export interface Site { id: string; name: string; owner?: Owner; - galery?: Image[]; + galery?: Galery; description?: string; - location: Address; - schedule?: RangeDay[]; + address?: Address; + schedule?: Schedule; category?: TypeCategory[]; valoration?: Valoration; - phone_number?: number; - email?: number; -} \ No newline at end of file + phone_number?: string; + phone_number_2?: string; + phone_number_3?: string; + email?: string; +} + diff --git a/src/app/core/mocks/data.ts b/src/app/core/mocks/data.ts index 6e3e5c7..8e279e5 100644 --- a/src/app/core/mocks/data.ts +++ b/src/app/core/mocks/data.ts @@ -4,7 +4,8 @@ { id: "f", name: "El recuerdo", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.3734021386687365, length: -72.64797890311478 } @@ -12,7 +13,8 @@ { id: "f", name: "Deposito", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.372737130482743, length: -72.6485850825132 } @@ -20,7 +22,8 @@ { id: "f", name: "Leoporinos", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.373793162733723, length: -72.64887476144403 } diff --git a/src/app/modules/public/discover/components/map/map.component.html b/src/app/modules/public/discover/components/map/map.component.html index d4f51b6..f39d0d3 100644 --- a/src/app/modules/public/discover/components/map/map.component.html +++ b/src/app/modules/public/discover/components/map/map.component.html @@ -20,18 +20,18 @@
-
+
-

{{ info_window_content.name }}

+

{{ info_window_content!.name }}

-

{{ info_window_content!.phone_number }}

-

{{ info_window_content!.email }}

+
{{ info_window_content!.email }}
+
{{ info_window_content!.phone_number }}
+
{{ info_window_content!.email }}
- diff --git a/src/app/modules/public/discover/components/map/map.component.scss b/src/app/modules/public/discover/components/map/map.component.scss index 2e0588e..ab12961 100644 --- a/src/app/modules/public/discover/components/map/map.component.scss +++ b/src/app/modules/public/discover/components/map/map.component.scss @@ -9,6 +9,7 @@ .map__info-window-marker{ width: 25rem; padding: 0; + color: white; img{ position: absolute; } diff --git a/src/app/modules/public/discover/components/map/map.component.ts b/src/app/modules/public/discover/components/map/map.component.ts index ed3be48..e04db4d 100644 --- a/src/app/modules/public/discover/components/map/map.component.ts +++ b/src/app/modules/public/discover/components/map/map.component.ts @@ -27,7 +27,7 @@ info_window_content: Site = { name: "", id: "", - location: { + address: { latitude: 1234, length: 123 } @@ -41,7 +41,8 @@ noClear: false, styles: [ { - "elementType": "labels", + "featureType": "poi", + "elementType": "labels.text", "stylers": [ { "visibility": "off" @@ -49,7 +50,7 @@ ] }, { - "featureType": "administrative.land_parcel", + "featureType": "poi.business", "stylers": [ { "visibility": "off" @@ -57,7 +58,16 @@ ] }, { - "featureType": "administrative.neighborhood", + "featureType": "road", + "elementType": "labels.icon", + "stylers": [ + { + "visibility": "off" + } + ] + }, + { + "featureType": "transit", "stylers": [ { "visibility": "off" @@ -81,20 +91,20 @@ this.sites.forEach((site: Site) => { this.markers.push({ position: { - lat: site.location.latitude, - lng: site.location.length + lat: site.address!.latitude, + lng: site.address!.length }, label: { - color: 'blue', + color: '', text: site.name, }, title: site.name, info: { ...site }, - icon: { + /* icon: { url: "https://upload.wikimedia.org/wikipedia/commons/thumb/6/69/How_to_use_icon.svg/2214px-How_to_use_icon.svg.png" - } + } */ }) }) } diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.html b/src/app/modules/public/discover/components/modal-site/modal-site.component.html index 25a876b..09c04fd 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.html +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.html @@ -1 +1,93 @@ -

modal-site works!

+ diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/schedule.ts b/src/app/core/interfaces/site/schedule/schedule.ts index e69de29..e6df930 100644 --- a/src/app/core/interfaces/site/schedule/schedule.ts +++ b/src/app/core/interfaces/site/schedule/schedule.ts @@ -0,0 +1,6 @@ +import { DaySchedule } from './day-schedule'; + +export interface Schedule { + name?: string; + day?: DaySchedule; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/site.ts b/src/app/core/interfaces/site/site.ts index e6e38da..97f2724 100644 --- a/src/app/core/interfaces/site/site.ts +++ b/src/app/core/interfaces/site/site.ts @@ -1,20 +1,23 @@ +import { Galery } from './galery'; import { Address } from './address'; import { Owner } from './owner'; -import { Image } from './image'; import { Valoration } from './valoration'; -import { RangeDay } from './schedule/range-day'; import { TypeCategory } from './category/type-category'; +import { Schedule } from './schedule/schedule'; export interface Site { id: string; name: string; owner?: Owner; - galery?: Image[]; + galery?: Galery; description?: string; - location: Address; - schedule?: RangeDay[]; + address?: Address; + schedule?: Schedule; category?: TypeCategory[]; valoration?: Valoration; - phone_number?: number; - email?: number; -} \ No newline at end of file + phone_number?: string; + phone_number_2?: string; + phone_number_3?: string; + email?: string; +} + diff --git a/src/app/core/mocks/data.ts b/src/app/core/mocks/data.ts index 6e3e5c7..8e279e5 100644 --- a/src/app/core/mocks/data.ts +++ b/src/app/core/mocks/data.ts @@ -4,7 +4,8 @@ { id: "f", name: "El recuerdo", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.3734021386687365, length: -72.64797890311478 } @@ -12,7 +13,8 @@ { id: "f", name: "Deposito", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.372737130482743, length: -72.6485850825132 } @@ -20,7 +22,8 @@ { id: "f", name: "Leoporinos", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.373793162733723, length: -72.64887476144403 } diff --git a/src/app/modules/public/discover/components/map/map.component.html b/src/app/modules/public/discover/components/map/map.component.html index d4f51b6..f39d0d3 100644 --- a/src/app/modules/public/discover/components/map/map.component.html +++ b/src/app/modules/public/discover/components/map/map.component.html @@ -20,18 +20,18 @@
-
+
-

{{ info_window_content.name }}

+

{{ info_window_content!.name }}

-

{{ info_window_content!.phone_number }}

-

{{ info_window_content!.email }}

+
{{ info_window_content!.email }}
+
{{ info_window_content!.phone_number }}
+
{{ info_window_content!.email }}
- diff --git a/src/app/modules/public/discover/components/map/map.component.scss b/src/app/modules/public/discover/components/map/map.component.scss index 2e0588e..ab12961 100644 --- a/src/app/modules/public/discover/components/map/map.component.scss +++ b/src/app/modules/public/discover/components/map/map.component.scss @@ -9,6 +9,7 @@ .map__info-window-marker{ width: 25rem; padding: 0; + color: white; img{ position: absolute; } diff --git a/src/app/modules/public/discover/components/map/map.component.ts b/src/app/modules/public/discover/components/map/map.component.ts index ed3be48..e04db4d 100644 --- a/src/app/modules/public/discover/components/map/map.component.ts +++ b/src/app/modules/public/discover/components/map/map.component.ts @@ -27,7 +27,7 @@ info_window_content: Site = { name: "", id: "", - location: { + address: { latitude: 1234, length: 123 } @@ -41,7 +41,8 @@ noClear: false, styles: [ { - "elementType": "labels", + "featureType": "poi", + "elementType": "labels.text", "stylers": [ { "visibility": "off" @@ -49,7 +50,7 @@ ] }, { - "featureType": "administrative.land_parcel", + "featureType": "poi.business", "stylers": [ { "visibility": "off" @@ -57,7 +58,16 @@ ] }, { - "featureType": "administrative.neighborhood", + "featureType": "road", + "elementType": "labels.icon", + "stylers": [ + { + "visibility": "off" + } + ] + }, + { + "featureType": "transit", "stylers": [ { "visibility": "off" @@ -81,20 +91,20 @@ this.sites.forEach((site: Site) => { this.markers.push({ position: { - lat: site.location.latitude, - lng: site.location.length + lat: site.address!.latitude, + lng: site.address!.length }, label: { - color: 'blue', + color: '', text: site.name, }, title: site.name, info: { ...site }, - icon: { + /* icon: { url: "https://upload.wikimedia.org/wikipedia/commons/thumb/6/69/How_to_use_icon.svg/2214px-How_to_use_icon.svg.png" - } + } */ }) }) } diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.html b/src/app/modules/public/discover/components/modal-site/modal-site.component.html index 25a876b..09c04fd 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.html +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.html @@ -1 +1,93 @@ -

modal-site works!

+ diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss index e69de29..a0d83af 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss @@ -0,0 +1,41 @@ +.modal { + height: inherit; +} + +.modal-dialog { + max-width: 100% !important; + display: flex; + height: 100vh; + align-items: center; + justify-content: center; +} + +.modal__content{ + div{ + width: 50%; + padding: 1.5rem; + } +} + +.modal-content { + width: 60rem; + height: 35rem; +} + +.has-bg-dark { + color: var(--base-color-white); +} + +.modal__galery { + display: grid; + gap: 0.5rem; + grid-auto-rows: 14rem; + grid-template-columns: repeat(auto-fill, minmax(min(100%, 14rem), 1fr)); +} +.modal__featured { + width: 100%; + img { + width: 100%; + max-height: 14rem; + } +} diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/schedule.ts b/src/app/core/interfaces/site/schedule/schedule.ts index e69de29..e6df930 100644 --- a/src/app/core/interfaces/site/schedule/schedule.ts +++ b/src/app/core/interfaces/site/schedule/schedule.ts @@ -0,0 +1,6 @@ +import { DaySchedule } from './day-schedule'; + +export interface Schedule { + name?: string; + day?: DaySchedule; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/site.ts b/src/app/core/interfaces/site/site.ts index e6e38da..97f2724 100644 --- a/src/app/core/interfaces/site/site.ts +++ b/src/app/core/interfaces/site/site.ts @@ -1,20 +1,23 @@ +import { Galery } from './galery'; import { Address } from './address'; import { Owner } from './owner'; -import { Image } from './image'; import { Valoration } from './valoration'; -import { RangeDay } from './schedule/range-day'; import { TypeCategory } from './category/type-category'; +import { Schedule } from './schedule/schedule'; export interface Site { id: string; name: string; owner?: Owner; - galery?: Image[]; + galery?: Galery; description?: string; - location: Address; - schedule?: RangeDay[]; + address?: Address; + schedule?: Schedule; category?: TypeCategory[]; valoration?: Valoration; - phone_number?: number; - email?: number; -} \ No newline at end of file + phone_number?: string; + phone_number_2?: string; + phone_number_3?: string; + email?: string; +} + diff --git a/src/app/core/mocks/data.ts b/src/app/core/mocks/data.ts index 6e3e5c7..8e279e5 100644 --- a/src/app/core/mocks/data.ts +++ b/src/app/core/mocks/data.ts @@ -4,7 +4,8 @@ { id: "f", name: "El recuerdo", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.3734021386687365, length: -72.64797890311478 } @@ -12,7 +13,8 @@ { id: "f", name: "Deposito", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.372737130482743, length: -72.6485850825132 } @@ -20,7 +22,8 @@ { id: "f", name: "Leoporinos", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.373793162733723, length: -72.64887476144403 } diff --git a/src/app/modules/public/discover/components/map/map.component.html b/src/app/modules/public/discover/components/map/map.component.html index d4f51b6..f39d0d3 100644 --- a/src/app/modules/public/discover/components/map/map.component.html +++ b/src/app/modules/public/discover/components/map/map.component.html @@ -20,18 +20,18 @@
-
+
-

{{ info_window_content.name }}

+

{{ info_window_content!.name }}

-

{{ info_window_content!.phone_number }}

-

{{ info_window_content!.email }}

+
{{ info_window_content!.email }}
+
{{ info_window_content!.phone_number }}
+
{{ info_window_content!.email }}
- diff --git a/src/app/modules/public/discover/components/map/map.component.scss b/src/app/modules/public/discover/components/map/map.component.scss index 2e0588e..ab12961 100644 --- a/src/app/modules/public/discover/components/map/map.component.scss +++ b/src/app/modules/public/discover/components/map/map.component.scss @@ -9,6 +9,7 @@ .map__info-window-marker{ width: 25rem; padding: 0; + color: white; img{ position: absolute; } diff --git a/src/app/modules/public/discover/components/map/map.component.ts b/src/app/modules/public/discover/components/map/map.component.ts index ed3be48..e04db4d 100644 --- a/src/app/modules/public/discover/components/map/map.component.ts +++ b/src/app/modules/public/discover/components/map/map.component.ts @@ -27,7 +27,7 @@ info_window_content: Site = { name: "", id: "", - location: { + address: { latitude: 1234, length: 123 } @@ -41,7 +41,8 @@ noClear: false, styles: [ { - "elementType": "labels", + "featureType": "poi", + "elementType": "labels.text", "stylers": [ { "visibility": "off" @@ -49,7 +50,7 @@ ] }, { - "featureType": "administrative.land_parcel", + "featureType": "poi.business", "stylers": [ { "visibility": "off" @@ -57,7 +58,16 @@ ] }, { - "featureType": "administrative.neighborhood", + "featureType": "road", + "elementType": "labels.icon", + "stylers": [ + { + "visibility": "off" + } + ] + }, + { + "featureType": "transit", "stylers": [ { "visibility": "off" @@ -81,20 +91,20 @@ this.sites.forEach((site: Site) => { this.markers.push({ position: { - lat: site.location.latitude, - lng: site.location.length + lat: site.address!.latitude, + lng: site.address!.length }, label: { - color: 'blue', + color: '', text: site.name, }, title: site.name, info: { ...site }, - icon: { + /* icon: { url: "https://upload.wikimedia.org/wikipedia/commons/thumb/6/69/How_to_use_icon.svg/2214px-How_to_use_icon.svg.png" - } + } */ }) }) } diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.html b/src/app/modules/public/discover/components/modal-site/modal-site.component.html index 25a876b..09c04fd 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.html +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.html @@ -1 +1,93 @@ -

modal-site works!

+ diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss index e69de29..a0d83af 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss @@ -0,0 +1,41 @@ +.modal { + height: inherit; +} + +.modal-dialog { + max-width: 100% !important; + display: flex; + height: 100vh; + align-items: center; + justify-content: center; +} + +.modal__content{ + div{ + width: 50%; + padding: 1.5rem; + } +} + +.modal-content { + width: 60rem; + height: 35rem; +} + +.has-bg-dark { + color: var(--base-color-white); +} + +.modal__galery { + display: grid; + gap: 0.5rem; + grid-auto-rows: 14rem; + grid-template-columns: repeat(auto-fill, minmax(min(100%, 14rem), 1fr)); +} +.modal__featured { + width: 100%; + img { + width: 100%; + max-height: 14rem; + } +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index 678375b..10988c6 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -15,11 +15,13 @@ -
+
-
+
-
+ diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/schedule.ts b/src/app/core/interfaces/site/schedule/schedule.ts index e69de29..e6df930 100644 --- a/src/app/core/interfaces/site/schedule/schedule.ts +++ b/src/app/core/interfaces/site/schedule/schedule.ts @@ -0,0 +1,6 @@ +import { DaySchedule } from './day-schedule'; + +export interface Schedule { + name?: string; + day?: DaySchedule; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/site.ts b/src/app/core/interfaces/site/site.ts index e6e38da..97f2724 100644 --- a/src/app/core/interfaces/site/site.ts +++ b/src/app/core/interfaces/site/site.ts @@ -1,20 +1,23 @@ +import { Galery } from './galery'; import { Address } from './address'; import { Owner } from './owner'; -import { Image } from './image'; import { Valoration } from './valoration'; -import { RangeDay } from './schedule/range-day'; import { TypeCategory } from './category/type-category'; +import { Schedule } from './schedule/schedule'; export interface Site { id: string; name: string; owner?: Owner; - galery?: Image[]; + galery?: Galery; description?: string; - location: Address; - schedule?: RangeDay[]; + address?: Address; + schedule?: Schedule; category?: TypeCategory[]; valoration?: Valoration; - phone_number?: number; - email?: number; -} \ No newline at end of file + phone_number?: string; + phone_number_2?: string; + phone_number_3?: string; + email?: string; +} + diff --git a/src/app/core/mocks/data.ts b/src/app/core/mocks/data.ts index 6e3e5c7..8e279e5 100644 --- a/src/app/core/mocks/data.ts +++ b/src/app/core/mocks/data.ts @@ -4,7 +4,8 @@ { id: "f", name: "El recuerdo", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.3734021386687365, length: -72.64797890311478 } @@ -12,7 +13,8 @@ { id: "f", name: "Deposito", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.372737130482743, length: -72.6485850825132 } @@ -20,7 +22,8 @@ { id: "f", name: "Leoporinos", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.373793162733723, length: -72.64887476144403 } diff --git a/src/app/modules/public/discover/components/map/map.component.html b/src/app/modules/public/discover/components/map/map.component.html index d4f51b6..f39d0d3 100644 --- a/src/app/modules/public/discover/components/map/map.component.html +++ b/src/app/modules/public/discover/components/map/map.component.html @@ -20,18 +20,18 @@
-
+
-

{{ info_window_content.name }}

+

{{ info_window_content!.name }}

-

{{ info_window_content!.phone_number }}

-

{{ info_window_content!.email }}

+
{{ info_window_content!.email }}
+
{{ info_window_content!.phone_number }}
+
{{ info_window_content!.email }}
- diff --git a/src/app/modules/public/discover/components/map/map.component.scss b/src/app/modules/public/discover/components/map/map.component.scss index 2e0588e..ab12961 100644 --- a/src/app/modules/public/discover/components/map/map.component.scss +++ b/src/app/modules/public/discover/components/map/map.component.scss @@ -9,6 +9,7 @@ .map__info-window-marker{ width: 25rem; padding: 0; + color: white; img{ position: absolute; } diff --git a/src/app/modules/public/discover/components/map/map.component.ts b/src/app/modules/public/discover/components/map/map.component.ts index ed3be48..e04db4d 100644 --- a/src/app/modules/public/discover/components/map/map.component.ts +++ b/src/app/modules/public/discover/components/map/map.component.ts @@ -27,7 +27,7 @@ info_window_content: Site = { name: "", id: "", - location: { + address: { latitude: 1234, length: 123 } @@ -41,7 +41,8 @@ noClear: false, styles: [ { - "elementType": "labels", + "featureType": "poi", + "elementType": "labels.text", "stylers": [ { "visibility": "off" @@ -49,7 +50,7 @@ ] }, { - "featureType": "administrative.land_parcel", + "featureType": "poi.business", "stylers": [ { "visibility": "off" @@ -57,7 +58,16 @@ ] }, { - "featureType": "administrative.neighborhood", + "featureType": "road", + "elementType": "labels.icon", + "stylers": [ + { + "visibility": "off" + } + ] + }, + { + "featureType": "transit", "stylers": [ { "visibility": "off" @@ -81,20 +91,20 @@ this.sites.forEach((site: Site) => { this.markers.push({ position: { - lat: site.location.latitude, - lng: site.location.length + lat: site.address!.latitude, + lng: site.address!.length }, label: { - color: 'blue', + color: '', text: site.name, }, title: site.name, info: { ...site }, - icon: { + /* icon: { url: "https://upload.wikimedia.org/wikipedia/commons/thumb/6/69/How_to_use_icon.svg/2214px-How_to_use_icon.svg.png" - } + } */ }) }) } diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.html b/src/app/modules/public/discover/components/modal-site/modal-site.component.html index 25a876b..09c04fd 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.html +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.html @@ -1 +1,93 @@ -

modal-site works!

+ diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss index e69de29..a0d83af 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss @@ -0,0 +1,41 @@ +.modal { + height: inherit; +} + +.modal-dialog { + max-width: 100% !important; + display: flex; + height: 100vh; + align-items: center; + justify-content: center; +} + +.modal__content{ + div{ + width: 50%; + padding: 1.5rem; + } +} + +.modal-content { + width: 60rem; + height: 35rem; +} + +.has-bg-dark { + color: var(--base-color-white); +} + +.modal__galery { + display: grid; + gap: 0.5rem; + grid-auto-rows: 14rem; + grid-template-columns: repeat(auto-fill, minmax(min(100%, 14rem), 1fr)); +} +.modal__featured { + width: 100%; + img { + width: 100%; + max-height: 14rem; + } +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index 678375b..10988c6 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -15,11 +15,13 @@
-
+
-
+
-
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index b5ebe62..3edb24d 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -28,4 +28,5 @@
hola
- \ No newline at end of file + + diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/schedule.ts b/src/app/core/interfaces/site/schedule/schedule.ts index e69de29..e6df930 100644 --- a/src/app/core/interfaces/site/schedule/schedule.ts +++ b/src/app/core/interfaces/site/schedule/schedule.ts @@ -0,0 +1,6 @@ +import { DaySchedule } from './day-schedule'; + +export interface Schedule { + name?: string; + day?: DaySchedule; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/site.ts b/src/app/core/interfaces/site/site.ts index e6e38da..97f2724 100644 --- a/src/app/core/interfaces/site/site.ts +++ b/src/app/core/interfaces/site/site.ts @@ -1,20 +1,23 @@ +import { Galery } from './galery'; import { Address } from './address'; import { Owner } from './owner'; -import { Image } from './image'; import { Valoration } from './valoration'; -import { RangeDay } from './schedule/range-day'; import { TypeCategory } from './category/type-category'; +import { Schedule } from './schedule/schedule'; export interface Site { id: string; name: string; owner?: Owner; - galery?: Image[]; + galery?: Galery; description?: string; - location: Address; - schedule?: RangeDay[]; + address?: Address; + schedule?: Schedule; category?: TypeCategory[]; valoration?: Valoration; - phone_number?: number; - email?: number; -} \ No newline at end of file + phone_number?: string; + phone_number_2?: string; + phone_number_3?: string; + email?: string; +} + diff --git a/src/app/core/mocks/data.ts b/src/app/core/mocks/data.ts index 6e3e5c7..8e279e5 100644 --- a/src/app/core/mocks/data.ts +++ b/src/app/core/mocks/data.ts @@ -4,7 +4,8 @@ { id: "f", name: "El recuerdo", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.3734021386687365, length: -72.64797890311478 } @@ -12,7 +13,8 @@ { id: "f", name: "Deposito", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.372737130482743, length: -72.6485850825132 } @@ -20,7 +22,8 @@ { id: "f", name: "Leoporinos", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.373793162733723, length: -72.64887476144403 } diff --git a/src/app/modules/public/discover/components/map/map.component.html b/src/app/modules/public/discover/components/map/map.component.html index d4f51b6..f39d0d3 100644 --- a/src/app/modules/public/discover/components/map/map.component.html +++ b/src/app/modules/public/discover/components/map/map.component.html @@ -20,18 +20,18 @@
-
+
-

{{ info_window_content.name }}

+

{{ info_window_content!.name }}

-

{{ info_window_content!.phone_number }}

-

{{ info_window_content!.email }}

+
{{ info_window_content!.email }}
+
{{ info_window_content!.phone_number }}
+
{{ info_window_content!.email }}
- diff --git a/src/app/modules/public/discover/components/map/map.component.scss b/src/app/modules/public/discover/components/map/map.component.scss index 2e0588e..ab12961 100644 --- a/src/app/modules/public/discover/components/map/map.component.scss +++ b/src/app/modules/public/discover/components/map/map.component.scss @@ -9,6 +9,7 @@ .map__info-window-marker{ width: 25rem; padding: 0; + color: white; img{ position: absolute; } diff --git a/src/app/modules/public/discover/components/map/map.component.ts b/src/app/modules/public/discover/components/map/map.component.ts index ed3be48..e04db4d 100644 --- a/src/app/modules/public/discover/components/map/map.component.ts +++ b/src/app/modules/public/discover/components/map/map.component.ts @@ -27,7 +27,7 @@ info_window_content: Site = { name: "", id: "", - location: { + address: { latitude: 1234, length: 123 } @@ -41,7 +41,8 @@ noClear: false, styles: [ { - "elementType": "labels", + "featureType": "poi", + "elementType": "labels.text", "stylers": [ { "visibility": "off" @@ -49,7 +50,7 @@ ] }, { - "featureType": "administrative.land_parcel", + "featureType": "poi.business", "stylers": [ { "visibility": "off" @@ -57,7 +58,16 @@ ] }, { - "featureType": "administrative.neighborhood", + "featureType": "road", + "elementType": "labels.icon", + "stylers": [ + { + "visibility": "off" + } + ] + }, + { + "featureType": "transit", "stylers": [ { "visibility": "off" @@ -81,20 +91,20 @@ this.sites.forEach((site: Site) => { this.markers.push({ position: { - lat: site.location.latitude, - lng: site.location.length + lat: site.address!.latitude, + lng: site.address!.length }, label: { - color: 'blue', + color: '', text: site.name, }, title: site.name, info: { ...site }, - icon: { + /* icon: { url: "https://upload.wikimedia.org/wikipedia/commons/thumb/6/69/How_to_use_icon.svg/2214px-How_to_use_icon.svg.png" - } + } */ }) }) } diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.html b/src/app/modules/public/discover/components/modal-site/modal-site.component.html index 25a876b..09c04fd 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.html +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.html @@ -1 +1,93 @@ -

modal-site works!

+ diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss index e69de29..a0d83af 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss @@ -0,0 +1,41 @@ +.modal { + height: inherit; +} + +.modal-dialog { + max-width: 100% !important; + display: flex; + height: 100vh; + align-items: center; + justify-content: center; +} + +.modal__content{ + div{ + width: 50%; + padding: 1.5rem; + } +} + +.modal-content { + width: 60rem; + height: 35rem; +} + +.has-bg-dark { + color: var(--base-color-white); +} + +.modal__galery { + display: grid; + gap: 0.5rem; + grid-auto-rows: 14rem; + grid-template-columns: repeat(auto-fill, minmax(min(100%, 14rem), 1fr)); +} +.modal__featured { + width: 100%; + img { + width: 100%; + max-height: 14rem; + } +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index 678375b..10988c6 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -15,11 +15,13 @@
-
+
-
+
-
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index b5ebe62..3edb24d 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -28,4 +28,5 @@
hola
- \ No newline at end of file + + diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 4c9fcf5..193cef4 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -2,7 +2,7 @@
- +
diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/schedule.ts b/src/app/core/interfaces/site/schedule/schedule.ts index e69de29..e6df930 100644 --- a/src/app/core/interfaces/site/schedule/schedule.ts +++ b/src/app/core/interfaces/site/schedule/schedule.ts @@ -0,0 +1,6 @@ +import { DaySchedule } from './day-schedule'; + +export interface Schedule { + name?: string; + day?: DaySchedule; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/site.ts b/src/app/core/interfaces/site/site.ts index e6e38da..97f2724 100644 --- a/src/app/core/interfaces/site/site.ts +++ b/src/app/core/interfaces/site/site.ts @@ -1,20 +1,23 @@ +import { Galery } from './galery'; import { Address } from './address'; import { Owner } from './owner'; -import { Image } from './image'; import { Valoration } from './valoration'; -import { RangeDay } from './schedule/range-day'; import { TypeCategory } from './category/type-category'; +import { Schedule } from './schedule/schedule'; export interface Site { id: string; name: string; owner?: Owner; - galery?: Image[]; + galery?: Galery; description?: string; - location: Address; - schedule?: RangeDay[]; + address?: Address; + schedule?: Schedule; category?: TypeCategory[]; valoration?: Valoration; - phone_number?: number; - email?: number; -} \ No newline at end of file + phone_number?: string; + phone_number_2?: string; + phone_number_3?: string; + email?: string; +} + diff --git a/src/app/core/mocks/data.ts b/src/app/core/mocks/data.ts index 6e3e5c7..8e279e5 100644 --- a/src/app/core/mocks/data.ts +++ b/src/app/core/mocks/data.ts @@ -4,7 +4,8 @@ { id: "f", name: "El recuerdo", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.3734021386687365, length: -72.64797890311478 } @@ -12,7 +13,8 @@ { id: "f", name: "Deposito", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.372737130482743, length: -72.6485850825132 } @@ -20,7 +22,8 @@ { id: "f", name: "Leoporinos", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.373793162733723, length: -72.64887476144403 } diff --git a/src/app/modules/public/discover/components/map/map.component.html b/src/app/modules/public/discover/components/map/map.component.html index d4f51b6..f39d0d3 100644 --- a/src/app/modules/public/discover/components/map/map.component.html +++ b/src/app/modules/public/discover/components/map/map.component.html @@ -20,18 +20,18 @@
-
+
-

{{ info_window_content.name }}

+

{{ info_window_content!.name }}

-

{{ info_window_content!.phone_number }}

-

{{ info_window_content!.email }}

+
{{ info_window_content!.email }}
+
{{ info_window_content!.phone_number }}
+
{{ info_window_content!.email }}
- diff --git a/src/app/modules/public/discover/components/map/map.component.scss b/src/app/modules/public/discover/components/map/map.component.scss index 2e0588e..ab12961 100644 --- a/src/app/modules/public/discover/components/map/map.component.scss +++ b/src/app/modules/public/discover/components/map/map.component.scss @@ -9,6 +9,7 @@ .map__info-window-marker{ width: 25rem; padding: 0; + color: white; img{ position: absolute; } diff --git a/src/app/modules/public/discover/components/map/map.component.ts b/src/app/modules/public/discover/components/map/map.component.ts index ed3be48..e04db4d 100644 --- a/src/app/modules/public/discover/components/map/map.component.ts +++ b/src/app/modules/public/discover/components/map/map.component.ts @@ -27,7 +27,7 @@ info_window_content: Site = { name: "", id: "", - location: { + address: { latitude: 1234, length: 123 } @@ -41,7 +41,8 @@ noClear: false, styles: [ { - "elementType": "labels", + "featureType": "poi", + "elementType": "labels.text", "stylers": [ { "visibility": "off" @@ -49,7 +50,7 @@ ] }, { - "featureType": "administrative.land_parcel", + "featureType": "poi.business", "stylers": [ { "visibility": "off" @@ -57,7 +58,16 @@ ] }, { - "featureType": "administrative.neighborhood", + "featureType": "road", + "elementType": "labels.icon", + "stylers": [ + { + "visibility": "off" + } + ] + }, + { + "featureType": "transit", "stylers": [ { "visibility": "off" @@ -81,20 +91,20 @@ this.sites.forEach((site: Site) => { this.markers.push({ position: { - lat: site.location.latitude, - lng: site.location.length + lat: site.address!.latitude, + lng: site.address!.length }, label: { - color: 'blue', + color: '', text: site.name, }, title: site.name, info: { ...site }, - icon: { + /* icon: { url: "https://upload.wikimedia.org/wikipedia/commons/thumb/6/69/How_to_use_icon.svg/2214px-How_to_use_icon.svg.png" - } + } */ }) }) } diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.html b/src/app/modules/public/discover/components/modal-site/modal-site.component.html index 25a876b..09c04fd 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.html +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.html @@ -1 +1,93 @@ -

modal-site works!

+ diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss index e69de29..a0d83af 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss @@ -0,0 +1,41 @@ +.modal { + height: inherit; +} + +.modal-dialog { + max-width: 100% !important; + display: flex; + height: 100vh; + align-items: center; + justify-content: center; +} + +.modal__content{ + div{ + width: 50%; + padding: 1.5rem; + } +} + +.modal-content { + width: 60rem; + height: 35rem; +} + +.has-bg-dark { + color: var(--base-color-white); +} + +.modal__galery { + display: grid; + gap: 0.5rem; + grid-auto-rows: 14rem; + grid-template-columns: repeat(auto-fill, minmax(min(100%, 14rem), 1fr)); +} +.modal__featured { + width: 100%; + img { + width: 100%; + max-height: 14rem; + } +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index 678375b..10988c6 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -15,11 +15,13 @@
-
+
-
+
-
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index b5ebe62..3edb24d 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -28,4 +28,5 @@
hola
- \ No newline at end of file + + diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 4c9fcf5..193cef4 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -2,7 +2,7 @@
- +
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index d6abbc1..9f4a665 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -8,6 +8,9 @@ transition: 2s; } .discover__filters-show{ + position: sticky; + top: 0; + height: 100vh; display: flex; height: 100%; max-width: 20rem; @@ -16,5 +19,4 @@ right: 0; background-color:white; z-index: 70; - } \ No newline at end of file diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/schedule.ts b/src/app/core/interfaces/site/schedule/schedule.ts index e69de29..e6df930 100644 --- a/src/app/core/interfaces/site/schedule/schedule.ts +++ b/src/app/core/interfaces/site/schedule/schedule.ts @@ -0,0 +1,6 @@ +import { DaySchedule } from './day-schedule'; + +export interface Schedule { + name?: string; + day?: DaySchedule; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/site.ts b/src/app/core/interfaces/site/site.ts index e6e38da..97f2724 100644 --- a/src/app/core/interfaces/site/site.ts +++ b/src/app/core/interfaces/site/site.ts @@ -1,20 +1,23 @@ +import { Galery } from './galery'; import { Address } from './address'; import { Owner } from './owner'; -import { Image } from './image'; import { Valoration } from './valoration'; -import { RangeDay } from './schedule/range-day'; import { TypeCategory } from './category/type-category'; +import { Schedule } from './schedule/schedule'; export interface Site { id: string; name: string; owner?: Owner; - galery?: Image[]; + galery?: Galery; description?: string; - location: Address; - schedule?: RangeDay[]; + address?: Address; + schedule?: Schedule; category?: TypeCategory[]; valoration?: Valoration; - phone_number?: number; - email?: number; -} \ No newline at end of file + phone_number?: string; + phone_number_2?: string; + phone_number_3?: string; + email?: string; +} + diff --git a/src/app/core/mocks/data.ts b/src/app/core/mocks/data.ts index 6e3e5c7..8e279e5 100644 --- a/src/app/core/mocks/data.ts +++ b/src/app/core/mocks/data.ts @@ -4,7 +4,8 @@ { id: "f", name: "El recuerdo", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.3734021386687365, length: -72.64797890311478 } @@ -12,7 +13,8 @@ { id: "f", name: "Deposito", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.372737130482743, length: -72.6485850825132 } @@ -20,7 +22,8 @@ { id: "f", name: "Leoporinos", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.373793162733723, length: -72.64887476144403 } diff --git a/src/app/modules/public/discover/components/map/map.component.html b/src/app/modules/public/discover/components/map/map.component.html index d4f51b6..f39d0d3 100644 --- a/src/app/modules/public/discover/components/map/map.component.html +++ b/src/app/modules/public/discover/components/map/map.component.html @@ -20,18 +20,18 @@
-
+
-

{{ info_window_content.name }}

+

{{ info_window_content!.name }}

-

{{ info_window_content!.phone_number }}

-

{{ info_window_content!.email }}

+
{{ info_window_content!.email }}
+
{{ info_window_content!.phone_number }}
+
{{ info_window_content!.email }}
- diff --git a/src/app/modules/public/discover/components/map/map.component.scss b/src/app/modules/public/discover/components/map/map.component.scss index 2e0588e..ab12961 100644 --- a/src/app/modules/public/discover/components/map/map.component.scss +++ b/src/app/modules/public/discover/components/map/map.component.scss @@ -9,6 +9,7 @@ .map__info-window-marker{ width: 25rem; padding: 0; + color: white; img{ position: absolute; } diff --git a/src/app/modules/public/discover/components/map/map.component.ts b/src/app/modules/public/discover/components/map/map.component.ts index ed3be48..e04db4d 100644 --- a/src/app/modules/public/discover/components/map/map.component.ts +++ b/src/app/modules/public/discover/components/map/map.component.ts @@ -27,7 +27,7 @@ info_window_content: Site = { name: "", id: "", - location: { + address: { latitude: 1234, length: 123 } @@ -41,7 +41,8 @@ noClear: false, styles: [ { - "elementType": "labels", + "featureType": "poi", + "elementType": "labels.text", "stylers": [ { "visibility": "off" @@ -49,7 +50,7 @@ ] }, { - "featureType": "administrative.land_parcel", + "featureType": "poi.business", "stylers": [ { "visibility": "off" @@ -57,7 +58,16 @@ ] }, { - "featureType": "administrative.neighborhood", + "featureType": "road", + "elementType": "labels.icon", + "stylers": [ + { + "visibility": "off" + } + ] + }, + { + "featureType": "transit", "stylers": [ { "visibility": "off" @@ -81,20 +91,20 @@ this.sites.forEach((site: Site) => { this.markers.push({ position: { - lat: site.location.latitude, - lng: site.location.length + lat: site.address!.latitude, + lng: site.address!.length }, label: { - color: 'blue', + color: '', text: site.name, }, title: site.name, info: { ...site }, - icon: { + /* icon: { url: "https://upload.wikimedia.org/wikipedia/commons/thumb/6/69/How_to_use_icon.svg/2214px-How_to_use_icon.svg.png" - } + } */ }) }) } diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.html b/src/app/modules/public/discover/components/modal-site/modal-site.component.html index 25a876b..09c04fd 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.html +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.html @@ -1 +1,93 @@ -

modal-site works!

+ diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss index e69de29..a0d83af 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss @@ -0,0 +1,41 @@ +.modal { + height: inherit; +} + +.modal-dialog { + max-width: 100% !important; + display: flex; + height: 100vh; + align-items: center; + justify-content: center; +} + +.modal__content{ + div{ + width: 50%; + padding: 1.5rem; + } +} + +.modal-content { + width: 60rem; + height: 35rem; +} + +.has-bg-dark { + color: var(--base-color-white); +} + +.modal__galery { + display: grid; + gap: 0.5rem; + grid-auto-rows: 14rem; + grid-template-columns: repeat(auto-fill, minmax(min(100%, 14rem), 1fr)); +} +.modal__featured { + width: 100%; + img { + width: 100%; + max-height: 14rem; + } +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index 678375b..10988c6 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -15,11 +15,13 @@
-
+
-
+
-
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index b5ebe62..3edb24d 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -28,4 +28,5 @@
hola
- \ No newline at end of file + + diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 4c9fcf5..193cef4 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -2,7 +2,7 @@
- +
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index d6abbc1..9f4a665 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -8,6 +8,9 @@ transition: 2s; } .discover__filters-show{ + position: sticky; + top: 0; + height: 100vh; display: flex; height: 100%; max-width: 20rem; @@ -16,5 +19,4 @@ right: 0; background-color:white; z-index: 70; - } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 87bebfb..bfef90b 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -14,9 +14,8 @@ import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' import { SwiperModule } from 'swiper/angular'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; + + /* carousel */ import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ diff --git a/src/app/core/interfaces/site/galery.ts b/src/app/core/interfaces/site/galery.ts new file mode 100644 index 0000000..b70f199 --- /dev/null +++ b/src/app/core/interfaces/site/galery.ts @@ -0,0 +1,6 @@ +import { Image } from './image'; + +export interface Galery { + name?: string; + image?: Image[]; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/image.ts b/src/app/core/interfaces/site/image.ts index 6d0f0c8..96b48d0 100644 --- a/src/app/core/interfaces/site/image.ts +++ b/src/app/core/interfaces/site/image.ts @@ -1,5 +1,5 @@ export interface Image{ - src: string; - creation_date: string; - verbose: string; + src?: string; + creation_date?: string; + verbose?: string; } \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/day-schedule.ts b/src/app/core/interfaces/site/schedule/day-schedule.ts new file mode 100644 index 0000000..d00d12a --- /dev/null +++ b/src/app/core/interfaces/site/schedule/day-schedule.ts @@ -0,0 +1,6 @@ +export interface DaySchedule{ + id?: string; + name: string; + opening_time?: Date; + closing_time?: Date; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/range-day.ts b/src/app/core/interfaces/site/schedule/range-day.ts deleted file mode 100644 index 826506a..0000000 --- a/src/app/core/interfaces/site/schedule/range-day.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface RangeDay{ - id: string; - name: string; - opening_time: Date; - closing_time: Date; - schedule: number; -} \ No newline at end of file diff --git a/src/app/core/interfaces/site/schedule/schedule.ts b/src/app/core/interfaces/site/schedule/schedule.ts index e69de29..e6df930 100644 --- a/src/app/core/interfaces/site/schedule/schedule.ts +++ b/src/app/core/interfaces/site/schedule/schedule.ts @@ -0,0 +1,6 @@ +import { DaySchedule } from './day-schedule'; + +export interface Schedule { + name?: string; + day?: DaySchedule; +} \ No newline at end of file diff --git a/src/app/core/interfaces/site/site.ts b/src/app/core/interfaces/site/site.ts index e6e38da..97f2724 100644 --- a/src/app/core/interfaces/site/site.ts +++ b/src/app/core/interfaces/site/site.ts @@ -1,20 +1,23 @@ +import { Galery } from './galery'; import { Address } from './address'; import { Owner } from './owner'; -import { Image } from './image'; import { Valoration } from './valoration'; -import { RangeDay } from './schedule/range-day'; import { TypeCategory } from './category/type-category'; +import { Schedule } from './schedule/schedule'; export interface Site { id: string; name: string; owner?: Owner; - galery?: Image[]; + galery?: Galery; description?: string; - location: Address; - schedule?: RangeDay[]; + address?: Address; + schedule?: Schedule; category?: TypeCategory[]; valoration?: Valoration; - phone_number?: number; - email?: number; -} \ No newline at end of file + phone_number?: string; + phone_number_2?: string; + phone_number_3?: string; + email?: string; +} + diff --git a/src/app/core/mocks/data.ts b/src/app/core/mocks/data.ts index 6e3e5c7..8e279e5 100644 --- a/src/app/core/mocks/data.ts +++ b/src/app/core/mocks/data.ts @@ -4,7 +4,8 @@ { id: "f", name: "El recuerdo", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.3734021386687365, length: -72.64797890311478 } @@ -12,7 +13,8 @@ { id: "f", name: "Deposito", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.372737130482743, length: -72.6485850825132 } @@ -20,7 +22,8 @@ { id: "f", name: "Leoporinos", - location: { + address: { + direction: "Calle 3 Barrio la esperanza", latitude: 7.373793162733723, length: -72.64887476144403 } diff --git a/src/app/modules/public/discover/components/map/map.component.html b/src/app/modules/public/discover/components/map/map.component.html index d4f51b6..f39d0d3 100644 --- a/src/app/modules/public/discover/components/map/map.component.html +++ b/src/app/modules/public/discover/components/map/map.component.html @@ -20,18 +20,18 @@
-
+
-

{{ info_window_content.name }}

+

{{ info_window_content!.name }}

-

{{ info_window_content!.phone_number }}

-

{{ info_window_content!.email }}

+
{{ info_window_content!.email }}
+
{{ info_window_content!.phone_number }}
+
{{ info_window_content!.email }}
- diff --git a/src/app/modules/public/discover/components/map/map.component.scss b/src/app/modules/public/discover/components/map/map.component.scss index 2e0588e..ab12961 100644 --- a/src/app/modules/public/discover/components/map/map.component.scss +++ b/src/app/modules/public/discover/components/map/map.component.scss @@ -9,6 +9,7 @@ .map__info-window-marker{ width: 25rem; padding: 0; + color: white; img{ position: absolute; } diff --git a/src/app/modules/public/discover/components/map/map.component.ts b/src/app/modules/public/discover/components/map/map.component.ts index ed3be48..e04db4d 100644 --- a/src/app/modules/public/discover/components/map/map.component.ts +++ b/src/app/modules/public/discover/components/map/map.component.ts @@ -27,7 +27,7 @@ info_window_content: Site = { name: "", id: "", - location: { + address: { latitude: 1234, length: 123 } @@ -41,7 +41,8 @@ noClear: false, styles: [ { - "elementType": "labels", + "featureType": "poi", + "elementType": "labels.text", "stylers": [ { "visibility": "off" @@ -49,7 +50,7 @@ ] }, { - "featureType": "administrative.land_parcel", + "featureType": "poi.business", "stylers": [ { "visibility": "off" @@ -57,7 +58,16 @@ ] }, { - "featureType": "administrative.neighborhood", + "featureType": "road", + "elementType": "labels.icon", + "stylers": [ + { + "visibility": "off" + } + ] + }, + { + "featureType": "transit", "stylers": [ { "visibility": "off" @@ -81,20 +91,20 @@ this.sites.forEach((site: Site) => { this.markers.push({ position: { - lat: site.location.latitude, - lng: site.location.length + lat: site.address!.latitude, + lng: site.address!.length }, label: { - color: 'blue', + color: '', text: site.name, }, title: site.name, info: { ...site }, - icon: { + /* icon: { url: "https://upload.wikimedia.org/wikipedia/commons/thumb/6/69/How_to_use_icon.svg/2214px-How_to_use_icon.svg.png" - } + } */ }) }) } diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.html b/src/app/modules/public/discover/components/modal-site/modal-site.component.html index 25a876b..09c04fd 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.html +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.html @@ -1 +1,93 @@ -

modal-site works!

+ diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss index e69de29..a0d83af 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss @@ -0,0 +1,41 @@ +.modal { + height: inherit; +} + +.modal-dialog { + max-width: 100% !important; + display: flex; + height: 100vh; + align-items: center; + justify-content: center; +} + +.modal__content{ + div{ + width: 50%; + padding: 1.5rem; + } +} + +.modal-content { + width: 60rem; + height: 35rem; +} + +.has-bg-dark { + color: var(--base-color-white); +} + +.modal__galery { + display: grid; + gap: 0.5rem; + grid-auto-rows: 14rem; + grid-template-columns: repeat(auto-fill, minmax(min(100%, 14rem), 1fr)); +} +.modal__featured { + width: 100%; + img { + width: 100%; + max-height: 14rem; + } +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index 678375b..10988c6 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -15,11 +15,13 @@
-
+
-
+
-
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index b5ebe62..3edb24d 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -28,4 +28,5 @@
hola
- \ No newline at end of file + + diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 4c9fcf5..193cef4 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -2,7 +2,7 @@
- +
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index d6abbc1..9f4a665 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -8,6 +8,9 @@ transition: 2s; } .discover__filters-show{ + position: sticky; + top: 0; + height: 100vh; display: flex; height: 100%; max-width: 20rem; @@ -16,5 +19,4 @@ right: 0; background-color:white; z-index: 70; - } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 87bebfb..bfef90b 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -14,9 +14,8 @@ import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' import { SwiperModule } from 'swiper/angular'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; + + /* carousel */ import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index 799d323..a062389 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,4 +1,4 @@ -
+
+ +
+
+
diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss index e69de29..a0d83af 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss @@ -0,0 +1,41 @@ +.modal { + height: inherit; +} + +.modal-dialog { + max-width: 100% !important; + display: flex; + height: 100vh; + align-items: center; + justify-content: center; +} + +.modal__content{ + div{ + width: 50%; + padding: 1.5rem; + } +} + +.modal-content { + width: 60rem; + height: 35rem; +} + +.has-bg-dark { + color: var(--base-color-white); +} + +.modal__galery { + display: grid; + gap: 0.5rem; + grid-auto-rows: 14rem; + grid-template-columns: repeat(auto-fill, minmax(min(100%, 14rem), 1fr)); +} +.modal__featured { + width: 100%; + img { + width: 100%; + max-height: 14rem; + } +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index 678375b..10988c6 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -15,11 +15,13 @@
-
+
-
+
-
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index b5ebe62..3edb24d 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -28,4 +28,5 @@
hola
- \ No newline at end of file + + diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 4c9fcf5..193cef4 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -2,7 +2,7 @@
- +
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index d6abbc1..9f4a665 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -8,6 +8,9 @@ transition: 2s; } .discover__filters-show{ + position: sticky; + top: 0; + height: 100vh; display: flex; height: 100%; max-width: 20rem; @@ -16,5 +19,4 @@ right: 0; background-color:white; z-index: 70; - } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 87bebfb..bfef90b 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -14,9 +14,8 @@ import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' import { SwiperModule } from 'swiper/angular'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; + + /* carousel */ import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index 799d323..a062389 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,4 +1,4 @@ -
+
+ +
+
+
diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss index e69de29..a0d83af 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss @@ -0,0 +1,41 @@ +.modal { + height: inherit; +} + +.modal-dialog { + max-width: 100% !important; + display: flex; + height: 100vh; + align-items: center; + justify-content: center; +} + +.modal__content{ + div{ + width: 50%; + padding: 1.5rem; + } +} + +.modal-content { + width: 60rem; + height: 35rem; +} + +.has-bg-dark { + color: var(--base-color-white); +} + +.modal__galery { + display: grid; + gap: 0.5rem; + grid-auto-rows: 14rem; + grid-template-columns: repeat(auto-fill, minmax(min(100%, 14rem), 1fr)); +} +.modal__featured { + width: 100%; + img { + width: 100%; + max-height: 14rem; + } +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index 678375b..10988c6 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -15,11 +15,13 @@
-
+
-
+
-
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index b5ebe62..3edb24d 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -28,4 +28,5 @@
hola
- \ No newline at end of file + + diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 4c9fcf5..193cef4 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -2,7 +2,7 @@
- +
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index d6abbc1..9f4a665 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -8,6 +8,9 @@ transition: 2s; } .discover__filters-show{ + position: sticky; + top: 0; + height: 100vh; display: flex; height: 100%; max-width: 20rem; @@ -16,5 +19,4 @@ right: 0; background-color:white; z-index: 70; - } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 87bebfb..bfef90b 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -14,9 +14,8 @@ import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' import { SwiperModule } from 'swiper/angular'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; + + /* carousel */ import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index 799d323..a062389 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,4 +1,4 @@ -
+
- + +
+ +
+
+
diff --git a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss index e69de29..a0d83af 100644 --- a/src/app/modules/public/discover/components/modal-site/modal-site.component.scss +++ b/src/app/modules/public/discover/components/modal-site/modal-site.component.scss @@ -0,0 +1,41 @@ +.modal { + height: inherit; +} + +.modal-dialog { + max-width: 100% !important; + display: flex; + height: 100vh; + align-items: center; + justify-content: center; +} + +.modal__content{ + div{ + width: 50%; + padding: 1.5rem; + } +} + +.modal-content { + width: 60rem; + height: 35rem; +} + +.has-bg-dark { + color: var(--base-color-white); +} + +.modal__galery { + display: grid; + gap: 0.5rem; + grid-auto-rows: 14rem; + grid-template-columns: repeat(auto-fill, minmax(min(100%, 14rem), 1fr)); +} +.modal__featured { + width: 100%; + img { + width: 100%; + max-height: 14rem; + } +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index 678375b..10988c6 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -15,11 +15,13 @@
-
+
-
+
-
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index b5ebe62..3edb24d 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -28,4 +28,5 @@
hola
- \ No newline at end of file + + diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 4c9fcf5..193cef4 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -2,7 +2,7 @@
- +
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index d6abbc1..9f4a665 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -8,6 +8,9 @@ transition: 2s; } .discover__filters-show{ + position: sticky; + top: 0; + height: 100vh; display: flex; height: 100%; max-width: 20rem; @@ -16,5 +19,4 @@ right: 0; background-color:white; z-index: 70; - } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 87bebfb..bfef90b 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -14,9 +14,8 @@ import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' import { SwiperModule } from 'swiper/angular'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; + + /* carousel */ import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index 799d323..a062389 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,4 +1,4 @@ -
+
- +