-
`;
@@ -2032,7 +2044,8 @@ const triggerWidgetOnLocationsUpdate = ({ realtimeUpdate = false, isCancel = fal
rating: state.locationObj.rating,
price: state.locationObj.price,
editingPermissions: state.locationObj.editingPermissions,
- openingHours: { ...state.locationObj.openingHours, ...state.selectedOpeningHours }
+ openingHours: { ...state.locationObj.openingHours, ...state.selectedOpeningHours },
+ additionalFields: state.locationObj.additionalFields
};
}
buildfire.messaging.sendMessageToWidget({
@@ -2044,6 +2057,7 @@ const triggerWidgetOnLocationsUpdate = ({ realtimeUpdate = false, isCancel = fal
});
}, 500);
};
+window.triggerWidgetOnLocationsUpdate = triggerWidgetOnLocationsUpdate;
const triggerWidgetOnSettingsUpdate = () => {
buildfire.messaging.sendMessageToWidget({
@@ -2068,8 +2082,11 @@ window.initLocations = () => {
});
getPinnedLocation();
locationsTable.onEditRow = (obj, tr) => {
+ if (state.isFetchingLocation) return;
+ state.isFetchingLocation = true;
LocationsController.getById(obj.id).then((updatedLocation) => {
window.addEditLocation({ ...updatedLocation.data, id: updatedLocation.id });
+ state.isFetchingLocation = false;
});
};
diff --git a/src/control/content/js/searchTable/searchTableHelper.js b/src/control/content/js/searchTable/searchTableHelper.js
index 6eb47d91..9f01318e 100644
--- a/src/control/content/js/searchTable/searchTableHelper.js
+++ b/src/control/content/js/searchTable/searchTableHelper.js
@@ -81,7 +81,7 @@ export default class SearchTableHelper {
if (!url) {
return "";
}
- return buildfire.imageLib.cropImage(url, options);
+ return buildfire.imageLib.cropImage(url, options) + '&crop=entropy';
}
search(filter) {
diff --git a/src/control/content/js/sortableList/sortableList.js b/src/control/content/js/sortableList/sortableList.js
index 5b716909..f7153325 100644
--- a/src/control/content/js/sortableList/sortableList.js
+++ b/src/control/content/js/sortableList/sortableList.js
@@ -118,7 +118,7 @@ export default class SortableList {
if (!url) {
return "";
}
- return buildfire.imageLib.cropImage(url, options);
+ return buildfire.imageLib.cropImage(url, options) + '&crop=entropy';
}
/* This will be triggered when the order of items changes
diff --git a/src/control/content/templates/categories.html b/src/control/content/templates/categories.html
index a698d426..6921c234 100644
--- a/src/control/content/templates/categories.html
+++ b/src/control/content/templates/categories.html
@@ -86,7 +86,7 @@ ${category.title}
+${category.title}
${subcategories.map((elem) => elem.title).join(', ')}Add Category
-
Subcategories
+Subcategories
diff --git a/src/control/content/templates/listView.html b/src/control/content/templates/listView.html
index 921a9894..898e1e17 100644
--- a/src/control/content/templates/listView.html
+++ b/src/control/content/templates/listView.html
@@ -1,11 +1,25 @@
-
-
Introduction Screen
-
-
-
-
+
+
Introduction Screen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -22,7 +36,7 @@
-
Pinned to top locations
+Pinned to top locations
Pin locations to the top of the list to highlight them.
@@ -34,36 +48,28 @@You haven't pinned any locations yet.
-
-
diff --git a/src/control/content/templates/locations.html b/src/control/content/templates/locations.html
index 6eb329fb..cba74d16 100644
--- a/src/control/content/templates/locations.html
+++ b/src/control/content/templates/locations.html
@@ -83,7 +83,7 @@
+ Other Locations
+Other Locations
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -103,22 +109,8 @@
Other Locations
-
-
-
-
-
-
-
-
-
-
-
-
+
+
No Locations Added.
-
Location on Map
+Location on Map
@@ -172,7 +172,7 @@
Location on Map
-
Categories
+Categories
@@ -290,7 +290,13 @@
Categories
-
+
Location Information & Images
+Location Images & Information
++
+
The list image is displayed in list view only. To set a main image for the location + details page, + add images under Location Images. The first image will be used as the main image.
+
@@ -336,10 +342,17 @@
Location Information & Images
Required
+
+
+
Location Fields
+
+
+
+
-
Location Action
+Location Action
You can add custom actions to your location to increase engagement.
@@ -382,7 +395,7 @@Location Action
-
Category 1
+Category 1
14 Subcategories
diff --git a/src/control/content/utils/helpers.js b/src/control/content/utils/helpers.js
index a05358d7..37aea52b 100644
--- a/src/control/content/utils/helpers.js
+++ b/src/control/content/utils/helpers.js
@@ -1,17 +1,6 @@
import { convertTimeToDate } from '../../../utils/datetime';
import DialogComponent from '../js/dialog/dialog';
-export const generateUUID = () => {
- let dt = new Date().getTime();
- const uuid = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
- const replace = (dt + Math.random() * 16) % 16 | 0;
- dt = Math.floor(dt / 16);
- return (c == "x" ? replace : (replace & 0x3) | 0x8).toString(16);
- });
-
- return uuid;
-};
-
export const createTemplate = (templateId) => {
const template = document.getElementById(`${templateId}`);
return document.importNode(template.content, true);
diff --git a/src/control/design/design.controller.js b/src/control/design/design.controller.js
index 2f0dbd67..496ab86b 100644
--- a/src/control/design/design.controller.js
+++ b/src/control/design/design.controller.js
@@ -1,4 +1,4 @@
-import Settings from '../../repository/Settings';
+import Settings from '../../widget/js/global/repository/Settings';
import authManager from '../../UserAccessControl/authManager';
export default {
diff --git a/src/control/design/design.js b/src/control/design/design.js
index d89b351a..9347bc8b 100644
--- a/src/control/design/design.js
+++ b/src/control/design/design.js
@@ -4,7 +4,7 @@
// Feel free to require any local or npm modules you've installed.
//
import buildfire from 'buildfire';
-import Settings from '../../entities/Settings';
+import Settings from '../../widget/js/global/data/Settings';
import authManager from '../../UserAccessControl/authManager';
import DesignController from "./design.controller";
diff --git a/src/control/settings/css/main.css b/src/control/settings/css/main.css
index 11cd4db4..aae005e9 100644
--- a/src/control/settings/css/main.css
+++ b/src/control/settings/css/main.css
@@ -81,6 +81,9 @@
.min-height-unset {
min-height: unset !important;
}
+.min-width-unset {
+ min-width: unset !important;
+}
.padding-2 {
padding: 2rem;
}
diff --git a/src/control/settings/index.html b/src/control/settings/index.html
index 27f93d3b..fd035f94 100755
--- a/src/control/settings/index.html
+++ b/src/control/settings/index.html
@@ -29,6 +29,11 @@
+
+
Loading...
Global
+Location Fields
+ +Sorting
diff --git a/src/control/settings/js/pages/locationFields.js b/src/control/settings/js/pages/locationFields.js new file mode 100644 index 00000000..0826960a --- /dev/null +++ b/src/control/settings/js/pages/locationFields.js @@ -0,0 +1,157 @@ +import buildfire from 'buildfire'; +import CustomFieldsListUI from '../ui/customFieldsListUI'; +import SettingsController from "../../settings.controller"; +import { generateUUID } from '../../../../widget/js/global/helpers'; +import constants from '../../../../widget/js/global/constants'; + +let _saveTimer; +const updateCustomFieldsWithDeilay = (customFields) => { + clearTimeout(_saveTimer); + _saveTimer = setTimeout(() => { + const updatedCustomFields = { + quickActions: customFields.quickActions.filter(item => item.label && item.type), + content: customFields.content.filter(item => item.label && item.type) + } + SettingsController.updateSettings({ customFields: updatedCustomFields }).then(() => { + updateAddButtonsState({ customFields }); + buildfire.messaging.sendMessageToWidget({ + cmd: 'sync', + scope: 'customFields' + }); + }) + }, 500); +} + +const initLocationFields = (settings) => { + const quickActionsList = new CustomFieldsListUI('quick-actions-container', [ + { id: constants.QuickActionsOptions.EMAIL, label: 'Email' }, + { id: constants.QuickActionsOptions.PHONE, label: 'Phone' }, + { id: constants.QuickActionsOptions.URL, label: 'URL' } + ]); + const textContentList = new CustomFieldsListUI('text-content-container', [ + { id: constants.ContentOptions.EMAIL, label: 'Email' }, + { id: constants.ContentOptions.PHONE, label: 'Phone' }, + { id: constants.ContentOptions.URL, label: 'URL' }, + { id: constants.ContentOptions.TEXT, label: 'Text' }, + { id: constants.ContentOptions.RICH_TEXT, label: 'Rich Text' }, + ]); + + // Quick Actions Listeners + quickActionsList.onUpdateItem = (item, index, divRow) => { + if (item.label && item.type) { + settings.customFields.quickActions = quickActionsList.items; + updateCustomFieldsWithDeilay(settings.customFields); + } + }; + quickActionsList.onOrderChange = (item, oldIndex, newIndex) => { + settings.customFields.quickActions = quickActionsList.items; + updateCustomFieldsWithDeilay(settings.customFields); + }; + quickActionsList.onDeleteItem = (item, index, callback) => { + buildfire.dialog.confirm( + { + title: 'Delete Field', + message: 'Are you sure you want to delete this field?', + confirmButton: { text: 'Delete', type: 'danger' }, + cancelButtonText: 'Cancel' + }, + (e, isConfirmed) => { + if (e) console.error(e); + if (isConfirmed) { + quickActionsList.items.splice(index, 1); + settings.customFields.quickActions = quickActionsList.items; + updateCustomFieldsWithDeilay(settings.customFields); + callback(true); + } else { + callback(false); + } + } + ); + }; + + // Text Content Listeners + textContentList.onUpdateItem = (item, index, divRow) => { + if (item.label && item.type) { + settings.customFields.content = textContentList.items; + updateCustomFieldsWithDeilay(settings.customFields); + } + }; + textContentList.onOrderChange = (item, oldIndex, newIndex) => { + settings.customFields.content = textContentList.items; + updateCustomFieldsWithDeilay(settings.customFields); + }; + textContentList.onDeleteItem = (item, index, callback) => { + buildfire.dialog.confirm( + { + title: 'Delete Field', + message: 'Are you sure you want to delete this field?', + confirmButton: { text: 'Delete', type: 'danger' }, + cancelButtonText: 'Cancel' + }, + (e, isConfirmed) => { + if (e) console.error(e); + if (isConfirmed) { + textContentList.items.splice(index, 1); + settings.customFields.content = textContentList.items; + updateCustomFieldsWithDeilay(settings.customFields); + callback(true); + } else { + callback(false); + } + } + ); + }; + + if (settings && settings.customFields) { + quickActionsList.init(settings.customFields.quickActions || []); + textContentList.init(settings.customFields.content || []); + } + + const addQuickActionBtn = document.getElementById('add-quick-action-field'); + addQuickActionBtn.onclick = () => { + quickActionsList.addItem({ + id: generateUUID(), + label: '', + type: constants.QuickActionsOptions.EMAIL, + required: false, + enableCustomLabel: false + }); + settings.customFields.quickActions = quickActionsList.items; + + updateAddButtonsState(settings); + }; + + const addTextContentBtn = document.getElementById('add-text-content-field'); + addTextContentBtn.onclick = () => { + textContentList.addItem({ + id: generateUUID(), + label: '', + type: constants.ContentOptions.EMAIL, + required: false, + enableCustomLabel: false + }); + settings.customFields.content = textContentList.items; + + updateAddButtonsState(settings); + }; + + updateAddButtonsState(settings); +}; + +const updateAddButtonsState = (settings) => { + const { customFields } = settings; + const allFields = [...customFields.quickActions, ...customFields.content]; + + const addTextContentBtn = document.getElementById('add-text-content-field'); + const addQuickActionBtn = document.getElementById('add-quick-action-field'); + + if (allFields.length < 10) { + addTextContentBtn.classList.remove('disabled'); + addQuickActionBtn.classList.remove('disabled'); + } else { + addTextContentBtn.classList.add('disabled'); + addQuickActionBtn.classList.add('disabled'); + } +}; + +export default initLocationFields; \ No newline at end of file diff --git a/src/control/settings/js/ui/customFieldsListUI.js b/src/control/settings/js/ui/customFieldsListUI.js new file mode 100644 index 00000000..2edf1fb3 --- /dev/null +++ b/src/control/settings/js/ui/customFieldsListUI.js @@ -0,0 +1,164 @@ +/* eslint-disable class-methods-use-this */ + +import SortableListUI from "./sortableList/sortableListUI"; +import BaseDropdown from "../../../../shared/baseDropdown"; + +class CustomFieldsListUI extends SortableListUI { + constructor(elementId, dropdownOptions) { + super(elementId, { isDraggable: true, dropdownOptions }); + } + + // append new sortable item to the DOM + _injectItemElements(item, index, divRow) { + if (!item) throw "Missing Item"; + divRow.innerHTML = ""; + divRow.setAttribute("arrayIndex", index); + + divRow.className = "d-item clearfix"; + divRow.style.padding = "10px"; + + const uniqueId = item.id || Date.now() + index; + + // Drag handle + const dragHandle = document.createElement("span"); + dragHandle.className = "icon icon-menu cursor-grab pull-left margin-zero padding-right-ten"; + dragHandle.style.marginTop = "10px"; + divRow.appendChild(dragHandle); + + // Main container + const mainContainer = document.createElement("div"); + mainContainer.className = "pull-left"; + mainContainer.style.width = "calc(100% - 40px)"; + mainContainer.style.marginLeft = "10px"; + divRow.appendChild(mainContainer); + + // Grid container + const flexContainer = document.createElement("div"); + flexContainer.style.display = "grid"; + flexContainer.style.gridTemplateColumns = "1fr 1fr 1fr"; + flexContainer.style.gridTemplateRows = "1fr 1fr"; + flexContainer.style.columnGap = "16px"; + flexContainer.style.rowGap = "8px"; + flexContainer.style.alignItems = "center"; + mainContainer.appendChild(flexContainer); + + // Field Name Input + const nameCol = document.createElement("div"); + nameCol.style.flex = "2"; + nameCol.style.minWidth = "150px"; + nameCol.style.gridColumn = "span 2"; + const labelInput = document.createElement("input"); + labelInput.type = "text"; + labelInput.className = "form-control label-input"; + labelInput.placeholder = "Field Name (Required)"; + labelInput.value = item.label || ""; + labelInput.oninput = (e) => { + item.label = e.target.value; + this.onUpdateItem(item, parseInt(divRow.getAttribute("arrayIndex"), 10), divRow); + }; + nameCol.appendChild(labelInput); + flexContainer.appendChild(nameCol); + + // Type Dropdown container + const typeDropdownContainer = document.createElement("div"); + typeDropdownContainer.style.flex = "1.5"; + typeDropdownContainer.style.minWidth = "120px"; + typeDropdownContainer.className = "type-dropdown-container"; + flexContainer.appendChild(typeDropdownContainer); + + // Required Checkbox + const reqCol = document.createElement("div"); + reqCol.style.display = "flex"; + reqCol.style.alignItems = "center"; + reqCol.style.gap = "10px"; + + const reqCheckboxWrap = document.createElement("div"); + reqCheckboxWrap.className = "checkbox checkbox-primary no-label margin-zero"; + + const reqCheckbox = document.createElement("input"); + reqCheckbox.type = "checkbox"; + reqCheckbox.id = `req_${uniqueId}`; + reqCheckbox.className = "required-checkbox"; + reqCheckbox.checked = !!item.required; + reqCheckbox.onchange = (e) => { + item.required = e.target.checked; + this.onUpdateItem(item, parseInt(divRow.getAttribute("arrayIndex"), 10), divRow); + }; + + const reqLabel = document.createElement("label"); + reqLabel.htmlFor = `req_${uniqueId}`; + + reqCheckboxWrap.appendChild(reqCheckbox); + reqCheckboxWrap.appendChild(reqLabel); + + const reqSpan = document.createElement("span"); + reqSpan.innerHTML = ``; + + reqCol.appendChild(reqCheckboxWrap); + reqCol.appendChild(reqSpan); + flexContainer.appendChild(reqCol); + + // Custom Label Checkbox + const custCol = document.createElement("div"); + custCol.style.display = "flex"; + custCol.style.alignItems = "center"; + custCol.style.gap = "10px"; + custCol.style.gridColumn = "span 2"; + + const custCheckboxWrap = document.createElement("div"); + custCheckboxWrap.className = "checkbox checkbox-primary no-label margin-zero"; + + const custCheckbox = document.createElement("input"); + custCheckbox.type = "checkbox"; + custCheckbox.id = `cust_${uniqueId}`; + custCheckbox.className = "custom-label-checkbox"; + custCheckbox.checked = !!item.enableCustomLabel; + custCheckbox.onchange = (e) => { + item.enableCustomLabel = e.target.checked; + this.onUpdateItem(item, parseInt(divRow.getAttribute("arrayIndex"), 10), divRow); + }; + + const custLabel = document.createElement("label"); + custLabel.htmlFor = `cust_${uniqueId}`; + + custCheckboxWrap.appendChild(custCheckbox); + custCheckboxWrap.appendChild(custLabel); + + const custSpan = document.createElement("span"); + custSpan.innerHTML = ``; + + custCol.appendChild(custCheckboxWrap); + custCol.appendChild(custSpan); + flexContainer.appendChild(custCol); + + // Delete Button + const delCol = document.createElement("div"); + const deleteBtn = document.createElement("span"); + deleteBtn.className = "btn--icon icon icon-cross2 cursor-pointer delete-btn margin-left-ten"; + deleteBtn.onclick = () => { + let currentIndex = divRow.getAttribute("arrayIndex"); + currentIndex = parseInt(currentIndex, 10); + this.onDeleteItem(item, currentIndex, (confirmed) => { + if (confirmed) { + divRow.parentNode.removeChild(divRow); + this.reIndexRows(); + } + }); + return false; + }; + delCol.appendChild(deleteBtn); + divRow.appendChild(delCol); + + // Instantiate BaseDropdown + new BaseDropdown(typeDropdownContainer, { + items: this.options.dropdownOptions, + selectedId: item.type, + handleSelect: (selected) => { + item.type = selected.id; + this.onUpdateItem(item, parseInt(divRow.getAttribute("arrayIndex"), 10), divRow); + } + }); + } +} + +export default CustomFieldsListUI; diff --git a/src/control/settings/js/ui/sortableList/sortableList.js b/src/control/settings/js/ui/sortableList/sortableList.js index 5b716909..f7153325 100644 --- a/src/control/settings/js/ui/sortableList/sortableList.js +++ b/src/control/settings/js/ui/sortableList/sortableList.js @@ -118,7 +118,7 @@ export default class SortableList { if (!url) { return ""; } - return buildfire.imageLib.cropImage(url, options); + return buildfire.imageLib.cropImage(url, options) + '&crop=entropy'; } /* This will be triggered when the order of items changes diff --git a/src/control/settings/settings.controller.js b/src/control/settings/settings.controller.js index 2f0dbd67..75b57dde 100644 --- a/src/control/settings/settings.controller.js +++ b/src/control/settings/settings.controller.js @@ -1,4 +1,4 @@ -import Settings from '../../repository/Settings'; +import Settings from '../../widget/js/global/repository/Settings'; import authManager from '../../UserAccessControl/authManager'; export default { @@ -6,6 +6,9 @@ export default { getSettings() { return Settings.get(true); }, + updateSettings(updatedSettings) { + return Settings.save({ $set: updatedSettings }); + }, saveSettings(settings) { settings.lastUpdatedOn = new Date(); settings.lastUpdatedBy = authManager.sanitizedCurrentUser; diff --git a/src/control/settings/settings.js b/src/control/settings/settings.js index e41bd79d..85475ac2 100644 --- a/src/control/settings/settings.js +++ b/src/control/settings/settings.js @@ -3,16 +3,17 @@ // This is the entry point of your plugin's settings control. // Feel free to require any local or npm modules you've installed. import buildfire from 'buildfire'; -import Settings from '../../entities/Settings'; +import Settings from '../../widget/js/global/data/Settings'; import authManager from '../../UserAccessControl/authManager'; import SettingsController from "./settings.controller"; import GlobalTagsListUI from './js/ui/globalTagsListUI'; import GlobalEditorsListUI from './js/ui/globalEditorsListUI'; import LocationEditingListUI from './js/ui/locationEditingListUI'; import DialogComponent from './js/ui/dialog/dialog'; -import Locations from '../../repository/Locations'; +import Locations from '../../widget/js/global/repository/Locations'; import { getDisplayName } from './js/util/helpers'; import { isCameraControlVersion } from '../../shared/utils/mapUtils'; +import initLocationFields from './js/pages/locationFields'; const sidenavContainer = document.getElementById('sidenav-container'); const emptyState = document.getElementById('empty-state'); @@ -502,7 +503,7 @@ const cropImage = (url, options) => { if (!url) { return ""; } - return buildfire.imageLib.cropImage(url, options); + return buildfire.imageLib.cropImage(url, options) + '&crop=entropy'; }; const createEmptyHolder = (message = 'No Data', classes = '') => { @@ -1211,6 +1212,12 @@ window.onSidenavChange = (section) => { initGlobalSettings(); }); break; + case 'locationFields': + setActiveSidenavTab('locationFields'); + navigate('locationFields', () => { + initLocationFields(state.settings); + }); + break; case 'sorting': setActiveSidenavTab('sorting'); navigate('sorting', () => { diff --git a/src/control/settings/templates/locationEditing.html b/src/control/settings/templates/locationEditing.html index 8fdac184..7e7a6abb 100644 --- a/src/control/settings/templates/locationEditing.html +++ b/src/control/settings/templates/locationEditing.html @@ -56,7 +56,7 @@
-
+
diff --git a/src/control/settings/templates/locationFields.html b/src/control/settings/templates/locationFields.html
new file mode 100644
index 00000000..fd564fca
--- /dev/null
+++ b/src/control/settings/templates/locationFields.html
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/control/settings/templates/map.html b/src/control/settings/templates/map.html
index a24fd8bb..5c20c05e 100644
--- a/src/control/settings/templates/map.html
+++ b/src/control/settings/templates/map.html
@@ -39,7 +39,7 @@
Location Fields
+
+
+
+
+ + Add custom fields that appear when adding or editing a location. Fields can be optional or required and will + be shown on all locations. You can allow users to customize the field label if needed. Add up to 10 fields + in total. +
+Quick Actions
+
+
+
+
+
+ + Fields displayed at the top of the Additional Details section as compact icon buttons with short labels. + Best suited for email, phone numbers, and URLs with brief titles. +
+Text Content
+
+
+
+
+
+ + Fields displayed as full-width sections below Quick Actions. Used for descriptive content such as text, + rich + text, or links in a standard layout. Suitable for longer labels. +
+
-
Default Map Area
+Default Map Area
diff --git a/src/control/tests/spec/categories.spec.js b/src/control/tests/spec/categories.spec.js
index 6947ec9e..6bd1ab0d 100644
--- a/src/control/tests/spec/categories.spec.js
+++ b/src/control/tests/spec/categories.spec.js
@@ -2,9 +2,9 @@ import "../lib/jasmine";
import "../lib/jasmine-html";
import "../lib/boot";
-import Categories from "../../../repository/Categories";
+import Categories from "../../../widget/js/global/repository/Categories";
import authManager from "../../../UserAccessControl/authManager";
-import Category from "../../../entities/Category";
+import Category from "../../../widget/js/global/data/Category";
const run = () => {
describe("Categories", () => {
diff --git a/src/control/tests/spec/locations.spec.js b/src/control/tests/spec/locations.spec.js
index 4b569ff9..6040b167 100644
--- a/src/control/tests/spec/locations.spec.js
+++ b/src/control/tests/spec/locations.spec.js
@@ -2,10 +2,10 @@ import "../lib/jasmine";
import "../lib/jasmine-html";
import "../lib/boot";
-import Categories from "../../../repository/Categories";
-import Locations from "../../../repository/Locations";
+import Categories from "../../../widget/js/global/repository/Categories";
+import Locations from "../../../widget/js/global/repository/Locations";
import authManager from "../../../UserAccessControl/authManager";
-import Location from "../../../entities/Location";
+import Location from "../../../widget/js/global/data/Location";
const run = () => {
describe("Locations", () => {
diff --git a/src/control/tests/spec/settings.spec.js b/src/control/tests/spec/settings.spec.js
index 04904d2f..2628eb77 100644
--- a/src/control/tests/spec/settings.spec.js
+++ b/src/control/tests/spec/settings.spec.js
@@ -2,7 +2,7 @@ import "../lib/jasmine";
import "../lib/jasmine-html";
import "../lib/boot";
-import Settings from "../../../repository/Settings";
+import Settings from "../../../widget/js/global/repository/Settings";
const run = () => {
describe("Settings", () => {
diff --git a/src/shared/baseDropdown.js b/src/shared/baseDropdown.js
new file mode 100644
index 00000000..cabe5543
--- /dev/null
+++ b/src/shared/baseDropdown.js
@@ -0,0 +1,133 @@
+export default class BaseDropdown {
+ constructor(container, props) {
+ this.container = typeof container === 'string' ? document.querySelector(container) : container;
+ this.props = props || {};
+ this.selectedItem = null;
+ this.placeholder = this.props.placeholder || "";
+ this.dropdownRef = null;
+ this._handleDocumentClick = this._handleDocumentClick.bind(this);
+
+ if (this.props.selectedId) {
+ this.selectedItem = this.props.items.find(item => item.id == this.props.selectedId);
+ } else {
+ const defaultItem = this.props.items && this.props.items.find(item => !item.id);
+ if (defaultItem) this.selectedItem = defaultItem;
+ else this.selectedItem = null;
+ }
+
+ this.render();
+ document.addEventListener('click', this._handleDocumentClick);
+ }
+
+ _handleDocumentClick(event) {
+ if (this.dropdownRef && !this.dropdownRef.contains(event.target) && this.dropdownRef.classList.contains('open')) {
+ this.hideDropdown();
+ }
+ }
+
+ hideDropdown() {
+ const dialogBody = document.querySelector('.dialog-body');
+ if (dialogBody) dialogBody.style.overflowY = 'auto';
+ if (this.dropdownRef) this.dropdownRef.classList.remove('open');
+ }
+
+ showDropdown() {
+ const dialogBody = document.querySelector('.dialog-body');
+ if (dialogBody) dialogBody.style.overflowY = 'unset';
+ if (this.dropdownRef) this.dropdownRef.classList.add('open');
+ }
+
+ toggleCategoriesDropDown() {
+ if (this.dropdownRef && this.dropdownRef.classList.contains('open')) {
+ this.hideDropdown();
+ } else {
+ this.showDropdown();
+ }
+ }
+
+ handleSelect(item) {
+ if (this.props.handleSelect) {
+ this.props.handleSelect(item);
+ }
+ this.hideDropdown();
+
+ this.selectedItem = item;
+ this.render();
+ }
+
+ render() {
+ this.container.innerHTML = "";
+
+ const wrapper = document.createElement('div');
+ if (this.props.id) wrapper.id = this.props.id;
+ wrapper.className = `row ${this.props.className ? this.props.className : ""}`;
+
+ if (this.props.label) {
+ const labelEl = document.createElement('label');
+ labelEl.className = "col-md-4 pull-left";
+ labelEl.innerHTML = `${this.props.label} ${this.props.required ? '' : ''}`;
+ wrapper.appendChild(labelEl);
+ }
+
+ const colDiv = document.createElement('div');
+ colDiv.className = `${this.props.label ? "col-md-8" : "col-md-12"} pull-left`;
+
+ const btnGroup = document.createElement('div');
+ btnGroup.className = "btn-group w-100";
+ this.dropdownRef = btnGroup;
+
+ const button = document.createElement('button');
+ button.type = "button";
+ button.className = "btn btn-default dropdown-toggle text-left flex space-between";
+ button.setAttribute("data-toggle", "dropdown");
+ button.setAttribute("aria-haspopup", "true");
+ button.setAttribute("aria-expanded", "false");
+
+ if (!this.props.items || !this.props.items.length) {
+ button.disabled = true;
+ }
+
+ button.onclick = () => this.toggleCategoriesDropDown();
+
+ const ellipsisSpan = document.createElement('span');
+ ellipsisSpan.className = "ellipsis";
+ ellipsisSpan.textContent = (this.selectedItem && this.selectedItem.label) ? this.selectedItem.label : this.placeholder;
+
+ const caretSpan = document.createElement('span');
+ caretSpan.className = "caret pull-right";
+
+ button.appendChild(ellipsisSpan);
+ button.appendChild(caretSpan);
+
+ btnGroup.appendChild(button);
+
+ const ul = document.createElement('ul');
+ ul.className = "dropdown-menu min-width-unset";
+ if (this.props.dropToTop) {
+ ul.classList.add('dropup');
+ }
+ ul.setAttribute("role", "menu");
+
+ if (this.props.items && this.props.items.length) {
+ this.props.items.forEach(item => {
+ const li = document.createElement('li');
+ li.onclick = () => this.handleSelect(item);
+ const a = document.createElement('a');
+ a.textContent = item.label;
+ li.appendChild(a);
+ ul.appendChild(li);
+ });
+ }
+
+ btnGroup.appendChild(ul);
+ colDiv.appendChild(btnGroup);
+ wrapper.appendChild(colDiv);
+
+ this.container.appendChild(wrapper);
+ }
+
+ destroy() {
+ document.removeEventListener('click', this._handleDocumentClick);
+ this.container.innerHTML = "";
+ }
+}
\ No newline at end of file
diff --git a/src/shared/stringsConfig.js b/src/shared/stringsConfig.js
index f7594a95..f123c8be 100644
--- a/src/shared/stringsConfig.js
+++ b/src/shared/stringsConfig.js
@@ -294,6 +294,20 @@ export default {
required: true,
maxLength: 35,
},
+ additionalDetails: {
+ title: 'Additional Details',
+ placeholder: 'Enter text here',
+ defaultValue: 'Additional Details',
+ required: true,
+ maxLength: 35,
+ },
+ locationCustomLabel: {
+ title: 'Location Custom Label',
+ placeholder: 'Enter text here',
+ defaultValue: 'Label (optional)',
+ required: true,
+ maxLength: 35,
+ },
locationStreetNameAndNumber: {
title: 'Street Name and Number',
placeholder: 'Enter text here',
@@ -517,6 +531,62 @@ export default {
required: true,
maxLength: 15,
},
+ enterEmailAddress: {
+ title: 'Enter email address',
+ placeholder: 'Enter text here',
+ defaultValue: 'Enter email address',
+ required: true,
+ maxLength: 50,
+ },
+ enterPhoneNumber: {
+ title: 'Enter phone number',
+ placeholder: 'Enter text here',
+ defaultValue: 'Enter phone number',
+ required: true,
+ maxLength: 50,
+ },
+ enterURL: {
+ title: 'Enter URL',
+ placeholder: 'Enter text here',
+ defaultValue: 'Enter URL',
+ required: true,
+ maxLength: 50,
+ },
+ addDescription: {
+ title: 'Add description',
+ placeholder: 'Enter text here',
+ defaultValue: 'Add description',
+ required: true,
+ maxLength: 50,
+ },
+ enterDetails: {
+ title: 'Enter details',
+ placeholder: 'Enter text here',
+ defaultValue: 'Enter details',
+ required: true,
+ maxLength: 50,
+ },
+ validEmail: {
+ title: 'Enter a valid email address',
+ placeholder: 'Enter text here',
+ defaultValue: 'Enter a valid email address',
+ required: true,
+ maxLength: 50,
+ },
+ validPhone: {
+ title: 'Enter a valid phone number',
+ placeholder: 'Enter text here',
+ defaultValue: 'Enter a valid phone number',
+ required: true,
+ maxLength: 50,
+ },
+ validURL: {
+ title: 'Enter a valid URL',
+ placeholder: 'Enter text here',
+ defaultValue: 'Enter a valid URL',
+ required: true,
+ maxLength: 50,
+ },
}
},
toast: {
diff --git a/src/widget/css/main.css b/src/widget/css/main.css
index 5b095b93..fceeff53 100644
--- a/src/widget/css/main.css
+++ b/src/widget/css/main.css
@@ -124,6 +124,16 @@ section#categories.overlay {
display: flex;
flex-direction: column;
}
+.gap-2-rem {
+ gap: 2rem;
+}
+
+.gap-rem {
+ gap: 1rem;
+}
+.gap-half-rem {
+ gap: 0.5rem;
+}
.d-block {
display: block;
}
@@ -650,10 +660,26 @@ button span {
.location-detail__actions {
display: flex;
flex-wrap: wrap;
- justify-content: space-evenly;
+ justify-content: flex-start;
margin: 10px -15px 0;
padding: 15px;
box-shadow: rgb(0 0 0 / 12%) 0px 3px 6px -1px;
+ column-gap: 16px;
+}
+.location-detail__actions .action-item {
+ flex: 1;
+ max-width: 30%;
+}
+.location-detail__actions .location-custom_content_container {
+ min-width: 100% !important;
+}
+
+.location-custom_content_item {
+ font-size: 14px;
+}
+
+.location-custom_content_item .custom-content-value>p:first-child {
+ margin: 0;
}
.location-detail__actions .action-item img {
width: 50px;
@@ -1120,8 +1146,10 @@ body section#home {
}
.fixed-footer button {
+ height: 40px;
margin-right: auto;
margin-left: auto;
+ width: 50%;
}
#create .fixed-footer button,
@@ -1425,7 +1453,8 @@ h4.light-text {
text-transform: unset;
}
#locationDescriptionTextField,
-#locationDescriptionContainer {
+#locationDescriptionContainer,
+.custom-wysiwyg-container {
background-color: rgba(150,150,150,.1);
height: 165px;
padding: 4px 16px 6px;
@@ -1436,24 +1465,29 @@ h4.light-text {
position: relative;
}
#locationDescriptionTextField.has-error,
-#locationDescriptionContainer.has-error {
+#locationDescriptionContainer.has-error,
+.custom-wysiwyg-container.has-error {
border-bottom-color: var(--mdc-theme-error, #EB4747) !important;
}
#locationDescriptionTextField *,
-#locationDescriptionContainer * {
+#locationDescriptionContainer *,
+.custom-wysiwyg-container * {
pointer-events: none;
}
#locationDescriptionTextField:not(.disabled),
-#locationDescriptionContainer:not(.disabled) {
+#locationDescriptionContainer:not(.disabled),
+.custom-wysiwyg-container:not(.disabled) {
cursor: text;
}
#locationDescriptionTextField.disabled,
-#locationDescriptionContainer.disabled {
+#locationDescriptionContainer.disabled,
+.custom-wysiwyg-container.disabled {
cursor: not-allowed;
opacity: 0.5;
}
#locationDescriptionTextField .mdc-floating-label,
-#locationDescriptionContainer .mdc-floating-label {
+#locationDescriptionContainer .mdc-floating-label,
+.custom-wysiwyg-container .mdc-floating-label {
left: 16px;
top: 20px;
color: var(--mdc-theme-on-background, #000000);
@@ -1517,6 +1551,31 @@ h4.light-text {
padding: 20px 0;
}
+.custom-field-title {
+ font-size: 14px;
+ font-weight: 400;
+ color: var(--bf-theme-header-text);
+}
+
+.text-32 {
+ font-size: 32px;
+}
+.custom-field-title.required::after {
+ margin-left: 1px;
+ content: "*";
+ font-size: 15px;
+}
.hidden {
display: none !important;
}
+
+.headerTextTheme {
+ color: var(--bf-theme-header-text);
+}
+
+.iconsTheme {
+ color: var(--bf-theme-icons);
+}
+.margin-auto {
+ margin: auto;
+}
\ No newline at end of file
diff --git a/src/widget/js/Views.js b/src/widget/js/Views.js
index d80e8e36..0ce7882d 100644
--- a/src/widget/js/Views.js
+++ b/src/widget/js/Views.js
@@ -5,6 +5,8 @@ import state from "./state";
import detailsView from "./views/detailsView";
import introView from "./views/introView";
import mapView from "./views/mapView";
+import createView from './views/createView';
+import editView from './views/editView';
class Views {
constructor() {
@@ -71,6 +73,12 @@ class Views {
case 'detail':
detailsView.initLocationDetails();
break;
+ case 'create':
+ createView.navigateTo();
+ break;
+ case 'edit':
+ editView.init();
+ break;
}
}
}
diff --git a/src/widget/js/accessManager.js b/src/widget/js/accessManager.js
index de193f38..79f77a06 100644
--- a/src/widget/js/accessManager.js
+++ b/src/widget/js/accessManager.js
@@ -1,4 +1,5 @@
import authManager from '../../UserAccessControl/authManager';
+import constants from './global/constants';
import state from './state';
export default {
@@ -75,4 +76,20 @@ export default {
}
return authed;
},
+ hasIntroScreenAccess() {
+ const { currentUser } = authManager;
+ const { visibilityOptions } = state.settings.introductoryListView;
+
+ if (visibilityOptions.value === constants.IntroViewVisibilityOptions.ALL) return true;
+
+ const appId = buildfire.getContext().appId;
+ if (currentUser && currentUser.tags && currentUser.tags[appId] && visibilityOptions.value === constants.IntroViewVisibilityOptions.TAGS) {
+ const allowedTagNames = visibilityOptions.tags.map((t) => t.tagName);
+
+ const userTagNames = currentUser.tags[appId].map((tag) => tag.tagName);
+
+ return userTagNames.some((tagName) => allowedTagNames.includes(tagName));
+ }
+ return false;
+ }
};
diff --git a/src/widget/js/constants/index.js b/src/widget/js/constants/index.js
deleted file mode 100644
index 3e970855..00000000
--- a/src/widget/js/constants/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import MAP_STYLES from './mapStyles';
-
-const getMapStyle = (name) => {
- let style;
-
- switch (name) {
- case 'nightMode':
- style = MAP_STYLES.NIGHT_MODE;
- break;
- default:
- style = [];
- }
-
- return style;
-};
-
-const getDefaultLocation = () => ({ lat: 32.7182625, lng: -117.1601157 });
-
-const SearchLocationsModes = {
- All: "All",
- UserPosition: "UserPosition",
- AreaRadius: "AreaRadius",
-};
-
-export default { getMapStyle, getDefaultLocation, SearchLocationsModes };
diff --git a/src/widget/js/global/constants/index.js b/src/widget/js/global/constants/index.js
new file mode 100644
index 00000000..862a381a
--- /dev/null
+++ b/src/widget/js/global/constants/index.js
@@ -0,0 +1,52 @@
+import MAP_STYLES from './mapStyles';
+
+const getMapStyle = (name) => {
+ let style;
+
+ switch (name) {
+ case 'nightMode':
+ style = MAP_STYLES.NIGHT_MODE;
+ break;
+ default:
+ style = [];
+ }
+
+ return style;
+};
+
+const getDefaultLocation = () => ({ lat: 32.7182625, lng: -117.1601157 });
+
+const SearchLocationsModes = {
+ All: "All",
+ UserPosition: "UserPosition",
+ AreaRadius: "AreaRadius",
+ MyLocations: "MyLocations",
+};
+
+const SortingOptions = {
+ Distance: "distance",
+ Alphabetical: "alphabetical",
+ Newest: "newest",
+}
+
+const IntroViewVisibilityOptions = {
+ ALL: "ALL",
+ TAGS: "TAGS",
+ NONE: "NONE",
+};
+
+const QuickActionsOptions = {
+ URL: "URL",
+ PHONE: "PHONE",
+ EMAIL: "EMAIL",
+}
+
+const ContentOptions = {
+ TEXT: "TEXT",
+ RICH_TEXT: "RICH_TEXT",
+ URL: "URL",
+ PHONE: "PHONE",
+ EMAIL: "EMAIL",
+}
+
+export default { getMapStyle, getDefaultLocation, SearchLocationsModes, SortingOptions, IntroViewVisibilityOptions, QuickActionsOptions, ContentOptions, QuickActionsOptions, ContentOptions };
diff --git a/src/widget/js/constants/mapStyles.js b/src/widget/js/global/constants/mapStyles.js
similarity index 100%
rename from src/widget/js/constants/mapStyles.js
rename to src/widget/js/global/constants/mapStyles.js
diff --git a/src/entities/Category.js b/src/widget/js/global/data/Category.js
similarity index 100%
rename from src/entities/Category.js
rename to src/widget/js/global/data/Category.js
diff --git a/src/entities/Location.js b/src/widget/js/global/data/Location.js
similarity index 90%
rename from src/entities/Location.js
rename to src/widget/js/global/data/Location.js
index c9a4addf..30ab56bf 100644
--- a/src/entities/Location.js
+++ b/src/widget/js/global/data/Location.js
@@ -54,6 +54,10 @@ export default class Location {
this.deletedOn = data.deletedOn || null;
this.deletedBy = data.deletedBy || null;
this.isActive = [0, 1].includes(data.isActive) ? data.isActive : 1;
+ this.additionalFields = {
+ quickActions: (data.additionalFields?.quickActions || []).map(field => new CustomField(field)),
+ content: (data.additionalFields?.content || []).map(field => new CustomField(field))
+ };
}
get instanceId() {
@@ -93,6 +97,7 @@ export default class Location {
deletedOn: this.deletedOn,
deletedBy: this.deletedBy,
isActive: this.isActive,
+ additionalFields: this.additionalFields,
_buildfire: {
index: {
text: `${this.title.toLowerCase()} ${this.subtitle ? this.subtitle : ''} ${this.address} ${this.formattedAddress} ${this.addressAlias ? this.addressAlias : ''}`,
@@ -115,3 +120,11 @@ export default class Location {
};
}
}
+
+class CustomField {
+ constructor(data = {}) {
+ this.id = data.id || null;
+ this.customLabel = data.customLabel || null;
+ this.value = data.value || null;
+ }
+}
\ No newline at end of file
diff --git a/src/entities/Settings.js b/src/widget/js/global/data/Settings.js
similarity index 71%
rename from src/entities/Settings.js
rename to src/widget/js/global/data/Settings.js
index 251b59f6..cdeb3d6f 100644
--- a/src/entities/Settings.js
+++ b/src/widget/js/global/data/Settings.js
@@ -1,3 +1,5 @@
+import constants from "../constants";
+
/**
* Settings data model
* @class
@@ -8,7 +10,6 @@ export default class Settings {
* @constructor
*/
constructor(data = {}) {
- this.showIntroductoryListView = typeof data.showIntroductoryListView === 'undefined' ? true : data.showIntroductoryListView;
this.subscription = data.subscription || {
enabled: false,
allowCustomNotifications: false,
@@ -17,12 +18,23 @@ export default class Settings {
this.introductoryListView = data.introductoryListView || {
images: [],
description: null,
- sorting: null,
+ sorting: constants.SortingOptions.Distance,
searchOptions: {
- mode: null,
+ mode: constants.SearchLocationsModes.UserPosition,
areaRadiusOptions: {}
- }
+ },
};
+ if (!data.introductoryListView?.visibilityOptions) {
+ this.introductoryListView.visibilityOptions = {
+ tags: [],
+ value: (data.showIntroductoryListView === true || typeof data.showIntroductoryListView === 'undefined') ? constants.IntroViewVisibilityOptions.ALL : constants.IntroViewVisibilityOptions.NONE
+ }
+ } else {
+ this.introductoryListView.visibilityOptions = {
+ tags: data.introductoryListView?.visibilityOptions?.tags || [],
+ value: data.introductoryListView?.visibilityOptions?.value || constants.IntroViewVisibilityOptions.ALL
+ };
+ }
this.sorting = data.sorting || {
defaultSorting: 'distance',
hideSorting: false,
@@ -34,6 +46,10 @@ export default class Settings {
allowSortByRating: true,
allowSortByViews: true,
};
+ this.customFields = {
+ quickActions: (data.customFields?.quickActions || []).map(field => new CustomField(field)),
+ content: (data.customFields?.content || []).map(field => new CustomField(field))
+ };
this.filter = data.filter || {
allowFilterByArea: true,
allowFilterByBookmarks: false,
@@ -53,7 +69,7 @@ export default class Settings {
allowForLocations: true,
allowForFilters: true
};
- this.design = data.design || {
+ this.design = data.design || {
listViewPosition: 'collapsed',
listViewStyle: 'backgroundImage',
defaultMapStyle: 'light',
@@ -67,7 +83,7 @@ export default class Settings {
};
this.globalEntries = data.globalEntries || {
locations: {
- allowAdding: 'none', // all || none || limited
+ allowAdding: 'none', // all || none || limited
tags: [],
},
photos: {
@@ -87,7 +103,7 @@ export default class Settings {
enabled: true,
time: "12H"
};
- this.categoriesSortBy = data.categoriesSortBy || "Asc";
+ this.categoriesSortBy = data.categoriesSortBy || "Asc";
this.createdOn = data.createdOn || new Date();
this.createdBy = data.createdBy || null;
this.lastUpdatedOn = data.lastUpdatedOn || new Date();
@@ -104,13 +120,13 @@ export default class Settings {
toJSON() {
return {
subscription: this.subscription,
- showIntroductoryListView: this.showIntroductoryListView,
measurementUnit: this.measurementUnit,
introductoryListView: this.introductoryListView,
sorting: this.sorting,
filter: this.filter,
map: this.map,
bookmarks: this.bookmarks,
+ customFields: this.customFields,
design: this.design,
globalEntries: this.globalEntries,
globalEditors: this.globalEditors,
@@ -129,3 +145,13 @@ export default class Settings {
};
}
}
+
+class CustomField {
+ constructor(data = {}) {
+ this.id = data.id || null;
+ this.label = data.label || null;
+ this.type = data.type || null;
+ this.required = data.required || false;
+ this.enableCustomLabel = data.enableCustomLabel || false;
+ }
+}
diff --git a/src/widget/js/global/helpers.js b/src/widget/js/global/helpers.js
new file mode 100644
index 00000000..87ebeafc
--- /dev/null
+++ b/src/widget/js/global/helpers.js
@@ -0,0 +1,10 @@
+export const generateUUID = () => {
+ let dt = new Date().getTime();
+ const uuid = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
+ const replace = (dt + Math.random() * 16) % 16 | 0;
+ dt = Math.floor(dt / 16);
+ return (c == "x" ? replace : (replace & 0x3) | 0x8).toString(16);
+ });
+
+ return uuid;
+};
\ No newline at end of file
diff --git a/src/repository/Categories.js b/src/widget/js/global/repository/Categories.js
similarity index 97%
rename from src/repository/Categories.js
rename to src/widget/js/global/repository/Categories.js
index 90542ba2..f942ecc2 100644
--- a/src/repository/Categories.js
+++ b/src/widget/js/global/repository/Categories.js
@@ -1,4 +1,4 @@
-import Category from "../entities/Category";
+import Category from "../data/Category";
/**
* Categories data access
* @class
diff --git a/src/repository/Locations.js b/src/widget/js/global/repository/Locations.js
similarity index 98%
rename from src/repository/Locations.js
rename to src/widget/js/global/repository/Locations.js
index 9c11bcab..aeea48b8 100644
--- a/src/repository/Locations.js
+++ b/src/widget/js/global/repository/Locations.js
@@ -1,4 +1,4 @@
-import Location from "../entities/Location";
+import Location from "../data/Location";
/**
* Locations data access
diff --git a/src/repository/Settings.js b/src/widget/js/global/repository/Settings.js
similarity index 94%
rename from src/repository/Settings.js
rename to src/widget/js/global/repository/Settings.js
index 8a9ffe3c..0e741cdd 100644
--- a/src/repository/Settings.js
+++ b/src/widget/js/global/repository/Settings.js
@@ -1,4 +1,5 @@
-import Setting from "../entities/Settings";
+import Setting from "../data/Settings";
+import constants from "../constants";
export default class Settings {
/**
@@ -29,6 +30,7 @@ export default class Settings {
resolve(settings);
return;
}
+
resolve(new Setting(res.data));
});
});
diff --git a/src/repository/searchEngine.js b/src/widget/js/global/repository/searchEngine.js
similarity index 100%
rename from src/repository/searchEngine.js
rename to src/widget/js/global/repository/searchEngine.js
diff --git a/src/widget/js/util/helpers.js b/src/widget/js/util/helpers.js
index 51867520..2fff05c9 100644
--- a/src/widget/js/util/helpers.js
+++ b/src/widget/js/util/helpers.js
@@ -5,7 +5,8 @@ import { convertTimeToDate, getCurrentDayName, openingNowDate } from '../../../u
import state from '../state';
import Analytics from '../../../utils/analytics';
import WidgetController from '../../widget.controller';
-import Location from '../../../entities/Location';
+import Location from '../global/data/Location';
+import { generateUUID } from '../global/helpers';
export const deepObjectDiff = (a, b, reversible) => {
const r = {};
@@ -55,15 +56,6 @@ export const cdnImage = (imageUrl) => {
return `https://buidfire-proxy.imgix.net/app_${appId}/${encodeURIComponent(imageUrl)}`;
};
-export const generateUUID = () => {
- let dt = new Date().getTime();
- return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
- const replace = (dt + Math.random() * 16) % 16 | 0;
- dt = Math.floor(dt / 16);
- return (c === "x" ? replace : (replace & 0x3) | 0x8).toString(16);
- });
-};
-
export const getDefaultOpeningHours = () => {
const intervals = [{ from: convertTimeToDate("08:00"), to: convertTimeToDate("20:00") }];
return {
@@ -104,7 +96,7 @@ export const cropImage = (url, options) => {
if (!url) {
return '';
}
- return buildfire.imageLib.cropImage(url, options);
+ return buildfire.imageLib.cropImage(url, options) + '&crop=entropy';
};
export const isLocationOpen = (location) => {
diff --git a/src/widget/js/Accordion.js b/src/widget/js/views/components/Accordion.js
similarity index 100%
rename from src/widget/js/Accordion.js
rename to src/widget/js/views/components/Accordion.js
diff --git a/src/widget/js/views/components/customFields.js b/src/widget/js/views/components/customFields.js
new file mode 100644
index 00000000..8f21e14f
--- /dev/null
+++ b/src/widget/js/views/components/customFields.js
@@ -0,0 +1,377 @@
+import state from '../../state';
+import constants from '../../global/constants';
+
+const customFieldsController = {
+ init() {
+ const { settings } = state;
+ const locationCustomFields = document.querySelector('#locationCustomFields');
+
+ if (settings.customFields.quickActions.length || settings.customFields.content.length) {
+ const locationAdditionalDetailsContainer = document.querySelector('#locationAdditionalDetailsContainer');
+ locationAdditionalDetailsContainer.innerHTML = '';
+
+ this._injectCustomFields();
+
+ locationCustomFields.classList.remove('hidden');
+ } else {
+ locationCustomFields.classList.add('hidden');
+ }
+ },
+
+ _getCustomFieldPlaceholder(fieldType) {
+ switch (fieldType) {
+ case constants.QuickActionsOptions.EMAIL:
+ case constants.ContentOptions.EMAIL:
+ return window.strings?.get('locationEditing.enterEmailAddress')?.v || 'Enter email address';
+ case constants.QuickActionsOptions.PHONE:
+ case constants.ContentOptions.PHONE:
+ return window.strings?.get('locationEditing.enterPhoneNumber')?.v || 'Enter phone number';
+ case constants.QuickActionsOptions.URL:
+ case constants.ContentOptions.URL:
+ return window.strings?.get('locationEditing.enterURL')?.v || 'Enter URL';
+ case constants.ContentOptions.RICH_TEXT:
+ return window.strings?.get('locationEditing.addDescription')?.v || 'Add description';
+ default:
+ return window.strings?.get('locationEditing.enterDetails')?.v || 'Enter details';
+ }
+ },
+
+ _createMDCInput(id, title, value = '', type = 'text', maxLength = 150) {
+ const container = document.createElement('div');
+ container.className = 'text-field-container';
+
+ const mdcField = document.createElement('div');
+ mdcField.className = 'mdc-text-field';
+ mdcField.id = `${id}Field`;
+
+ const input = document.createElement('input');
+ input.className = 'mdc-text-field__input mdc-theme--text-primary-on-background';
+ input.id = id;
+ input.maxLength = maxLength;
+ input.type = type;
+ input.value = value;
+ mdcField.appendChild(input);
+
+ const lineRipple = document.createElement('div');
+ lineRipple.className = 'mdc-line-ripple';
+ mdcField.appendChild(lineRipple);
+
+ const floatingLabel = document.createElement('label');
+ floatingLabel.className = 'mdc-floating-label';
+ floatingLabel.setAttribute('for', id);
+ floatingLabel.textContent = title;
+ mdcField.appendChild(floatingLabel);
+
+ container.appendChild(mdcField);
+
+ const helperLine = document.createElement('div');
+ helperLine.className = `mdc-text-field-helper-line ${id}Helper hidden`;
+
+ const helperText = document.createElement('p');
+ helperText.className = 'mdc-theme--text-primary-on-background mdc-text-field-helper-text mdc-text-field-helper-text--persistent mdc-text-field-helper-text--validation-msg error-msg';
+ helperText.textContent = window.strings?.get('locationEditing.required')?.v || 'Required';
+ helperLine.appendChild(helperText);
+ container.appendChild(helperLine);
+
+ return { container, input };
+ },
+
+ _createMDCDialogTrigger(id, title, value = '') {
+ const container = document.createElement('div');
+ container.className = 'text-field-container';
+
+ const descriptionId = `${id}Container`;
+
+ const wysiwygContainer = document.createElement('div');
+ wysiwygContainer.id = descriptionId;
+ wysiwygContainer.className = 'custom-wysiwyg-container';
+
+ if (value) {
+ wysiwygContainer.innerHTML = value;
+ } else {
+ const labelSpan = document.createElement('label');
+ labelSpan.className = 'mdc-floating-label mdc-theme--text-primary-on-background';
+ labelSpan.textContent = title;
+ wysiwygContainer.appendChild(labelSpan);
+ }
+
+ wysiwygContainer.dataset.value = value;
+ container.appendChild(wysiwygContainer);
+
+ const helperLine = document.createElement('div');
+ helperLine.className = `mdc-text-field-helper-line ${id}Helper hidden`;
+
+ const helperText = document.createElement('p');
+ helperText.className = 'mdc-theme--text-primary-on-background mdc-text-field-helper-text mdc-text-field-helper-text--persistent mdc-text-field-helper-text--validation-msg error-msg';
+ helperText.textContent = window.strings?.get('locationEditing.fieldRequired')?.v || 'Required';
+ helperLine.appendChild(helperText);
+ container.appendChild(helperLine);
+
+ wysiwygContainer.onclick = (e) => {
+ if (wysiwygContainer.classList.contains('disabled')) return;
+ wysiwygContainer.classList.add('disabled');
+ buildfire.input.showTextDialog(
+ {
+ placeholder: title,
+ saveText: window.strings?.get('locationEditing.descriptionDialogSave')?.v || 'Save',
+ cancelText: window.strings?.get('locationEditing.descriptionDialogCancel')?.v || 'Cancel',
+ defaultValue: wysiwygContainer.dataset.value || '',
+ wysiwyg: true,
+ },
+ (err, response) => {
+ wysiwygContainer.classList.remove('disabled');
+ if (err) return console.error(err);
+ if (response.cancelled) return;
+
+ wysiwygContainer.dataset.value = response.results[0].wysiwygValue;
+ wysiwygContainer.innerHTML = '';
+
+ if (response.results[0].wysiwygValue) {
+ wysiwygContainer.innerHTML = response.results[0].wysiwygValue;
+ } else {
+ const labelSpan = document.createElement('label');
+ labelSpan.className = 'mdc-floating-label mdc-theme--text-primary-on-background';
+ labelSpan.textContent = title;
+ wysiwygContainer.appendChild(labelSpan);
+ }
+ }
+ );
+ };
+
+ return { container, input: wysiwygContainer };
+ },
+
+ _injectCustomFields() {
+ const { settings, selectedLocation } = state;
+ const locationAdditionalDetailsContainer = document.querySelector('#locationAdditionalDetailsContainer');
+
+ const allFields = [
+ ...(settings.customFields?.quickActions || []),
+ ...(settings.customFields?.content || [])
+ ];
+
+ const activeLocationFields = [
+ ...(selectedLocation?.additionalFields?.quickActions || []),
+ ...(selectedLocation?.additionalFields?.content || [])
+ ];
+
+ allFields.forEach(field => {
+ const activeField = activeLocationFields.find(f => f.id === field.id) || {};
+ const isRichText = field.type === constants.ContentOptions.RICH_TEXT;
+
+ const row = document.createElement('div');
+ row.id = `custom-field-container-${field.id}`;
+ row.className = 'custom-field-wrapper margin-bottom-twenty d-flex-column gap-half-rem';
+
+ const fieldTitle = field.label;
+ const fieldTitleSpan = document.createElement('span');
+ fieldTitleSpan.className = field.required ? 'custom-field-title required' : 'custom-field-title';
+ fieldTitleSpan.textContent = fieldTitle;
+ row.appendChild(fieldTitleSpan);
+ const placeholder = this._getCustomFieldPlaceholder(field.type);
+
+ if (field.enableCustomLabel) {
+ const innerFlex = document.createElement('div');
+ innerFlex.className = 'd-flex-column gap-half-rem';
+
+ const labelCol = document.createElement('div');
+ labelCol.className = 'w-100';
+
+ const { container: labelMdc } = this._createMDCInput(`custom-field-label-${field.id}`, window.strings?.get('locationEditing.locationCustomLabel')?.v || 'Label (optional)', activeField.customLabel || '', 'text', 50);
+ labelCol.appendChild(labelMdc);
+
+ const valueCol = document.createElement('div');
+ valueCol.className = 'w-100';
+
+ if (isRichText) {
+ const { container: valueMdc } = this._createMDCDialogTrigger(`custom-field-input-${field.id}`, placeholder, activeField.value || '');
+ valueCol.appendChild(valueMdc);
+ } else {
+ const { container: valueMdc, input } = this._createMDCInput(`custom-field-input-${field.id}`, placeholder, activeField.value || '', 'text', 150);
+ input.addEventListener('blur', () => this._validateField(field));
+ valueCol.appendChild(valueMdc);
+ }
+
+ innerFlex.appendChild(labelCol);
+ innerFlex.appendChild(valueCol);
+ row.appendChild(innerFlex);
+
+ } else {
+ if (isRichText) {
+ const { container: valueMdc } = this._createMDCDialogTrigger(`custom-field-input-${field.id}`, placeholder, activeField.value || '');
+ row.appendChild(valueMdc);
+ } else {
+ const { container: valueMdc, input } = this._createMDCInput(`custom-field-input-${field.id}`, placeholder, activeField.value || '', 'text', 150);
+ input.addEventListener('blur', () => this._validateField(field));
+ row.appendChild(valueMdc);
+ }
+ }
+
+ locationAdditionalDetailsContainer.appendChild(row);
+
+ row.querySelectorAll('.mdc-text-field').forEach((el) => {
+ new mdc.textField.MDCTextField(el);
+ });
+ });
+ },
+
+ validate() {
+ const { settings } = state;
+ let isValid = true;
+ const allFields = [
+ ...(settings.customFields?.quickActions || []),
+ ...(settings.customFields?.content || [])
+ ];
+
+ allFields.forEach(field => {
+ if (!this._validateField(field)) {
+ isValid = false;
+ }
+ });
+
+ return isValid;
+ },
+
+ _validateField(field) {
+ let isValid = true;
+ const isRichText = field.type === constants.ContentOptions.RICH_TEXT;
+ let inputElement;
+ let valueStr = '';
+
+ if (isRichText) {
+ inputElement = document.querySelector(`#custom-field-input-${field.id}Container`);
+ valueStr = inputElement ? (inputElement.dataset.value || '') : '';
+ } else {
+ inputElement = document.querySelector(`#custom-field-input-${field.id}`);
+ valueStr = inputElement ? (inputElement.value || '') : '';
+ }
+
+ if (!isRichText && inputElement) {
+ valueStr = valueStr.trim();
+ inputElement.value = valueStr;
+ } else if (isRichText && inputElement) {
+ valueStr = valueStr.trim();
+ inputElement.dataset.value = valueStr;
+ }
+
+ const helperLine = document.querySelector(`.custom-field-input-${field.id}Helper`);
+ const helperText = helperLine ? helperLine.querySelector('.error-msg') : null;
+
+ if (helperLine) {
+ helperLine.classList.add('hidden');
+ helperLine.classList.remove('has-error');
+ }
+ if (inputElement && !isRichText) {
+ const mdcField = inputElement.closest('.mdc-text-field');
+ if (mdcField) mdcField.classList.remove('mdc-text-field--invalid');
+ }
+
+ let errorMessage = '';
+
+ if (field.required && !valueStr) {
+ errorMessage = window.strings?.get('locationEditing.fieldRequired')?.v || 'This field is required';
+ } else if (valueStr) {
+ if (field.type === constants.QuickActionsOptions.EMAIL || field.type === constants.ContentOptions.EMAIL) {
+ const emailHasAt = valueStr.includes('@');
+ const emailHasDotAfterAt = emailHasAt && valueStr.indexOf('.', valueStr.indexOf('@')) !== -1;
+ const emailNoSpaces = !valueStr.includes(' ');
+
+ if (!emailHasAt || !emailHasDotAfterAt || !emailNoSpaces) {
+ errorMessage = window.strings?.get('locationEditing.validEmail')?.v || 'Enter a valid email address';
+ }
+ } else if (field.type === constants.QuickActionsOptions.PHONE || field.type === constants.ContentOptions.PHONE) {
+ const phoneRegex = /^[\d\s+\-()]+$/;
+ const hasLetters = /[a-zA-Z]/.test(valueStr);
+ if (!phoneRegex.test(valueStr) || hasLetters) {
+ errorMessage = window.strings?.get('locationEditing.validPhone')?.v || 'Enter a valid phone number';
+ }
+ } else if (field.type === constants.QuickActionsOptions.URL || field.type === constants.ContentOptions.URL) {
+ if (valueStr.includes(' ') || !valueStr.includes('.')) {
+ errorMessage = window.strings?.get('locationEditing.validURL')?.v || 'Enter a valid URL';
+ } else {
+ if (!/^https?:\/\//i.test(valueStr)) {
+ valueStr = 'https://' + valueStr;
+ if (inputElement && !isRichText) {
+ inputElement.value = valueStr;
+ }
+ }
+ }
+ }
+ }
+
+ if (errorMessage) {
+ isValid = false;
+ if (helperLine && helperText) {
+ helperText.textContent = errorMessage;
+ helperLine.classList.remove('hidden');
+ helperLine.classList.add('has-error');
+ }
+ if (inputElement && !isRichText) {
+ const mdcField = inputElement.closest('.mdc-text-field');
+ if (mdcField) mdcField.classList.add('mdc-text-field--invalid');
+ }
+ }
+
+ return isValid;
+ },
+
+ getFieldsValues() {
+ const { settings } = state;
+ const values = {
+ quickActions: [],
+ content: []
+ };
+
+ const allFields = [
+ ...(settings.customFields?.quickActions || []),
+ ...(settings.customFields?.content || [])
+ ];
+
+ allFields.forEach(field => {
+ const isRichText = field.type === constants.ContentOptions.RICH_TEXT;
+ let inputElement;
+ let valueStr = '';
+ let customLabelStr = '';
+
+ if (isRichText) {
+ inputElement = document.querySelector(`#custom-field-input-${field.id}Container`);
+ valueStr = inputElement ? (inputElement.dataset.value || '') : '';
+ } else {
+ inputElement = document.querySelector(`#custom-field-input-${field.id}`);
+ valueStr = inputElement ? (inputElement.value || '') : '';
+ }
+
+ if (field.enableCustomLabel) {
+ const labelInput = document.querySelector(`#custom-field-label-${field.id}`);
+ customLabelStr = labelInput ? (labelInput.value || '') : '';
+ }
+
+ const fieldData = {
+ id: field.id,
+ value: valueStr.trim()
+ };
+
+ if (field.enableCustomLabel) {
+ fieldData.customLabel = customLabelStr.trim();
+ }
+
+ if (settings.customFields?.quickActions?.find(q => q.id === field.id)) {
+ values.quickActions.push(fieldData);
+ } else {
+ values.content.push(fieldData);
+ }
+ });
+
+ return values;
+ }
+};
+
+export default {
+ ui: {
+ init: customFieldsController.init.bind(customFieldsController)
+ },
+ helper: {
+ validate: customFieldsController.validate.bind(customFieldsController),
+ getFieldsValues: customFieldsController.getFieldsValues.bind(customFieldsController)
+ }
+};
\ No newline at end of file
diff --git a/src/widget/js/views/createView.js b/src/widget/js/views/createView.js
index 8efd0e30..26b9ffb5 100644
--- a/src/widget/js/views/createView.js
+++ b/src/widget/js/views/createView.js
@@ -1,9 +1,8 @@
import state from '../state';
-import Location from '../../../entities/Location';
+import Location from '../global/data/Location';
import views from '../Views';
import {
createTemplate,
- generateUUID,
getDefaultOpeningHours,
showToastMessage,
transformCategoriesToText,
@@ -11,8 +10,9 @@ import {
getActiveTemplate,
cropImage
} from '../util/helpers';
-import { navigateTo, resetBodyScroll, showElement } from '../util/ui';
-import Accordion from '../Accordion';
+import { generateUUID } from '../global/helpers';
+import { hideElement, navigateTo, resetBodyScroll, showElement } from '../util/ui';
+import Accordion from './components/Accordion';
import { convertDateToTime, convertTimeToDate } from '../../../utils/datetime';
import mapView from './mapView';
import introView from './introView';
@@ -23,7 +23,8 @@ import {
validateTimeInterval,
uploadImages, toggleFieldError, createImageHolder, validateOpeningHours
} from '../util/forms';
-import constants from '../constants';
+import constants from '../global/constants';
+import customFieldsController from './components/customFields';
export default {
get _defaultFieldsInfo() {
@@ -292,6 +293,10 @@ export default {
isValid = false;
}
+ if (!customFieldsController.helper.validate()) {
+ isValid = false;
+ }
+
return { isValid };
},
submit(e) {
@@ -314,6 +319,8 @@ export default {
return;
}
+ this.payload.additionalFields = customFieldsController.helper.getFieldsValues();
+
widgetController.createLocation(this.payload)
.then((result) => {
showToastMessage('locationSaved', 5000);
@@ -335,6 +342,7 @@ export default {
if (activeTemplate === 'intro') {
introView.clearIntroViewList();
introView.renderIntroductoryLocations(state.listLocations, true);
+ hideElement('#intro div.empty-page');
} else {
mapView.clearMapViewList();
mapView.renderListingLocations(state.listLocations);
@@ -848,7 +856,17 @@ export default {
this.buildEventsHandlers();
this.buildMap();
this.show();
+ customFieldsController.ui.init();
window.strings.inject(document.querySelector('section#create'), false);
+
+ buildfire.device.onKeyboardShow(() => {
+ setTimeout(() => {
+ const currentActiveInput = document.querySelector('.mdc-text-field.mdc-text-field--focused');
+ if (currentActiveInput) {
+ currentActiveInput.scrollIntoView({ behavior: 'smooth', block: 'start' });
+ }
+ }, 100);
+ });
});
},
};
diff --git a/src/widget/js/views/detailsView.js b/src/widget/js/views/detailsView.js
index 78ea10f0..1ecd2d7f 100644
--- a/src/widget/js/views/detailsView.js
+++ b/src/widget/js/views/detailsView.js
@@ -5,7 +5,6 @@ import state from '../state';
import {
shareLocation,
bookmarkLocation,
- generateUUID,
showToastMessage,
getActiveTemplate,
transformCategoriesToText,
@@ -13,20 +12,21 @@ import {
isLocationOpen,
cdnImage
} from '../util/helpers';
+import { generateUUID } from '../global/helpers';
import { uploadImages } from '../util/forms';
import accessManager from '../accessManager';
import reportAbuse from '../reportAbuse';
-import Locations from '../../../repository/Locations';
-import Location from '../../../entities/Location';
+import Locations from '../global/repository/Locations';
+import Location from '../global/data/Location';
import DeepLink from '../../../utils/deeplink';
-import SearchEngine from '../../../repository/searchEngine';
+import SearchEngine from '../global/repository/searchEngine';
import introView from './introView';
import mapView from './mapView';
import authManager from '../../../UserAccessControl/authManager';
import notifications from '../../services/notifications';
import widgetController from '../../widget.controller';
import views from '../Views';
-import constants from '../constants';
+import constants from '../global/constants';
import MainMap from '../map/Map';
let selectors = {};
@@ -37,7 +37,7 @@ export default {
const location = state.selectedLocation;
const carouselContainer = document.querySelector('.location-detail__carousel');
- carouselContainer.innerHTML = location.images.map((n) => ``).join('\n');
+ carouselContainer.innerHTML = location.images.map((n) => ``).join('\n');
const indexInList = state.listLocations.findIndex((i) => i.id === location.id);
const indexInPinned = state.pinnedLocations.findIndex((i) => i.id === location.id);
@@ -353,6 +353,119 @@ export default {
}
},
+ buildCustomActions() {
+ const { selectedLocation } = state;
+ const additionalFields = selectedLocation.additionalFields || {};
+ const quickActions = additionalFields.quickActions || [];
+ const content = additionalFields.content || [];
+
+ state.settings?.customFields?.quickActions.forEach(fieldSchema => {
+ const field = quickActions.find(q => q.id === fieldSchema.id);
+ if (!fieldSchema.type || !field || !field.value) return;
+
+ let icon = '';
+ let actionObject = null;
+
+ if (fieldSchema.type === constants.QuickActionsOptions.EMAIL) {
+ icon = 'alternate_email';
+ actionObject = { action: 'sendEmail', email: field.value };
+ } else if (fieldSchema.type === constants.QuickActionsOptions.PHONE) {
+ icon = 'call';
+ actionObject = { action: 'callNumber', phoneNumber: field.value };
+ } else if (fieldSchema.type === constants.QuickActionsOptions.URL) {
+ icon = 'link';
+ actionObject = { action: 'linkToWeb', url: field.value, openIn: '_blank' };
+ }
+
+ let title = field.customLabel;
+ if (!fieldSchema.enableCustomLabel || !field.customLabel) {
+ title = fieldSchema.label;
+ }
+
+ const div = document.createElement('div');
+ div.className = 'action-item';
+ div.innerHTML = `
+ ${icon}
+
+
+
+
+
+
+
+ ${title}
+
+
+
+ `;
+
+ div.onclick = (e) => {
+ e.stopPropagation();
+ if (actionObject) {
+ buildfire.actionItems.execute(actionObject, (err) => {
+ if (err) console.error(err);
+ });
+ }
+ };
+
+ selectors.actionItems.appendChild(div);
+ });
+
+ state.settings?.customFields?.content.forEach(fieldSchema => {
+ const field = content.find(q => q.id === fieldSchema.id);
+
+ if (!fieldSchema.type || !field || !field.value) return;
+
+ let descriptionContainer = selectors.actionItems.querySelector('.location-custom_content_container');
+ if (!descriptionContainer) {
+ descriptionContainer = document.createElement('div');
+ descriptionContainer.className = 'location-custom_content_container flex d-flex-column gap-2-rem padded-md';
+ selectors.actionItems.appendChild(descriptionContainer);
+ }
+
+ const fieldContainer = document.createElement('div');
+ fieldContainer.className = 'location-custom_content_item d-flex-column gap-half-rem';
+
+ let title = field.customLabel;
+ if (!fieldSchema.enableCustomLabel || !field.customLabel) {
+ title = fieldSchema.label;
+ }
+
+ const titleEl = document.createElement('p');
+ titleEl.innerHTML = title;
+ titleEl.classList.add('headerTextTheme');
+ titleEl.style.margin = '0';
+
+ const valueEl = document.createElement('div');
+ valueEl.innerHTML = field.value;
+ valueEl.className = 'custom-content-value';
+ let actionObject = null;
+
+ if (fieldSchema.type === constants.ContentOptions.EMAIL) {
+ valueEl.classList.add('primaryTheme', 'pointer');
+ actionObject = { action: 'sendEmail', email: field.value };
+ } else if (fieldSchema.type === constants.ContentOptions.PHONE) {
+ valueEl.classList.add('primaryTheme', 'pointer');
+ actionObject = { action: 'callNumber', phoneNumber: field.value };
+ } else if (fieldSchema.type === constants.ContentOptions.URL) {
+ valueEl.classList.add('primaryTheme', 'pointer');
+ actionObject = { action: 'linkToWeb', url: field.value, openIn: '_blank' };
+ } else {
+ valueEl.classList.add('bodyTextTheme');
+ }
+
+ valueEl.onclick = (e) => {
+ e.stopPropagation();
+ if (actionObject) {
+ buildfire.actionItems.execute(actionObject, (err) => {
+ if (err) console.error(err);
+ });
+ }
+ };
+
+ fieldContainer.appendChild(titleEl);
+ fieldContainer.appendChild(valueEl);
+ descriptionContainer.appendChild(fieldContainer);
+ });
+ },
+
initLocationDetails() {
return new Promise((resolve, reject) => {
const { selectedLocation } = state;
@@ -431,10 +544,10 @@ export default {
if (selectedLocation.images?.length > 0) {
if (pageMapPosition === 'top') {
- selectors.cover.style.backgroundImage = `linear-gradient( rgb(0 0 0 / 0.6), rgb(0 0 0 / 0.6) ),url('${buildfire.imageLib.cropImage(selectedLocation.images[0].imageUrl, { size: "full_width", aspect: "16:9" })}')`;
+ selectors.cover.style.backgroundImage = `linear-gradient( rgb(0 0 0 / 0.6), rgb(0 0 0 / 0.6) ),url('${buildfire.imageLib.cropImage(selectedLocation.images[0].imageUrl, { size: "full_width", aspect: "1:1" }) + '&crop=entropy'}')`;
selectors.cover.style.display = 'block';
} else {
- selectors.main.style.backgroundImage = `linear-gradient( rgb(0 0 0 / 0.6), rgb(0 0 0 / 0.6) ),url('${buildfire.imageLib.cropImage(selectedLocation.images[0].imageUrl, { size: "full_width", aspect: "16:9" })}')`;
+ selectors.main.style.backgroundImage = `linear-gradient( rgb(0 0 0 / 0.6), rgb(0 0 0 / 0.6) ),url('${buildfire.imageLib.cropImage(selectedLocation.images[0].imageUrl, { size: "full_width", aspect: "1:1" }) + '&crop=entropy'}')`;
}
}
@@ -497,7 +610,7 @@ export default {
}
selectors.actionItems.innerHTML = selectedLocation.actionItems.map((a) => `
- ${a.iconUrl ? `})
` : a.iconClassName ? `` : ''}
+ ${a.iconUrl ? `` : a.iconClassName ? `` : ''}
`).join('\n');
- selectors.carousel.innerHTML = selectedLocation.images.map((n) => ``).join('\n');
+ selectors.carousel.innerHTML = selectedLocation.images.map((n) => ``).join('\n');
+ this.buildCustomActions();
+
resolve();
});
});
diff --git a/src/widget/js/views/editView.js b/src/widget/js/views/editView.js
index 2f3e7b58..d13a88c3 100644
--- a/src/widget/js/views/editView.js
+++ b/src/widget/js/views/editView.js
@@ -1,12 +1,11 @@
import state from '../state';
-import Location from '../../../entities/Location';
-import Locations from '../../../repository/Locations';
+import Location from '../global/data/Location';
+import Locations from '../global/repository/Locations';
import DeepLink from '../../../utils/deeplink';
-import SearchEngine from '../../../repository/searchEngine';
+import SearchEngine from '../global/repository/searchEngine';
import views from '../Views';
import {
createTemplate,
- generateUUID,
getDefaultOpeningHours,
showToastMessage,
transformCategoriesToText,
@@ -14,15 +13,17 @@ import {
getActiveTemplate,
cropImage,
} from '../util/helpers';
+import { generateUUID } from '../global/helpers';
import { uploadImages } from '../util/forms';
import { navigateTo, resetBodyScroll } from '../util/ui';
-import Accordion from '../Accordion';
+import Accordion from './components/Accordion';
import { convertDateToTime, convertTimeToDate } from '../../../utils/datetime';
import mapView from './mapView';
import introView from './introView';
import { validateOpeningHoursDuplication } from '../../../shared/utils';
-import constants from '../constants';
+import constants from '../global/constants';
import accessManager from '../accessManager';
+import customFieldsController from './components/customFields';
const localState = {
pendingLocation: null,
@@ -173,6 +174,10 @@ const _validateLocationSave = () => {
isValid = false;
}
+ if (!customFieldsController.helper.validate()) {
+ isValid = false;
+ }
+
return isValid;
};
@@ -315,6 +320,8 @@ const _saveChanges = (e) => {
if (!_validateLocationSave()) return;
if (!validateOpeningHoursDuplication(pendingLocation.openingHours)) return;
+ pendingLocation.additionalFields = customFieldsController.helper.getFieldsValues();
+
e.target.disabled = true;
updateLocation(pendingLocation.id, pendingLocation)
@@ -887,6 +894,7 @@ const init = () => {
_refreshLocationImages();
_renderOpeningHours();
_initAddressAutocompleteField('locationAddressFieldInput');
+ customFieldsController.ui.init();
editView.addEventListener('click', onViewClick);
editView.querySelectorAll('.mdc-text-field').forEach((i) => {
@@ -940,6 +948,15 @@ const init = () => {
multi: true,
expanded: true
});
+
+ buildfire.device.onKeyboardShow(() => {
+ setTimeout(() => {
+ const currentActiveInput = document.querySelector('.mdc-text-field.mdc-text-field--focused');
+ if (currentActiveInput) {
+ currentActiveInput.scrollIntoView({ behavior: 'smooth', block: 'start' });
+ }
+ }, 100);
+ });
})
.catch((err) => {
console.error(`error initilizing editView ${err}`);
diff --git a/src/widget/js/views/introView.js b/src/widget/js/views/introView.js
index 744d7f38..6070ff9d 100644
--- a/src/widget/js/views/introView.js
+++ b/src/widget/js/views/introView.js
@@ -9,7 +9,7 @@ const renderIntroductoryLocations = (list, includePinned = false) => {
const container = document.querySelector('#introLocationsList');
let reducedLocations = list.reduce((filtered, n) => {
if (n.listImage != null) {
- n.listImage = buildfire.imageLib.cropImage(n.listImage, { size: "full_width", aspect: "1:1" })
+ n.listImage = buildfire.imageLib.cropImage(n.listImage, { size: "full_width", aspect: "1:1" }) + '&crop=entropy'
} else {
n.listImage = "./images/empty_image.PNG"
}
@@ -48,7 +48,7 @@ const renderIntroductoryLocations = (list, includePinned = false) => {
if (includePinned) {
reducedLocations = state.pinnedLocations.map((n) => (`
@@ -507,7 +620,9 @@ export default {
- 
+
+
+
+
+
${n.title ?? ""}
${n.subtitle ?? ""}
diff --git a/src/widget/services/search/introSearchService.js b/src/widget/services/search/introSearchService.js index 9569886c..a5571c8d 100644 --- a/src/widget/services/search/introSearchService.js +++ b/src/widget/services/search/introSearchService.js @@ -2,7 +2,8 @@ import { buildOpenNowCriteria, buildSearchCriteria } from "./shared"; import state from "../../js/state"; import WidgetController from "../../widget.controller"; -import constants from "../../js/constants"; +import constants from "../../js/global/constants"; +import authManager from "../../../UserAccessControl/authManager"; const IntroSearchService = { _getUserCoordinates() { @@ -52,6 +53,9 @@ const IntroSearchService = { } } }; + if (state.settings.introductoryListView.searchOptions?.mode === constants.SearchLocationsModes.MyLocations) { + $match['createdBy.userId'] = authManager.currentUser?.userId || ''; + } pipelines.push({ $geoNear }); pipelines.push({ $match }); @@ -82,6 +86,10 @@ const IntroSearchService = { "_buildfire.index.string1": { $nin: existLocationStrings }, }; + if (state.settings.introductoryListView.searchOptions?.mode === constants.SearchLocationsModes.MyLocations) { + $match['createdBy.userId'] = authManager.currentUser?.userId || ''; + } + pipelines.push({ $match }); pipelines.push({ $sort }); diff --git a/src/widget/services/search/mapSearchService.js b/src/widget/services/search/mapSearchService.js index 60d355e4..1ea5e6de 100644 --- a/src/widget/services/search/mapSearchService.js +++ b/src/widget/services/search/mapSearchService.js @@ -3,7 +3,7 @@ import WidgetController from '../../widget.controller'; import mapSearchControl from '../../js/map/search-control'; import state from "../../js/state"; import { buildOpenNowCriteria, buildSearchCriteria } from './shared'; -import constants from '../../js/constants'; +import constants from '../../js/global/constants'; const MapSearchService = { getMapCenterPoint() { diff --git a/src/widget/templates/create.html b/src/widget/templates/create.html index 20a4fff8..fd4c41c2 100644 --- a/src/widget/templates/create.html +++ b/src/widget/templates/create.html @@ -101,6 +101,26 @@
diff --git a/src/widget/templates/edit.html b/src/widget/templates/edit.html
index dd1c12c8..57dabaae 100644
--- a/src/widget/templates/edit.html
+++ b/src/widget/templates/edit.html
@@ -104,6 +104,25 @@