diff --git a/crates/e5r-cli/src/dashboard.rs b/crates/e5r-cli/src/dashboard.rs index 44dc641..a871fb9 100644 --- a/crates/e5r-cli/src/dashboard.rs +++ b/crates/e5r-cli/src/dashboard.rs @@ -383,6 +383,22 @@ fn serve_inner( respond(request, 200, kind, body.into()); continue; } + // Fonts ship inside the binary: the workspace stays offline and the CSP stays 'self'. + let font: Option<&'static [u8]> = match path.as_str() { + "/fonts/archivo.woff2" => Some(include_bytes!("dashboard/fonts/archivo.woff2")), + "/fonts/plex-mono-400.woff2" => Some(include_bytes!("dashboard/fonts/plex-mono-400.woff2")), + "/fonts/plex-mono-500.woff2" => Some(include_bytes!("dashboard/fonts/plex-mono-500.woff2")), + "/fonts/plex-mono-600.woff2" => Some(include_bytes!("dashboard/fonts/plex-mono-600.woff2")), + _ => None, + }; + if let Some(body) = font { + let response = Response::from_data(body) + .with_header(header("Content-Type", "font/woff2")) + .with_header(header("Cache-Control", "max-age=86400, immutable")) + .with_header(header("X-Content-Type-Options", "nosniff")); + let _ = request.respond(response); + continue; + } } if let Some(registry) = ®istry { if path == "/api/projects" { diff --git a/crates/e5r-cli/src/dashboard/app.js b/crates/e5r-cli/src/dashboard/app.js index 25581b3..99691a5 100644 --- a/crates/e5r-cli/src/dashboard/app.js +++ b/crates/e5r-cli/src/dashboard/app.js @@ -1039,6 +1039,11 @@ $("font-larger").onclick = () => resizeCode(1); resizeCode(); window.addEventListener("hashchange", route); window.addEventListener("keydown", (e) => { + const typing = ["INPUT", "TEXTAREA", "SELECT"].includes(document.activeElement.tagName); + if (!typing && !$("task-dialog").open && !e.altKey && !e.ctrlKey && !e.metaKey && (e.key === "1" || e.key === "2")) { + document.querySelector(`[data-view="${e.key === "1" ? "overview" : "workspace"}"]`).click(); + return; + } if ($("workspace").hidden || $("task-dialog").open || ["INPUT", "TEXTAREA", "SELECT"].includes(document.activeElement.tagName)) return; if (e.key === "/") { diff --git a/crates/e5r-cli/src/dashboard/fonts/OFL-Archivo.txt b/crates/e5r-cli/src/dashboard/fonts/OFL-Archivo.txt new file mode 100644 index 0000000..78b7453 --- /dev/null +++ b/crates/e5r-cli/src/dashboard/fonts/OFL-Archivo.txt @@ -0,0 +1,93 @@ +Copyright 2020 The Archivo Project Authors (https://github.com/Omnibus-Type/Archivo) Archivo-Italic[wdth,wght].ttf: Copyright 2020 The Archivo Project Authors (https://github.com/Omnibus-Type/Archivo) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/crates/e5r-cli/src/dashboard/fonts/OFL-IBM-Plex-Mono.txt b/crates/e5r-cli/src/dashboard/fonts/OFL-IBM-Plex-Mono.txt new file mode 100644 index 0000000..83eac82 --- /dev/null +++ b/crates/e5r-cli/src/dashboard/fonts/OFL-IBM-Plex-Mono.txt @@ -0,0 +1,93 @@ +Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-ThinItalic.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-ExtraLight.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-ExtraLightItalic.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-Light.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-LightItalic.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-Regular.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-Italic.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-Medium.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-MediumItalic.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-SemiBold.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-SemiBoldItalic.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-Bold.ttf: Copyright 2017 IBM Corp. All rights reserved. IBMPlexMono-BoldItalic.ttf: Copyright 2017 IBM Corp. All rights reserved. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/crates/e5r-cli/src/dashboard/fonts/archivo.woff2 b/crates/e5r-cli/src/dashboard/fonts/archivo.woff2 new file mode 100644 index 0000000..716d4ab Binary files /dev/null and b/crates/e5r-cli/src/dashboard/fonts/archivo.woff2 differ diff --git a/crates/e5r-cli/src/dashboard/fonts/plex-mono-400.woff2 b/crates/e5r-cli/src/dashboard/fonts/plex-mono-400.woff2 new file mode 100644 index 0000000..0804aaf Binary files /dev/null and b/crates/e5r-cli/src/dashboard/fonts/plex-mono-400.woff2 differ diff --git a/crates/e5r-cli/src/dashboard/fonts/plex-mono-500.woff2 b/crates/e5r-cli/src/dashboard/fonts/plex-mono-500.woff2 new file mode 100644 index 0000000..090f82f Binary files /dev/null and b/crates/e5r-cli/src/dashboard/fonts/plex-mono-500.woff2 differ diff --git a/crates/e5r-cli/src/dashboard/fonts/plex-mono-600.woff2 b/crates/e5r-cli/src/dashboard/fonts/plex-mono-600.woff2 new file mode 100644 index 0000000..67aeeb0 Binary files /dev/null and b/crates/e5r-cli/src/dashboard/fonts/plex-mono-600.woff2 differ diff --git a/crates/e5r-cli/src/dashboard/index.html b/crates/e5r-cli/src/dashboard/index.html index f81e456..6b2144b 100644 --- a/crates/e5r-cli/src/dashboard/index.html +++ b/crates/e5r-cli/src/dashboard/index.html @@ -9,41 +9,27 @@