diff --git a/README.md b/README.md index 441666c6..531790d9 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ This target allow to program a [BBC micro:bit](https://microbit.org/) using PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt)). -* [Try it live](https://pxt.microbit.org) +* [Try it live](@homeurl@) [![Build Status](https://travis-ci.org/Microsoft/pxt-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-microbit) diff --git a/clients/chrome/background.js b/clients/chrome/background.js index 1a73f494..9f725010 100644 --- a/clients/chrome/background.js +++ b/clients/chrome/background.js @@ -40,7 +40,7 @@ function findNewDevices() { function main() { // Register new clients in the [ports] global variable. chrome.runtime.onConnectExternal.addListener(function (port) { - if (/^(micro:bit|touchdevelop|yelm|pxt|codemicrobit|codethemicrobit|pxt.microbit.org)$/.test(port.name)) { + if (/^(micro:bit|touchdevelop|yelm|pxt|codemicrobit|codethemicrobit|pxt.microbit.org|makecode)$/.test(port.name)) { ports.push(port); port.onDisconnect.addListener(function () { ports = ports.filter(function (x) { return x != port; }); diff --git a/clients/chrome/manifest.json b/clients/chrome/manifest.json index fa61c001..599a488d 100644 --- a/clients/chrome/manifest.json +++ b/clients/chrome/manifest.json @@ -6,13 +6,13 @@ }, "manifest_version": 2, - "name": "pxt.microbit.org", + "name": "makecode.microbit.org", "version": "0.7.0", "author": "Microsoft Corporation", - "short_name": "pxt.microbit.org", + "short_name": "makecode.microbit.org", - "description": "Extension for https://pxt.microbit.org.", - "homepage_url": "https://pxt.microbit.org", + "description": "Extension for https://makecode.microbit.org.", + "homepage_url": "https://makecode.microbit.org", "offline_enabled": "true", "icons": { "48": "logo48.png", @@ -25,6 +25,6 @@ ], "externally_connectable": { - "matches": [ "*://localhost/*", "https://pxt.microbit.org/*", "https://*.microbit.org/*" ] + "matches": [ "*://localhost/*", "https://makecode.microbit.org/*", "https://*.microbit.org/*" ] } } diff --git a/clients/macuploader/Microbit Uploader/AppDelegate.m b/clients/macuploader/Microbit Uploader/AppDelegate.m index 3f07a9ed..ae0d64e1 100644 --- a/clients/macuploader/Microbit Uploader/AppDelegate.m +++ b/clients/macuploader/Microbit Uploader/AppDelegate.m @@ -124,7 +124,7 @@ } - (void)launchEditor:(id)sender { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://pxt.microbit.org/"]]; + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://makecode.microbit.org/"]]; } @end diff --git a/clients/macuploader/README.md b/clients/macuploader/README.md index c59cbd34..69316e82 100644 --- a/clients/macuploader/README.md +++ b/clients/macuploader/README.md @@ -3,10 +3,10 @@ ![](Microbit Uploader/Assets.xcassets/AppIcon.appiconset/icon_256x256.png) This project is a clone of the [Windows -uploader](https://pxt.microbit.org/uploader), but for OS X. Once launched, +uploader](https://makecode.microbit.org/uploader), but for OS X. Once launched, the app runs in your menu bar and will automatically deploy any HEX files to your `@boardname@`. Like the Windows version, it is compatible with any browser -that can run [pxt.microbit.org](http://pxt.microbit.org). +that can run @homeurl@. ## Install the built version diff --git a/clients/winuploader/Microbit.Uploader/MainForm.cs b/clients/winuploader/Microbit.Uploader/MainForm.cs index 11eecb33..09126c9b 100644 --- a/clients/winuploader/Microbit.Uploader/MainForm.cs +++ b/clients/winuploader/Microbit.Uploader/MainForm.cs @@ -32,7 +32,7 @@ namespace Microsoft.MicroBit private void openEditor() { // lanch editor - try { Process.Start("https://pxt.microbit.org#uploader"); } catch (Exception) { } + try { Process.Start("https://makecode.microbit.org#uploader"); } catch (Exception) { } } private void initializeFileWatch() @@ -236,7 +236,7 @@ namespace Microsoft.MicroBit { try { - Process.Start("https://pxt.microbit.org/uploader"); + Process.Start("https://makecode.microbit.org/uploader"); } catch (IOException) { } } diff --git a/docs/about.md b/docs/about.md index 412c5ed6..eb7c19e8 100644 --- a/docs/about.md +++ b/docs/about.md @@ -88,7 +88,7 @@ When code is compiled to ARM machine code, the calls to JavaScript micro:bit fun ## [Command Line Tools](/cli) -Looking to use pxt.microbit.org in your favorite editor? Install the [command line tools](/cli) and get rolling! +Looking to use @homeurl@ in your favorite editor? Install the [command line tools](/cli) and get rolling! ## [Packages](/packages) diff --git a/docs/device/serial.md b/docs/device/serial.md index 28d5a1dd..f607c65d 100644 --- a/docs/device/serial.md +++ b/docs/device/serial.md @@ -29,7 +29,7 @@ Unfortunately, using the serial library requires quite a bit of a setup. If you are using the Google Chrome browser, you can use our extension to get serial data streaming in the editor. * Install the [Extension for BBC micro:bit](https://chrome.google.com/webstore/detail/extension-for-bbc-microbi/cihhkhnngbjlhahcfmhekmbnnjcjdbge?hl=en-US) on the Chrome Web Store. -* Restart Chrome and open the [web editor](https://pxt.microbit.org) +* Restart Chrome and open the [web editor](@homeurl@) * The serial data will show below the simulator If the extension is enabled, it will not be possible to access the port/device for the micro:bit from other programs than Chrome. diff --git a/docs/device/usb/mac-chrome.md b/docs/device/usb/mac-chrome.md index 14e7143a..44c74cf6 100644 --- a/docs/device/usb/mac-chrome.md +++ b/docs/device/usb/mac-chrome.md @@ -34,7 +34,7 @@ it appears as a new drive under Devices. ## Step 2: Download your program -1. Open your project on [pxt.microbit.org](https://pxt.microbit.org) +1. Open your project on @homeurl@ 2. Click **Download** 3. When prompted, choose to **save** the compiled file onto your computer. The prompt will be different depending on which browser you are using, or diff --git a/docs/device/usb/mac-firefox.md b/docs/device/usb/mac-firefox.md index 79b39a9b..3e01ce4d 100644 --- a/docs/device/usb/mac-firefox.md +++ b/docs/device/usb/mac-firefox.md @@ -34,7 +34,7 @@ it appears as a new drive under Devices. ## Step 2: Download your program -1. Open your project on [pxt.microbit.org](https://pxt.microbit.org) +1. Open your project on @homeurl@ 2. Click **Download** 3. When prompted, choose to **save** the compiled file onto your computer. The prompt will be different depending on which browser you are using, or diff --git a/docs/device/usb/mac-safari.md b/docs/device/usb/mac-safari.md index 104e364a..efceb2e3 100644 --- a/docs/device/usb/mac-safari.md +++ b/docs/device/usb/mac-safari.md @@ -34,7 +34,7 @@ it appears as a new drive under Devices. ## Step 2: Download your program -1. Open your project on [pxt.microbit.org](https://pxt.microbit.org) +1. Open your project on @homeurl@ 2. Click **Download** 3. When prompted, choose to **save** the compiled file onto your computer. The prompt will be different depending on which browser you are using, or diff --git a/docs/device/usb/windows-chrome.md b/docs/device/usb/windows-chrome.md index 49124c2a..2745f27e 100644 --- a/docs/device/usb/windows-chrome.md +++ b/docs/device/usb/windows-chrome.md @@ -43,7 +43,7 @@ You only need to do this once. ## Step 3: Download your program -1. Open your project on [pxt.microbit.org](https://pxt.microbit.org) +1. Open your project on @homeurl@ 2. Click **Download** 3. If you did Step 2 above, Chrome will ask where to save the `.hex` file, so save it into the `MICROBIT` drive. diff --git a/docs/device/usb/windows-edge.md b/docs/device/usb/windows-edge.md index 03e1b82e..4e6585dc 100644 --- a/docs/device/usb/windows-edge.md +++ b/docs/device/usb/windows-edge.md @@ -36,7 +36,7 @@ it appears as a new drive under Devices. ## Step 2: Download your program -1. Open your project on [pxt.microbit.org](https://pxt.microbit.org) +1. Open your project on @homeurl@ 2. Click **Download** 3. When prompted, choose to **save** the compiled file onto your computer. The prompt will be different depending on which browser you are using, or diff --git a/docs/device/usb/windows-firefox.md b/docs/device/usb/windows-firefox.md index a06a955a..8752cf3c 100644 --- a/docs/device/usb/windows-firefox.md +++ b/docs/device/usb/windows-firefox.md @@ -36,7 +36,7 @@ it appears as a new drive under Devices. ## Step 2: Download your program -1. Open your project on [pxt.microbit.org](https://pxt.microbit.org) +1. Open your project on @homeurl@ 2. Click **Download** 3. When prompted, choose to **save** the compiled file onto your computer. The prompt will be different depending on which browser you are using, or diff --git a/docs/device/usb/windows-ie.md b/docs/device/usb/windows-ie.md index dc7e8a0c..a823a484 100644 --- a/docs/device/usb/windows-ie.md +++ b/docs/device/usb/windows-ie.md @@ -35,7 +35,7 @@ it appears as a new drive under Devices. ## Step 2: Download your program -1. Open your project on [pxt.microbit.org](https://pxt.microbit.org) +1. Open your project on @homeurl@ 2. Click **Download** 3. When prompted, choose to **save** the compiled file onto your computer. The prompt will be different depending on which browser you are using, or diff --git a/docs/projects/infection.md b/docs/projects/infection.md index b4ed0e2a..b500af55 100644 --- a/docs/projects/infection.md +++ b/docs/projects/infection.md @@ -51,7 +51,7 @@ Icons used in the game: * Incubating: IconNames.Confused * Healthy: IconNames.Happy -https://pxt.microbit.org/_gymCJCWPbiDu +https://makecode.microbit.org/_gymCJCWPbiDu ### JavaScript code diff --git a/docs/reference/bluetooth.md b/docs/reference/bluetooth.md index e7ee8dce..3d6d44b5 100644 --- a/docs/reference/bluetooth.md +++ b/docs/reference/bluetooth.md @@ -37,7 +37,7 @@ bluetooth.onUartDataReceived(",", () => {}) ```cards bluetooth.advertiseUid(42, 1, 7, true); -bluetooth.advertiseUrl("https://pxt.microbit.org/", 7, true); +bluetooth.advertiseUrl("https://makecode.microbit.org/", 7, true); bluetooth.stopAdvertising(); ``` diff --git a/docs/reference/bluetooth/advertise-url.md b/docs/reference/bluetooth/advertise-url.md index 900d31a2..067ddbb0 100644 --- a/docs/reference/bluetooth/advertise-url.md +++ b/docs/reference/bluetooth/advertise-url.md @@ -18,7 +18,7 @@ Read more at https://lancaster-university.github.io/microbit-docs/ble/eddystone/ ## ~ ```sig -bluetooth.advertiseUrl("https://pxt.microbit.org/", 7, true); +bluetooth.advertiseUrl("https://makecode.microbit.org/", 7, true); ``` ### Parameters diff --git a/docs/static/icons/manifest.json b/docs/static/icons/manifest.json index d3b4bb2b..339e99ba 100644 --- a/docs/static/icons/manifest.json +++ b/docs/static/icons/manifest.json @@ -1,5 +1,5 @@ { - "name": "pxt.microbit.org", + "name": "makecode.microbit.org", "icons": [ { "src": "\/android-chrome-36x36.png", diff --git a/targetconfig.json b/targetconfig.json index c8e5ca5b..086d7522 100644 --- a/targetconfig.json +++ b/targetconfig.json @@ -31,14 +31,5 @@ "si-LK", "zh-CN", "zh-TW" - ], - "notifications": { - "pxt.microbit.org": { - "type": "warning", - "heading": "Important", - "message": "This editor is moving to https://makecode.microbit.org on July 22nd 2017. Please update your bookmarks and school internet filters.", - "url": "https://makecode.microbit.org", - "readmore": "https://makecode.com/blog/microbit/v0.12.35" - } - } + ] } diff --git a/webmanifest.json b/webmanifest.json index 50b694d8..68b81b56 100644 --- a/webmanifest.json +++ b/webmanifest.json @@ -1,5 +1,5 @@ { - "name": "pxt.microbit.org", + "name": "makecode.microbit.org", "display": "fullscreen", "orientation": "portrait", "icons": [