Merge branch 'master' into dependabot/npm_and_yarn/mqtt-5.14.1
This commit is contained in:
commit
e8f796c5ad
3 changed files with 379 additions and 561 deletions
908
package-lock.json
generated
908
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -9,17 +9,17 @@
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@prisma/client": "^6.13.0",
|
"@prisma/client": "^6.16.2",
|
||||||
"command-line-args": "^6.0.1",
|
"command-line-args": "^6.0.1",
|
||||||
"command-line-usage": "^7.0.3",
|
"command-line-usage": "^7.0.3",
|
||||||
"compression": "^1.8.1",
|
"compression": "^1.8.1",
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
"express": "^5.0.0",
|
"express": "^5.0.0",
|
||||||
"mqtt": "^5.14.1",
|
"mqtt": "^5.14.1",
|
||||||
"protobufjs": "^7.5.3"
|
"protobufjs": "^7.5.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"jest": "^30.0.5",
|
"jest": "^30.1.3",
|
||||||
"prisma": "^6.13.0"
|
"prisma": "^6.16.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -156,6 +156,30 @@
|
||||||
<div class="flex flex-col h-full w-full overflow-hidden">
|
<div class="flex flex-col h-full w-full overflow-hidden">
|
||||||
<div class="flex flex-col h-full">
|
<div class="flex flex-col h-full">
|
||||||
|
|
||||||
|
<!-- announcement -->
|
||||||
|
<div v-if="isShowingAnnouncement" class="flex bg-yellow-300 p-2 border-gray-300 border-b">
|
||||||
|
|
||||||
|
<!-- info -->
|
||||||
|
<div class="my-auto leading-tight">
|
||||||
|
<div class="font-bold">Viktigt!</div>
|
||||||
|
<div class="text-sm">
|
||||||
|
<span>Den 28 september går STHLM-MESH över till MediumFast modulation. Du behöver uppdatera dina inställningar. För mer info <a href="https://sthlm-mesh.se/blog/2025/övergång-till-mediumfast-den-27-september/" type="button" class="link">klicka här</a>.</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- action buttons -->
|
||||||
|
<div class="flex my-auto ml-auto mr-0 sm:mr-2">
|
||||||
|
<a @click="dismissAnnouncement" href="javascript:void(0)" class="rounded-full">
|
||||||
|
<div class="bg-white hover:bg-gray-100 p-2 rounded-full">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- header -->
|
<!-- header -->
|
||||||
<div class="flex p-3 h-16" style="background-color: 30a552;">
|
<div class="flex p-3 h-16" style="background-color: 30a552;">
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue