Skip to content

Commit

Permalink
chore: correction to package json
Browse files Browse the repository at this point in the history
  • Loading branch information
paga16-hash committed Jan 27, 2024
1 parent 31ce442 commit 50a8645
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
2 changes: 1 addition & 1 deletion auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"main": "dist/src/index.js",
"scripts": {
"serve": "node .",
"dev": "npm run build && node NODE_ENV=develop --env-file=../.env .",
"dev": "npm run build && NODE_ENV=develop node --env-file=../.env .",
"build": "tsc && tsc-alias",
"watch": "tsc -w & tsc-alias -w & nodemon --experimental-specifier-resolution=node .",
"test": "vitest --run",
Expand Down
8 changes: 2 additions & 6 deletions frontend/src/components/security-rule/SecurityRule.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ defineProps<{
>
</span>
<span v-else>
<i>{{ securityRule.deviceId.code }} -</i>
{{ ObjectClass[(securityRule as IntrusionRule).objectClass] }}
<i>{{ securityRule.deviceId.code }} -</i
>{{ ObjectClass[(securityRule as IntrusionRule).objectClass] }}
</span>
</header>
<ul :class="DeviceType[securityRule.deviceId.type].toLowerCase()">
Expand All @@ -52,10 +52,6 @@ defineProps<{
<i>Active from: </i>{{ securityRule.from.toLocaleString().split(' ')[1] }} <i>to: </i
>{{ securityRule.to.toLocaleString().split(' ')[1] }}
</li>
<!-- <li v-if="securityRule.deviceId.type == DeviceType.CAMERA">
<i>Resolution: </i
>{{ (device as Camera).resolution.width + 'x' + (device as Camera).resolution.height }}
</li>-->
<li>{{ securityRule.description }}</li>

<li class="actions">
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/views/SecurityRuleView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import { onMounted, ref } from 'vue'
import type { SecurityRuleFactory } from '@domain/security-rule/factories/SecurityRuleFactory'
import { SecurityRuleFactoryImpl } from '@domain/security-rule/factories/impl/SecurityRuleFactoryImpl'
import { type ExceedingRule, type IntrusionRule } from 'domain/dist/domain/security-rule/core'
import type { DeviceIdFactory } from 'domain/dist/domain/device/factories'
import type { ContactFactory } from 'domain/dist/domain/monitoring/factories'
import { ContactFactoryImpl } from 'domain/dist/domain/monitoring/factories/impl/ContactFactoryImpl'
import { DeviceIdFactoryImpl } from 'domain/dist/domain/device/factories/impl/DeviceIdFactoryImpl'
import { type Contact } from 'domain/dist/domain/monitoring/core'
import type { DeviceIdFactory } from '@domain/device/factories'
import type { ContactFactory } from '@domain/monitoring/factories'
import { ContactFactoryImpl } from '@domain/monitoring/factories/impl/ContactFactoryImpl'
import { DeviceIdFactoryImpl } from '@domain/device/factories/impl/DeviceIdFactoryImpl'
import { type Contact } from '@domain/monitoring/core'
import SecurityRule from '@/components/security-rule/SecurityRule.vue'
import NewSecurityRulePopup from '@/components/security-rule/NewSecurityRulePopup.vue'
import { RequestHelper } from '@/utils/RequestHelper'
Expand Down Expand Up @@ -127,7 +127,7 @@ const popupVisible = ref<boolean>(false)
/>
</div>

<!-- da correggere que get in update, ma prima da fare creazione.-->
<!-- da correggere quel get in update, ma prima da fare creazione.-->
<new-security-rule-popup
v-model="popupVisible"
@update-security-rules="getExceedingSecurityRules"
Expand Down

0 comments on commit 50a8645

Please sign in to comment.