Skip to content

Commit e0a638c

Browse files
willwadewillwade
authored
Merge pull request #35 from owenpkent/feature/navigation-restructure
Restructure navigation: streamline header and integrate content
2 parents c5a64ca + 6837724 commit e0a638c

19 files changed

Lines changed: 540 additions & 490 deletions

File tree

‎src/layouts/BaseLayout.astro‎

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@ const currentPath = Astro.url.pathname;
66
const navItems = [
77
{ href: '/', label: 'Home' },
88
{ href: '/about/', label: 'About' },
9-
{ href: '/demonstrations/', label: 'Demonstrations' },
109
{ href: '/downloads/', label: 'Downloads' },
1110
{ href: '/docs/', label: 'Docs' },
12-
{ href: '/search/', label: 'Search' },
13-
{ href: '/community/', label: 'Community' },
1411
{ href: '/faq/', label: 'FAQ' },
1512
];
1613
---
@@ -84,12 +81,25 @@ const navItems = [
8481

8582
<footer class="site-footer">
8683
<div class="container site-footer-inner">
87-
<p>Dasher Project</p>
88-
<p>
89-
<a href="https://github.com/dasher-project" target="_blank" rel="noopener noreferrer"
90-
>GitHub</a
91-
>
92-
</p>
84+
<div class="footer-brand">
85+
<p><strong>Dasher Project</strong></p>
86+
</div>
87+
<nav class="footer-nav" aria-label="Footer">
88+
<ul class="footer-nav-list">
89+
{
90+
navItems.map((item) => (
91+
<li>
92+
<a href={item.href}>{item.label}</a>
93+
</li>
94+
))
95+
}
96+
<li>
97+
<a href="https://github.com/dasher-project" target="_blank" rel="noopener noreferrer"
98+
>GitHub</a
99+
>
100+
</li>
101+
</ul>
102+
</nav>
93103
</div>
94104
</footer>
95105

@@ -234,11 +244,27 @@ const navItems = [
234244
color: var(--color-text-secondary);
235245
}
236246

237-
.site-footer a {
238-
color: var(--color-link);
247+
.footer-brand p {
248+
margin: 0;
249+
color: var(--color-text-primary);
250+
}
251+
252+
.footer-nav-list {
253+
list-style: none;
254+
margin: 0;
255+
padding: 0;
256+
display: flex;
257+
flex-wrap: wrap;
258+
gap: var(--space-sm) var(--space-md);
259+
}
260+
261+
.footer-nav-list a {
262+
color: var(--color-text-secondary);
263+
text-decoration: none;
264+
transition: var(--transition-smooth);
239265
}
240266

241-
.site-footer a:hover {
267+
.footer-nav-list a:hover {
242268
color: var(--color-link-hover);
243269
}
244270

‎src/pages/about.astro‎

Lines changed: 151 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ import BaseLayout from '../layouts/BaseLayout.astro';
2020
steering toward your target, you can enter text at speeds competitive with touch typing,
2121
using only a single pointing device.
2222
</p>
23+
<div class="demo-note">
24+
<p>
25+
Real-world example: Yvette, a Dasher user, writes using a trackpad and reports speeds
26+
of around 32 words per minute, faster than other techniques she has tried.
27+
</p>
28+
<p>
29+
<a href="#yvette-trackpad-demo">Watch Yvette's demonstration video</a>.
30+
</p>
31+
</div>
2332

2433
<h2>Origins</h2>
2534
<p>
@@ -99,8 +108,9 @@ import BaseLayout from '../layouts/BaseLayout.astro';
99108
<ul>
100109
<li><a href="/docs/">Documentation</a></li>
101110
<li><a href="/faq/">FAQ</a></li>
102-
<li><a href="/press/">Press Information</a></li>
103-
<li><a href="/demonstrations/">Demonstrations</a></li>
111+
<li><a href="/downloads/">Downloads</a></li>
112+
<li><a href="#demonstrations">Video Demos</a></li>
113+
<li><a href="#community">Community</a></li>
104114
<li>
105115
<a
106116
href="https://github.com/dasher-project/dasher"
@@ -115,7 +125,6 @@ import BaseLayout from '../layouts/BaseLayout.astro';
115125
rel="noopener noreferrer">Releases</a
116126
>
117127
</li>
118-
<li><a href="/community/">Community</a></li>
119128
</ul>
120129
</div>
121130
</div>
@@ -182,5 +191,144 @@ import BaseLayout from '../layouts/BaseLayout.astro';
182191
</div>
183192
</div>
184193
</section>
194+
195+
<!-- Video Demonstrations -->
196+
<section class="section" id="demonstrations">
197+
<h2>Video Demonstrations</h2>
198+
<p class="lead">
199+
Watch Dasher in action with these video demonstrations showing different input methods.
200+
</p>
201+
<p>
202+
<a
203+
href="https://www.youtube.com/playlist?list=PLG22wrzFpavafCF-5u9jh6kS-UAIGkPbw"
204+
target="_blank"
205+
rel="noopener noreferrer"
206+
class="btn-secondary">Open Full YouTube Playlist</a
207+
>
208+
</p>
209+
210+
<div class="video-list">
211+
<div class="video-item" id="yvette-trackpad-demo">
212+
<h3>Yvette: Trackpad Demo (~32 WPM)</h3>
213+
<p>
214+
Yvette uses Dasher with a trackpad and reports typing at around 32 words per minute.
215+
</p>
216+
<div class="video-player">
217+
<iframe
218+
src="https://www.youtube.com/embed/va1WufK864o"
219+
title="Yvette using Dasher with a trackpad"
220+
loading="lazy"
221+
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
222+
referrerpolicy="strict-origin-when-cross-origin"
223+
allowfullscreen
224+
>
225+
</iframe>
226+
</div>
227+
</div>
228+
229+
<div class="video-item">
230+
<h3>Eye-Tracking Demo (Nov 2001)</h3>
231+
<p>Classic eye-tracking demonstration from the original project videos.</p>
232+
<div class="video-player">
233+
<iframe
234+
src="https://www.youtube.com/embed/-96VfRFS7tw"
235+
title="Eye-tracking demo (Nov 2001)"
236+
loading="lazy"
237+
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
238+
referrerpolicy="strict-origin-when-cross-origin"
239+
allowfullscreen
240+
>
241+
</iframe>
242+
</div>
243+
</div>
244+
245+
<div class="video-item">
246+
<h3>Control Mode</h3>
247+
<p>Enhanced eye-tracking mode demonstrating control mode behavior.</p>
248+
<div class="video-player">
249+
<iframe
250+
src="https://www.youtube.com/embed/KwpGpCSK2Pk"
251+
title="Dasher control mode demo"
252+
loading="lazy"
253+
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
254+
referrerpolicy="strict-origin-when-cross-origin"
255+
allowfullscreen
256+
>
257+
</iframe>
258+
</div>
259+
</div>
260+
261+
<div class="video-item">
262+
<h3>Dasher Eyetracker and BreathDasher</h3>
263+
<p>Additional legacy demos now hosted on YouTube.</p>
264+
<div class="video-player">
265+
<iframe
266+
src="https://www.youtube.com/embed/qW2-Qvj_p7k"
267+
title="Dasher Eyetracker demo"
268+
loading="lazy"
269+
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
270+
referrerpolicy="strict-origin-when-cross-origin"
271+
allowfullscreen
272+
>
273+
</iframe>
274+
</div>
275+
<p>
276+
More videos:
277+
<a href="https://youtu.be/Bz3OJXokFDs" target="_blank" rel="noopener noreferrer"
278+
>EyeDasher 4800</a
279+
>,
280+
<a href="https://youtu.be/_tMIotLU7Co" target="_blank" rel="noopener noreferrer"
281+
>BreathDasher</a
282+
>.
283+
</p>
284+
</div>
285+
</div>
286+
</section>
287+
288+
<!-- Community -->
289+
<section class="section" id="community">
290+
<h2>Join the Dasher Community</h2>
291+
<p>
292+
Dasher is developed and maintained by a global community of users, developers, and
293+
researchers. We welcome contributions of all kinds.
294+
</p>
295+
296+
<div class="community-links">
297+
<a
298+
href="https://matrix.to/#/#dasher:matrix.org"
299+
target="_blank"
300+
rel="noopener noreferrer"
301+
class="community-link"
302+
>
303+
<h3>Matrix Chat</h3>
304+
<p>Join our real-time chat for questions and support.</p>
305+
</a>
306+
307+
<a
308+
href="https://github.com/dasher-project/dasher"
309+
target="_blank"
310+
rel="noopener noreferrer"
311+
class="community-link"
312+
>
313+
<h3>GitHub</h3>
314+
<p>Report bugs, request features, and contribute code.</p>
315+
</a>
316+
317+
<a
318+
href="https://github.com/dasher-project/dasher/discussions"
319+
target="_blank"
320+
rel="noopener noreferrer"
321+
class="community-link"
322+
>
323+
<h3>Discussions</h3>
324+
<p>Share questions and ideas with the community.</p>
325+
</a>
326+
327+
<a href="/blog/" class="community-link">
328+
<h3>Blog</h3>
329+
<p>News, updates, and development progress.</p>
330+
</a>
331+
</div>
332+
</section>
185333
</div>
186334
</BaseLayout>

‎src/pages/community.astro‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)