Skip to content

Commit

Permalink
fix(website) Fixed the discord link
Browse files Browse the repository at this point in the history
  • Loading branch information
Rheeseyb committed Jun 23, 2021
1 parent 8d373ec commit 1031b96
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Our goal is to craft an open and welcoming community here, which is why we have

## Looking for help?

If you need help, please reach out to us on our [Discord](https://discord.gg/pD8SrEJ), in the `#help-me` channel.
If you need help, please reach out to us on our [Discord](https://discord.gg/NEEnPKCgzC), in the `#help-me` channel.

## Reporting an issue

Expand Down
11 changes: 6 additions & 5 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@
<!-- ALL-CONTRIBUTORS-BADGE:END -->

# Welcome to Utopia 🏝

Utopia is an integrated design and development environment for React. It uses React code as the source of truth, and lets you make real time changes to components by editing it and using a suite of design tools. It's early software, but you can [try it today](https://utopia.app/project), look at an [example project](https://utopia.app/p/36ae27be-welcome-to-utopia/), or read about it on our [blog](https://utopia.app/blog)!

![screenshot of utopia](https://user-images.githubusercontent.com/2226774/93580752-7b7b8e80-f9a0-11ea-8663-39683a53df2e.png)




# For development: Installing Utopia on your machine

Utopia is browser-based. To run it locally, clone the repo, and then set up the server and webpack by following these instructions.
Expand All @@ -25,9 +23,11 @@ Utopia is browser-based. To run it locally, clone the repo, and then set up the
- Recommended: [direnv](https://github.com/concrete-utopia/utopia#using-direnv-to-make-your-life-easier). If you don't have `direnv` installed, you'll need to run `nix-shell` before any of the `start` commands, and switching to nix will be a bit slower.

## Contributing and Bug Reporting
We welcome contributions. Utopia is a big project, but we're here to help, and are happy to pair up with you. The easiest way is to file an issue, or reach out on [Discord](https://discord.gg/pD8SrEJ). Please read our [contributing](contributing.md) doc to get started

We welcome contributions. Utopia is a big project, but we're here to help, and are happy to pair up with you. The easiest way is to file an issue, or reach out on [Discord](https://discord.gg/NEEnPKCgzC). Please read our [contributing](contributing.md) doc to get started

# Run the Editor

There are a few different options for running Utopia below, but for all of them you'll head to [localhost:8000](https://localhost:8000). Importantly, [/project](https://localhost:8000/project) gets you to the editor.

Before you do anything, you'll need to build VS Code:
Expand Down Expand Up @@ -135,7 +135,6 @@ nix-shell
watch-website
```


### Build editor vscode

```
Expand All @@ -157,6 +156,7 @@ Limitations:
# Troubleshooting

## M1 Macbook

There are some extra steps to build server files, steps 11-14 are also needed when there are dependency changes for the server.

1. Open Applications, locate the Terminal within the Utilities folder
Expand All @@ -175,6 +175,7 @@ There are some extra steps to build server files, steps 11-14 are also needed wh
14. Open a normal Terminal, run the `start` script in the utopia folder.

## fsevents

If you notice that 1 or more CPU cores are running 100% because of `node` processes, it is probably webpack-dev-server having trouble with `fsevents` on MacOS. To fix it, run `npm install fsevents` in the `utopia/editor` directory. see https://github.com/webpack/webpack/issues/701#issuecomment-216082726

## Running this without Nix
Expand Down
14 changes: 9 additions & 5 deletions website-next/components/contact-us.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { BasicEmailSignup } from './email-signup'

const navigation = [
{ name: 'Play with Utopia', href: 'https://utopia.app/p/36ae27be-welcome-to-utopia' },
{ name: 'Join our Discord', href: 'https://discord.gg/dSWs79MY' },
{ name: 'Join our Discord', href: 'https://discord.gg/NEEnPKCgzC' },
{ name: 'Check us on Github', href: 'https://github.com/concrete-utopia/utopia' },
]

Expand All @@ -13,8 +13,9 @@ export const ContactUs = (props) => (
style={{
position: 'relative',
border: '1px solid black',
padding: 16
}}>
padding: 16,
}}
>
<div
style={{
position: 'absolute',
Expand All @@ -26,10 +27,13 @@ export const ContactUs = (props) => (
background: 'white',
padding: 14,
display: 'flex',
flexDirection: 'column'
flexDirection: 'column',
}}
>
<span>Stay in touch. We’ll send you a long-form email once or twice a month <br/>(and only when we have enough new development to write about!)</span>
<span>
Stay in touch. We’ll send you a long-form email once or twice a month <br />
(and only when we have enough new development to write about!)
</span>
<BasicEmailSignup />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion website-next/components/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const navigation = [
{ name: ' ', href: '#' },
{ name: ' ', href: '#' },
{ name: 'Github', href: 'https://github.com/concrete-utopia/utopia' },
{ name: 'Discord', href: 'https://discord.gg/dSWs79MY' },
{ name: 'Discord', href: 'https://discord.gg/NEEnPKCgzC' },
{
name: 'Play with Utopia',
href: 'https://utopia.app/p/36ae27be-welcome-to-utopia',
Expand Down

0 comments on commit 1031b96

Please sign in to comment.