Skip to content

Commit

Permalink
Merge branch 'jhipster:src' into src
Browse files Browse the repository at this point in the history
  • Loading branch information
jdubois authored Aug 24, 2023
2 parents aafdff9 + 6abd848 commit ef08b8c
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/update-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: NPM install
run: npm i
run: npm i --legacy-peer-deps
- name: NPM deploy
run: npm run deploy
2 changes: 1 addition & 1 deletion .github/workflows/update-jhipster-online.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
steps:
# Checkout jhipster-online with submodules
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
repository: 'jhipster/jhipster-online'
submodules: 'true'
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"eslintConfig": {
"extends": "react-app"
},
"homepage" : "https://www.jhipster.tech/jdl-studio/",
"browserslist": {
"production": [
">0.2%",
Expand Down
4 changes: 2 additions & 2 deletions src/__snapshots__/App.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ exports[`renders default snapshot 1`] = `
<img
alt="JHipster logo"
class="jhi-logo"
src="/src/resources/logo-jhipster.svg"
src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIgogICB3aWR0aD0iNDEuNjUwNTgxbW0iCiAgIGhlaWdodD0iMjIuNzM3MTQzbW0iCiAgIHZpZXdCb3g9IjAgMCA0MS42NTA1ODEgMjIuNzM3MTQ0Ij4KICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSg5MS4xMjg4NjEsLTMxLjYzMTQyOCkiPgogICAgPGcgdHJhbnNmb3JtPSJtYXRyaXgoMC4yNjQ1ODMzMywwLDAsMC4yNjQ1ODMzMywtODYuMTI4NjUzLDMxLjg0OTM4KSI+CiAgICAgIDxwYXRoCiAgICAgICAgIHN0eWxlPSJmaWxsOiMzNDc0YWIiCiAgICAgICAgIGQ9Ik0gNjkuODgsMzguMTggQyA2OS44OCwzOC4xOCAxMC41MywzLjc0IDUuNCwyNS4xNiAwLjI3LDQ2LjU4IC01LjUsNjIuODYgMTAuMzEsNjUuODcgMjYuMTIsNjguODggNjkuODgsMzguMTggNjkuODgsMzguMTggWiIvPgogICAgICA8cGF0aAogICAgICAgICBzdHlsZT0iZmlsbDojNDI4OWM3IgogICAgICAgICBkPSJtIDU5LjYyLDMzIGMgMTcsLTguOCA1MC42OCwtMjMuODggNTQuNTMsLTcuOTEgNS4xOCwyMS40OSAxMSwzNy44NCAtNC43OSw0MC45MSAtMTEuMDgsMi4xNSAtMzYsLTEyLjM4IC00OS44MiwtMjEuMiAtMC4wMiwtMTAuNDQgMC4xLC0xLjUxIDAuMDgsLTExLjggeiIvPgogICAgPC9nPgogIDwvZz4KPC9zdmc+Cgo="
/>
</a>
<a
Expand Down Expand Up @@ -679,7 +679,7 @@ exports[`renders default snapshot 1`] = `
<img
alt="JHipster logo"
class="jhi-logo"
src="/src/resources/logo-jhipster.svg"
src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIgogICB3aWR0aD0iNDEuNjUwNTgxbW0iCiAgIGhlaWdodD0iMjIuNzM3MTQzbW0iCiAgIHZpZXdCb3g9IjAgMCA0MS42NTA1ODEgMjIuNzM3MTQ0Ij4KICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSg5MS4xMjg4NjEsLTMxLjYzMTQyOCkiPgogICAgPGcgdHJhbnNmb3JtPSJtYXRyaXgoMC4yNjQ1ODMzMywwLDAsMC4yNjQ1ODMzMywtODYuMTI4NjUzLDMxLjg0OTM4KSI+CiAgICAgIDxwYXRoCiAgICAgICAgIHN0eWxlPSJmaWxsOiMzNDc0YWIiCiAgICAgICAgIGQ9Ik0gNjkuODgsMzguMTggQyA2OS44OCwzOC4xOCAxMC41MywzLjc0IDUuNCwyNS4xNiAwLjI3LDQ2LjU4IC01LjUsNjIuODYgMTAuMzEsNjUuODcgMjYuMTIsNjguODggNjkuODgsMzguMTggNjkuODgsMzguMTggWiIvPgogICAgICA8cGF0aAogICAgICAgICBzdHlsZT0iZmlsbDojNDI4OWM3IgogICAgICAgICBkPSJtIDU5LjYyLDMzIGMgMTcsLTguOCA1MC42OCwtMjMuODggNTQuNTMsLTcuOTEgNS4xOCwyMS40OSAxMSwzNy44NCAtNC43OSw0MC45MSAtMTEuMDgsMi4xNSAtMzYsLTEyLjM4IC00OS44MiwtMjEuMiAtMC4wMiwtMTAuNDQgMC4xLC0xLjUxIDAuMDgsLTExLjggeiIvPgogICAgPC9nPgogIDwvZz4KPC9zdmc+Cgo="
/>
</a>
<a
Expand Down
8 changes: 6 additions & 2 deletions src/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import React, { useEffect, useState } from "react";
import { connect } from "react-redux";
import LineIcon from "react-lineicons";
import logo from "../resources/logo-jhipster.svg";
import logo from "../resources/logo-jhipster.svg?raw";
import { IRootState } from "../Store";
import {
initAuthentication,
Expand Down Expand Up @@ -126,7 +126,11 @@ export function Header({
rel="noopener noreferrer"
className="logo-img"
>
<img className="jhi-logo" src={logo} alt="JHipster logo" />
<img
className="jhi-logo"
src={"data:image/svg+xml;base64," + btoa(logo)}
alt="JHipster logo"
/>
</a>
<a
className="logo link"
Expand Down
36 changes: 6 additions & 30 deletions src/resources/logo-jhipster.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { nodePolyfills } from "vite-plugin-node-polyfills";

// https://vitejs.dev/config/
export default defineConfig({
base: "./",
plugins: [
react(),
viteTsconfigPaths(),
Expand Down

0 comments on commit ef08b8c

Please sign in to comment.