Skip to content

Commit

Permalink
Rebrand to Gel (#375)
Browse files Browse the repository at this point in the history
  • Loading branch information
jaclarke authored Nov 29, 2024
1 parent 2d36d21 commit 931eafe
Show file tree
Hide file tree
Showing 18 changed files with 146 additions and 135 deletions.
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# EdgeDB UI
# Gel UI

This monorepo is the home of EdgeDB UI and all related UI components
that it shares with the EdgeDB website and cloud.
This monorepo is the home of Gel UI and all related UI components
that it shares with the Gel website and cloud.

If you are just looking to use EdgeDB UI: it already comes bundled with
the EdgeDB server, and opening it is as simple as running the command
`edgedb ui` from your project directory.
If you are just looking to use Gel UI: it already comes bundled with
the Gel server, and opening it is as simple as running the command
`gel ui` from your project directory.

## Contributing

This repo is organised using yarn workspaces as follows:

- `/web`: This is the main workspace of EdgeDB UI that is bundled with the
EdgeDB server. Refer to <./web/readme.md> for instructions on how to build
and develop EdgeDB UI.
- `/web`: This is the main workspace of Gel UI that is bundled with the
Gel server. Refer to <./web/readme.md> for instructions on how to build
and develop Gel UI.

- `/shared`: This directory contains all the shared components used by EdgeDB
- `/shared`: This directory contains all the shared components used by Gel
UI and across the website and cloud. Each subdirectory is it's own
workspace; the most notable being `studio`, which contains the REPL, schema
viewer and data viewer/editor components.
10 changes: 5 additions & 5 deletions shared/common/components/infoCards/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ export function InfoCards({
priority: 0,
card: (
<InfoCard
title="Learn EdgeDB"
title="Learn Gel"
icon={<DocsIcon />}
link="https://docs.edgedb.com"
>
Check out our docs for to learn everything you need to know about
EdgeDB, from helpful guides to full API reference docs.
Gel, from helpful guides to full API reference docs.
</InfoCard>
),
},
Expand All @@ -56,7 +56,7 @@ export function InfoCards({
priority: 1,
card: (
<InfoCard
title="What's New in EdgeDB"
title="What's New in Gel"
icon={<NewUpdatesIcon />}
link={data.latestUpdate.url}
>
Expand All @@ -75,11 +75,11 @@ export function InfoCards({
priority: 3,
card: (
<InfoCard
title={`EdgeDB ${data.latestEdgeDBVersion.major}.${data.latestEdgeDBVersion.minor} is available`}
title={`Gel ${data.latestEdgeDBVersion.major}.${data.latestEdgeDBVersion.minor} is available`}
icon={<UpgradeIcon />}
link={`https://docs.edgedb.com/changelog/${data.latestEdgeDBVersion.major}_x`}
>
This instance is ready to update to the latest version of EdgeDB.{" "}
This instance is ready to update to the latest version of Gel.{" "}
<u>Find out what's new in the changelog.</u>
</InfoCard>
),
Expand Down
25 changes: 25 additions & 0 deletions shared/common/newui/logo.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
@import "@edgedb/common/mixins.scss";

.cloudLogo {
@include isMobile {
width: 37px;
}
}
.gel {
fill: var(--Grey30);
@include darkTheme {
fill: var(--Grey65);
}
}
.cloud {
fill: var(--Grey65);
@include darkTheme {
fill: var(--Grey40);
}
}
.beta {
fill: #08b985;
@include darkTheme {
fill: #358b6c;
}
}
25 changes: 13 additions & 12 deletions shared/common/newui/logo.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
export function EdgeDBCloudLogo({className}: {className?: string}) {
import styles from "./logo.module.scss";

export function CloudLogo({className}: {className?: string}) {
return (
<svg
className={className}
xmlns="http://www.w3.org/2000/svg"
width="131"
height="22"
viewBox="0 0 131 22"
className={`${styles.cloudLogo} ${className}`}
width="101"
height="32"
viewBox="0 0 101 32"
fill="none"
xmlns="http://www.w3.org/2000/svg"
preserveAspectRatio="xMinYMid slice"
>
<path
d="M89.036 9.226c-.06.01-.108 0-.145-.032a.186.186 0 0 1-.049-.137v-.694c0-.286-.032-.525-.097-.719a1.043 1.043 0 0 0-.314-.484 1.25 1.25 0 0 0-.55-.266 3.65 3.65 0 0 0-.83-.08c-.41 0-.74.026-.993.08a1.132 1.132 0 0 0-.597.307c-.14.145-.237.35-.29.613a5.93 5.93 0 0 0-.073 1.033v4.067c0 .382.03.696.089.944.059.247.161.444.306.589.146.145.345.247.598.306.252.054.572.081.96.081.339 0 .621-.024.847-.072a1.36 1.36 0 0 0 .557-.235.92.92 0 0 0 .298-.443c.06-.183.09-.412.09-.686v-.726c0-.06.015-.105.047-.138a.197.197 0 0 1 .146-.056h1.71a.17.17 0 0 1 .138.056.17.17 0 0 1 .056.138v.54c0 1.21-.328 2.125-.984 2.744-.657.618-1.625.928-2.905.928-.64 0-1.21-.073-1.71-.218-.501-.15-.926-.363-1.276-.638a2.786 2.786 0 0 1-.79-1.024A3.364 3.364 0 0 1 83 13.616V8.104c0-1.097.342-1.928 1.025-2.493.683-.565 1.692-.847 3.026-.847 1.28 0 2.248.317 2.905.952.656.63.984 1.56.984 2.792v.33c0 .06-.019.108-.056.146a.195.195 0 0 1-.138.064l-1.71.178ZM93.555 16.722a.215.215 0 0 1-.146-.048.215.215 0 0 1-.048-.145V5.119c0-.06.016-.105.048-.137a.197.197 0 0 1 .146-.057h1.71a.17.17 0 0 1 .137.057.17.17 0 0 1 .057.137v9.554h4.285c.059 0 .105.019.137.056a.171.171 0 0 1 .056.137v1.663c0 .059-.019.107-.056.145-.032.032-.078.048-.137.048h-6.19ZM101.64 8.104c0-.527.086-.998.258-1.412.178-.414.439-.764.783-1.049a3.568 3.568 0 0 1 1.267-.653c.505-.151 1.086-.226 1.743-.226.624 0 1.186.075 1.686.226.5.145.925.36 1.275.645.35.285.619.635.807 1.05.188.413.282.887.282 1.42v5.51c0 .517-.094.98-.282 1.389a2.822 2.822 0 0 1-.807 1.024c-.35.28-.775.493-1.275.638-.5.145-1.062.218-1.686.218-.657 0-1.238-.073-1.743-.218-.506-.15-.931-.366-1.275-.646a2.748 2.748 0 0 1-.775-1.024 3.49 3.49 0 0 1-.258-1.38V8.104Zm2.098 4.81c0 .398.024.723.073.976.053.247.15.441.29.581.145.14.344.237.597.29.258.049.589.073.993.073.403 0 .731-.024.984-.072.258-.054.457-.151.597-.291.146-.14.242-.334.291-.581.054-.253.08-.578.08-.976V8.847c0-.42-.026-.761-.08-1.025-.054-.264-.154-.468-.299-.613-.14-.15-.336-.253-.589-.307a4.454 4.454 0 0 0-.984-.089c-.404 0-.732.03-.985.09a1.13 1.13 0 0 0-.597.306c-.14.145-.237.35-.29.613a5.275 5.275 0 0 0-.081 1.025v4.067ZM119.796 4.925a.17.17 0 0 1 .137.057c.038.032.056.078.056.137v7.302c0 .791-.091 1.469-.274 2.034-.177.565-.438 1.027-.783 1.388-.339.36-.753.624-1.242.79-.49.167-1.041.25-1.655.25h-.242a4.945 4.945 0 0 1-1.646-.258 3.149 3.149 0 0 1-1.242-.798c-.345-.366-.608-.829-.791-1.388-.183-.565-.275-1.238-.275-2.018V5.12c0-.06.017-.105.049-.137a.197.197 0 0 1 .145-.057h1.711a.17.17 0 0 1 .137.057c.038.032.056.078.056.137v6.818c0 .49.025.918.073 1.283.054.36.148.662.283.904.139.237.328.414.564.533.242.118.554.177.936.177h.242c.399 0 .719-.054.961-.161.242-.113.43-.288.565-.525.134-.236.223-.538.266-.903.043-.366.064-.802.064-1.308l-.008-6.818c0-.06.016-.105.049-.137a.195.195 0 0 1 .145-.057h1.719ZM122.604 16.722a.214.214 0 0 1-.145-.048.212.212 0 0 1-.049-.145V5.119c0-.06.016-.105.049-.137a.195.195 0 0 1 .145-.057h4.551c1.017 0 1.783.27 2.3.807.521.533.782 1.323.782 2.372v5.512c0 1.022-.261 1.796-.782 2.324-.517.521-1.283.782-2.3.782h-4.551Zm5.535-3.68V8.638c0-.371-.016-.664-.048-.88-.032-.22-.102-.387-.21-.5-.107-.118-.263-.194-.468-.226a4.542 4.542 0 0 0-.807-.056h-2.098v7.698h2.098c.339 0 .611-.016.815-.049.205-.037.358-.113.46-.226.108-.113.178-.277.21-.492.032-.215.048-.503.048-.863Z"
fill="#A6A6A6"
className={styles.gel}
d="M0 15.3636C0 19.6104 3.28137 23.039 7.3458 23.039C11.3729 23.039 14.6916 19.6104 14.6916 15.3636C14.6916 11.1558 11.3729 7.68831 7.3458 7.68831C3.28137 7.68831 0 11.1558 0 15.3636ZM31.4714 4.72727C31.4714 3.28571 32.6273 2 34.0816 2C35.5358 2 36.7663 3.28571 36.7663 4.72727V20.3117C36.7663 21.7532 35.5358 23.039 34.0816 23.039C32.6273 23.039 31.4714 21.7532 31.4714 20.3117V4.72727ZM1.93899 26.8571C2.2373 29.5455 4.36274 32 7.3458 32C10.2916 32 12.4916 29.5455 12.7899 26.8571C13.2001 22.961 9.80684 24.2468 7.3458 24.2468C4.88477 24.2468 1.52882 22.961 1.93899 26.8571ZM25.6171 16.4545C25.8781 15.8312 26.5493 15.4416 27.8544 15.4416C29.9053 15.4026 30.7256 14 29.6442 11.7792C28.8985 10.2597 27.7425 9.09091 26.1764 8.35065C22.4849 6.63636 18.1221 8.38961 16.4815 12.2468C14.8408 16.0649 16.4814 20.6234 20.2103 22.3766C21.7764 23.0779 23.3425 23.1948 24.9459 22.7662C27.2578 22.1039 27.7425 20.5065 26.3629 18.9091C25.5052 17.8571 25.3188 17.1169 25.6171 16.4545Z"
/>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M63.07 10.836c0 5.139-2.06 6.06-4.364 6.06H53.81V4.776h4.896c2.303 0 4.363.922 4.363 6.06Zm-2.497 0c0-3.586-1.09-3.756-2.666-3.756H56.38v7.514h1.527c1.575 0 2.666-.17 2.666-3.757Zm-25.936 6.06V4.776h7.708V7.08h-5.139v2.473h3.878v2.278h-3.878v2.763h5.139v2.303h-7.708ZM46.538 22h2.539V0h-2.538v22Zm21.67-10.484v3.078h2.132c1.334 0 1.673-.872 1.673-1.527 0-.509-.243-1.551-2.06-1.551h-1.746Zm0-4.436v2.303h1.745c.993 0 1.575-.437 1.575-1.164 0-.727-.582-1.14-1.575-1.14h-1.746Zm-2.57-2.303h4.945c2.594 0 3.37 1.818 3.37 3.126 0 1.212-.776 2.085-1.31 2.327 1.552.752 1.819 2.279 1.819 3.054 0 1.018-.51 3.612-3.879 3.612H65.64V4.776Zm-45.762 6.06c0 5.138-2.06 6.059-4.363 6.059h-4.896V4.776h4.896c2.303 0 4.363.922 4.363 6.06Zm7.562 3.854c1.31 0 1.988-.436 2.23-.727v-1.333h-2.084v-2.085h4.145v4.824c-.364.558-2.352 1.648-4.17 1.648-2.981 0-5.502-1.163-5.502-6.302 0-5.138 2.545-6.06 4.848-6.06 3.611 0 4.508 1.891 4.8 3.564l-2.134.484c-.121-.775-.8-1.745-2.35-1.745-1.576 0-2.667.17-2.667 3.757 0 3.588 1.139 3.975 2.884 3.975ZM17.38 10.837c0-3.587-1.09-3.757-2.666-3.757h-1.527v7.514h1.527c1.575 0 2.666-.17 2.666-3.757ZM0 16.896V4.776h7.708V7.08H2.569v2.473h3.879v2.278H2.569v2.763h5.139v2.303H0Z"
fill="#4D4D4D"
className={styles.cloud}
d="M53.05 13.624C52.982 13.636 52.926 13.624 52.882 13.586 52.845 13.549 52.826 13.496 52.826 13.428V12.626C52.826 12.297 52.789 12.02 52.714 11.797 52.64 11.567 52.519 11.38 52.351 11.237 52.189 11.094 51.978 10.992 51.717 10.93 51.456 10.868 51.136 10.837 50.757 10.837 50.285 10.837 49.903 10.868 49.611 10.93 49.318 10.992 49.089 11.11 48.921 11.284 48.759 11.452 48.647 11.688 48.585 11.992 48.529 12.297 48.501 12.695 48.501 13.185V17.883C48.501 18.324 48.536 18.688 48.604 18.974 48.672 19.26 48.79 19.486 48.958 19.654 49.126 19.822 49.356 19.94 49.648 20.008 49.94 20.07 50.31 20.102 50.757 20.102 51.148 20.102 51.475 20.074 51.736 20.018 52.003 19.962 52.217 19.872 52.379 19.747 52.54 19.617 52.655 19.446 52.724 19.235 52.792 19.023 52.826 18.759 52.826 18.442V17.604C52.826 17.535 52.845 17.482 52.882 17.445 52.926 17.402 52.982 17.38 53.05 17.38H55.026C55.094 17.38 55.147 17.402 55.184 17.445 55.228 17.482 55.25 17.535 55.25 17.604V18.228C55.25 19.626 54.871 20.683 54.113 21.397 53.354 22.112 52.236 22.469 50.757 22.469 50.018 22.469 49.359 22.385 48.781 22.217 48.203 22.043 47.712 21.798 47.308 21.481 46.911 21.158 46.606 20.763 46.395 20.297 46.184 19.825 46.078 19.291 46.078 18.694V12.328C46.078 11.06 46.472 10.1 47.262 9.448 48.051 8.795 49.216 8.469 50.757 8.469 52.236 8.469 53.354 8.836 54.113 9.569 54.871 10.296 55.25 11.371 55.25 12.794V13.176C55.25 13.244 55.228 13.3 55.184 13.344 55.147 13.387 55.094 13.412 55.026 13.418L53.05 13.624ZM58.27 22.283C58.201 22.283 58.145 22.264 58.102 22.227 58.065 22.183 58.046 22.127 58.046 22.059V8.879C58.046 8.811 58.065 8.758 58.102 8.721 58.145 8.677 58.201 8.655 58.27 8.655H60.246C60.314 8.655 60.367 8.677 60.404 8.721 60.448 8.758 60.469 8.811 60.469 8.879V19.915H65.419C65.487 19.915 65.54 19.937 65.577 19.98 65.621 20.018 65.642 20.07 65.642 20.139V22.059C65.642 22.127 65.621 22.183 65.577 22.227 65.54 22.264 65.487 22.283 65.419 22.283H58.27ZM67.609 12.328C67.609 11.719 67.709 11.175 67.907 10.697 68.113 10.218 68.414 9.814 68.812 9.485 69.209 9.156 69.697 8.904 70.275 8.73 70.859 8.556 71.53 8.469 72.288 8.469 73.009 8.469 73.658 8.556 74.236 8.73 74.814 8.898 75.305 9.146 75.709 9.476 76.113 9.805 76.424 10.209 76.641 10.687 76.859 11.166 76.967 11.713 76.967 12.328V18.694C76.967 19.291 76.859 19.825 76.641 20.297 76.424 20.763 76.113 21.158 75.709 21.481 75.305 21.804 74.814 22.05 74.236 22.217 73.658 22.385 73.009 22.469 72.288 22.469 71.53 22.469 70.859 22.385 70.275 22.217 69.691 22.043 69.2 21.795 68.802 21.472 68.411 21.149 68.113 20.754 67.907 20.288 67.709 19.822 67.609 19.291 67.609 18.694V12.328ZM70.033 17.883C70.033 18.343 70.061 18.719 70.117 19.011 70.179 19.297 70.291 19.521 70.452 19.682 70.62 19.844 70.85 19.956 71.142 20.018 71.44 20.074 71.822 20.102 72.288 20.102 72.754 20.102 73.133 20.074 73.425 20.018 73.724 19.956 73.954 19.844 74.115 19.682 74.283 19.521 74.395 19.297 74.451 19.011 74.513 18.719 74.544 18.343 74.544 17.883V13.185C74.544 12.701 74.513 12.306 74.451 12.002 74.389 11.697 74.274 11.461 74.106 11.293 73.944 11.119 73.717 11.001 73.425 10.939 73.133 10.871 72.754 10.837 72.288 10.837 71.822 10.837 71.443 10.871 71.151 10.939 70.859 11.001 70.629 11.119 70.461 11.293 70.3 11.461 70.188 11.697 70.126 12.002 70.064 12.306 70.033 12.701 70.033 13.185V17.883ZM88.581 8.655C88.65 8.655 88.702 8.677 88.74 8.721 88.783 8.758 88.805 8.811 88.805 8.879V17.315C88.805 18.228 88.699 19.011 88.488 19.663 88.283 20.316 87.982 20.85 87.584 21.267 87.192 21.683 86.714 21.987 86.148 22.18 85.583 22.373 84.946 22.469 84.238 22.469H83.958C83.256 22.469 82.622 22.37 82.057 22.171 81.497 21.972 81.019 21.664 80.621 21.248 80.223 20.825 79.919 20.291 79.708 19.645 79.496 18.992 79.391 18.216 79.391 17.315V8.879C79.391 8.811 79.409 8.758 79.447 8.721 79.49 8.677 79.546 8.655 79.615 8.655H81.591C81.659 8.655 81.712 8.677 81.749 8.721 81.792 8.758 81.814 8.811 81.814 8.879V16.755C81.814 17.321 81.842 17.815 81.898 18.237 81.96 18.654 82.069 19.002 82.224 19.281 82.386 19.555 82.603 19.76 82.877 19.896 83.156 20.033 83.517 20.102 83.958 20.102H84.238C84.698 20.102 85.067 20.039 85.347 19.915 85.627 19.785 85.844 19.583 85.999 19.309 86.155 19.036 86.257 18.688 86.307 18.265 86.357 17.843 86.381 17.339 86.381 16.755L86.372 8.879C86.372 8.811 86.391 8.758 86.428 8.721 86.472 8.677 86.528 8.655 86.596 8.655H88.581ZM91.825 22.283C91.757 22.283 91.701 22.264 91.657 22.227 91.62 22.183 91.601 22.127 91.601 22.059V8.879C91.601 8.811 91.62 8.758 91.657 8.721 91.701 8.677 91.757 8.655 91.825 8.655H97.082C98.256 8.655 99.142 8.966 99.738 9.588 100.341 10.203 100.642 11.116 100.642 12.328V18.694C100.642 19.875 100.341 20.77 99.738 21.379 99.142 21.981 98.256 22.283 97.082 22.283H91.825ZM98.219 18.032V12.943C98.219 12.514 98.2 12.176 98.163 11.927 98.126 11.672 98.045 11.48 97.921 11.349 97.796 11.213 97.616 11.126 97.38 11.088 97.15 11.045 96.84 11.023 96.448 11.023H94.025V19.915H96.448C96.84 19.915 97.153 19.896 97.389 19.859 97.626 19.816 97.803 19.729 97.921 19.598 98.045 19.468 98.126 19.278 98.163 19.03 98.2 18.781 98.219 18.449 98.219 18.032Z"
/>
</svg>
);
Expand Down
Loading

0 comments on commit 931eafe

Please sign in to comment.