Skip to content

better mobile layout #259

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

Merged
merged 12 commits into from
Mar 15, 2023
Merged

better mobile layout #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1e20af8
mobile toggle
Mar 14, 2023
67d41db
a11y
Mar 14, 2023
a029e7e
update lockfile
Mar 14, 2023
2fc9987
Merge branch 'main' into gh-12
Mar 14, 2023
e7f70e9
fix
Mar 14, 2023
029f156
fix tooltip positions
Mar 14, 2023
a17bc1c
mobile filetree
Mar 14, 2023
c1a28eb
debugging
Mar 14, 2023
74947c5
wtf
Mar 14, 2023
fe43f21
throw CSS at the problem
Mar 14, 2023
e44f3db
remove debugging stuff
Mar 14, 2023
a293707
make view history-driven
Mar 14, 2023
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@lezer/javascript": "^1.4.1",
"@lezer/lr": "^1.3.3",
"@replit/codemirror-lang-svelte": "^6.0.0",
"@rich_harris/svelte-split-pane": "^1.0.1",
"@rich_harris/svelte-split-pane": "^1.0.2",
"@webcontainer/api": "^1.0.2",
"adm-zip": "^0.5.10",
"ansi-to-html": "^0.7.2",
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml
View file
Open in desktop

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

266 changes: 186 additions & 80 deletions src/routes/tutorial/[slug]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<script>
import Output from './Output.svelte';
import { browser } from '$app/environment';
import { afterNavigate, beforeNavigate } from '$app/navigation';
import ContextMenu from './filetree/ContextMenu.svelte';
import Filetree from './filetree/Filetree.svelte';
import { SplitPane } from '@rich_harris/svelte-split-pane';
import Icon from '@sveltejs/site-kit/components/Icon.svelte';
import { writable } from 'svelte/store';
import Editor from './Editor.svelte';
import ImageViewer from './ImageViewer.svelte';
import ScreenToggle from './ScreenToggle.svelte';
Expand All @@ -23,20 +21,28 @@
export let data;
let width = browser ? window.innerWidth : 1000;
let selected_view = 0;
let path = data.exercise.path;
let show_editor = false;
let show_filetree = false;
let paused = false;
let w = 1000;
/** @type {import('$lib/types').Stub[]} */
let previous_files = [];
$: mobile = w < 800; // for the things we can't do with media queries
$: completed = is_completed($files, data.exercise.b);
$: files.set(Object.values(data.exercise.a));
$: solution.set(data.exercise.b);
$: selected_name.set(data.exercise.focus);
beforeNavigate(() => {
previous_files = $files;
});
afterNavigate(async () => {
w = window.innerWidth;
const will_delete = previous_files.some((file) => !(file.name in data.exercise.a));
if (data.exercise.path !== path || will_delete) paused = true;
Expand All @@ -46,15 +52,6 @@
paused = false;
});
$: mobile = writable(false);
$: $mobile = width < 768;
$: completed = is_completed($files, data.exercise.b);
$: files.set(Object.values(data.exercise.a));
$: solution.set(data.exercise.b);
$: selected_name.set(data.exercise.focus);
/**
* @param {import('$lib/types').Stub[]} files
* @param {Record<string, import('$lib/types').Stub> | null} solution
Expand Down Expand Up @@ -103,74 +100,132 @@
<meta property="og:image" content="https://svelte.dev/images/twitter-thumbnail.jpg" />
</svelte:head>
<svelte:window
bind:innerWidth={w}
on:popstate={(e) => {
const q = new URLSearchParams(location.search);
show_editor = q.get('view') === 'editor';
}}
/>
<ContextMenu />
<div class="container" style="--toggle-height: {$mobile ? '4.6rem' : '0px'}">
<SplitPane
type="horizontal"
min={$mobile ? '0px' : '360px'}
max={$mobile ? '100%' : '50%'}
pos={$mobile ? (selected_view === 0 ? '100%' : '0%') : '33%'}
>
<section slot="a" class="content">
<Sidebar
index={data.index}
exercise={data.exercise}
on:select={(e) => {
select_file(e.detail.file);
}}
/>
</section>
<section slot="b" class:hidden={$mobile && selected_view === 0}>
<SplitPane
type="vertical"
min={$mobile ? '0px' : '100px'}
max={$mobile ? '100%' : '50%'}
pos={$mobile ? (selected_view === 1 ? '100%' : '0%') : '50%'}
>
<section slot="a">
<SplitPane type="horizontal" min="120px" max="300px" pos="200px">
<section class="navigator" slot="a">
<Filetree readonly={mobile} exercise={data.exercise} />
<button
class:completed
disabled={!data.exercise.has_solution}
on:click={() => {
reset_files(Object.values(completed ? data.exercise.a : data.exercise.b));
}}
>
{#if completed && data.exercise.has_solution}
reset
<div class="container" class:mobile>
<div class="top" class:offset={show_editor}>
<SplitPane id="main" type="horizontal" min="360px" max="50%" pos="33%">
<section slot="a" class="content">
<Sidebar
index={data.index}
exercise={data.exercise}
on:select={(e) => {
select_file(e.detail.file);
}}
/>
</section>
<section slot="b">
<SplitPane type="vertical" min="100px" max="50%" pos="50%">
<section slot="a">
<SplitPane
id="editor"
type={mobile ? 'vertical' : 'horizontal'}
min="120px"
max="300px"
pos="200px"
>
<section class="navigator" slot="a">
{#if mobile}
<button class="file" on:click={() => (show_filetree = !show_filetree)}>
{$selected_file?.name.replace(
data.exercise.scope.prefix,
data.exercise.scope.name + '/'
) ?? 'Files'}
</button>
{:else}
solve <Icon name="arrow-right" />
<Filetree exercise={data.exercise} />
{/if}
</button>
</section>
<section class="editor-container" slot="b">
<Editor />
<ImageViewer selected={$selected_file} />
</section>
</SplitPane>
</section>
<section slot="b" class="preview">
<Output exercise={data.exercise} {paused} />
</section>
</SplitPane>
</section>
</SplitPane>
{#if $mobile}
<ScreenToggle labels={['Tutorial', 'Input', 'Output']} bind:selected={selected_view} />
{/if}
<button
class="solve"
class:completed
disabled={!data.exercise.has_solution}
on:click={() => {
reset_files(Object.values(completed ? data.exercise.a : data.exercise.b));
}}
>
{#if completed && data.exercise.has_solution}
reset
{:else}
solve <Icon name="arrow-right" />
{/if}
</button>
</section>
<section class="editor-container" slot="b">
<Editor />
<ImageViewer selected={$selected_file} />
{#if mobile && show_filetree}
<div class="mobile-filetree">
<Filetree
mobile
exercise={data.exercise}
on:select={() => (show_filetree = false)}
/>
</div>
{/if}
</section>
</SplitPane>
</section>
<section slot="b" class="preview">
<Output exercise={data.exercise} {paused} />
</section>
</SplitPane>
</section>
</SplitPane>
</div>
<div class="screen-toggle">
<ScreenToggle
on:change={(e) => {
show_editor = e.detail.pressed;
const view = show_editor ? 'editor' : 'tutorial';
history.pushState({}, '', `?view=${view}`);
}}
pressed={show_editor}
/>
</div>
</div>
<style>
.container {
height: calc(100% - var(--toggle-height));
max-height: 100%;
display: flex;
flex-direction: column;
height: 100%;
/** necessary for innerWidth to be correct, so we can determine `mobile` */
width: 100vw;
overflow: hidden;
}
.top {
width: 200vw;
margin-left: -100vw;
height: 0;
flex: 1;
transition: transform 0.2s;
/* we transform the default state, rather than the editor state, because otherwise
the positioning of tooltips is wrong (doesn't take into account transforms) */
transform: translate(50%, 0);
}
.top.offset {
transform: none;
}
.screen-toggle {
height: 4.6rem;
}
.content {
Expand All @@ -191,7 +246,7 @@
flex-direction: column;
}
.navigator button {
.navigator .solve {
position: relative;
background: var(--sk-theme-2);
padding: 0.5rem;
Expand All @@ -202,15 +257,15 @@
opacity: 1;
}
.navigator button:disabled {
.navigator .solve:disabled {
opacity: 0.5;
}
.navigator button:not(:disabled) {
.navigator .solve:not(:disabled) {
background: var(--sk-theme-1);
}
.navigator button.completed {
.navigator .solve.completed {
background: var(--sk-theme-2);
}
Expand All @@ -224,7 +279,58 @@
background-color: var(--sk-back-3);
}
.hidden {
display: none;
.mobile .navigator {
display: flex;
flex-direction: row;
align-items: center;
padding: 1rem;
}
.mobile .navigator .file {
flex: 1;
text-align: left;
}
.mobile .navigator .solve {
width: 9rem;
height: auto;
padding: 0.2rem;
border-radius: 4rem;
border: none;
}
.mobile-filetree {
position: absolute;
top: 0;
width: 100%;
height: 100%;
overflow-y: auto;
}
/* on mobile, override the <SplitPane> controls */
@media (max-width: 799px) {
:global([data-pane='main']) {
--pos: 50% !important;
}
:global([data-pane='editor']) {
--pos: 5.4rem !important;
}
:global([data-pane]) :global(.divider) {
cursor: default;
}
}
@media (min-width: 800px) {
.top {
width: 100vw;
margin: 0;
transform: none;
}
.screen-toggle {
display: none;
}
}
</style>
5 changes: 4 additions & 1 deletion src/routes/tutorial/[slug]/Editor.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,10 @@
editor_states.clear();
reset($files);
select_state($selected_name);
if (editor_view) {
// could be false if onMount returned early
select_state($selected_name);
}
// clear warnings
warnings.set({});
Expand Down
Loading