Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates domain to wasp.sh in examples, Mage and more #2499

Merged
merged 1 commit into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"label": "NodeJS Server"
}
},
"onCreateCommand": "curl -sSL https://get.wasp-lang.dev/installer.sh | sh -s",
"onCreateCommand": "curl -sSL https://get.wasp.sh/installer.sh | sh -s",
"postCreateCommand": "printf 'export WASP_WEB_CLIENT_URL=https://$CODESPACE_NAME-3000.app.github.dev\n' >> $HOME/.bashrc && printf 'export REACT_APP_API_URL=https://$CODESPACE_NAME-3001.app.github.dev\n' >> $HOME/.bashrc && echo 'gh codespace ports visibility 3000:public -c $CODESPACE_NAME\n' >> $HOME/.bashrc && echo 'gh codespace ports visibility 3001:public -c $CODESPACE_NAME\n' >> $HOME/.bashrc",
"workspaceFolder": "/workspaces/wasp/examples/tutorials/TodoApp"
}
19 changes: 10 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# Contributing to Wasp

Wasp's compiler is built with Haskell and under the hood it generates a web application in React and NodeJS. Given that, there are several ways in which you can contribute:
Wasp's compiler is built with Haskell and under the hood it generates a web application in React and NodeJS. Given that, there are several ways in which you can contribute:

