You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ma...@apache.org on 2021/11/17 10:33:19 UTC
[superset] 01/01: Change logo, loading animation, add logo
This is an automated email from the ASF dual-hosted git repository.
mayurnewase pushed a commit to branch customize
in repository https://gitbox.apache.org/repos/asf/superset.git
commit c6eb10f1ed32217dddd7ca44eb914efb65ad8a6d
Author: Mayur <ma...@gmail.com>
AuthorDate: Wed Nov 17 16:01:28 2021 +0530
Change logo, loading animation, add logo
---
superset-frontend/images/ficus_logo.svg | 1 +
.../src/components/Loading/Loading.stories.tsx | 4 ++--
superset-frontend/src/components/Loading/index.tsx | 4 ++--
superset/cli.py | 2 +-
superset/config.py | 14 +++++++-------
superset/templates/superset/basic.html | 2 +-
superset/views/base.py | 2 +-
7 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/superset-frontend/images/ficus_logo.svg b/superset-frontend/images/ficus_logo.svg
new file mode 100644
index 0000000..1382240
--- /dev/null
+++ b/superset-frontend/images/ficus_logo.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><defs><style>.cls-1{fill:none;}.cls-2{fill:#45bcdf;}.cls-3{fill:#606161;}</style></defs><polygon class="cls-1" points="12.32 25.66 14.12 25.66 14.69 22.92 12.89 22.92 12.32 25.66"/><polygon class="cls-2" points="14.7 22.9 14.69 22.92 14.69 22.92 14.12 25.66 14.12 25.66 14.05 26 13.1 30.53 14.25 30.53 15.07 26.64 18.73 26.64 18.91 25.66 15.27 25.66 15.84 22.92 19.43 22.92 19.63 21.94 14.9 21.94 14 [...]
\ No newline at end of file
diff --git a/superset-frontend/src/components/Loading/Loading.stories.tsx b/superset-frontend/src/components/Loading/Loading.stories.tsx
index 60ef378..fc521b3 100644
--- a/superset-frontend/src/components/Loading/Loading.stories.tsx
+++ b/superset-frontend/src/components/Loading/Loading.stories.tsx
@@ -40,7 +40,7 @@ export const LoadingGallery = () => (
}}
>
<h4>{position}</h4>
- <Loading position={position} image="/images/loading.gif" />
+ <Loading position={position} image="/images/ficus_logo.svg" />
</div>
))}
</>
@@ -71,7 +71,7 @@ InteractiveLoading.story = {
};
InteractiveLoading.args = {
- image: '/images/loading.gif',
+ image: '/images/ficus_logo.svg',
className: '',
};
diff --git a/superset-frontend/src/components/Loading/index.tsx b/superset-frontend/src/components/Loading/index.tsx
index 6ba6fb4..6e46eb0 100644
--- a/superset-frontend/src/components/Loading/index.tsx
+++ b/superset-frontend/src/components/Loading/index.tsx
@@ -34,7 +34,7 @@ export interface Props {
const LoaderImg = styled.img`
z-index: 99;
- width: 50px;
+ width: 100px;
position: relative;
margin: 10px;
&.inline {
@@ -57,7 +57,7 @@ const LoaderImg = styled.img`
`;
export default function Loading({
position = 'floating',
- image = '/static/assets/images/loading.gif',
+ image = '/static/assets/images/ficus_logo.svg',
className,
}: Props) {
return (
diff --git a/superset/cli.py b/superset/cli.py
index 0382054..9e9f766 100755
--- a/superset/cli.py
+++ b/superset/cli.py
@@ -85,7 +85,7 @@ def superset() -> None:
@superset.command()
@with_appcontext
def init() -> None:
- """Inits the Superset application"""
+ """Inits the Superset application"""
appbuilder.add_permissions(update_perms=True)
security_manager.sync_role_definitions()
diff --git a/superset/config.py b/superset/config.py
index 76c2ace..fa25ee3 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -162,9 +162,9 @@ SQLALCHEMY_TRACK_MODIFICATIONS = False
SECRET_KEY = "\2\1thisismyscretkey\1\2\\e\\y\\y\\h"
# The SQLAlchemy connection string.
-SQLALCHEMY_DATABASE_URI = "sqlite:///" + os.path.join(DATA_DIR, "superset.db")
+#SQLALCHEMY_DATABASE_URI = "sqlite:///" + os.path.join(DATA_DIR, "superset.db")
# SQLALCHEMY_DATABASE_URI = 'mysql://myapp@localhost/myapp'
-# SQLALCHEMY_DATABASE_URI = 'postgresql://root:password@localhost/myapp'
+SQLALCHEMY_DATABASE_URI = 'postgresql://postgres:ficusdb123@ficus-public-cluster.cnnvnp5ly68a.us-east-1.rds.amazonaws.com/postgres'
# In order to hook up a custom password store for all SQLACHEMY connections
# implement a function that takes a single argument of type 'sqla.engine.url',
@@ -214,18 +214,18 @@ PROXY_FIX_CONFIG = {"x_for": 1, "x_proto": 1, "x_host": 1, "x_port": 1, "x_prefi
# GLOBALS FOR APP Builder
# ------------------------------
# Uncomment to setup Your App name
-APP_NAME = "Superset"
+APP_NAME = "Ficus BI"
# Specify the App icon
-APP_ICON = "/static/assets/images/superset-logo-horiz.png"
+APP_ICON = "/static/assets/images/ficus_logo.svg"
APP_ICON_WIDTH = 126
# Specify where clicking the logo would take the user
# e.g. setting it to '/' would take the user to '/superset/welcome/'
-LOGO_TARGET_PATH = None
+LOGO_TARGET_PATH = "/"
# Specify tooltip that should appear when hovering over the App Icon/Logo
-LOGO_TOOLTIP = ""
+LOGO_TOOLTIP = "Ficus BI"
# Specify any text that should appear to the right of the logo
LOGO_RIGHT_TEXT: Union[Callable[[], str], str] = ""
@@ -845,7 +845,7 @@ ALLOWED_USER_CSV_SCHEMA_FUNC: Callable[["Database", "models.User"], List[str]] =
)
# Values that should be treated as nulls for the csv uploads.
-CSV_DEFAULT_NA_NAMES = list(STR_NA_VALUES)
+CSV_DEFAULT_NA_NAMES = list([None, ""])
# A dictionary of items that gets merged into the Jinja context for
# SQL Lab. The existing context gets updated with this dictionary,
diff --git a/superset/templates/superset/basic.html b/superset/templates/superset/basic.html
index 902fc8c..21199e0 100644
--- a/superset/templates/superset/basic.html
+++ b/superset/templates/superset/basic.html
@@ -73,7 +73,7 @@
{% block body %}
<div id="app" data-bootstrap="{{ bootstrap_data }}">
- <img src="/static/assets/images/loading.gif" style="width: 50px; position: absolute; top: 50%; left: 50%; transform: translate(-50%,-50%)">
+ <img src="/static/assets/images/ficus_logo.svg" style="width: 50px; position: absolute; top: 50%; left: 50%; transform: translate(-50%,-50%)">
</div>
{% endblock %}
diff --git a/superset/views/base.py b/superset/views/base.py
index b970c0f..bc84924 100644
--- a/superset/views/base.py
+++ b/superset/views/base.py
@@ -325,7 +325,7 @@ def menu_data() -> Dict[str, Any]:
},
"navbar_right": {
# show the watermark if the default app icon has been overriden
- "show_watermark": ("superset-logo-horiz" not in appbuilder.app_icon),
+ "show_watermark": False,
"bug_report_url": appbuilder.app.config["BUG_REPORT_URL"],
"documentation_url": appbuilder.app.config["DOCUMENTATION_URL"],
"version_string": appbuilder.app.config["VERSION_STRING"],