Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
begonaalvarezd committed May 6, 2024
2 parents 2e81039 + 76bb2e5 commit 7bd36b8
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 22 deletions.
4 changes: 2 additions & 2 deletions api/package-lock.json

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

2 changes: 1 addition & 1 deletion api/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "explorer-api",
"description": "API for Tangle Explorer",
"version": "3.3.8",
"version": "3.3.9",
"author": "Martyn Janes <[email protected]>",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions client/package-lock.json

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

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "explorer-client",
"description": "Tangle Explorer UI",
"version": "3.3.8",
"version": "3.3.9",
"author": "Martyn Janes <[email protected]>",
"type": "module",
"repository": {
Expand Down
13 changes: 0 additions & 13 deletions client/src/app/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,3 @@
}
}
}

.fixed-center-page {
background: var(--body-background);
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
13 changes: 13 additions & 0 deletions client/src/app/components/Spinner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@
@import "../../scss/mixins";
@import "../../scss/variables";

.fixed-center-page {
background: var(--body-background);
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}

.spinner {
position: relative;
top: 20px;
Expand Down
6 changes: 4 additions & 2 deletions client/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ const AppInitializer = () => {

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const container = document.getElementById("root")!;
const root = createRoot(container);
root.render(<AppInitializer />);
if (!container.hasChildNodes()) {
const root = createRoot(container);
root.render(<AppInitializer />);
}

/**
* Register all the services.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "explorer",
"description": "Tangle Explorer",
"version": "3.3.8",
"version": "3.3.9",
"scripts": {
"setup:client": "cd client && npm install && npm run postinstall",
"setup:api": "cd api && npm install && npm run build-compile && npm run build-config",
Expand Down

0 comments on commit 7bd36b8

Please sign in to comment.