Merge branch 'main' of github.com:/gitploy-io/gitploy

gitploy-io · Oct 3, 2021 · 2035ca1 · 2035ca1
2 parents 4472757 + ff6aa21
commit 2035ca1
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 5 deletions.
diff --git a/docs/images/favicon.ico b/docs/images/favicon.ico
diff --git a/docs/images/logo.svg b/docs/images/logo.svg
diff --git a/internal/server/router.go b/internal/server/router.go
@@ -240,8 +240,6 @@ func NewRouter(c *RouterConfig) *gin.Engine {
 		// Static files
 		// Files in ui/public
 		r.StaticFile("/favicon.ico", "./favicon.ico")
-		r.StaticFile("/logo192.png", "./logo192.png")
-		r.StaticFile("/logo512.png", "./logo512.png")
 		r.StaticFile("/manifest.json", "./manifest.json")
 		r.StaticFile("/robots.txt", "./robots.txt")
 		r.Static("/static", "./static")

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -5,6 +5,8 @@ theme:
   palette:
     primary: deep purple
     accent: deep purple 
+  logo: images/logo.svg
+  favicon: images/favicon.ico
   icon:
     repo: fontawesome/brands/github
 nav:

diff --git a/ui/public/favicon.ico b/ui/public/favicon.ico
diff --git a/ui/public/logo192.png b/ui/public/logo192.png
diff --git a/ui/public/logo512.png b/ui/public/logo512.png
diff --git a/ui/src/logo.svg b/ui/src/logo.svg
diff --git a/ui/src/views/Main.tsx b/ui/src/views/Main.tsx
@@ -10,6 +10,8 @@ import { subscribeEvents } from "../apis"
 import RecentActivities from "../components/RecentActivities"
 import LicenseFooter from "../components/LicenseFooter"
 
+import Logo from "../logo.svg"
+
 const { Header, Content, Footer } = Layout
 
 // eslint-disable-next-line
@@ -86,8 +88,8 @@ export default function Main(props: any) {
             <Header>
                 <Row>
                     <Col span="16">
-                        <Menu theme="dark" mode="horizontal" defaultActiveFirst>
-                            <Menu.Item key={0}>Gitploy</Menu.Item>
+                        <Menu theme="dark" mode="horizontal" >
+                            <Menu.Item key={0}><a href="/"><img src={Logo} style={{width: 62}}/></a></Menu.Item>
                             <Menu.Item key={1}><a href="/">Home</a></Menu.Item>
                             {(user?.admin)? <Menu.Item key={2}><a href="/members">Members</a></Menu.Item>: null}
                         </Menu>