Stefan-5422/-T5-Elektrifikatsiya
1
0
Fork 0
mirror of https://github.com/Stefan-5422/-T5-Elektrifikatsiya.git synced 2026-09-04 00:45:58 +02:00
Code Issues 2 Packages Projects Releases Wiki Activity

[PR #20] [MERGED] Feature dashboard #27

New Issue
Closed
opened 2026-09-04 00:41:42 +02:00 by Stone_Red · 0 comments
Stone_Red commented 2026-09-04 00:41:42 +02:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/Stefan-5422/-T5-Elektrifikatsiya/pull/20
Author: @Friend2868
Created: 2/8/2023
Status: ✅ Merged
Merged: 2/8/2023
Merged by: @Stone-Red-Code

Base: Development ← Head: feature-Dashboard

📝 Commits (9)

📊 Changes

16 files changed (+300 additions, -349 deletions)

View changed files

📝 src/Elektrifikatsiya/Elektrifikatsiya/App.razor (+59 -44)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor (+19 -24)
➖ src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/TopMenu.razor (+0 -163)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Database/DeviceManagementDatabaseContext.cs (+1 -1)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Elektrifikatsiya.csproj (+5 -3)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor (+13 -64)
➖ src/Elektrifikatsiya/Elektrifikatsiya/Model/Device.cs (+0 -20)
➕ src/Elektrifikatsiya/Elektrifikatsiya/Models/Device.cs (+27 -0)
➕ src/Elektrifikatsiya/Elektrifikatsiya/Models/Event.cs (+18 -0)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor (+120 -29)
➕ src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor.cs (+28 -0)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Pages/_Layout.cshtml (+1 -0)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Program.cs (+8 -1)
📝 src/Elektrifikatsiya/Elektrifikatsiya/_Imports.razor (+1 -0)
➖ src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/brand-logo.png (+0 -0)
➕ src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/logo.png (+0 -0)

📄 Description

yay merge conflict

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/Stefan-5422/-T5-Elektrifikatsiya/pull/20 **Author:** [@Friend2868](https://github.com/Friend2868) **Created:** 2/8/2023 **Status:** ✅ Merged **Merged:** 2/8/2023 **Merged by:** [@Stone-Red-Code](https://github.com/Stone-Red-Code) **Base:** `Development` ← **Head:** `feature-Dashboard` --- ### 📝 Commits (9) - [`cf057e3`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/cf057e3a2caa0f668887d680a3fb7ff1ae860dbf) Sidebar angepasst und im Dashboard die Plug Liste hinzugefügt - [`363b010`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/363b01035c6295321385e4325994645d2b9776dc) Sidebar angepasst und im Dashboard die Plug Liste hinzugefügt - [`ac0ea50`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/ac0ea50d015bd730f2a41fc8e9a16e2b054d1f5b) Fix - [`0f27469`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/0f27469f56486de8e1453592905e2f90b0a89d1a) fixed and updated ui stuff - [`c127cb3`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/c127cb39763b89dc27258def2d210f0644146cda) Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard - [`38f255c`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/38f255c430a648d49d3146abc09c2bd4c7fb3f15) Dashboard progress / Docker fix - [`53cddb8`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/53cddb8ef9157d172e681cdcd0433c282279d10d) Yeet 🎂 - [`3154632`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/3154632d29ef60d97c85a5b5cf57c4a32627095e) Merge branch 'Development' into feature-Dashboard - [`5017f82`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/5017f82157e7eab65cb81047d14a3522f9486f4e) Remove ### 📊 Changes **16 files changed** (+300 additions, -349 deletions) <details> <summary>View changed files</summary> 📝 `src/Elektrifikatsiya/Elektrifikatsiya/App.razor` (+59 -44) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor` (+19 -24) ➖ `src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/TopMenu.razor` (+0 -163) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Database/DeviceManagementDatabaseContext.cs` (+1 -1) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Elektrifikatsiya.csproj` (+5 -3) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor` (+13 -64) ➖ `src/Elektrifikatsiya/Elektrifikatsiya/Model/Device.cs` (+0 -20) ➕ `src/Elektrifikatsiya/Elektrifikatsiya/Models/Device.cs` (+27 -0) ➕ `src/Elektrifikatsiya/Elektrifikatsiya/Models/Event.cs` (+18 -0) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor` (+120 -29) ➕ `src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor.cs` (+28 -0) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Pages/_Layout.cshtml` (+1 -0) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Program.cs` (+8 -1) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/_Imports.razor` (+1 -0) ➖ `src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/brand-logo.png` (+0 -0) ➕ `src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/logo.png` (+0 -0) </details> ### 📄 Description yay merge conflict --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Stone_Red added the pull-request label 2026-09-04 00:41:42 +02:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
pull-request
Mirrored from GitHub Pull Request
No labels pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
Stone_Red
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Stefan-5422/-T5-Elektrifikatsiya#27