Skip to content

Commit

Permalink
Merge pull request #4 from prodesert22/ortege
Browse files Browse the repository at this point in the history
feat:  change logo and loading to ortege
  • Loading branch information
josedev-union authored Nov 9, 2023
2 parents 5e87581 + a3de1d1 commit 4de6ba6
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 9 deletions.
11 changes: 11 additions & 0 deletions superset-frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions superset-frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
"@visx/xychart": "^3.0.0",
"abortcontroller-polyfill": "^1.1.9",
"ace-builds": "^1.4.14",
"animate.css": "^4.1.1",
"ansi-regex": "^4.1.1",
"antd": "4.10.3",
"array-move": "^2.2.1",
Expand Down
Binary file modified superset-frontend/src/assets/images/favicon.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 12 additions & 4 deletions superset-frontend/src/components/Loading/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
import React from 'react';
import { styled } from '@superset-ui/core';
import cls from 'classnames';
import Loader from 'src/assets/images/loading.gif';
import 'animate.css';
import Loader from 'src/assets/images/ortege-logo.png';

export type PositionOption =
| 'floating'
Expand All @@ -35,8 +36,9 @@ export interface Props {

const LoaderImg = styled.img`
z-index: 99;
width: 50px;
height: unset;
height: 100px;
animation-duration: 1s;
animation-iteration-count: infinite;
position: relative;
margin: 10px;
&.inline {
Expand Down Expand Up @@ -64,7 +66,13 @@ export default function Loading({
}: Props) {
return (
<LoaderImg
className={cls('loading', position, className)}
className={cls(
'loading',
position,
className,
'animate__animated',
'animate__pulse',
)}
alt="Loading..."
src={image || Loader}
role="status"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@ import Alert from 'src/components/Alert';
import Table, { ColumnsType, TableSize } from 'src/components/Table';
import { alphabeticalSort } from 'src/components/Table/sorters';
// @ts-ignore
import LOADING_GIF from 'src/assets/images/loading.gif';
import LOADING_GIF from 'src/assets/images/ortege-logo.png';
import { DatasetObject } from 'src/features/datasets/AddDataset/types';
import { ITableColumn } from './types';
import MessageContent from './MessageContent';
import 'animate.css';

/**
* Enum defining CSS position options
Expand Down Expand Up @@ -172,6 +173,12 @@ const StyledAlert = styled(Alert)`
`}
`;

const Loader = styled.img`
height: 100px;
animation-duration: 1s;
animation-iteration-count: infinite;
`;

export const REFRESHING = t('Refreshing columns');
export const COLUMN_TITLE = t('Table columns');
export const ALT_LOADING = t('Loading');
Expand Down Expand Up @@ -274,7 +281,11 @@ const DatasetPanel = ({
loader = (
<LoaderContainer>
<StyledLoader>
<img alt={ALT_LOADING} src={LOADING_GIF} />
<Loader
alt={ALT_LOADING}
src={LOADING_GIF}
className="animate__animated animate__pulse"
/>
<div>{REFRESHING}</div>
</StyledLoader>
</LoaderContainer>
Expand Down
4 changes: 2 additions & 2 deletions superset/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,10 @@ def _try_json_readsha(filepath: str, length: int) -> str | None:
# GLOBALS FOR APP Builder
# ------------------------------
# Uncomment to setup Your App name
APP_NAME = "Superset"
APP_NAME = "Ortege"

# Specify the App icon
APP_ICON = "/static/assets/images/superset-logo-horiz.png"
APP_ICON = "/static/assets/images/ortege-logo-horiz.png"

# Specify where clicking the logo would take the user
# e.g. setting it to '/' would take the user to '/superset/welcome/'
Expand Down
2 changes: 1 addition & 1 deletion superset/templates/superset/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@

{% block body %}
<div id="app" data-bootstrap="{{ bootstrap_data }}">
<img src="{{ assets_prefix }}/static/assets/images/loading.gif" style="width: 50px; position: absolute; top: 50%; left: 50%; transform: translate(-50%,-50%)">
<img src="{{ assets_prefix }}/static/assets/images/ortege-logo.png" style="width: 50px; position: absolute; top: 50%; left: 50%; transform: translate(-50%,-50%)">
</div>
{% endblock %}

Expand Down

0 comments on commit 4de6ba6

Please sign in to comment.