hippoz/waffle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: hippoz:cb0a7330b623c00b77ab537f2a1ca543082aa907
Branches Tags
hippoz:master
..
compare: hippoz:5aaaf56380acf2e4a13607088bad9cc1859935c1
Branches Tags
hippoz:master

No commits in common. "cb0a7330b623c00b77ab537f2a1ca543082aa907" and "5aaaf56380acf2e4a13607088bad9cc1859935c1" have entirely different histories.
cb0a7330b6 ... 5aaaf56380

5 changed files with 33 additions and 16 deletions
Show stats Expand all files Collapse all files

4
frontend/public/global.css
View file

@ -66,10 +66,6 @@
--radius-lg: calc(2 * var(--radius-unit)); --radius-lg: calc(2 * var(--radius-unit));
--radius-xl: calc(3.25 * var(--radius-unit)); --radius-xl: calc(3.25 * var(--radius-unit));
--radius-xxl: calc(5.25 * var(--sradius-unit)); --radius-xxl: calc(5.25 * var(--sradius-unit));
/* initial values. these will be modified by javascript */
--viewportWidth: 100vw;
--viewportHeight: 100vh;
} }
html, body { html, body {

10
frontend/public/index.html
View file

@ -20,6 +20,14 @@
</head> </head>
<body> <body>
<div class="sidebar-container" id="pre--loading-screen"><noscript><span>please enable javascript to use this app</span></noscript></div> <div class="fullscreen-message" id="pre--loading-screen">
<div>
loading...
<noscript>
<br>
<span>please enable javascript to use this app</span>
</noscript>
</div>
</div>
</body> </body>
</html> </html>

2
frontend/rollup.config.js
View file

@ -40,7 +40,7 @@ export default {
// Watch the `public` directory and refresh the // Watch the `public` directory and refresh the
// browser on changes when not in production // browser on changes when not in production
//!production && livereload('public'), !production && livereload('public'),
// Copy fonts // Copy fonts
copy({ copy({

30
frontend/src/components/Main.svelte
View file

@ -28,14 +28,26 @@
{/if} {/if}
</svelte:head> </svelte:head>
<style>
.flex-container {
width: 100%;
height: 100%;
display: flex;
flex-direction: row;
overflow: hidden;
}
</style>
<OverlayProvider /> <OverlayProvider />
{#if !($smallViewport && $showPresenceSidebar) && $showSidebar || $selectedChannel.id === -1} <div class="flex-container">
<Sidebar /> {#if !($smallViewport && $showPresenceSidebar) && $showSidebar || $selectedChannel.id === -1}
{/if} <Sidebar />
{#if !($smallViewport && $showSidebar) && !($smallViewport && $showPresenceSidebar) && $showChannelView && $selectedChannel.id !== -1} {/if}
<ChannelView channel={$selectedChannel} /> {#if !($smallViewport && $showSidebar) && !($smallViewport && $showPresenceSidebar) && $showChannelView && $selectedChannel.id !== -1}
{/if} <ChannelView channel={$selectedChannel} />
{#if $showPresenceSidebar} {/if}
<PresenceSidebar /> {#if $showPresenceSidebar}
{/if} <PresenceSidebar />
{/if}
</div>

3
frontend/src/main.js
View file

@ -8,6 +8,8 @@ import gateway, { GatewayEventType } from './gateway';
import "@material-design-icons/font"; import "@material-design-icons/font";
function handleGatewaySettlement() { function handleGatewaySettlement() {
initResponsiveHandlers();
const loadingElement = document.getElementById("pre--loading-screen"); const loadingElement = document.getElementById("pre--loading-screen");
if (loadingElement) { if (loadingElement) {
loadingElement.parentElement.removeChild(loadingElement); loadingElement.parentElement.removeChild(loadingElement);
@ -25,7 +27,6 @@ function handleGatewaySettlement() {
function main() { function main() {
useDebuggingApi(); useDebuggingApi();
useAuthHandlers(); useAuthHandlers();
initResponsiveHandlers();
gateway.subscribe(GatewayEventType.Ready, handleGatewaySettlement); gateway.subscribe(GatewayEventType.Ready, handleGatewaySettlement);
gateway.subscribe(GatewayEventType.Close, handleGatewaySettlement); gateway.subscribe(GatewayEventType.Close, handleGatewaySettlement);