Skip to content

Commit 0440c3b

Browse files
tomast1337tomast1337
committed
Merge branch 'main' of https://github.com/OpenNBS/NoteBlockWorld into feature/bun
2 parents bded1d5 + d582b0a commit 0440c3b

File tree

6 files changed

+24
-26
lines changed

6 files changed

+24
-26
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ on:
44
push:
55
branches:
66
- develop
7+
- main
78
pull_request:
89
branches:
910
- develop
11+
- main
1012

1113
jobs:
1214
lint:
@@ -18,16 +20,13 @@ jobs:
1820
- name: Checkout code
1921
uses: actions/checkout@v3
2022

21-
- name: Set up Node.js
22-
uses: actions/setup-node@v3
23-
with:
24-
node-version: '20'
25-
26-
- name: Install pnpm
27-
run: npm install -g pnpm
23+
- name: Set up Bun
24+
run: |
25+
curl -fsSL https://bun.sh/install | bash
26+
echo "${HOME}/.bun/bin" >> $GITHUB_PATH
2827
2928
- name: Install dependencies
30-
run: pnpm install
29+
run: bun install
3130

3231
- name: Run linter
33-
run: pnpm lint
32+
run: bun run lint

‎.github/workflows/tests.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ on:
44
push:
55
branches:
66
- develop
7+
- main
78
pull_request:
89
branches:
910
- develop
11+
- main
1012

1113
jobs:
1214
test:
@@ -16,16 +18,13 @@ jobs:
1618
- name: Checkout code
1719
uses: actions/checkout@v3
1820

19-
- name: Set up Node.js
20-
uses: actions/setup-node@v3
21-
with:
22-
node-version: '20'
23-
24-
- name: Install pnpm
25-
run: npm install -g pnpm
21+
- name: Set up Bun
22+
run: |
23+
curl -fsSL https://bun.sh/install | bash
24+
echo "${HOME}/.bun/bin" >> $GITHUB_PATH
2625
2726
- name: Install dependencies
28-
run: pnpm install
27+
run: bun install
2928

3029
- name: Run tests
31-
run: pnpm test
30+
run: bun test

‎docker-compose-dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
mongodb:
3-
container_name: opennoteworld-mongodb-dev
3+
container_name: noteblockworld-mongodb-dev
44
image: mongo
55
volumes:
66
- mongodb_data:/data/db
@@ -12,7 +12,7 @@ services:
1212
- MONGO_INITDB_ROOT_USERNAME=noteblockworlduser
1313

1414
maildev:
15-
container_name: opennoteworld-maildev-dev
15+
container_name: noteblockworld-maildev-dev
1616
image: maildev/maildev
1717
ports:
1818
- '1080:1080' # Web Interface

‎server/src/mailing/templates/magic-link-new-account.hbs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<title>Welcome to OpenNoteBlockWorld!</title>
7+
<title>Welcome to Note Block World!</title>
88
<style>
99
body {
1010
font-family: Arial, sans-serif;
@@ -51,13 +51,13 @@
5151

5252
<body>
5353
<div class="container">
54-
<img src="cid:logo" alt="OpenNoteBlockWorld Logo" class="logo">
54+
<img src="cid:logo" alt="Note Block World Logo" class="logo">
5555
<h1>Welcome, {{username}}!</h1>
5656
<p>Click the button below to log in to your account:</p>
5757
<a href="{{magicLink}}" class="btn">Login</a>
5858
<p>If you did not request this login link, please ignore this email.</p>
5959
<footer class="footer">
60-
<p>OpenNoteBlockWorld</p>
60+
<p>Note Block World</p>
6161
</footer>
6262
</div>
6363
</body>

‎server/src/mailing/templates/magic-link.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@
5252
<body>
5353
<div class="outer">
5454
<div class="container">
55-
<img src="cid:logo" alt="OpenNoteBlockWorld Logo" class="logo">
55+
<img src="cid:logo" alt="Note Block World Logo" class="logo">
5656
<h1>Hello, {{username}}!</h1>
5757
<p>Click the button below to log in to your account:</p>
5858
<a href="{{magicLink}}" class="btn">Login</a>
5959
<p>If you did not request this login link, please ignore this email.</p>
6060
<footer class="footer">
61-
<p>OpenNoteBlockWorld</p>
61+
<p>Note Block World</p>
6262
</footer>
6363
</div>
6464
</div>

‎web/posts/blog/2024-07-22_closed-beta-announcement.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This stage will last a couple weeks, so we can iron out any major bugs before th
1919

2020
- Make sure to test everything as thoroughly as you can! If you find any issues, feedback or improvement suggestions, let us know via our Discord server or our [contact](/contact) page.
2121

22-
- In order for the 'Open in NBS' button to work, you must have installed one of the latest **3.11 beta versions**. You can download them from the [NBS GitHub releases page](https://github.com/OpenNBS/OpenNoteBlockStudio/releases), or by enabling the option _'Check for development versions'_ in the app's preferences.
22+
- In order for the 'Open in NBS' button to work, you must have installed one of the latest **3.11 beta versions**. You can download them from the [NBS GitHub releases page](https://github.com/OpenNBS/NoteBlockStudio/releases), or by enabling the option _'Check for development versions'_ in the app's preferences.
2323

2424
- At this time, all the songs you upload will be **public** and everyone will be able to download them. You'll be able to disable allowing downloads in the future, in case you wouldn't like your songs to be downloaded by other users.
2525

0 commit comments

Comments
 (0)