You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by mi...@apache.org on 2023/11/01 07:33:25 UTC

(incubator-devlake) branch refactor-6372 created (now f28986dcc)

This is an automated email from the ASF dual-hosted git repository.

mintsweet pushed a change to branch refactor-6372
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


      at f28986dcc feat(config-ui): add two environment variables

This branch includes the following new commits:

     new 7f87d48a6 feat(config-ui): upgrade vitejs to support env in html file
     new 2455f7b4d fix(config-ui): adjust the html template
     new 86b42e163 refactor(config-ui): adjust the logo component
     new bfc0c301c refactor(config-ui): remove env from html
     new f28986dcc feat(config-ui): add two environment variables

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(incubator-devlake) 05/05: feat(config-ui): add two environment variables

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mintsweet pushed a commit to branch refactor-6372
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git

commit f28986dcc9245d9db8f9897b52f3c5ecd54beda4
Author: mintsweet <0x...@gmail.com>
AuthorDate: Wed Nov 1 20:33:07 2023 +1300

    feat(config-ui): add two environment variables
---
 config-ui/env.example                   | 4 ++++
 config-ui/src/components/logo/index.tsx | 2 +-
 config-ui/src/routes/layout/layout.tsx  | 2 +-
 config-ui/src/vite-env.d.ts             | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config-ui/env.example b/config-ui/env.example
index bf3d10d30..085d00bbb 100644
--- a/config-ui/env.example
+++ b/config-ui/env.example
@@ -1,3 +1,7 @@
+# About Basic Information
+# DEVLAKE_LOGO=
+# DEVLAKE_COPYRIGHT=
+
 # All plugins are loaded by default, optional plugins can be loaded
 # eg. DEVLAKE_PLUGINS=github,gitlab
 DEVLAKE_PLUGINS=
