blade/materialious
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #208 from WardPearce/update/layout-changes

Browse Source 
Layout changes
This commit is contained in:
Ward
2024-05-03 15:23:00 +12:00
committed by GitHub
parent dfac047c48 9438dc450b
commit 8e36692ca6
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
materialious/src/lib/SyncParty.svelte
+4 -4
View File
@@ -38,8 +38,8 @@
if ($syncPartyPeerStore) {
$syncPartyPeerStore.on('connection', (conn) => {
conn.on('open', () => {
ui('#sync-party-connection-join');
conn.on('open', async () => {
await ui('#sync-party-connection-join');
if ($page.url.pathname.startsWith('/watch')) {
const paths = $page.url.pathname.split('/');
@@ -58,8 +58,8 @@
syncPartyConnectionsStore.set([...($syncPartyConnectionsStore || []), conn]);
});
conn.on('close', () => {
ui('#sync-party-connection-left');
conn.on('close', async () => {
await ui('#sync-party-connection-left');
});
});
}
materialious/src/lib/misc.ts
+5 -5
View File
@@ -42,11 +42,11 @@ export function videoLength(lengthSeconds: number): string {
export interface PhasedDescription {
description: string;
timestamps: { title: string; time: number; timePretty: string }[];
timestamps: { title: string; time: number; timePretty: string; }[];
}
export function phaseDescription(content: string): PhasedDescription {
const timestamps: { title: string; time: number; timePretty: string }[] = [];
const timestamps: { title: string; time: number; timePretty: string; }[] = [];
const lines = content.split('\n');
const urlRegex = /<a href="([^"]+)"/;
@@ -129,9 +129,9 @@ export function removeWindowQueryFlag(key: string) {
export function peerJsOptions(): PeerOptions {
return {
host: import.meta.env.VITE_DEFAULT_PEERJS_HOST || '0.peerjs.com',
path: import.meta.env.VITE_DEFAULT_PEERJS_PATH || '/',
port: Number(import.meta.env.VITE_DEFAULT_PEERJS_PORT) || 443
host: import.meta.env.VITE_DEFAULT_PEERJS_HOST && import.meta.env.VITE_DEFAULT_PEERJS_HOST !== '' ? import.meta.env.VITE_DEFAULT_PEERJS_HOST : '0.peerjs.com',
path: import.meta.env.VITE_DEFAULT_PEERJS_PATH && import.meta.env.VITE_DEFAULT_PEERJS_PATH !== '' ? import.meta.env.VITE_DEFAULT_PEERJS_PATH : '/',
port: import.meta.env.VITE_DEFAULT_PEERJS_PATH && import.meta.env.VITE_DEFAULT_PEERJS_PATH !== '' ? Number(import.meta.env.VITE_DEFAULT_PEERJS_PORT) : 443
};
}
materialious/src/routes/+layout.svelte
+3 -4
View File
@@ -264,16 +264,15 @@
{/each}
</dialog>
<SyncParty />
<MiniPlayer />
<main class="responsive max root">
{#if $navigating}
<PageLoading />
{:else}
<slot />
{/if}
<SyncParty />
<MiniPlayer />
</main>
<style>
materialious/src/routes/playlists/+page.svelte
+1 -1
View File
@@ -26,7 +26,7 @@
async function createPlaylist() {
await postPersonalPlaylist(playlistTitle, playlistPrivacy);
ui('#create-playlist');
await ui('#create-playlist');
data.playlists = await getPersonalPlaylists();
}
</script>