- [Wasp compiler/CLI/LSP internals](#wasp-compilerclilsp-internals) (Haskell)
- [Wasp as a web framework](#wasp-as-a-web-framework) (React, Node, HTML/CSS, database and so on)
- [Tutorials or Example apps](#tutorials-or-example-apps)
- [Documentation](#documentation)

## Before you begin
## Before you begin

- Check out the [**Getting Started**](https://wasp-lang.dev/docs) guide to get familiar with Wasp's fundamentals. Ideally, you'd also build an app from the [**Pick a Tutorial**](https://wasp-lang.dev/docs/tutorials/todo-app) page to really get a feel for it!
- Check out the [**Getting Started**](https://wasp.sh/docs) guide to get familiar with Wasp's fundamentals. Ideally, you'd also build an app from the [**Pick a Tutorial**](https://wasp.sh/docs/tutorials/todo-app) page to really get a feel for it!
- Figure out what you'd like to help with. It can be code, documentation, tutorials, etc. More on this is below.
- Join our Discord [![**Discord**](https://img.shields.io/discord/686873244791210014?label=chat%20on%20discord)](https://discord.gg/rzdnErX) for faster communication and feedback. We'd be happy to help you find the issue you'll enjoy working on, depending on your interests and skill set!
- Below you can find links to the good first issues. If you'd like to filter the issues on your own — please, use [this link](https://github.com/wasp-lang/wasp/issues)
Expand All @@ -23,32 +24,32 @@ While you will need to know some Haskell, you don't have to be an expert in Hask

Check the [**Wasp compiler README**](https://github.com/wasp-lang/wasp/blob/main/waspc/README.md) for all the detailed instructions and guides.

[**Haskell-related issues for beginners can be found here.**](https://github.com/wasp-lang/wasp/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+label%3Ahaskell)
[**Haskell-related issues for beginners can be found here.**](https://github.com/wasp-lang/wasp/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+label%3Ahaskell)

Feel free to contact us via Discord to ask for an appropriate issue for yourself, or just open a new one if you have something specific in mind and it isn't already there!

## Wasp as a web framework

Wasp is a language for developing full-stack web apps. This means there are plenty of tasks related to web development itself.
Wasp is a language for developing full-stack web apps. This means there are plenty of tasks related to web development itself.

[**Web dev issues for beginners can be found here.**](https://github.com/wasp-lang/wasp/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+label%3Awebdev)

## Tutorials or Example apps

Another great way to help is to create an app with Wasp! We have an [Examples](https://wasp-lang.dev/docs/examples) section on our website, as well as the [Tutorials](https://wasp-lang.dev/docs/tutorials/todo-app) page. Both of them can be improved and updated with your projects.
Another great way to help is to create an app with Wasp! We have an [Examples](https://wasp.sh/docs/examples) section on our website, as well as the [Tutorials](https://wasp.sh/docs/tutorials/todo-app) page. Both of them can be improved and updated with your projects.

All that's required is to create an app. And make a tutorial or a blog post to help other people reproduce your work. Some prominent examples are: [Waspello](https://wasp-lang.dev/blog/2021/12/02/waspello), [Waspleau](https://wasp-lang.dev/blog/2022/01/27/waspleau), [It Wasps on My Machine](https://wasp-lang.dev/blog/2022/09/05/dev-excuses-app-tutrial) and [To-Do app](https://wasp-lang.dev/docs/tutorials/todo-app).
All that's required is to create an app. And make a tutorial or a blog post to help other people reproduce your work. Some prominent examples are: [Waspello](https://wasp.sh/blog/2021/12/02/waspello), [Waspleau](https://wasp.sh/blog/2022/01/27/waspleau), [It Wasps on My Machine](https://wasp.sh/blog/2022/09/05/dev-excuses-app-tutrial) and [To-Do app](https://wasp.sh/docs/tutorials/todo-app).

Or you can re-build your existing pet project with Wasp. That would be cool!

## Documentation & Blog

It may sound like the simplest one, but it's super valuable! If you've found an issue, a broken link or if something was unclear on our [website](https://wasp-lang.dev/) - please, feel free to fix it :)
It may sound like the simplest one, but it's super valuable! If you've found an issue, a broken link or if something was unclear on our [website](https://wasp.sh/) - please, feel free to fix it :)

Please make sure to **base your feature branches and PRs on the `release` branch** instead of `main`, since that's the one that is deployed to the website.

[**Documentation issues for beginners can be found here.**](https://github.com/wasp-lang/wasp/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+label%3Adocumentation)

If you'd like to write a blog post about Wasp, please contact us via [Discord](https://discord.gg/zKFDFrsHa9) to discuss the topic and the details.

Happy hacking!
Happy hacking!
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
---

<p align="center">
<a href="https://wasp-lang.dev">Web page</a> | <a href="https://wasp-lang.dev/docs">Docs</a>
<a href="https://wasp.sh">Web page</a> | <a href="https://wasp.sh/docs">Docs</a>
</p>

<br>
Expand Down Expand Up @@ -79,19 +79,19 @@ Given a simple .wasp configuration file that describes the high-level details of

This unique approach is what makes Wasp "smart" and gives it its superpowers!

For more information about Wasp, check [**docs**](https://wasp-lang.dev/docs).
For more information about Wasp, check [**docs**](https://wasp.sh/docs).

# Get started

Run

```
curl -sSL https://get.wasp-lang.dev/installer.sh | sh
curl -sSL https://get.wasp.sh/installer.sh | sh
```

to install Wasp on OSX/Linux/WSL(Win). From there, just follow the instructions to run your first app in less than a minute!

For more details, check out [the docs](https://wasp-lang.dev/docs).
For more details, check out [the docs](https://wasp.sh/docs).

# Wasp AI / Mage

Expand Down Expand Up @@ -121,7 +121,7 @@ Even if you don't plan to submit any code, just joining the discussion on discor
You can also:

- :star: Star this repo to show your interest/support.
- :mailbox: Stay updated by subscribing to our [email list](https://wasp-lang.dev#signup).
- :mailbox: Stay updated by subscribing to our [email list](https://wasp.sh#signup).
- :speech_balloon: Join the discussion at https://github.com/wasp-lang/wasp/discussions .

# Careers
Expand Down
2 changes: 2 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ We are currently in pre-production stage so only the latest major release is rec

## Reporting a Vulnerability

<!-- TODO: update the email once we have the @wasp.sh email setup -->

Please report any vulnerabilities at [email protected] !
35 changes: 20 additions & 15 deletions examples/README.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,38 @@
Example Wasp apps
=================
# Example Wasp apps

Here's a list of all officially maintained Wasp example apps!
Most of these apps are relatively small, and each one demonstrates several of Wasp's interesting features.

The **tutorials** directory contains [Wasp tutorial](https://wasp-lang.dev/docs/tutorial/create) apps.
The **tutorials** directory contains [Wasp tutorial](https://wasp.sh/docs/tutorial/create) apps.

1. **todo-typescript**
- A simple task-tracking app implemented in TypeScript.
- Demonstrates: **full-stack type safety in Wasp via TypeScript**, [auth](https://wasp-lang.dev/docs/auth/overview), [rpc](https://wasp-lang.dev/docs/data-model/operations/overview)

- A simple task-tracking app implemented in TypeScript.
- Demonstrates: **full-stack type safety in Wasp via TypeScript**, [auth](https://wasp.sh/docs/auth/overview), [rpc](https://wasp.sh/docs/data-model/operations/overview)

1. **waspello**
- A simple Trello clone.
- Demonstrates: [auth](https://wasp-lang.dev/docs/auth/overview), [rpc](https://wasp-lang.dev/docs/data-model/operations/overview)

- A simple Trello clone.
- Demonstrates: [auth](https://wasp.sh/docs/auth/overview), [rpc](https://wasp.sh/docs/data-model/operations/overview)

1. **hackaton-submissions**
- An app for organizing your own hackaton.
- Demonstrates: [tailwind](https://wasp-lang.dev/docs/project/css-frameworks#tailwind), [rpc](https://wasp-lang.dev/docs/data-model/operations/overview)

- An app for organizing your own hackaton.
- Demonstrates: [tailwind](https://wasp.sh/docs/project/css-frameworks#tailwind), [rpc](https://wasp.sh/docs/data-model/operations/overview)

1. **waspleau**
- A simple clone of Tableau. The app regularly pulls in external data and shows it on a nice dashboard.
- Demonstrates: **[jobs](https://wasp-lang.dev/docs/advanced/jobs)**, analytics

- A simple clone of Tableau. The app regularly pulls in external data and shows it on a nice dashboard.
- Demonstrates: **[jobs](https://wasp.sh/docs/advanced/jobs)**, analytics

1. **thoughts**
- A simple note-taking app organized around the concept of hashtags.
- Demonstrates: [db seeding](https://wasp-lang.dev/docs/data-model/backends#seeding-the-database), [auth](https://wasp-lang.dev/docs/auth/overview), [rpc](https://wasp-lang.dev/docs/data-model/operations/overview), [Wasp TS config](https://wasp-lang.dev/docs/general/wasp-ts-config) .

- A simple note-taking app organized around the concept of hashtags.
- Demonstrates: [db seeding](https://wasp.sh/docs/data-model/backends#seeding-the-database), [auth](https://wasp.sh/docs/auth/overview), [rpc](https://wasp.sh/docs/data-model/operations/overview), [Wasp TS config](https://wasp.sh/docs/general/wasp-ts-config) .

1. **streaming**
- Demonstrates: **http streaming**, [api](https://wasp-lang.dev/docs/advanced/apis)

- Demonstrates: **http streaming**, [api](https://wasp.sh/docs/advanced/apis)

1. **websockets-realtime-voting**
- Demonstrates: **[web sockets](https://wasp-lang.dev/docs/advanced/web-sockets)**, [auth](https://wasp-lang.dev/docs/auth/overview), voting system
- Demonstrates: **[web sockets](https://wasp.sh/docs/advanced/web-sockets)**, [auth](https://wasp.sh/docs/auth/overview), voting system
6 changes: 3 additions & 3 deletions examples/hackathon-submissions/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

# 🐝🚀 Wasp Hackathon Submission App

This app was created for Wasp's Beta Hackathon (aka Betathon), so that participants would have a central place to learn about the hackathon and submit their projects. The app was deployed to Railway.app and is live [here](https://betathon-production.up.railway.app/).
This app was created for Wasp's Beta Hackathon (aka Betathon), so that participants would have a central place to learn about the hackathon and submit their projects. The app was deployed to Railway.app and is live [here](https://betathon-production.up.railway.app/).

Visit the homepage to get started with [Wasp](https://wasp-lang.dev).
Visit the homepage to get started with [Wasp](https://wasp.sh).

Feel free to use this as a template for your own Hackathons!
Feel free to use this as a template for your own Hackathons!
2 changes: 1 addition & 1 deletion examples/hackathon-submissions/src/components/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const Navbar = () => {

const Logo = () => (
<div className='flex flex-shrink-0 items-center'>
<a href='https://www.wasp-lang.dev'>
<a href='https://www.wasp.sh'>
<img src={waspLogo} width={35} height={35} alt='Wasp Logo' />
</a>
<span className='hidden md:block ml-3 font-semibold text-lg text-neutral-700'>
Expand Down
2 changes: 1 addition & 1 deletion examples/thoughts/src/client/WaspSourceHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const WaspSourceHeader = (props) => {
<div style={divStyle}>
<span style={{ marginRight: "5px" }}><img alt="Wasp" src={waspLogo} height={30} /></span>
<span>
This is an example <a href="https://wasp-lang.dev" target="_blank" rel="noreferrer" style={{ color: "#fc0" }}>Wasp</a> application{props.name && ` called ${props.name}`}.
This is an example <a href="https://wasp.sh" target="_blank" rel="noreferrer" style={{ color: "#fc0" }}>Wasp</a> application{props.name && ` called ${props.name}`}.
To see the source, please visit our <a href="https://github.com/wasp-lang/wasp/tree/main/examples" target="_blank" rel="noreferrer" style={{ color: "#fc0" }}>GitHub repo</a>.
</span>
<span style={{ marginLeft: "5px" }}>🚀</span>
Expand Down
8 changes: 4 additions & 4 deletions examples/todo-typescript/main.wasp
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ app TodoTypescript {
userEntity: User,
methods: {
usernameAndPassword: {}, // this is a very naive implementation, use 'email' in production instead
//google: {}, //https://wasp-lang.dev/docs/integrations/google
//gitHub: {}, //https://wasp-lang.dev/docs/integrations/github
//email: {} //https://wasp-lang.dev/docs/guides/email-auth
//google: {}, //https://wasp.sh/docs/integrations/google
//gitHub: {}, //https://wasp.sh/docs/integrations/github
//email: {} //https://wasp.sh/docs/guides/email-auth
},
onAuthFailedRedirectTo: "/login",
}
Expand All @@ -35,7 +35,7 @@ page SignupPage {
query getTasks {
// We specify the JS implementation of our query (which is an async JS function)
// Even if you use TS and have a queries.ts file, you will still need to import it using the .js extension.
// see here for more info: https://wasp-lang.dev/docs/tutorials/todo-app/03-listing-tasks#wasp-declaration
// see here for more info: https://wasp.sh/docs/tutorials/todo-app/03-listing-tasks#wasp-declaration
fn: import { getTasks } from "@src/queries.js",
// We tell Wasp that this query is doing something with the `Task` entity. With that, Wasp will
// automatically refresh the results of this query when tasks change.
Expand Down
2 changes: 1 addition & 1 deletion examples/todo-typescript/src/LoginPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export function LoginPage() {
return (
<main>
{/** Wasp has built-in auth forms & flows, which you can customize or opt-out of, if you wish :)
* https://wasp-lang.dev/docs/guides/auth-ui
* https://wasp.sh/docs/guides/auth-ui
*/}
<LoginForm />
<br />
Expand Down
2 changes: 1 addition & 1 deletion examples/todo-typescript/src/SignupPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export function SignupPage() {
return (
<main>
{/** Wasp has built-in auth forms & flows, which you can customize or opt-out of, if you wish :)
* https://wasp-lang.dev/docs/guides/auth-ui
* https://wasp.sh/docs/guides/auth-ui
*/}
<SignupForm />
<br />
Expand Down
10 changes: 6 additions & 4 deletions examples/tutorials/TodoApp/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Todo App Tutorial Example App
This is an example app that complements the [Intro Wasp Tutorial](https://wasp-lang.dev/docs/tutorial/create). It is a simple Todo App that demonstrates how to use Wasp to build a truly full-stack web app quickly and easily.

This example app represents the final state of the tutorial. If you'd prefer to follow it step-by-step, you can find [the tutorial here](https://wasp-lang.dev/docs/tutorial/create).
This is an example app that complements the [Intro Wasp Tutorial](https://wasp.sh/docs/tutorial/create). It is a simple Todo App that demonstrates how to use Wasp to build a truly full-stack web app quickly and easily.

This example app represents the final state of the tutorial. If you'd prefer to follow it step-by-step, you can find [the tutorial here](https://wasp.sh/docs/tutorial/create).

This project also allows you to run the app in GitHub Codespaces, so you can try out Wasp without installing anything on your machine.

Expand All @@ -24,12 +25,13 @@ wasp start
This will start the app. The codespace should prompt you with an "Open in Browser" button. If not, click on the "Ports" tab next to the terminal in the bottom of the Codespace and click on the "forwarded address" for port 3000.

## Running the App Locally

After you've cloned this repository, you can run the app locally by following these steps:

Install Wasp

```bash
curl -sSL https://get.wasp-lang.dev/installer.sh | sh
curl -sSL https://get.wasp.sh/installer.sh | sh
```

Position yourself in the project directory, then migrate the DB:
Expand All @@ -42,4 +44,4 @@ Finally, run the app:

```bash
wasp start
```
```
2 changes: 1 addition & 1 deletion examples/waspello/src/common/WaspSourceHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const WaspSourceHeader = (props) => {
<img alt="Wasp" src={waspLogo} className='h-8' />
</span>
<span>
This is an example <a href="https://wasp-lang.dev" target="_blank" rel="noreferrer" style={{ color: "#fc0" }}>Wasp</a> application{props.name && ` called ${props.name}`}.
This is an example <a href="https://wasp.sh" target="_blank" rel="noreferrer" style={{ color: "#fc0" }}>Wasp</a> application{props.name && ` called ${props.name}`}.
To see the source, please visit our <a href="https://github.com/wasp-lang/wasp/tree/main/examples" target="_blank" rel="noreferrer" style={{ color: "#fc0" }}>GitHub repo</a>.
</span>
<span style={{ marginLeft: "5px" }}>🚀</span>
Expand Down
2 changes: 1 addition & 1 deletion examples/waspleau/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Waspleau

Welcome to the Waspleau example! This is a small Wasp project that tracks status of wasp-lang/wasp repo via a nice looking dashboard.
It pulls in data via [Jobs](https://wasp-lang.dev/docs/advanced/jobs) and stores them in the database.
It pulls in data via [Jobs](https://wasp.sh/docs/advanced/jobs) and stores them in the database.

This example project can serve as a good starting point for building your own dashboard with Wasp, that regularly pulls in external data by using Jobs Wasp feature.

Expand Down
4 changes: 2 additions & 2 deletions examples/waspleau/main.wasp
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ job loadTime {
schedule: {
cron: "*/5 * * * *",
args: {=json {
"url": "https://wasp-lang.dev",
"name": "wasp-lang.dev Load Time"
"url": "https://wasp.sh",
"name": "wasp.sh Load Time"
} json=}
},
entities: [Datum]
Expand Down
2 changes: 1 addition & 1 deletion examples/waspleau/src/WaspSourceHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const WaspSourceHeader = (props) => {
return (
<div style={divStyle}>
<span style={{ marginRight: "5px" }}><img alt="Wasp" src={waspLogo} height={30} /></span>
<span>This is an example <a href="https://wasp-lang.dev" target="_blank" rel="noreferrer" style={{ color: "#fc0" }}>Wasp</a> application{props.name && ` called ${props.name}`}. To see the source, please visit our <a href="https://github.com/wasp-lang/wasp/tree/main/examples" target="_blank" rel="noreferrer" style={{ color: "#fc0" }}>GitHub repo</a>.</span>
<span>This is an example <a href="https://wasp.sh" target="_blank" rel="noreferrer" style={{ color: "#fc0" }}>Wasp</a> application{props.name && ` called ${props.name}`}. To see the source, please visit our <a href="https://github.com/wasp-lang/wasp/tree/main/examples" target="_blank" rel="noreferrer" style={{ color: "#fc0" }}>GitHub repo</a>.</span>
<span style={{ marginLeft: "5px" }}>🚀</span>
</div>
)
Expand Down
8 changes: 4 additions & 4 deletions examples/waspleau/src/serverSetup.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { github, loadTime } from "wasp/server/jobs";

export default async function () {
await github.submit()
await github.submit();
await loadTime.submit({
url: "https://wasp-lang.dev",
name: "wasp-lang.dev Load Time"
})
url: "https://wasp.sh",
name: "wasp.sh Load Time",
});
}
Loading
Loading