Skip to content

Commit

Permalink
[Feature] Rebranding (#3788)
Browse files Browse the repository at this point in the history
* feat(color icon): icons and colors were changed

* feat(assets): Change logos

* feat(colorIcon): icon color change

* feat(managment-welcome): change icon colors and add changelog

* feat(changelog): add changelog

* feat(printer): change the report color

* feat(health-check logo): change of logo in health-check

* changelog

* the colors was change

* fix: removed fixed value of brand color in some icons

* fix: Apply brand logos depending on custom or default images with the selected theme

  - Apply brand images depending on app configuration with custom (no themes) or default (with themes)
  - Changed default values of `customization` app setting to empty.
    - customization.logo.app
    - customization.logo.sidebar
    - customization.logo.healthcheck
    - customization.logo.reports
  - Moved the app screenshots images to `screenshots` directory
  - Organize the default assets in the next structure:
    - fonts
    - images
      - icons: moved the icons (office365 and gmail)
      - themes: moved the default brand images. Added images for dark theme.
  - Moved some values to `contants.ts` file
  - Created functions related to the assets that create the path of them

* fix: set some butotns as primary

* feat(rebranding): Add brand colors and replace some module icons in Management directory

  - Add logos (line art) for Docker, GitHub, Google Cloud, Office 365 as ReactJS components
  - Replaced logos for Docker, GitHub, Google Cloud and Office 365 in `Management directory`
  - Add app styles for `light` and `dark` theme.
    - Created mixin to apply the brand color in `light` and `dark` themes.
    - Centralized the brand colors using SCSS variables
  - Changed some styles in the health check
  - Apply `primary` color for icons in the app menu

* fix: Fixed path to app screenshot in Readme.md

* feat: Add app screenshots images

Co-authored-by: yenienserrano <[email protected]>
Co-authored-by: yenienserrano <[email protected]>
Co-authored-by: Ian Yenien Serrano <[email protected]>
Co-authored-by: Antonio David Gutiérrez <[email protected]>
  • Loading branch information
5 people authored Jan 25, 2022
1 parent 3768936 commit 8a90a3f
Show file tree
Hide file tree
Showing 68 changed files with 387 additions and 162 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ All notable changes to the Wazuh app project will be documented in this file.
- Testing logs using the Ruletest Test don't display the rule information if not matching a rule. [#3446](https://github.com/wazuh/wazuh-kibana-app/pull/3446)
- Changed format permissions in FIM inventory [#3649](https://github.com/wazuh/wazuh-kibana-app/pull/3649)
- Changed of request for one that does not return data that is not necessary to optimize times. [#3686](https://github.com/wazuh/wazuh-kibana-app/pull/3686) [#3728](https://github.com/wazuh/wazuh-kibana-app/pull/3728)
- Rebranding. Replaced the brand logos, set module icons with brand colors [#3788](https://github.com/wazuh/wazuh-kibana-app/pull/3788)
- Changed user for sample data management [#3795](https://github.com/wazuh/wazuh-kibana-app/pull/3795)
- Changed agent install codeblock copy button and powershell terminal warning [#3792](https://github.com/wazuh/wazuh-kibana-app/pull/3792)

Expand Down Expand Up @@ -115,6 +116,8 @@ All notable changes to the Wazuh app project will be documented in this file.
- Fixed `Maximum call stack size exceeded` error exporting key-value pairs of a CDB List [#3738](https://github.com/wazuh/wazuh-kibana-app/pull/3738)
- Fixed regex lookahead and lookbehind for safari [#3741](https://github.com/wazuh/wazuh-kibana-app/pull/3741)
- Fixed Vulnerabilities Inventory flyout details filters [#3744](https://github.com/wazuh/wazuh-kibana-app/pull/3744)
- Removed api selector toggle from settings menu since it performed no useful function [#3604](https://github.com/wazuh/wazuh-kibana-app/pull/3604)
- Fixed the requests get [#3661](https://github.com/wazuh/wazuh-kibana-app/pull/3661)
- Fixed Dashboard PDF report error when switching pinned agent state [#3748](https://github.com/wazuh/wazuh-kibana-app/pull/3748)
- Fixed the rendering of the command to deploy new Windows agent not working in some Kibana versions [#3753](https://github.com/wazuh/wazuh-kibana-app/pull/3753)
- Fixed action buttons overlaying to the request text in Tools/API Console [#3772](https://github.com/wazuh/wazuh-kibana-app/pull/3772)
Expand Down Expand Up @@ -218,7 +221,6 @@ All notable changes to the Wazuh app project will be documented in this file.
- Fixed Wazuh main menu and breadcrumb render issues [#3347](https://github.com/wazuh/wazuh-kibana-app/pull/3347)
- Fixed generation of huge logs from backend errors [#3397](https://github.com/wazuh/wazuh-kibana-app/pull/3397)
- Fixed vulnerabilities flyout not showing alerts if the vulnerability had a field missing [#3593](https://github.com/wazuh/wazuh-kibana-app/pull/3593)
- Removed api selector toggle from settings menu since it performed no useful function [#3604](https://github.com/wazuh/wazuh-kibana-app/pull/3604)

## Wazuh v4.2.1 - Kibana 7.10.2 , 7.11.2 - Revision 4202

Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,31 +56,31 @@ This plugin for Kibana allows you to visualize and analyze Wazuh alerts stored i

**Modules overview**

![Overview](/public/assets/app.png)
![Overview](screenshots/app.png)

**Security events**

![Overview](/public/assets/app2.png)
![Overview](screenshots/app2.png)

**Integrity monitoring**

![Overview](/public/assets/app3.png)
![Overview](screenshots/app3.png)

**Vulnerability detection**

![Overview](/public/assets/app4.png)
![Overview](screenshots/app4.png)

**Regulatory compliance**

![Overview](/public/assets/app5.png)
![Overview](screenshots/app5.png)

**Agents overview**

![Overview](/public/assets/app6.png)
![Overview](screenshots/app6.png)

**Agent summary**

![Overview](/public/assets/app7.png)
![Overview](screenshots/app7.png)

## Branches

Expand Down
14 changes: 10 additions & 4 deletions common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,10 @@ export const WAZUH_DEFAULT_APP_CONFIG = {
hideManagerAlerts: false,
'logs.level': 'info',
'enrollment.dns': '',
'customization.logo.app':'logotype.svg',
'customization.logo.sidebar':'icon_blue.png',
'customization.logo.healthcheck':'icon_blue.svg',
'customization.logo.reports':'logo.png'
'customization.logo.app': '',
'customization.logo.sidebar': '',
'customization.logo.healthcheck':'',
'customization.logo.reports': ''
};

// Wazuh errors
Expand Down Expand Up @@ -347,3 +347,9 @@ export const UI_TOAST_COLOR = {
DANGER: 'danger',
};

export const ASSETS_BASE_URL_PREFIX = '/plugins/wazuh/assets/';

export const REPORTS_PRIMARY_COLOR = '#256BD1';

export const REPORTS_LOGO_IMAGE_ASSETS_RELATIVE_PATH = 'images/logo_reports.png';

Binary file removed public/assets/app.png
Binary file not shown.
Binary file removed public/assets/app2.png
Binary file not shown.
Binary file removed public/assets/app3.png
Binary file not shown.
Binary file removed public/assets/app4.png
Binary file not shown.
Binary file removed public/assets/app5.png
Binary file not shown.
Binary file removed public/assets/app6.png
Binary file not shown.
Binary file removed public/assets/app7.png
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file removed public/assets/icon_blue.png
Binary file not shown.
1 change: 0 additions & 1 deletion public/assets/icon_blue.svg

This file was deleted.

33 changes: 0 additions & 33 deletions public/assets/icon_fail.svg

This file was deleted.

File renamed without changes
File renamed without changes
Binary file added public/assets/images/logo_reports.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions public/assets/images/themes/dark/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions public/assets/images/themes/dark/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions public/assets/images/themes/light/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions public/assets/images/themes/light/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/logo.png
Binary file not shown.
1 change: 0 additions & 1 deletion public/assets/logo.svg

This file was deleted.

18 changes: 0 additions & 18 deletions public/assets/logotype.svg

This file was deleted.

Loading

0 comments on commit 8a90a3f

Please sign in to comment.