From 3e98988f830fb77ca50f2a069b291660c15bd000 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 12 Apr 2022 17:06:28 +0800
Subject: [PATCH] =?UTF-8?q?merge=E5=90=8E=E7=A8=8D=E5=BE=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js                     |  2 +-
 src/forge/Head/Header.js       | 21 +++------------------
 src/modules/tpm/TPMIndexHOC.js |  2 +-
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/App.js b/src/App.js
index 0ac0cd99f..56c6d259a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -417,7 +417,7 @@ class App extends Component {
               <Route exact path="/"
                 render={
                   (props) => (
-                    <Home {...props} {...this.props} {...this.state}/>
+                    <Projects {...props} {...this.props} {...this.state}/>
                   )
                 }
               />
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 55100b743..a7ecb34aa 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -375,7 +375,7 @@ class NewHeader extends Component {
     } = this.state;
     let search_url = settings && settings.common && settings.common.search;
     return (
-      <div className={publicNav ? `newHeaders publicNav`:`newHeaders`} id="nHeader">
+      <div className={`newHeaders`} id="nHeader">
         <Engineer QQVisible={QQVisible} setQQVisible={this.setQQVisible}/>
         <div className="headerContent">
           {isRender === true ?
@@ -391,14 +391,14 @@ class NewHeader extends Component {
               {...this.props}
               {...this.state}
             /> : ""}
-            <div style={{width:"78px"}}>
+            {/* <div style={{width:"78px"}}>
               {
                 publicNav &&
                 <a href={'https://www.ccf.org.cn/'} className={"fl"}>
                   <img src={MainLogo} alt="ccf" width="63px"/>
                 </a>
               }
-            </div>
+            </div> */}
             {
               settings && settings.nav_logo_url ?
               <a href={settings && settings.new_course.default_url} className={"fl mr50"}>
@@ -414,22 +414,7 @@ class NewHeader extends Component {
                 {
                   settings.navbar && settings.navbar.map((item, key) => {
                     var new_link = item.link;
-                    // var user_login = current_user && current_user.login;
                     var is_hidden = item.hidden;
-                    // if (new_link && (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1)) {
-                    //   if (user_login) {
-                    //     if (new_link.indexOf("courses") > -1) {
-                    //       new_link = new_link.replace(/courses/g, user_login + "/courses")
-                    //     } else if (new_link.indexOf("contests") > -1) {
-                    //       new_link = new_link.replace(/contests/g, user_login + "/contests")
-                    //     }
-                    //   } else {
-                    //     is_hidden = true
-                    //   }
-                    // }
-                    // if (user_login && (new_link && new_link.indexOf("homes") > -1)) {
-                    //   new_link = new_link.replace(/homes/g, user_login + "/user_activities")
-                    // }
                     var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
                     var wl = waiLian && waiLian.length>0;
                     return (
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index 508c13355..1ca83b505 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -267,7 +267,7 @@ export function TPMIndexHOC(WrappedComponent) {
 						size="large" tip={this._gLoadingTip || "加载中..."}
 					>
 						<div className="newContainer newContainers">
-							{!publicNav && <div style={{height:"58px"}}></div> }
+							<div style={{height:"58px"}}></div>
 							<div style={{minHeight:"60vh"}}>
 								{
 									current_user &&