Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Alarm widget name is optional #1933

Merged
merged 1 commit into from Nov 6, 2023
Merged

Alarm widget name is optional #1933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions front/src/components/boxs/alarm/Alarm.jsx
View file
Open in desktop
Expand Up @@ -83,9 +83,11 @@ class AlarmComponent extends Component {
const isCurrentlyArmingWithCoutdown = arming && house.alarm_delay_before_arming > 0;
return (
<div class="card">
<div class="card-header">
<h3 class="card-title">{props.box.name}</h3>
</div>
{props.box.name && (
<div class="card-header">
<h3 class="card-title">{props.box.name}</h3>
</div>
)}
{house && (
<div class="card-body">
<div class={loading ? 'dimmer active' : 'dimmer'}>
Expand Down
2 changes: 1 addition & 1 deletion front/src/config/i18n/en.json
View file
Open in desktop
Expand Up @@ -377,7 +377,7 @@
"partiallyArmedButton": "Partial",
"partiallyArmedButtonSecondLine": "Arm",
"panicButton": "Panic",
"editBoxNameLabel": "Widget Name",
"editBoxNameLabel": "Widget Name (optional)",
"editBoxNamePlaceholder": "Enter the widget name",
"editHouseLabel": "Select the house for alarm activation/disarmament.",
"alarmStatusText": "Your house is ",
Expand Down
2 changes: 1 addition & 1 deletion front/src/config/i18n/fr.json
View file
Open in desktop
Expand Up @@ -377,7 +377,7 @@
"partiallyArmedButton": "Armement",
"partiallyArmedButtonSecondLine": "partiel",
"panicButton": "Panique",
"editBoxNameLabel": "Nom du widget",
"editBoxNameLabel": "Nom du widget (optionnel)",
"editBoxNamePlaceholder": "Entrez le nom du widget",
"editHouseLabel": "Sélectionnez la maison qui est concernée pour l'activation/désactivation de l'alarme.",
"alarmStatusText": "Votre maison est ",
Expand Down
2 changes: 1 addition & 1 deletion server/models/dashboard.js
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ const boxesSchema = Joi.array().items(
house: Joi.string(),
room: Joi.string(),
camera: Joi.string(),
name: Joi.string(),
name: Joi.string().allow(''),
modes: Joi.object(),
device_features: Joi.array().items(Joi.string()),
device_feature_names: Joi.array().items(Joi.string()),
Expand Down