Skip to content

Commit cc1c31d

Browse files
committed
Various website fixes
1 parent 563b849 commit cc1c31d

17 files changed

+63
-40
lines changed

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
1-
![Graphite Logo](graphite_splash.png)
1+
![Graphite logo](website/static/images/logos/splash.svg)
22

33
# Powerful 2D vector and raster editing. Procedural and nondestructive.
44

55
Graphite is a digital content creation software package for 2D graphics, merging traditional tool-based interactive editing workflows with a powerful node-based approach to procedural, non-destructive editing and compositing. The application strives to be the most user-friendly and versatile tool for vector and raster illustration, graphic design, photo editing, procedural texturing, data-driven visualization, and technical art.
66

77
While the project is still in early development, implementation progress has been moving forward at a swift pace. The Graphite Alpha release is launching soon and focuses on vector art for SVG creation. The next major milestone will introduce a nondestructive backend for vector graphics with a powerful node graph system. Later releases will provide better vector rendering capabilities and then resolution-agnostic raster editing and compositing.
88

9-
Play around with Graphite right now in your browser at [editor.graphite.design](https://editor.graphite.design). Windows, Mac, and Linux will additionally be supported with a native (not web-based) desktop client later in the development roadmap.
9+
Play around with Graphite right now in your browser at [editor.graphite.rs](https://editor.graphite.rs). Windows, Mac, and Linux will additionally be supported with a native (not web-based) desktop client later in the development roadmap.
1010

1111
## Contributing
1212

1313
We need Rust and web developers! See [instructions here](https://github.com/GraphiteEditor/Graphite/issues/202) for getting started.
1414

15-
We are also in search of a new logo and brand style system. If you are an experienced designer, please get in touch for more details.
15+
We are also in search of artists to help create material for the website. Please get in touch for more details.
1616

1717
## Discord
1818

19-
If the Graphite project strikes your fancy, join our Discord community to chat with the community and development team. You're invited to stop by just to lurk, ask questions, offer suggestions, or get involved in the project. We are seeking collaborators to help design and develop the software and this is where we communicate. Paste `https://di----scord.gg/uMjBz----5N68W` into your browser and delete the dashes. (To prevent spam bots, please don't share the link on any website without the dashes.)
20-
19+
If the Graphite project strikes your fancy, [join our Discord community](https://discord.graphite.rs) to chat with the community and development team. You're invited to stop by just to lurk, ask questions, offer suggestions, or get involved in the project. We are seeking collaborators to help design and develop the software and this is where we communicate.
2120
## Vision
2221

2322
Graphite is an open source, cross-platform digital content creation desktop and web application for 2D graphics editing, photo processing, vector art, digital painting, illustration, data visualization, compositing, and more. Inspired by the open source success of Blender in the 3D domain, it aims to bring 2D content creation to new heights with efficient workflows influenced by Photoshop/Gimp and Illustrator/Inkscape and backed by a powerful node-based, nondestructive approach proven by Houdini and Substance.

editor/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name = "graphite-editor"
33
publish = false
44
version = "0.0.0"
55
rust-version = "1.56.0"
6-
authors = ["Graphite Authors <contact@graphite.design>"]
6+
authors = ["Graphite Authors <contact@graphite.rs>"]
77
edition = "2021"
88
readme = "../README.md"
9-
homepage = "https://www.graphite.design"
9+
homepage = "https://graphite.rs"
1010
repository = "https://github.com/GraphiteEditor/Graphite"
1111
license = "Apache-2.0"
1212

frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"type": "git",
1414
"url": "git+https://github.com/GraphiteEditor/Graphite.git"
1515
},
16-
"author": "Graphite Authors <contact@graphite.design>",
16+
"author": "Graphite Authors <contact@graphite.rs>",
1717
"license": "Apache-2.0",
18-
"homepage": "https://www.graphite.design",
18+
"homepage": "https://graphite.rs",
1919
"dependencies": {
2020
"class-transformer": "^0.5.0",
2121
"reflect-metadata": "^0.1.13",

frontend/src/components/widgets/inputs/MenuBarInput.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="menu-bar-input">
33
<div class="entry-container">
4-
<div @click="() => visitWebsite('https://www.graphite.design')" class="entry">
4+
<div @click="() => visitWebsite('https://graphite.rs')" class="entry">
55
<IconLabel :icon="'GraphiteLogo'" />
66
</div>
77
</div>

frontend/src/lifetime/errors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function githubUrl(panicDetails: string): string {
5858
5959
**Steps To Reproduce**
6060
Describe precisely how the crash occurred, step by step, starting with a new editor window.
61-
1. Open the Graphite Editor at https://editor.graphite.design
61+
1. Open the Graphite Editor at https://editor.graphite.rs
6262
2.
6363
3.
6464
4.

frontend/src/state/dialog.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export function createDialogState(editor: EditorState) {
8282
const buttons: TextButtonWidget[] = [
8383
{
8484
kind: "TextButton",
85-
callback: (): unknown => window.open("https://www.graphite.design", "_blank"),
85+
callback: (): unknown => window.open("https://graphite.rs", "_blank"),
8686
props: { label: "Website", emphasized: false, minWidth: 0 },
8787
},
8888
{

frontend/wasm/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name = "graphite-wasm"
33
publish = false
44
version = "0.0.0"
55
rust-version = "1.56.0"
6-
authors = ["Graphite Authors <contact@graphite.design>"]
6+
authors = ["Graphite Authors <contact@graphite.rs>"]
77
edition = "2021"
88
readme = "../../README.md"
9-
homepage = "https://www.graphite.design"
9+
homepage = "https://graphite.rs"
1010
repository = "https://github.com/GraphiteEditor/Graphite"
1111
license = "Apache-2.0"
1212

graphene/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name = "graphite-graphene"
33
publish = false
44
version = "0.0.0"
55
rust-version = "1.56.0"
6-
authors = ["Graphite Authors <contact@graphite.design>"]
6+
authors = ["Graphite Authors <contact@graphite.rs>"]
77
edition = "2021"
88
readme = "../README.md"
9-
homepage = "https://www.graphite.design"
9+
homepage = "https://graphite.rs"
1010
repository = "https://github.com/GraphiteEditor/Graphite"
1111
license = "Apache-2.0"
1212

graphite_splash.png

-61.3 KB
Binary file not shown.

proc-macros/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name = "graphite-proc-macros"
33
publish = false
44
version = "0.0.0"
55
rust-version = "1.56.0"
6-
authors = ["Graphite Authors <contact@graphite.design>"]
6+
authors = ["Graphite Authors <contact@graphite.rs>"]
77
edition = "2021"
88
readme = "../README.md"
9-
homepage = "https://www.graphite.design"
9+
homepage = "https://graphite.rs"
1010
repository = "https://github.com/GraphiteEditor/Graphite"
1111
license = "Apache-2.0"
1212

website/content/blog/2022-02-12-announcing-graphite-alpha.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
+++
22
title = "Announcing Graphite alpha"
3-
date = 2021-02-12
3+
date = 2022-02-12
44

55
[extra]
66
banner = "2022-02-12-announcing-graphite-alpha.png"

website/content/blog/2022-03-12-the-vision-behind-graphite.md renamed to website/content/blog/2022-03-12-graphite-a-vision-for-the-future-of-2d-content-creation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
+++
22
title = "Graphite: a vision for the future of 2D content creation"
3-
date = 2021-03-12
3+
date = 2022-03-12
44

55
[extra]
6-
banner = "2022-03-12-the-vision-behind-graphite.png"
6+
banner = "2022-03-12-graphite-a-vision-for-the-future-of-2d-content-creation.png"
77
author = "Keavon Chambers"
88
+++
99

website/content/contribute/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ It's great to hear you are interested in contributing to Graphite! We want to ma
99

1010
Graphite is built with Rust and web technologies. Download and install the latest LTS version of [Node.js](https://nodejs.org/) and stable release of [Rust](https://www.rust-lang.org/), as well as [Git](https://git-scm.com/).
1111

12-
**On Windows**, Rust requires the MSVC toolchain properly configured with the Visual Studio Build Tools installed on your machine including the "Desktop development with C++" workload. **If you are having issues building,** you might have skipped this step or you may have outdated Node.js or Rust versions (compare `node --version` and `rustc --version` against the versions listed in the links above, use `rustup update` to upgrade Rust).
12+
On Windows, Rust requires the MSVC toolchain properly configured with the Visual Studio Build Tools installed on your machine including the "Desktop development with C++" workload. **If you are having issues building,** you might have skipped this step or you may have outdated Node.js or Rust versions (compare `node --version` and `rustc --version` against the versions listed in the links above, use `rustup update` to upgrade Rust).
1313

1414
Clone the project:
1515
```
@@ -43,7 +43,7 @@ Pay attention to the tags which provide some useful information like which ones
4343

4444
## Mentorship.
4545

46-
Join the [project's Discord server](https://discord.graphite.design) then hop on the `#development` channel and ping @Keavon and @TrueDoctor. We would be delighted to help you get started with in-depth explanations of the code, one-on-one mentorship and pair programming. This is very valuable and not at all an inconvenience to us because it helps you avoid the intimidating step of getting started, so please do not hesitate to reach out right away.
46+
Join the [project's Discord server](https://discord.graphite.rs) then hop on the `#development` channel and ping @Keavon and @TrueDoctor. We would be delighted to help you get started with in-depth explanations of the code, one-on-one mentorship and pair programming. This is very valuable and not at all an inconvenience to us because it helps you avoid the intimidating step of getting started, so please do not hesitate to reach out right away.
4747

4848
## Docs.
4949

website/content/features/_index.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,29 @@ template = "page.html"
55

66
This page is a work in progress. Below is an incomplete list of planned features in no particular order. Many are long-term aspirations. In the coming days, this will be sequenced into a roadmap and expanded with further details.
77

8+
Short-term feature development at a more granular level is tracked in the [Task Board](https://github.com/GraphiteEditor/Graphite/projects/1) on GitHub. Check that out to see what's coming down the pipeline during monthly sprints.
9+
810
The current order of priorities right now begins with adding a node graph system to the existing vector editing toolset, then building a raster-based render engine. More advanced features will build off those core capabilities.
911

1012
- Node graph and layer tree
1113
- Resolution-agnostic rendering
14+
- Compositing engine
1215
- Procedural generation
13-
- Capable compositing
14-
- Constraint solver
15-
- Advanced typesetting
16+
- Mixed vector and raster design
1617
- RAW photo editing
18+
- Physically-based painting
19+
- Data viz/graph/chart creation
20+
- Advanced typesetting
21+
- HDR/WCG color handling
1722
- Motion graphics and animation
1823
- Live video compositing
1924
- Animated SVG creation
20-
- Physically-based painting
21-
- HDR/WCG color handling
2225
- Real-time collaborative editing
26+
- Constraint solver
2327
- Custom node scripting
2428
- Asset manager and store
2529
- Portable render engine
2630
- Batch conversion and processing
27-
- Mixed vector and raster design
28-
- Data visualization and graph/charts
2931
- Data-driven template replacement
3032
- Native desktop application
3133
- Distributed rendering system
Lines changed: 17 additions & 0 deletions
Loading

website/static/js/navbar.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ const HANDLE_STRETCH = 0.4;
55

66
let ripplesInitialized;
77
let navButtons;
8-
let navButtonFontSize;
98
let rippleSvg;
109
let ripplePath;
1110
let fullRippleHeight;
1211
let ripples;
1312
let activeRippleIndex;
1413

14+
let globalCount = 0;
15+
1516
window.addEventListener("DOMContentLoaded", initializeRipples);
1617
window.addEventListener("resize", () => animate(true));
1718

@@ -30,7 +31,7 @@ function initializeRipples() {
3031
goingUp: false,
3132
}));
3233

33-
activeRippleIndex = ripples.findIndex((ripple) => ripple.element.getAttribute("href") === window.location.pathname);
34+
activeRippleIndex = ripples.findIndex((ripple) => ripple.element.getAttribute("href").replace(/\//g, "") === window.location.pathname.replace(/\//g, ""));
3435

3536

3637
ripples.forEach((ripple) => {
@@ -55,28 +56,32 @@ function initializeRipples() {
5556

5657
ripples[activeRippleIndex] = {
5758
...ripples[activeRippleIndex],
58-
animationStartTime: Date.now(),
59-
animationEndTime: Date.now() + RIPPLE_ANIMATION_MILLISECONDS,
59+
animationStartTime: 1,
60+
animationEndTime: 1 + RIPPLE_ANIMATION_MILLISECONDS,
6061
goingUp: true,
6162
};
6263

63-
animate(false);
64+
setRipples();
6465
}
6566

6667
function animate(forceRefresh) {
6768
if (!ripplesInitialized) return;
69+
70+
const animateThisFrame = ripples.some((ripple) => ripple.animationStartTime && ripple.animationEndTime && Date.now() <= ripple.animationEndTime);
6871

69-
navButtonFontSize = Number.parseInt(window.getComputedStyle(navButtons[0]).fontSize) || NAV_BUTTON_INITIAL_FONT_SIZE;
70-
const mediaQueryScaleFactor = navButtonFontSize / NAV_BUTTON_INITIAL_FONT_SIZE;
72+
console.log(globalCount, new Date().getSeconds(), Date.now(), animateThisFrame, {...ripples[0]});
73+
globalCount++;
7174

72-
const animateThisFrame = ripples.some((ripple) => ripple.animationStartTime && ripple.animationEndTime && Date.now() <= ripple.animationEndTime);
7375
if (animateThisFrame || forceRefresh) {
74-
setRipples(mediaQueryScaleFactor);
76+
setRipples();
7577
window.requestAnimationFrame(() => animate(false));
7678
}
7779
}
7880

79-
function setRipples(mediaQueryScaleFactor) {
81+
function setRipples() {
82+
const navButtonFontSize = Number.parseInt(window.getComputedStyle(navButtons[0]).fontSize) || NAV_BUTTON_INITIAL_FONT_SIZE;
83+
const mediaQueryScaleFactor = navButtonFontSize / NAV_BUTTON_INITIAL_FONT_SIZE;
84+
8085
const rippleHeight = fullRippleHeight * (mediaQueryScaleFactor * 0.5 + 0.5);
8186
const rippleSvgRect = rippleSvg.getBoundingClientRect();
8287
const rippleSvgLeft = rippleSvgRect.left;

0 commit comments

Comments
 (0)