Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Index page fixes #1754

Merged
merged 1 commit into from
Oct 18, 2024
Merged

Index page fixes #1754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions resources/template/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<html>
<head>
<base href="<%= appPrefix %>" />
<link href="favicon.ico" rel="icon">
<style>
.loadmask {
position: fixed;
Expand All @@ -12,10 +13,6 @@
transform: -moz-translate(-50%, -50%);
transform: -ms-translate(-50%, -50%);
z-index: 999;

/* Keeping this for future reference */
/* opacity: 0;
animation: heartBeat 2s ease-in-out infinite; */
}

.loadmask-hidden {
Expand Down Expand Up @@ -58,6 +55,12 @@
<noscript>
You need to enable JavaScript to run this app.
</noscript>
<div id="loadmask" class="loadmask">
<img src="loading-placeholder.png" id="loadmask-image">
<span id="loading-text">
Loading, please wait…
</span>
</div>
<script src="./gis-client-config.js"></script>
<script>
if (!window.clientConfig) {
Expand All @@ -67,7 +70,8 @@
</script>
<script>
const regex = /\applicationId=(\d+)/;
const appId = location.search.match(regex)[1];
const appIdCand = location.search.match(regex);
let appId = appIdCand ? appIdCand[1] : null;
let logoPath = './shogun_spinner.gif';
if (appId) {
logoPath = localStorage.getItem(`SHOGun_Logo_Path_${appId}`);
Expand All @@ -78,12 +82,7 @@
loadingImageElement.src = logoPath;
}
</script>
<div id="loadmask" class="loadmask">
<img src="loading-placeholder.png" id="loadmask-image">
<span id="loading-text">
Loading, please wait…
</span>
</div>

<div id="app" class="app"></div>
</body>
</html>
1 change: 0 additions & 1 deletion rspack.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ module.exports = {
templateParameters: {
appPrefix: process.env.HTML_BASE_URL ?? ''
},
favicon: path.join(__dirname, 'resources', 'public', 'favicon.ico'),
meta: {
charset: 'utf-8',
viewport: 'user-scalable=no, width=device-width, initial-scale=1, shrink-to-fit=no'
Expand Down
Loading