Removed top bar from Registration and Welcome view (#2330)

* Removed top bar from Registration and Welcome view
saveourtool · Jul 14, 2023 · b9759b1 · b9759b1
1 parent f2dd42b
commit b9759b1
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/App.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/App.kt
@@ -29,7 +29,6 @@ import web.html.HTMLElement
 import kotlinx.browser.window
 import kotlinx.coroutines.await
 import kotlinx.coroutines.launch
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 
 internal val topBarComponent = topBar()

diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/topbar/TopBar.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/topbar/TopBar.kt
@@ -7,7 +7,9 @@
 package com.saveourtool.save.frontend.components.topbar
 
 import com.saveourtool.save.frontend.externals.fontawesome.*
+import com.saveourtool.save.frontend.utils.not
 import com.saveourtool.save.info.UserInfo
+import com.saveourtool.save.validation.FrontendRoutes
 import js.core.jso
 
 import react.*
@@ -62,21 +64,23 @@ fun ChildrenBuilder.dropdownEntry(
  */
 fun topBar() = FC<TopBarProps> { props ->
     val location = useLocation()
-    nav {
-        className =
-                ClassName("navbar navbar-expand navbar-dark bg-dark topbar mb-3 static-top shadow mr-1 ml-1 rounded")
-        style = jso {
-            width = 100.vw
-        }
-        id = "navigation-top-bar"
-        topBarUrlSplits {
-            this.location = location
-        }
-        topBarLinks {
-            this.location = location
-        }
-        topBarUserField {
-            userInfo = props.userInfo
+    if (location.not("/${FrontendRoutes.SAVE.path}") && location.not("/${FrontendRoutes.REGISTRATION.path}")) {
+        nav {
+            className =
+                    ClassName("navbar navbar-expand navbar-dark bg-dark topbar mb-3 static-top shadow mr-1 ml-1 rounded")
+            style = jso {
+                width = 100.vw
+            }
+            id = "navigation-top-bar"
+            topBarUrlSplits {
+                this.location = location
+            }
+            topBarLinks {
+                this.location = location
+            }
+            topBarUserField {
+                userInfo = props.userInfo
+            }
         }
     }
 }
diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/LocationUtils.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/LocationUtils.kt
@@ -0,0 +1,10 @@
+@file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
+
+package com.saveourtool.save.frontend.utils
+
+import remix.run.router.Location
+
+/**
+ * @param url url for comparison
+ */
+fun Location.not(url: String) = !pathname.startsWith(url)