From d6f9c7b6b3f18f870960a5d17e6ca5e712e210ca Mon Sep 17 00:00:00 2001 From: Frikky Date: Thu, 25 Jan 2024 20:13:45 +0100 Subject: [PATCH] Made logo show up, and fixed notification loading problems onprem --- backend/go-app/main.go | 4 +++- frontend/public/images/logos/topleft_logo.svg | 6 ++++++ frontend/src/App.jsx | 5 +++-- frontend/src/components/NewHeader.jsx | 9 +++++---- 4 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 frontend/public/images/logos/topleft_logo.svg diff --git a/backend/go-app/main.go b/backend/go-app/main.go index 31d0e85f..b702f16d 100755 --- a/backend/go-app/main.go +++ b/backend/go-app/main.go @@ -4945,10 +4945,12 @@ func initHandlers() { r.HandleFunc("/api/v1/files", shuffle.HandleGetFiles).Methods("GET", "OPTIONS") // Introduced in 0.9.21 to handle notifications for e.g. failed Workflow + r.HandleFunc("/api/v1/notifications", shuffle.HandleCreateNotification).Methods("POST", "OPTIONS") r.HandleFunc("/api/v1/notifications", shuffle.HandleGetNotifications).Methods("GET", "OPTIONS") r.HandleFunc("/api/v1/notifications/clear", shuffle.HandleClearNotifications).Methods("GET", "OPTIONS") r.HandleFunc("/api/v1/notifications/{notificationId}/markasread", shuffle.HandleMarkAsRead).Methods("GET", "OPTIONS") - //r.HandleFunc("/api/v1/notifications/{notificationId}/markasread", shuffle.HandleMarkAsRead).Methods("GET", "OPTIONS") + + r.HandleFunc("/api/v1/users/notifications", shuffle.HandleCreateNotification).Methods("POST", "OPTIONS") r.HandleFunc("/api/v1/users/notifications", shuffle.HandleGetNotifications).Methods("GET", "OPTIONS") r.HandleFunc("/api/v1/users/notifications/clear", shuffle.HandleClearNotifications).Methods("GET", "OPTIONS") r.HandleFunc("/api/v1/users/notifications/{notificationId}/markasread", shuffle.HandleMarkAsRead).Methods("GET", "OPTIONS") diff --git a/frontend/public/images/logos/topleft_logo.svg b/frontend/public/images/logos/topleft_logo.svg new file mode 100644 index 00000000..95895320 --- /dev/null +++ b/frontend/public/images/logos/topleft_logo.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index eccd320f..f2a79f65 100755 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -8,8 +8,8 @@ import Workflows from "./views/Workflows"; import GettingStarted from "./views/GettingStarted"; import AngularWorkflow from "./views/AngularWorkflow.jsx"; -//import Header from "./components/NewHeader.jsx"; -import Header from "./components/Header.jsx"; +import Header from "./components/NewHeader.jsx"; +//import Header from "./components/Header.jsx"; import theme from "./theme"; import Apps from "./views/Apps"; import AppCreator from "./views/AppCreator"; @@ -240,6 +240,7 @@ const App = (message, props) => { setCookie={setCookie} cookies={cookies} checkLogin={checkLogin} + notifications={notifications} {...props} /> } diff --git a/frontend/src/components/NewHeader.jsx b/frontend/src/components/NewHeader.jsx index 277b1a40..558d0c72 100644 --- a/frontend/src/components/NewHeader.jsx +++ b/frontend/src/components/NewHeader.jsx @@ -235,7 +235,7 @@ const Header = (props) => { setLoginHoverColor(hoverOutColor); }; - const notificationWidth = 300 + const notificationWidth = 335 const imagesize = 22; const boxColor = "#86c142"; @@ -398,7 +398,8 @@ const Header = (props) => {