From 450261f109e944645c984f8e9016a1ce600c3c8f Mon Sep 17 00:00:00 2001
From: ashin-czi <109984998+ashin-czi@users.noreply.github.com>
Date: Thu, 25 Aug 2022 12:01:03 -0400
Subject: [PATCH] chore: updating Annotate favicon and logo icon (#2556)

* chore: replacing html icon with png icon and updating favicon
---
 .../configuration/webpack/webpack.config.dev.js |   3 ++-
 .../webpack/webpack.config.prod.js              |   3 ++-
 client/src/components/framework/logo.js         |  16 +++++++---------
 client/src/images/icon.png                      | Bin 0 -> 3124 bytes
 4 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 client/src/images/icon.png

diff --git a/client/configuration/webpack/webpack.config.dev.js b/client/configuration/webpack/webpack.config.dev.js
index 1c6abc4b..58428b0d 100644
--- a/client/configuration/webpack/webpack.config.dev.js
+++ b/client/configuration/webpack/webpack.config.dev.js
@@ -9,6 +9,7 @@ const sharedConfig = require("./webpack.config.shared");
 const babelOptions = require("../babel/babel.dev");
 
 const fonts = path.resolve("src/fonts");
+const images = path.resolve("src/images");
 const nodeModules = path.resolve("node_modules");
 
 const devConfig = {
@@ -28,7 +29,7 @@ const devConfig = {
       {
         test: /\.(jpg|png|gif|eot|svg|ttf|woff|woff2|otf)$/i,
         loader: "file-loader",
-        include: [nodeModules, fonts],
+        include: [nodeModules, fonts, images],
         options: {
           name: "static/assets/[name].[ext]",
           // (thuang): This is needed to make sure @font url path is '/static/assets/'
diff --git a/client/configuration/webpack/webpack.config.prod.js b/client/configuration/webpack/webpack.config.prod.js
index e05ae72b..a236da0f 100644
--- a/client/configuration/webpack/webpack.config.prod.js
+++ b/client/configuration/webpack/webpack.config.prod.js
@@ -14,6 +14,7 @@ const CspHashPlugin = require("./cspHashPlugin");
 const sharedConfig = require("./webpack.config.shared");
 
 const fonts = path.resolve("src/fonts");
+const images = path.resolve("src/images");
 const nodeModules = path.resolve("node_modules");
 
 const prodConfig = {
@@ -43,7 +44,7 @@ const prodConfig = {
       {
         test: /\.(jpg|png|gif|eot|svg|ttf|woff|woff2|otf)$/i,
         loader: "file-loader",
-        include: [nodeModules, fonts],
+        include: [nodeModules, fonts, images],
         options: {
           name: "static/assets/[name]-[contenthash].[ext]",
           // (thuang): This is needed to make sure @font url path is '../static/assets/'
diff --git a/client/src/components/framework/logo.js b/client/src/components/framework/logo.js
index e95e4b1c..3b7d3881 100644
--- a/client/src/components/framework/logo.js
+++ b/client/src/components/framework/logo.js
@@ -1,17 +1,15 @@
 import React from "react";
-import * as globals from "../../globals";
+import icon from "../../images/icon.png";
 
 const Logo = (props) => {
   const { size } = props;
   return (
-    <svg width={size} height={size} viewBox="0 0 48 48" fill="none">
-      <rect width="48" height="48" fill="white" />
-      <rect width="48" height="48" fill={globals.logoColor} />
-      <rect x="19" y="19" width="22" height="22" fill="white" />
-      <rect x="24" y="24" width="12" height="12" fill={globals.logoColor} />
-      <rect x="7" y="19" width="7" height="22" fill="white" />
-      <rect x="19" y="7" width="22" height="7" fill="white" />
-    </svg>
+    <img
+      src={icon}
+      height={size}
+      width={size}
+      alt="CELLxGENE Annotate Logo"
+     />
   );
 };
 
diff --git a/client/src/images/icon.png b/client/src/images/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbc81eb888ec4ec25779df217454dacedfa9d8ed
GIT binary patch
literal 3124
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
IF(ta-7i)?%=>Px#

literal 0
HcmV?d00001