From 0f2ba45267b103a99e31d97aa4bac2a0e7e926b6 Mon Sep 17 00:00:00 2001 From: Nate Date: Tue, 14 Sep 2021 17:54:23 -0400 Subject: [PATCH 01/57] wip test new site content --- server/src/about_app.rs | 15 +++++++ server/src/main.rs | 2 + server/templates/about_app.hbs | 63 ++++++++++++++++++++++++++++ server/templates/partials/layout.hbs | 6 +++ 4 files changed, 86 insertions(+) create mode 100644 server/src/about_app.rs create mode 100644 server/templates/about_app.hbs diff --git a/server/src/about_app.rs b/server/src/about_app.rs new file mode 100644 index 0000000000000000000000000000000000000000..020a536cc59357dbe57fbd1f47f03fea9183789e --- /dev/null +++ b/server/src/about_app.rs @@ -0,0 +1,15 @@ +use crate::{AppState, Request, RequestExt}; +use std::sync::Arc; +use tide::http::mime; + +pub fn add_routes(app: &mut tide::Server>) { + app.at("/app").get(get_about_app); +} + +async fn get_about_app(mut request: Request) -> tide::Result { + let data = request.layout_data().await?; + Ok(tide::Response::builder(200) + .body(request.state().render_template("about_app.hbs", &data)?) + .content_type(mime::HTML) + .build()) +} diff --git a/server/src/main.rs b/server/src/main.rs index ba54f05f1c4d33fe5947f30f4257d962b3348ba8..635430d793a760313b2092c6664625437d1ae454 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -9,6 +9,7 @@ mod github; mod home; mod rpc; mod team; +mod about_app; use self::errors::TideResultExt as _; use anyhow::Result; @@ -173,6 +174,7 @@ pub async fn run_server( web.with(errors::Middleware); home::add_routes(&mut web); team::add_routes(&mut web); + about_app::add_routes(&mut web); admin::add_routes(&mut web); auth::add_routes(&mut web); assets::add_routes(&mut web); diff --git a/server/templates/about_app.hbs b/server/templates/about_app.hbs new file mode 100644 index 0000000000000000000000000000000000000000..371ebbdd61c4bc5953983bbf50caa263d68df5db --- /dev/null +++ b/server/templates/about_app.hbs @@ -0,0 +1,63 @@ +{{#> layout }} + +
+

TEST TEST

+
+
+ +
+ + TEST TEST TEST + +
+ Nathan joined GitHub in late 2011 to build the Atom text editor, and + he led the Atom team until 2018. He also co-led development of Teletype for Atom, pioneering one of the first production + uses of conflict-free replicated data types for collaborative text editing. He's been dreaming about + building the world’s best text editor since he graduated from college, and is excited to finally + have + the knowledge, tools, and resources to achieve this vision. +
+
+
+
+ +
+ + ANTONIO SCANDURRA + +
+ Antonio joined the Atom team in 2014 while still in university after his outstanding open source + contributions caught the attention of the team. He later joined Nathan in architecting Teletype for + Atom and researching the foundations of what has turned into Zed. For the last two years, + he’s + become an expert in distributed systems and conflict-free replicated data types through the + development of a real-time, distributed, conflict-free database implemented in Rust for Ditto. +
+
+
+
+ +
+ + MAX BRUNSFELD + +
+ Max joined the Atom team in 2013 after working at Pivotal Labs. While driving Atom towards its 1.0 + launch during the day, Max spent nights and weekends building Tree-sitter, a blazing-fast and + expressive incremental parsing framework that currently powers all code analysis at GitHub. Before + leaving to start Zed, Max helped GitHub's semantic analysis team integrate Tree-sitter to support + syntax highlighting and code navigation on github.com. +
+
+
+
+
+ +{{/layout}} diff --git a/server/templates/partials/layout.hbs b/server/templates/partials/layout.hbs index 1e4a3561bda5f10287617c1f2a5e4c2a39c13628..244c218052b59e123f5bc146293dd04fa910de4d 100644 --- a/server/templates/partials/layout.hbs +++ b/server/templates/partials/layout.hbs @@ -30,10 +30,16 @@ ZEDINDUSTRIES
+ + The App + Team {{#if current_user}} + + test + {{#if current_user.is_admin }} Admin From 68926908d0fbd388e459ce0203e14d4898471ac0 Mon Sep 17 00:00:00 2001 From: Nate Date: Wed, 15 Sep 2021 12:54:07 -0400 Subject: [PATCH 02/57] new home markup --- server/templates/home.hbs | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/server/templates/home.hbs b/server/templates/home.hbs index 83dc7112094d03ff72a62ac287c4bbcef2bf8d51..7bd0297264a03563dffc18c2e3a9ae09bca46cda 100644 --- a/server/templates/home.hbs +++ b/server/templates/home.hbs @@ -31,24 +31,18 @@
+

Meet Zed, a lightning fast code editor written natively in Rust.

- We’re the team behind GitHub’s Atom text editor, and we’re building something new: -

- -

- Zed is a fully-native desktop code editor focused on high performance, - clean design, and seamless collaboration. -

- -

- We’re in early development, but we’d like to build a small community of developers who care deeply about - their tools and are willing to give us feedback. We'll be sharing alpha builds with community members and - telling our story along the way. -

- -

- If you’re interested in joining us, please let us know. + Level up your development process with +

    +
  • a lightning fast code editor
    • +
  • real time collaboration on any work tree
    • +
  • powerful code annotation tools
    • +
  • the ability to rewind time to any point
    • +

+

Early access to Zed will open up mid-2022 for small teams and individuals. Be the first in line.

+

Read our story.

From c0ad0955133fecdbee4c0982af5a764e2cbf07ae Mon Sep 17 00:00:00 2001 From: Nate Date: Wed, 15 Sep 2021 12:54:19 -0400 Subject: [PATCH 03/57] add wishful nav items --- server/templates/partials/layout.hbs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/server/templates/partials/layout.hbs b/server/templates/partials/layout.hbs index 244c218052b59e123f5bc146293dd04fa910de4d..2fc746e5c6ee07c5ddcbb94decc68c629a2f78e3 100644 --- a/server/templates/partials/layout.hbs +++ b/server/templates/partials/layout.hbs @@ -27,18 +27,28 @@
- ZEDINDUSTRIES + Zed
- The App + About + + + Tech Team + + Community + {{#if current_user}} +

Insider Zone

+ + Updates + - test + Release Notes {{#if current_user.is_admin }} From 8eb1ba9fe77bda1ca5575acf65f5f481782a79fb Mon Sep 17 00:00:00 2001 From: Nate Date: Wed, 15 Sep 2021 12:57:25 -0400 Subject: [PATCH 04/57] split home and releases --- server/templates/home.hbs | 30 ------------ server/templates/releases.hbs | 90 +++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 30 deletions(-) create mode 100644 server/templates/releases.hbs diff --git a/server/templates/home.hbs b/server/templates/home.hbs index 7bd0297264a03563dffc18c2e3a9ae09bca46cda..5bd341bd2cd48611a28956e660672aa91b70354f 100644 --- a/server/templates/home.hbs +++ b/server/templates/home.hbs @@ -1,33 +1,4 @@ {{#> layout }} -{{#if releases}} - -
-
- {{#each releases}} -
-
-
- VERSION {{name}} -
- - DOWNLOAD - -
-
- {{{body}}} -
-
- {{/each}} -
-
- -{{else}} - -
- -
@@ -59,5 +30,4 @@
-{{/if}} {{/layout}} \ No newline at end of file diff --git a/server/templates/releases.hbs b/server/templates/releases.hbs new file mode 100644 index 0000000000000000000000000000000000000000..f2a49207003732f89f1b3881619ea9c819281225 --- /dev/null +++ b/server/templates/releases.hbs @@ -0,0 +1,90 @@ +{{#> layout }} +{{#if releases}} + +
+
+ {{#each releases}} +
+
+
+ VERSION {{name}} +
+ + DOWNLOAD + +
+
+ {{{body}}} +
+
+ {{/each}} +
+
+ +{{else}} + +

You can't access this without logging in.

+ +{{/if}} +
+
+
+ +
+ + NATHAN SOBO + +
+ Nathan joined GitHub in late 2011 to build the Atom text editor, and + he led the Atom team until 2018. He also co-led development of Teletype for Atom, pioneering one of the first production + uses of conflict-free replicated data types for collaborative text editing. He's been dreaming about + building the world’s best text editor since he graduated from college, and is excited to finally + have + the knowledge, tools, and resources to achieve this vision. +
+
+
+
+ +
+ + ANTONIO SCANDURRA + +
+ Antonio joined the Atom team in 2014 while still in university after his outstanding open source + contributions caught the attention of the team. He later joined Nathan in architecting Teletype for + Atom and researching the foundations of what has turned into Zed. For the last two years, + he’s + become an expert in distributed systems and conflict-free replicated data types through the + development of a real-time, distributed, conflict-free database implemented in Rust for Ditto. +
+
+
+
+ +
+ + MAX BRUNSFELD + +
+ Max joined the Atom team in 2013 after working at Pivotal Labs. While driving Atom towards its 1.0 + launch during the day, Max spent nights and weekends building Tree-sitter, a blazing-fast and + expressive incremental parsing framework that currently powers all code analysis at GitHub. Before + leaving to start Zed, Max helped GitHub's semantic analysis team integrate Tree-sitter to support + syntax highlighting and code navigation on github.com. +
+
+
+
+
+ +{{/layout}} From 0906b96a23ef3937d9dc313a35e095c14c0b1d35 Mon Sep 17 00:00:00 2001 From: Nate Date: Wed, 15 Sep 2021 13:21:04 -0400 Subject: [PATCH 05/57] add new font stack --- script/tailwind.config.js | 13 +++++++++---- server/styles.css | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/script/tailwind.config.js b/script/tailwind.config.js index fc8127ef6e6aa812006f05502a60a633b444c65a..16e881dda08ebbf254f360041c1f3c31f5c312cd 100644 --- a/script/tailwind.config.js +++ b/script/tailwind.config.js @@ -2,15 +2,20 @@ module.exports = { theme: { fontFamily: { display: [ - "Visby CF", "ui-sans-serif", "system-ui", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", - "Helvetica Neue", "Arial", "Noto Sans", "sans-serif", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", + "Spectral", "Constantia", "Lucida Bright", "Lucidabright", "Lucida Serif", "Lucida", "DejaVu Serif", "Bitstream Vera Serif", + "Liberation Serif", "Georgia", "serif", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" ], body: [ - "Open Sans", "ui-sans-serif", "system-ui", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", - "Helvetica Neue", "Arial", "Noto Sans", "sans-serif", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", + "Spectral", "Constantia", "Lucida Bright", "Lucidabright", "Lucida Serif", "Lucida", "DejaVu Serif", "Bitstream Vera Serif", + "Liberation Serif", "Georgia", "serif", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" ], + mono: [ + "Inconsolata", "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", + "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", "Courier New", "Apple Color Emoji", "Segoe UI Emoji", + "Segoe UI Symbol", "Noto Color Emoji" + ], }, extend: { typography: (theme) => ({ diff --git a/server/styles.css b/server/styles.css index ab10493e32ab146ccec53f5a29c179785288c32a..4749583ff02de2f567a17efbe676181d3cc4ead7 100644 --- a/server/styles.css +++ b/server/styles.css @@ -1,6 +1,6 @@ /* This file is compiled to /assets/styles/tailwind.css via script/tailwind */ -@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Inconsolata:wght@400;700&family=Spectral:ital,wght@0,200;0,400;1,800&display=swap'); @font-face { font-family: 'Visby CF'; From 0eb9822e0dc84449dfc355596c9217032f93786c Mon Sep 17 00:00:00 2001 From: Nate Date: Wed, 15 Sep 2021 14:47:50 -0400 Subject: [PATCH 06/57] style nav --- server/templates/partials/layout.hbs | 101 ++++++++++++++++++--------- 1 file changed, 68 insertions(+), 33 deletions(-) diff --git a/server/templates/partials/layout.hbs b/server/templates/partials/layout.hbs index 2fc746e5c6ee07c5ddcbb94decc68c629a2f78e3..fcc762b12ce72e81002e484fc519e8567bc0cdd8 100644 --- a/server/templates/partials/layout.hbs +++ b/server/templates/partials/layout.hbs @@ -1,10 +1,9 @@ - + - Zed Industries - + Zed – a lightning fast, collaborative code editor written natively in Rust - -
-
+ +
+
-
+ - {{> @partial-block}} +
+ {{> @partial-block}} +
+ \ No newline at end of file From 51f0250466c4693086cd072b3a875f52052b7f7c Mon Sep 17 00:00:00 2001 From: Nate Date: Wed, 15 Sep 2021 14:58:59 -0400 Subject: [PATCH 07/57] swap logged in avatar -> username --- server/templates/partials/layout.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/templates/partials/layout.hbs b/server/templates/partials/layout.hbs index fcc762b12ce72e81002e484fc519e8567bc0cdd8..f891e872d140a4b7aa2abc6ed23a0473e36a8d1a 100644 --- a/server/templates/partials/layout.hbs +++ b/server/templates/partials/layout.hbs @@ -87,8 +87,8 @@
- + +

{{current_user.github_login}}