diff --git a/config-ui/src/components/logo/index.tsx b/config-ui/src/components/logo/index.tsx
index fcda11424..23362c9e4 100644
--- a/config-ui/src/components/logo/index.tsx
+++ b/config-ui/src/components/logo/index.tsx
@@ -28,7 +28,7 @@ const Wrapper = styled.div`
 export const Logo = () => {
   return (
     <Wrapper>
-      <img src={LogoImg} alt="Logo" />
+      <img src={import.meta.env.DEVLAKE_LOGO ?? LogoImg} alt="Logo" />
     </Wrapper>
   );
 };
diff --git a/config-ui/src/routes/layout/layout.tsx b/config-ui/src/routes/layout/layout.tsx
index fc3fd222c..514bc8054 100644
--- a/config-ui/src/routes/layout/layout.tsx
+++ b/config-ui/src/routes/layout/layout.tsx
@@ -114,7 +114,7 @@ export const Layout = () => {
                 })}
               </Menu>
               <div className="copyright">
-                <div>Apache 2.0 License</div>
+                <div>{import.meta.env.DEVLAKE_COPYRIGHT ?? 'Apache 2.0 License'}</div>
                 <div className="version">{version}</div>
               </div>
             </S.Sider>
diff --git a/config-ui/src/vite-env.d.ts b/config-ui/src/vite-env.d.ts
index d52d9a2d7..57374a1d2 100644
--- a/config-ui/src/vite-env.d.ts
+++ b/config-ui/src/vite-env.d.ts
@@ -19,6 +19,8 @@
 /// <reference types="vite/client" />
 
 interface ImportMetaEnv {
+  readonly DEVLAKE_LOGO: string;
+  readonly DEVLAKE_COPYRIGHT: string;
   readonly DEVLAKE_PLUGINS: string;
 }
 


(incubator-devlake) 01/05: feat(config-ui): upgrade vitejs to support env in html file

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mintsweet pushed a commit to branch refactor-6372
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git

commit 7f87d48a61850a96f1638f80970073cbd3816f35
Author: mintsweet <0x...@gmail.com>
AuthorDate: Wed Nov 1 14:57:33 2023 +1300

    feat(config-ui): upgrade vitejs to support env in html file
---
 config-ui/package.json |   2 +-
 config-ui/yarn.lock    | 232 +++++++++++++++++++++++++------------------------
 2 files changed, 118 insertions(+), 116 deletions(-)

diff --git a/config-ui/package.json b/config-ui/package.json
index 97d90658b..bb068ef95 100644
--- a/config-ui/package.json
+++ b/config-ui/package.json
@@ -65,6 +65,6 @@
     "lint-staged": "^13.1.0",
     "prettier": "^2.7.1",
     "typescript": "^4.9.4",
-    "vite": "^4.1.4"
+    "vite": "^4.2.3"
   }
 }
diff --git a/config-ui/yarn.lock b/config-ui/yarn.lock
index c6fbdf122..3b17d3a9e 100644
--- a/config-ui/yarn.lock
+++ b/config-ui/yarn.lock
@@ -1673,156 +1673,156 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/android-arm64@npm:0.16.17"
+"@esbuild/android-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/android-arm64@npm:0.18.20"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/android-arm@npm:0.16.17"
+"@esbuild/android-arm@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/android-arm@npm:0.18.20"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@esbuild/android-x64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/android-x64@npm:0.16.17"
+"@esbuild/android-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/android-x64@npm:0.18.20"
   conditions: os=android & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-arm64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/darwin-arm64@npm:0.16.17"
+"@esbuild/darwin-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/darwin-arm64@npm:0.18.20"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-x64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/darwin-x64@npm:0.16.17"
+"@esbuild/darwin-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/darwin-x64@npm:0.18.20"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-arm64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/freebsd-arm64@npm:0.16.17"
+"@esbuild/freebsd-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/freebsd-arm64@npm:0.18.20"
   conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-x64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/freebsd-x64@npm:0.16.17"
+"@esbuild/freebsd-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/freebsd-x64@npm:0.18.20"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/linux-arm64@npm:0.16.17"
+"@esbuild/linux-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-arm64@npm:0.18.20"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/linux-arm@npm:0.16.17"
+"@esbuild/linux-arm@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-arm@npm:0.18.20"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ia32@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/linux-ia32@npm:0.16.17"
+"@esbuild/linux-ia32@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-ia32@npm:0.18.20"
   conditions: os=linux & cpu=ia32
   languageName: node
   linkType: hard
 
-"@esbuild/linux-loong64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/linux-loong64@npm:0.16.17"
+"@esbuild/linux-loong64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-loong64@npm:0.18.20"
   conditions: os=linux & cpu=loong64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-mips64el@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/linux-mips64el@npm:0.16.17"
+"@esbuild/linux-mips64el@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-mips64el@npm:0.18.20"
   conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ppc64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/linux-ppc64@npm:0.16.17"
+"@esbuild/linux-ppc64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-ppc64@npm:0.18.20"
   conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-riscv64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/linux-riscv64@npm:0.16.17"
+"@esbuild/linux-riscv64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-riscv64@npm:0.18.20"
   conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-s390x@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/linux-s390x@npm:0.16.17"
+"@esbuild/linux-s390x@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-s390x@npm:0.18.20"
   conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
 
-"@esbuild/linux-x64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/linux-x64@npm:0.16.17"
+"@esbuild/linux-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-x64@npm:0.18.20"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/netbsd-x64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/netbsd-x64@npm:0.16.17"
+"@esbuild/netbsd-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/netbsd-x64@npm:0.18.20"
   conditions: os=netbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-x64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/openbsd-x64@npm:0.16.17"
+"@esbuild/openbsd-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/openbsd-x64@npm:0.18.20"
   conditions: os=openbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/sunos-x64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/sunos-x64@npm:0.16.17"
+"@esbuild/sunos-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/sunos-x64@npm:0.18.20"
   conditions: os=sunos & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/win32-arm64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/win32-arm64@npm:0.16.17"
+"@esbuild/win32-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/win32-arm64@npm:0.18.20"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/win32-ia32@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/win32-ia32@npm:0.16.17"
+"@esbuild/win32-ia32@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/win32-ia32@npm:0.18.20"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@esbuild/win32-x64@npm:0.16.17":
-  version: 0.16.17
-  resolution: "@esbuild/win32-x64@npm:0.16.17"
+"@esbuild/win32-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/win32-x64@npm:0.18.20"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -3098,7 +3098,7 @@ __metadata:
     redux: ^4.2.1
     styled-components: ^5.3.6
     typescript: ^4.9.4
-    vite: ^4.1.4
+    vite: ^4.2.3
   languageName: unknown
   linkType: soft
 
@@ -3537,32 +3537,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.16.14":
-  version: 0.16.17
-  resolution: "esbuild@npm:0.16.17"
-  dependencies:
-    "@esbuild/android-arm": 0.16.17
-    "@esbuild/android-arm64": 0.16.17
-    "@esbuild/android-x64": 0.16.17
-    "@esbuild/darwin-arm64": 0.16.17
-    "@esbuild/darwin-x64": 0.16.17
-    "@esbuild/freebsd-arm64": 0.16.17
-    "@esbuild/freebsd-x64": 0.16.17
-    "@esbuild/linux-arm": 0.16.17
-    "@esbuild/linux-arm64": 0.16.17
-    "@esbuild/linux-ia32": 0.16.17
-    "@esbuild/linux-loong64": 0.16.17
-    "@esbuild/linux-mips64el": 0.16.17
-    "@esbuild/linux-ppc64": 0.16.17
-    "@esbuild/linux-riscv64": 0.16.17
-    "@esbuild/linux-s390x": 0.16.17
-    "@esbuild/linux-x64": 0.16.17
-    "@esbuild/netbsd-x64": 0.16.17
-    "@esbuild/openbsd-x64": 0.16.17
-    "@esbuild/sunos-x64": 0.16.17
-    "@esbuild/win32-arm64": 0.16.17
-    "@esbuild/win32-ia32": 0.16.17
-    "@esbuild/win32-x64": 0.16.17
+"esbuild@npm:^0.18.10":
+  version: 0.18.20
+  resolution: "esbuild@npm:0.18.20"
+  dependencies:
+    "@esbuild/android-arm": 0.18.20
+    "@esbuild/android-arm64": 0.18.20
+    "@esbuild/android-x64": 0.18.20
+    "@esbuild/darwin-arm64": 0.18.20
+    "@esbuild/darwin-x64": 0.18.20
+    "@esbuild/freebsd-arm64": 0.18.20
+    "@esbuild/freebsd-x64": 0.18.20
+    "@esbuild/linux-arm": 0.18.20
+    "@esbuild/linux-arm64": 0.18.20
+    "@esbuild/linux-ia32": 0.18.20
+    "@esbuild/linux-loong64": 0.18.20
+    "@esbuild/linux-mips64el": 0.18.20
+    "@esbuild/linux-ppc64": 0.18.20
+    "@esbuild/linux-riscv64": 0.18.20
+    "@esbuild/linux-s390x": 0.18.20
+    "@esbuild/linux-x64": 0.18.20
+    "@esbuild/netbsd-x64": 0.18.20
+    "@esbuild/openbsd-x64": 0.18.20
+    "@esbuild/sunos-x64": 0.18.20
+    "@esbuild/win32-arm64": 0.18.20
+    "@esbuild/win32-ia32": 0.18.20
+    "@esbuild/win32-x64": 0.18.20
   dependenciesMeta:
     "@esbuild/android-arm":
       optional: true
@@ -3610,7 +3610,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: 4c2cc609ecfb426554bc3f75beb92d89eb2d0c515cfceebaa36c7599d7dcaab7056b70f6d6b51e72b45951ddf9021ee28e356cf205f8e42cc055d522312ea30c
+  checksum: 5d253614e50cdb6ec22095afd0c414f15688e7278a7eb4f3720a6dd1306b0909cf431e7b9437a90d065a31b1c57be60130f63fe3e8d0083b588571f31ee6ec7b
   languageName: node
   linkType: hard
 
@@ -5332,12 +5332,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nanoid@npm:^3.3.4":
-  version: 3.3.4
-  resolution: "nanoid@npm:3.3.4"
+"nanoid@npm:^3.3.6":
+  version: 3.3.6
+  resolution: "nanoid@npm:3.3.6"
   bin:
     nanoid: bin/nanoid.cjs
-  checksum: 2fddd6dee994b7676f008d3ffa4ab16035a754f4bb586c61df5a22cf8c8c94017aadd360368f47d653829e0569a92b129979152ff97af23a558331e47e37cd9c
+  checksum: 7d0eda657002738aa5206107bd0580aead6c95c460ef1bdd0b1a87a9c7ae6277ac2e9b945306aaa5b32c6dcb7feaf462d0f552e7f8b5718abfc6ead5c94a71b3
   languageName: node
   linkType: hard
 
@@ -5722,14 +5722,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.4.21":
-  version: 8.4.21
-  resolution: "postcss@npm:8.4.21"
+"postcss@npm:^8.4.27":
+  version: 8.4.31
+  resolution: "postcss@npm:8.4.31"
   dependencies:
-    nanoid: ^3.3.4
+    nanoid: ^3.3.6
     picocolors: ^1.0.0
     source-map-js: ^1.0.2
-  checksum: e39ac60ccd1542d4f9d93d894048aac0d686b3bb38e927d8386005718e6793dbbb46930f0a523fe382f1bbd843c6d980aaea791252bf5e176180e5a4336d9679
+  checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea
   languageName: node
   linkType: hard
 
@@ -6208,9 +6208,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:^3.10.0":
-  version: 3.19.1
-  resolution: "rollup@npm:3.19.1"
+"rollup@npm:^3.27.1":
+  version: 3.29.4
+  resolution: "rollup@npm:3.29.4"
   dependencies:
     fsevents: ~2.3.2
   dependenciesMeta:
@@ -6218,7 +6218,7 @@ __metadata:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: f78198c6de224b26650c70b16db156762d1fcceeb375d34fb2c76fc5b23a78f712c3c881d3248e6f277a511589e20d50c247bcf5c7920f1ddc0a43cadf9f0140
+  checksum: 8bb20a39c8d91130825159c3823eccf4dc2295c9a0a5c4ed851a5bf2167dbf24d9a29f23461a54c955e5506395e6cc188eafc8ab0e20399d7489fb33793b184e
   languageName: node
   linkType: hard
 
@@ -6945,18 +6945,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^4.1.4":
-  version: 4.1.4
-  resolution: "vite@npm:4.1.4"
+"vite@npm:^4.2.3":
+  version: 4.5.0
+  resolution: "vite@npm:4.5.0"
   dependencies:
-    esbuild: ^0.16.14
+    esbuild: ^0.18.10
     fsevents: ~2.3.2
-    postcss: ^8.4.21
-    resolve: ^1.22.1
-    rollup: ^3.10.0
+    postcss: ^8.4.27
+    rollup: ^3.27.1
   peerDependencies:
     "@types/node": ">= 14"
     less: "*"
+    lightningcss: ^1.21.0
     sass: "*"
     stylus: "*"
     sugarss: "*"
@@ -6969,6 +6969,8 @@ __metadata:
       optional: true
     less:
       optional: true
+    lightningcss:
+      optional: true
     sass:
       optional: true
     stylus:
@@ -6979,7 +6981,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 50a9a1f2e29e0ee8fefdec60314d38fb9b746df0bb6ae5a8114014b5bfd95e0fc9b29c0d5e73939361ba53af7eb66c7d20c5656bbe53a783e96540bd3b907c47
+  checksum: 06f1a4c858e4dc4c04a10466f4ccacea30c5a9f8574e5ba3deb9d03fa20e80ca6797f02dad97a988da7cdef96238dbc69c3b6a538156585c74722d996223619e
   languageName: node
   linkType: hard
 


(incubator-devlake) 02/05: fix(config-ui): adjust the html template

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mintsweet pushed a commit to branch refactor-6372
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git

commit 2455f7b4d75539e5bf2363687e9bdfbc9e045367
Author: mintsweet <0x...@gmail.com>
AuthorDate: Wed Nov 1 14:58:07 2023 +1300

    fix(config-ui): adjust the html template
---
 config-ui/index.html | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/config-ui/index.html b/config-ui/index.html
index e868c60a2..3f05628ee 100644
--- a/config-ui/index.html
+++ b/config-ui/index.html
@@ -23,24 +23,17 @@ ____  _______     __  _        _    _  _______
 |____/|_____|  \_/    |_____/_/   \_\_|\_\_____|
 
 
-CONFIGURATION-UI: Production Mode HTML
-https://github.com/apache/incubator-devlake/wiki
-
+CONFIGURATION-UI
+Link: https://github.com/apache/incubator-devlake
 -->
+
 <!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Devlake Config-UI</title>
-    <meta
-      name="description"
-      content="Dev Lake is the one-stop solution that integrates, analyzes, and visualizes software development."
-    />
-    <meta name="keywords" content="big data, devops, data warehouse, big code" />
-    <meta name="robots" content="noindex, nofollow" />
+    <title>Devlake Config UI</title>
     <link rel="icon" href="/favicon.ico" />
-    <title>Lake: Config UI</title>
   </head>
   <body>
     <div id="root"></div>


(incubator-devlake) 03/05: refactor(config-ui): adjust the logo component

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mintsweet pushed a commit to branch refactor-6372
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git

commit 86b42e163cd3fc7d2d751674478fd333dc80db8a
Author: mintsweet <0x...@gmail.com>
AuthorDate: Wed Nov 1 20:11:10 2023 +1300

    refactor(config-ui): adjust the logo component
---
 config-ui/src/components/logo/index.tsx   | 17 +++++++++------
 config-ui/src/components/logo/styled.ts   | 36 -------------------------------
 config-ui/src/images/devlake-logo.svg     | 28 ------------------------
 config-ui/src/images/devlake-textmark.svg | 21 ------------------
 4 files changed, 10 insertions(+), 92 deletions(-)

diff --git a/config-ui/src/components/logo/index.tsx b/config-ui/src/components/logo/index.tsx
index 6b5af0595..fcda11424 100644
--- a/config-ui/src/components/logo/index.tsx
+++ b/config-ui/src/components/logo/index.tsx
@@ -16,16 +16,19 @@
  *
  */
 
-import LogoImg from '@/images/devlake-logo.svg';
-import LogoTextImg from '@/images/devlake-textmark.svg';
+import styled from 'styled-components';
 
-import * as S from './styled';
+import LogoImg from '@/images/logo.svg';
+
+const Wrapper = styled.div`
+  display: flex;
+  justify-content: center;
+`;
 
 export const Logo = () => {
   return (
-    <S.Wrapper>
-      <img src={LogoImg} alt="" />
-      <img src={LogoTextImg} alt="" />
-    </S.Wrapper>
+    <Wrapper>
+      <img src={LogoImg} alt="Logo" />
+    </Wrapper>
   );
 };
diff --git a/config-ui/src/components/logo/styled.ts b/config-ui/src/components/logo/styled.ts
deleted file mode 100644
index 07d719249..000000000
--- a/config-ui/src/components/logo/styled.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import styled from 'styled-components';
-
-export const Wrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  img:first-child {
-    width: 48px;
-    height: 48px;
-  }
-
-  img:last-child {
-    margin-top: 10px;
-    width: 100px;
-    height: 13px;
-  }
-`;
diff --git a/config-ui/src/images/devlake-logo.svg b/config-ui/src/images/devlake-logo.svg
deleted file mode 100644
index 234da18d9..000000000
--- a/config-ui/src/images/devlake-logo.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<svg width="100" height="100" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <circle cx="24" cy="24" r="24" fill="#7497F7" />
-    <path
-        d="M36.3565 28.2413C34.8541 28.2762 33.4745 28.1777 32.198 27.9751C33.6367 26.6784 34.4828 24.8944 34.3781 22.9664C34.2789 21.1452 33.3483 19.5357 31.9202 18.3944C33.8344 17.5795 36.0517 16.3076 37.1975 14.4932C38.527 12.3879 37.7124 10.6129 37.0612 9.69778C36.801 9.33198 36.1886 9.29821 35.8106 9.63081L27.782 16.6965C27.3573 16.6453 26.9218 16.625 26.479 16.6363C27.8254 15.0447 29.1492 12.9501 29.5075 10.596C29.9739 7.53166 28.3696 6.0403 27.3037 5.40211C26.8779 5.14717 26.2317  [...]
-        fill="white" />
-    <path
-        d="M23.4341 21.6448C23.4341 22.6578 24.256 23.4783 25.2694 23.4783C26.2834 23.4783 27.1048 22.6578 27.1048 21.6448C27.1048 20.6318 26.2834 19.8113 25.2694 19.8113C24.2554 19.8113 23.4341 20.6318 23.4341 21.6448Z"
-        fill="#FF8B8B" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-        d="M5.81165 39.6587C4.55094 38.1957 3.46375 36.5788 2.58203 34.8402C6.00017 33.819 10.6322 32.8665 15.667 32.8665C19.4684 32.8665 22.3446 33.5767 25.0905 34.2558L25.134 34.2666C27.8411 34.9361 30.4856 35.5902 34.1912 35.7548C38.5009 35.9463 42.5512 34.949 45.8368 33.972C44.6821 36.4964 43.1025 38.7859 41.1895 40.7489C38.9327 41.1367 36.4783 41.368 33.9468 41.2555C29.6929 41.0665 26.6085 40.3034 23.8871 39.6302L23.7685 39.6008C21.0418 38.9265 18.7375 38.3725 15.667 38.3725C11.9727 [...]
-        fill="white" />
-</svg>
\ No newline at end of file
diff --git a/config-ui/src/images/devlake-textmark.svg b/config-ui/src/images/devlake-textmark.svg
deleted file mode 100644
index 706b087f5..000000000
--- a/config-ui/src/images/devlake-textmark.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<svg width="100" height="100" viewBox="0 0 100 13" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd"
-        d="M1.85853 9.7561H0L2.06835 2.20723C2.4255 0.903737 3.61017 0 4.96171 0H6.00651C7.15817 0 8.07188 0.970163 8.00292 2.11976L7.54484 9.7561H5.74167L6.01464 6.38223H2.77185L1.85853 9.7561ZM6.35354 2.19474L6.14328 4.7937H3.20176L3.88088 2.28505C3.9989 1.84909 4.39449 1.54636 4.84614 1.54636H5.7555C6.10594 1.54636 6.3818 1.84543 6.35354 2.19474ZM37.9166 3.81498L36.9686 9.90796H35.3434L36.2102 4.35017C36.2643 3.95221 36.1831 3.93848 35.8445 3.93848H33.2443L32.3234 9.90796H30.6982L32.2 [...]
-        fill="#7497F7" />
-</svg>
\ No newline at end of file


(incubator-devlake) 04/05: refactor(config-ui): remove env from html

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mintsweet pushed a commit to branch refactor-6372
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git

commit bfc0c301c73ce201bfee82e8345960d69d24a1ff
Author: mintsweet <0x...@gmail.com>
AuthorDate: Wed Nov 1 20:32:21 2023 +1300

    refactor(config-ui): remove env from html
---
 config-ui/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config-ui/index.html b/config-ui/index.html
index 3f05628ee..051865dd2 100644
--- a/config-ui/index.html
+++ b/config-ui/index.html
@@ -32,7 +32,7 @@ Link: https://github.com/apache/incubator-devlake
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Devlake Config UI</title>
+    <title>Config UI</title>
     <link rel="icon" href="/favicon.ico" />
   </head>
   <body>