From 5f21789d902c84514cb2f79c1c4c6625f86f2056 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 22 Jun 2016 09:43:41 -0700 Subject: [PATCH] migration to codethemicrobit.com --- README.md | 6 +- ...xt.io.jsproj => codethemicrobitapp.jsproj} | 0 clients/win10/app/package.appxmanifest | 4 +- .../winuploader/CodeTheMicroBit.Loader.sln | 22 ------- clients/winuploader/CodeTheMicroBit.sln | 66 +++++++++++++++++++ ...Uploader.csproj => CodeTheMicrobit.csproj} | 2 +- .../LicenseDialog.Designer.cs | 2 +- .../Microbit.Uploader/MainForm.Designer.cs | 3 +- .../winuploader/Microbit.Uploader/MainForm.cs | 11 ++-- docs/reference/offline.md | 2 +- docs/windows10.md | 12 +--- pxtarget.json | 10 +-- 12 files changed, 90 insertions(+), 50 deletions(-) rename clients/win10/app/{m.pxt.io.jsproj => codethemicrobitapp.jsproj} (100%) delete mode 100644 clients/winuploader/CodeTheMicroBit.Loader.sln create mode 100644 clients/winuploader/CodeTheMicroBit.sln rename clients/winuploader/Microbit.Uploader/{CodeTheMicrobit.Uploader.csproj => CodeTheMicrobit.csproj} (98%) diff --git a/README.md b/README.md index ef81e233..0d435614 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ This target allow to program a [BBC micro:bit](https://www.microbit.co.uk/) using PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt)). -* [Try it live](https://m.pxt.io) +* [Try it live](https://codethemicrobit.com) [![Build Status](https://travis-ci.org/Microsoft/pxt-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-microbit) @@ -47,12 +47,12 @@ More instructions at https://github.com/Microsoft/pxt#running-a-target-from-loca ## Universal Windows App The Windows 10 app is a [Universal Windows Hosted Web App](https://microsoftedge.github.io/WebAppsDocs/en-US/win10/CreateHWA.htm) -that wraps ``m.pxt.io`` and provides additional features. +that wraps ``codethemicrobit.com`` and provides additional features. ### Building * Install Visual Studio 2015 Update 2 or higher. Make sure the Windows 10 templates are installed. -* open the ``win10/app.sln`` solution and launch the ``m.pxt.io`` project. +* open the ``win10/app.sln`` solution and launch the ``codethemicrobit`` project. ## Code of Conduct diff --git a/clients/win10/app/m.pxt.io.jsproj b/clients/win10/app/codethemicrobitapp.jsproj similarity index 100% rename from clients/win10/app/m.pxt.io.jsproj rename to clients/win10/app/codethemicrobitapp.jsproj diff --git a/clients/win10/app/package.appxmanifest b/clients/win10/app/package.appxmanifest index 74ee73b2..2915d938 100644 --- a/clients/win10/app/package.appxmanifest +++ b/clients/win10/app/package.appxmanifest @@ -14,13 +14,13 @@ - + - + diff --git a/clients/winuploader/CodeTheMicroBit.Loader.sln b/clients/winuploader/CodeTheMicroBit.Loader.sln deleted file mode 100644 index 9c82e656..00000000 --- a/clients/winuploader/CodeTheMicroBit.Loader.sln +++ /dev/null @@ -1,22 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeTheMicrobit.Uploader", "Microbit.Uploader\CodeTheMicrobit.Uploader.csproj", "{7DC6CA45-FD75-44BC-805E-708C812CD4BF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/clients/winuploader/CodeTheMicroBit.sln b/clients/winuploader/CodeTheMicroBit.sln new file mode 100644 index 00000000..4401ca6e --- /dev/null +++ b/clients/winuploader/CodeTheMicroBit.sln @@ -0,0 +1,66 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25123.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeTheMicrobit", "Microbit.Uploader\CodeTheMicrobit.csproj", "{7DC6CA45-FD75-44BC-805E-708C812CD4BF}" +EndProject +Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "codethemicrobitapp", "..\win10\app\codethemicrobitapp.jsproj", "{39122940-AB16-4CD4-A0CE-79A3EB863ECF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|ARM = Debug|ARM + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|ARM = Release|ARM + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|ARM.ActiveCfg = Debug|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|ARM.Build.0 = Debug|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|x64.ActiveCfg = Debug|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|x64.Build.0 = Debug|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|x86.ActiveCfg = Debug|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|x86.Build.0 = Debug|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|Any CPU.Build.0 = Release|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|ARM.ActiveCfg = Release|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|ARM.Build.0 = Release|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|x64.ActiveCfg = Release|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|x64.Build.0 = Release|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|x86.ActiveCfg = Release|Any CPU + {7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|x86.Build.0 = Release|Any CPU + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.ActiveCfg = Debug|ARM + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Build.0 = Debug|ARM + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Deploy.0 = Debug|ARM + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.ActiveCfg = Debug|x64 + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Build.0 = Debug|x64 + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Deploy.0 = Debug|x64 + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.ActiveCfg = Debug|x86 + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Build.0 = Debug|x86 + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Deploy.0 = Debug|x86 + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Build.0 = Release|Any CPU + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Deploy.0 = Release|Any CPU + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.ActiveCfg = Release|ARM + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Build.0 = Release|ARM + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Deploy.0 = Release|ARM + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.ActiveCfg = Release|x64 + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Build.0 = Release|x64 + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Deploy.0 = Release|x64 + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.ActiveCfg = Release|x86 + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Build.0 = Release|x86 + {39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Deploy.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/clients/winuploader/Microbit.Uploader/CodeTheMicrobit.Uploader.csproj b/clients/winuploader/Microbit.Uploader/CodeTheMicrobit.csproj similarity index 98% rename from clients/winuploader/Microbit.Uploader/CodeTheMicrobit.Uploader.csproj rename to clients/winuploader/Microbit.Uploader/CodeTheMicrobit.csproj index 077710b6..0436a0f6 100644 --- a/clients/winuploader/Microbit.Uploader/CodeTheMicrobit.Uploader.csproj +++ b/clients/winuploader/Microbit.Uploader/CodeTheMicrobit.csproj @@ -8,7 +8,7 @@ WinExe Properties Microsoft.MicroBit - Microbit.Uploader + CodeTheMicrobit v2.0 512 true diff --git a/clients/winuploader/Microbit.Uploader/LicenseDialog.Designer.cs b/clients/winuploader/Microbit.Uploader/LicenseDialog.Designer.cs index bf8ed131..70ca5739 100644 --- a/clients/winuploader/Microbit.Uploader/LicenseDialog.Designer.cs +++ b/clients/winuploader/Microbit.Uploader/LicenseDialog.Designer.cs @@ -79,7 +79,7 @@ this.MinimizeBox = false; this.Name = "LicenseDialog"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "code the micro:bit uploader Terms Of Use"; + this.Text = "code the micro:bit terms of use"; this.ResumeLayout(false); } diff --git a/clients/winuploader/Microbit.Uploader/MainForm.Designer.cs b/clients/winuploader/Microbit.Uploader/MainForm.Designer.cs index cf9a6d0c..a27b4fa5 100644 --- a/clients/winuploader/Microbit.Uploader/MainForm.Designer.cs +++ b/clients/winuploader/Microbit.Uploader/MainForm.Designer.cs @@ -116,6 +116,7 @@ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox1.TabIndex = 5; this.pictureBox1.TabStop = false; + this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click); // // linkLabel1 // @@ -148,7 +149,7 @@ this.ShowInTaskbar = false; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "code the micro:bit uploader"; + this.Text = "code the micro:bit"; this.Load += new System.EventHandler(this.MainForm_Load); ((System.ComponentModel.ISupportInitialize)(this.backgroundPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); diff --git a/clients/winuploader/Microbit.Uploader/MainForm.cs b/clients/winuploader/Microbit.Uploader/MainForm.cs index 2800bda3..beba1b58 100644 --- a/clients/winuploader/Microbit.Uploader/MainForm.cs +++ b/clients/winuploader/Microbit.Uploader/MainForm.cs @@ -243,11 +243,7 @@ namespace Microsoft.MicroBit private void backgroundPictureBox_Click(object sender, EventArgs e) { - try - { - Process.Start("https://codethemicrobit.com"); - } - catch (IOException) { } + this.openEditor(); } private void SettingsLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) @@ -262,5 +258,10 @@ namespace Microsoft.MicroBit { this.openEditor(); } + + private void pictureBox1_Click(object sender, EventArgs e) + { + this.openEditor(); + } } } diff --git a/docs/reference/offline.md b/docs/reference/offline.md index e40e9b46..028f3dc8 100644 --- a/docs/reference/offline.md +++ b/docs/reference/offline.md @@ -4,7 +4,7 @@ The micro:bit pins. ## How to work offline -If you have loaded the web app at some time in the past (by clicking on "my scripts" from the home page), then if you later open the same browser (whether you are online or offline) and type in [https://m.pxt.io/](https://m.pxt.io/), you will be able to access all the features of the web app. Note that it is important to end the URL with "/". +If you have loaded the web app at some time in the past (by clicking on "my scripts" from the home page), then if you later open the same browser (whether you are online or offline) and type in [https://codethemicrobit.com/](https://codethemicrobit.com/), you will be able to access all the features of the web app. Note that it is important to end the URL with "/". ## Save and load code using files diff --git a/docs/windows10.md b/docs/windows10.md index dcb8d66b..3f79bbc3 100644 --- a/docs/windows10.md +++ b/docs/windows10.md @@ -2,17 +2,11 @@ ## Features -The Windows 10 App provides all the existing features of [m.pxt.io](https://m.pxt.io) plus the following ones: +The Windows 10 App provides all the existing features of [codethemicrobit](https://codethemicrobit.com) plus the following ones: * **auto-upload**: the compiled .hex file is automatically deployed to all connected BBC micro:bits * **serial piping**: all serial data sent by connected BBC micro:bit is automatically imported and analyzed in the editor. -## Installing the pre-release app +## Installing the app -The following instructions allow to side-load the Windows 10 app. This is required until the app is in the store. - -* Search for “developer settings” in Windows 10 and put your computer in “Developer mode”. -* Download https://m.pxt.io/codemicrobit.appx and unzip it. **DO NOT try to install from a zipped folder.** -* Open the extracted folder, right-click on `Add-AppDevPackage.ps1` and click on `Run with PowerShell`. Follow the prompts… - -4) In order to communicate with the micro:bit via serial, you need to install the [ARM mbed driver](https://developer.mbed.org/handbook/Windows-serial-configuration). +Coming to the store soon! \ No newline at end of file diff --git a/pxtarget.json b/pxtarget.json index 1cd50988..93138988 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -1,7 +1,7 @@ { "id": "microbit", - "name": "m.pxt.io", - "title": "m.pxt.io", + "name": "code the micro:bit", + "title": "code the micro:bit", "corepkg": "microbit", "bundleddirs": [ "libs/microbit", @@ -81,14 +81,14 @@ }, "appTheme": { "accentColor": "#5C005C", - "logoUrl": "https://m.pxt.io/about", + "logoUrl": "https://codethemicrobit.com/about", "logo": "./static/microbit.simplified.svg", "docsLogo": "./static/microbit.simplified.svg", "portraitLogo": "./static/microbit.simplified.svg", "footerLogo": "./static/microbit.simplified.svg", "organizationLogo": "./static/Microsoft-logo_rgb_c-gray.png", - "homeUrl": "https://m.pxt.io/", - "embedUrl": "https://m.pxt.io/", + "homeUrl": "https://codethemicrobit.com/", + "embedUrl": "https://codethemicrobit.com/", "privacyUrl": "https://go.microsoft.com/fwlink/?LinkId=521839", "termsOfUseUrl": "https://go.microsoft.com/fwlink/?LinkID=206977", "boardName": "BBC micro:bit",