refactorring dashboard

This commit is contained in:
ISA
2025-06-27 07:23:34 +02:00
parent 7da872ae07
commit d3a8556b2f
18 changed files with 63 additions and 56 deletions

View File

@@ -6,6 +6,6 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false
NEXT_PUBLIC_EXPORT_STATIC=false NEXT_PUBLIC_EXPORT_STATIC=false
NEXT_PUBLIC_USE_CGI=false NEXT_PUBLIC_USE_CGI=false
# App-Versionsnummer # App-Versionsnummer
NEXT_PUBLIC_APP_VERSION=1.6.486 NEXT_PUBLIC_APP_VERSION=1.6.487
NEXT_PUBLIC_CPL_MODE=json # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter) NEXT_PUBLIC_CPL_MODE=json # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter)

View File

@@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL
NEXT_PUBLIC_EXPORT_STATIC=true NEXT_PUBLIC_EXPORT_STATIC=true
NEXT_PUBLIC_USE_CGI=true NEXT_PUBLIC_USE_CGI=true
# App-Versionsnummer # App-Versionsnummer
NEXT_PUBLIC_APP_VERSION=1.6.486 NEXT_PUBLIC_APP_VERSION=1.6.487
NEXT_PUBLIC_CPL_MODE=production NEXT_PUBLIC_CPL_MODE=production

View File

@@ -1,3 +1,8 @@
## [1.6.487] 2025-06-27
- refactor
---
## [1.6.486] 2025-06-27 ## [1.6.486] 2025-06-27
- refactor: rename einausgange to digitalOtputs and digitalInputs - refactor: rename einausgange to digitalOtputs and digitalInputs

View File

@@ -39,59 +39,60 @@ const NetworkInfo: React.FC = () => {
return ( return (
<div className="w-full flex-direction: row flex"> <div className="w-full flex-direction: row flex">
<div className=" flex-grow flex justify-between items-center mt-1 bg-white p-2 rounded-lg shadow-md border border-gray-200 laptop:m-0 laptop:scale-y-75 2xl:scale-y-75"> <div className=" flex-grow flex justify-between items-center mt-1 bg-white p-2 rounded-lg shadow-md border border-gray-200 laptop:m-0 laptop:scale-y-75 2xl:scale-y-75">
<Image <div className="flex items-center space-x-4">
src="/images/IP-icon.svg" <Image
alt="IP Address" src="/images/IP-icon.svg"
width={24} alt="IP Address"
height={24} width={24}
className="w-6 text-littwin-blue" height={24}
priority className="w-6 text-littwin-blue"
/> priority
<div> />
<p className="text-xs text-gray-500">IP-Adresse</p> <div>
<p className="text-sm font-medium text-gray-700">{ip}</p> <p className="text-xs text-gray-500">IP-Adresse</p>
<p className="text-sm font-medium text-gray-700">{ip}</p>
</div>
</div> </div>
</div>
<div className="flex items-center space-x-4"> <div className="flex items-center space-x-4">
<Image <Image
src="/images/subnet-mask.svg" src="/images/subnet-mask.svg"
alt="subnet mask" alt="subnet mask"
width={24} width={24}
height={24} height={24}
className="w-6" className="w-6"
priority priority
/> />
<div> <div>
<p className="text-xs text-gray-500">Subnet-Maske</p> <p className="text-xs text-gray-500">Subnet-Maske</p>
<p className="text-sm font-medium text-gray-700">{subnet}</p> <p className="text-sm font-medium text-gray-700">{subnet}</p>
</div>
</div> </div>
</div>
<div className="flex items-center space-x-4"> <div className="flex items-center space-x-4">
<Image <Image
src="/images/gateway.svg" src="/images/gateway.svg"
alt="gateway" alt="gateway"
width={24} width={24}
height={24} height={24}
className="w-6" className="w-6"
priority priority
/> />
<div> <div>
<p className="text-xs text-gray-500">Gateway</p> <p className="text-xs text-gray-500">Gateway</p>
<p className="text-sm font-medium text-gray-700">{gateway}</p> <p className="text-sm font-medium text-gray-700">{gateway}</p>
</div>
</div> </div>
</div>
<div className="flex items-center space-x-4"> <div className="flex items-center space-x-4">
<div className="text-xs font-bold text-littwin-blue">OPC-UA</div> <div className="text-xs font-bold text-littwin-blue">OPC-UA</div>
<div> <div>
<p className="text-xs text-gray-500">Status</p> <p className="text-xs text-gray-500">Status</p>
<p className="text-sm font-medium text-gray-700">{opcUaZustand}</p> <p className="text-sm font-medium text-gray-700">{opcUaZustand}</p>
</div>
</div> </div>
</div> {/* OPC UA Nodeset Name */}
{/* OPC UA Nodeset Name */} {/*
{/*
<div className="flex items-center space-x-4"> <div className="flex items-center space-x-4">
<div> <div>
<p className="text-xs text-gray-500">Nodeset Name</p> <p className="text-xs text-gray-500">Nodeset Name</p>
@@ -101,6 +102,7 @@ const NetworkInfo: React.FC = () => {
</div> </div>
</div> </div>
*/} */}
</div>
</div> </div>
); );
}; };

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "cpl-v4", "name": "cpl-v4",
"version": "1.6.486", "version": "1.6.487",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "cpl-v4", "name": "cpl-v4",
"version": "1.6.486", "version": "1.6.487",
"dependencies": { "dependencies": {
"@fontsource/roboto": "^5.1.0", "@fontsource/roboto": "^5.1.0",
"@iconify-icons/ri": "^1.2.10", "@iconify-icons/ri": "^1.2.10",

View File

@@ -1,6 +1,6 @@
{ {
"name": "cpl-v4", "name": "cpl-v4",
"version": "1.6.486", "version": "1.6.487",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",

View File

@@ -4,10 +4,10 @@ import "tailwindcss/tailwind.css";
import "@fontsource/roboto"; import "@fontsource/roboto";
import "bootstrap-icons/font/bootstrap-icons.css"; import "bootstrap-icons/font/bootstrap-icons.css";
import { Icon } from "@iconify/react"; import { Icon } from "@iconify/react";
import Last20MessagesTable from "../components/main/uebersicht/Last20MessagesTable"; import Last20MessagesTable from "../components/main/dashboard/Last20MessagesTable";
import NetworkInfo from "../components/main/uebersicht/NetworkInfo"; import NetworkInfo from "../components/main/dashboard/NetworkInfo";
import VersionInfo from "../components/main/uebersicht/VersionInfo"; import VersionInfo from "../components/main/dashboard/VersionInfo";
import Baugruppentraeger from "../components/main/uebersicht/Baugruppentraeger"; import Baugruppentraeger from "../components/main/dashboard/Baugruppentraeger";
import { getLast20MessagesThunk } from "../redux/thunks/getLast20MessagesThunk"; import { getLast20MessagesThunk } from "../redux/thunks/getLast20MessagesThunk";
import { useAppDispatch } from "../redux/store"; import { useAppDispatch } from "../redux/store";

View File

@@ -1,7 +1,7 @@
"use client"; "use client";
// /pages/meldungen.tsx // /pages/meldungen.tsx
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import DateRangePickerMeldungen from "@/components/main/meldungen/DateRangePickerMeldungen"; import DateRangePickerMeldungen from "@/components/main/reports/DateRangePickerMeldungen";
type Meldung = { type Meldung = {
t: string; t: string;