Просмотр исходного кода

Merge pull request #1157 from porter-dev/0.9.0-company-form

allow logout from welcome form
jusrhee 4 лет назад
Родитель
Сommit
80fd48d780

+ 10 - 4
dashboard/src/main/home/Home.tsx

@@ -393,9 +393,15 @@ class Home extends Component<PropsType, StateType> {
             this.context?.capabilities?.version === "staging") &&
             this.context?.capabilities?.version === "staging") &&
             this.state.showWelcomeForm &&
             this.state.showWelcomeForm &&
             localStorage.getItem("welcomed") != "true" && (
             localStorage.getItem("welcomed") != "true" && (
-              <WelcomeForm
-                closeForm={() => this.setState({ showWelcomeForm: false })}
-              />
+              <>
+                <WelcomeForm
+                  closeForm={() => this.setState({ showWelcomeForm: false })}
+                />
+                <Navbar
+                  logOut={this.props.logOut}
+                  currentView={this.props.currentRoute} // For form feedback
+                />
+              </>
             )
             )
           }
           }
         </>
         </>
@@ -671,7 +677,7 @@ const StyledHome = styled.div`
 
 
 const DiscordButton = styled.a`
 const DiscordButton = styled.a`
   position: absolute;
   position: absolute;
-  z-index: 100;
+  z-index: 1;
   text-decoration: none;
   text-decoration: none;
   bottom: 17px;
   bottom: 17px;
   display: flex;
   display: flex;

+ 1 - 1
dashboard/src/main/home/WelcomeForm.tsx

@@ -291,7 +291,7 @@ const StyledWelcomeForm = styled.div`
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   justify-content: center;
   justify-content: center;
-  z-index: 999;
+  z-index: 1;
   background: #202227;
   background: #202227;
 
 
   &.alert-exit {
   &.alert-exit {

+ 1 - 1
dashboard/src/main/home/modals/AccountSettingsModal.tsx

@@ -140,7 +140,7 @@ const User = styled.div`
 
 
 const ListWrapper = styled.div`
 const ListWrapper = styled.div`
   width: 100%;
   width: 100%;
-  height: 200px;
+  height: 250px;
   background: #ffffff11;
   background: #ffffff11;
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;

+ 1 - 0
dashboard/src/main/home/navbar/Navbar.tsx

@@ -241,6 +241,7 @@ const StyledNavbar = styled.div`
   align-items: center;
   align-items: center;
   padding-right: 5px;
   padding-right: 5px;
   justify-content: flex-end;
   justify-content: flex-end;
+  z-index: 1;
 `;
 `;
 
 
 const NavButton = styled.a`
 const NavButton = styled.a`