e30ae8ed09
- App.tsx: full navigation (Auth stack + Main tabs with 5 screens) - Auth: LoginScreen, RegisterScreen, ForgotPasswordScreen - HomeScreen: dashboard with IoT metrics, weather widget, alerts, quick actions, sensors - MapScreen: interactive map with layer toggles (6 layers) - MarketplaceScreen: categories (6), products (5), search - ChatScreen: AI chat with quick prompts (4), bot responses - ProfileScreen: user info, stats, menu (9 items), logout - AlertsScreen: alert list with severity, acknowledge - SensorsScreen: sensor list with type filters (6 types), search - ZonesScreen: zone cards with stats - SettingsScreen: language picker (FR/EN/ES/DE), privacy, about - Stores: iotStore (sensors, zones, alerts), notificationStore, uiStore + i18n - Hooks: useSensors, useAlerts, useNotifications, useLocation - Components: Card, Button, LoadingSpinner, ErrorBoundary, Header - Services: iotService, notificationService (with axios API client) - Utils: formatters (temp, AQI, noise, dates), validators (email, password, IBAN) - Theme: colors.ts with full design system (Blue Ocean palette) - Ditto: fixed MongoDB connection, new JWT secrets, official gateway image
29 lines
559 B
JavaScript
29 lines
559 B
JavaScript
|
|
/**
|
|
* Join `arr` with the trailing `str` defaulting to "and",
|
|
* and `sep` string defaulting to ", ".
|
|
*
|
|
* @param {Array} arr
|
|
* @param {String} str
|
|
* @param {String} sep
|
|
* @return {String}
|
|
* @api public
|
|
*/
|
|
|
|
module.exports = function(arr, str, sep){
|
|
str = str || 'and';
|
|
sep = sep || ', ';
|
|
|
|
if (arr.length < 2) return arr[0] || '';
|
|
|
|
var oxford = str.slice(0, 2) === sep;
|
|
|
|
if (!oxford) {
|
|
str = ' ' + str;
|
|
} else if (arr.length == 2) {
|
|
str = str.slice(1);
|
|
}
|
|
|
|
return arr.slice(0, -1).join(sep) + str + ' ' + arr[arr.length - 1];
|
|
};
|