Merge branch 'vnext' into Issue_48

microsoft · Jul 23, 2020 · 59b216b · 59b216b
2 parents 7f3291e + d0ceb16
commit 59b216b
Show file tree

Hide file tree

Showing 29 changed files with 316 additions and 152 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -66,6 +66,52 @@
         "bug",
         "ideas"
       ]
+    },
+    {
+      "login": "Hedlund01",
+      "name": "Hugo Hedlund",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/48281171?v=4",
+      "profile": "https://github.com/Hedlund01",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "thefisk",
+      "name": "Nathan Fisk",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/39799908?v=4",
+      "profile": "https://github.com/thefisk",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "alsmyr",
+      "name": "Erik Alsmyr",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/3719489?v=4",
+      "profile": "http://www.lexplore.com",
+      "contributions": [
+        "bug",
+        "doc"
+      ]
+    },
+    {
+      "login": "jawn",
+      "name": "Bernard Vander Beken",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1705112?v=4",
+      "profile": "https://jawn.net",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "IronManion",
+      "name": "IronManion",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/36028632?v=4",
+      "profile": "https://github.com/IronManion",
+      "contributions": [
+        "doc"
+      ]
     }
   ]
 }
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
@@ -2,17 +2,17 @@ version: 1
 update_configs:
   - package_manager: "dotnet:nuget"
     directory: "/src/shortenerTools"
-    update_schedule: "weekly"
+    update_schedule: "monthly"
     default_assignees: 
         - "fboucher"
     default_reviewers: 
         - "fboucher"
-    target_branch: "dev"
+    target_branch: "vnext"
   - package_manager: "dotnet:nuget"
     directory: "/src/adminTools/adminBlazorWebsite/src"
-    update_schedule: "weekly"
+    update_schedule: "monthly"
     default_assignees: 
         - "fboucher"
     default_reviewers: 
         - "fboucher"
-    target_branch: "dev"
+    target_branch: "vnext"
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,21 +1,18 @@
 # Contributing
 
-We appreciate contributions of any kind and acknowledge them on our [README][readme].  By participating 
-in this project, you agree to abide by our [code of conduct](CODE_OF_CONDUCT.md).
+We appreciate contributions of any kind and acknowledge them on our [README][readme].  By participating in this project, you agree to abide by our [code of conduct](CODE_OF_CONDUCT.md).
 
 ## Any enhancements/bugs/etc you see?
 
 Add an issue.  We'll review it, add labels and reply within a few days.
 
 ## See an issue you'd like to work on?
 
-Comment on the issue that you'd like to work on it 
-and we'll add the `claimed` label.  If you see the `claimed` label already on the issue you 
-might want to ask the contributor if they'd like some help.
+Comment on the issue that you'd like to work on it and we'll add the `claimed` label.  If you see the `claimed` label already on the issue you might want to ask the contributor if they'd like some help.
 
 ## Documentation/etc need updating?
 
-Go right ahead! Just submit a pull request when you're done.
+Go right ahead! Just submit a pull request (to the branch **vnext**) when you're done.
 
 
 ## Pull Requests
@@ -26,11 +23,9 @@ Fork, then clone the repo:
 
     git clone [email protected]:your-username/AzUrlShortener.git
 
-Push to your fork and [submit a pull request](https://github.com/fboucher/AzUrlShortener/compare/) against the `dev` branch.
+Push to your fork and [submit a pull request](https://github.com/fboucher/AzUrlShortener/compare/) against the `vnext` branch.
 
-At this point you're waiting on us. We like to at least comment on pull requests
-within three days (and, typically, one day). We may suggest
-some changes or improvements or alternatives.
+At this point you're waiting on us. We like to at least comment on pull requests within three days (and, typically, one day). We may suggest some changes or improvements or alternatives.
 
 Some things that will increase the chance that your pull request is accepted:
 

diff --git a/README.md b/README.md
@@ -1,9 +1,12 @@
 # Azure Url Shortener (AzUrlShortener)
 
-[![Deploy to Azure](https://img.shields.io/badge/Deploy%20To-Azure-blue?logo=microsoft-azure)](https://portal.azure.com/?WT.mc_id=urlshortener-github-frbouche#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FFBoucher%2FAzUrlShortener%2Fmaster%2Fdeployment%2FazureDeploy.json)
+[![Deploy to Azure](https://img.shields.io/badge/Deploy%20To-Azure-blue?logo=microsoft-azure)](https://portal.azure.com/?WT.mc_id=urlshortener-github-frbouche#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FFBoucher%2FAzUrlShortener%2Fmain%2Fdeployment%2FazureDeploy.json)
 [![GLO Board](https://img.shields.io/badge/with-GLO_Board-orange/?color=05887F&logoWidth=15&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAABMCAMAAADeDICLAAAABlBMVEX///8A/+Bm7Mx0AAAAAXRSTlMAQObYZgAAAXlJREFUeNrV2NGOwjAMRNH4/396X5Cm26twww5IrF9CXfvUSlskWPuYOUh4kJ25HzN3RsOBi+SrMolLINu7hFx2t5dROgicLVyRC1fkwgWssru9zJZzuXFd7l2/gT3MXndL+ZEw12VO+lg6OA5gcV3OkitNBxMiDNdk7oXsRLkXzcDswfJJeHVwkIgfhOfL4ZDXzzV8nRIwZHUdNtldhym7SzgZkdWNhokpu8uJvxRep7DLPvC/hte7YfnahOzu3Zr4m0KYXs+FdZCTRD3EbeGzn2MGr/fBkXCdAia034t5GY6HBGXePLgcUEfehw8cWGRxoWDXSQtLxEZ2WAxkHTaX6UEHHzeBJR94s5z0z/aMw3jZKGd1WFzZZofpAoasMN3kVXZ4bgObPGfwYJ69nE8Os8VlUlw2rsvzBJ6h63JoiDjn7v3GOcwel22rWaTy78ItjHIPlBKu/kCe2cKs+xNN2FmnBzCft5fpBN+MsB0dGGxt47AOwsvjB19NCt1bbfikAAAAAElFTkSuQmCC)](https://app.gitkraken.com/glo/board/XnI94exk8AARj-ph)
-[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors)
 [![Serverless Library](https://img.shields.io/badge/Serverless%20Library-%E2%9C%94%EF%B8%8Fyes-blue?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAMAAADzN3VRAAACx1BMVEUAAAAAAAAAAP8Af38AVaoAf78AVaoAbbYAXLkAc7kAZqoAWqUAY7gAZrIAZa4AYKwAY7QAZ7YAZ7MAZ7UAZLMAY7MAZLUAZrIAZLcAY7QAZrIAZLMAZLYAZ7YAZLYAZrcAZbgAZLMAZ7YAZbIAZLQAYrMAY7UAZLUAZLYAZbQAZrcAZbMAZbgAZbQAZrQAZrgAZrcAZbgAaLkAZbUAZbYAZ7YAZbUAZrUAZ7YAZ7cAZbcAZrcAZ7cAZrcAZ7cAZrcAZrcAZbcAZ7YAZ7cAZrcAZrYAZrcAZbYAZrcAZ7cAZrYAZrcAZrcAZ7cAZ7gAZrcAZrcAZ7cAZ7gAZ7gBaLcCaLcDabgEaLYFabUGarQGa7oHarMIbLoKbbsMbrsOb7wPcLwQcb0Rcb0SbawTcr0Xdb4Ydb8Zdr8dc6UeecEfdKQgcqMhe8Eic6IkdqEkfcIndJ4of8MqeJ0rgcQsdpsseZwxhMY2eZQ3iMc7fZI7gJJBjstCfYxGkcxHkcxMh4hNlc5TmM9VioFVmtBYnNFZnNFbndFbntFcntFcntJdn9Jfh3lhodNiodNnpNVopdVsi3Bsp9Ztj3BulXFuqdZuqddwqtd0mG11mG12j2l7mml9kWWGn2KMlluUpVmWpliaqFWpoEeusEivokOz0uq31Ou51eu61uy7pju81+2/2O3BqDfB2u7C2u7C2+7DqTbD2+7EuTrF3O/F3e/G3e/H3e/H3u/ItTbKqzLKuzbL4PDOsjDOvTTW5vTb6vXdwyrgsyPg7ffitCLk7/jm8PjqyCLq8/ns9PrttxrwuBjxuBfyzB3zvBfzzBzz+Pz0uRb1uRX1+fz2+v33+v34+/35uxL5/P36/P77wxP70Bf7/f78yhT8yxT8zBX8zRX8zhX8zxb80Bb8/f79vA/9vQ/9vhD9vxD9wBH9whH9xBL9xhP9xxP9yBOZ2sNJAAAAU3RSTlMAAQECAwQGBwsLDxESFCMlKSovOz1AQkNHSFBRUVFUVVpbW11gYmRlZmdoaWlqbXByc3V5e36AgYOIubrBysvR09XX2drd3ub2+vv7/Pz8/f7+/mxm4TkAAAHCSURBVHgBXcz1U1VBHEDxr90d2N2KLYbYAbZwVAzB7g6xOxS7OzCwu8UQFVtEBUMxWFeeoX+Ee5e5bxg+v56ZI155itesX80nl6STpYJ/EI5uzUplShsKtwVGP4+LexEff7hlQfHy7YKxU6kkrZ+NI7CsG2pj3VLql9YbgZ5lxCraHRjJDKW+an2qzwgg0A6zdQSWvhm/V6nf+tXkWS/nAi0ymFILWJEY0fuuSv6hd8H21wuA0qa0hrXvVzJHqb/6egiwKWERNBfJBxtM4IBSKfpJTEzM8b7rExbTOadUZNunCOj3UH3+6fF49NuZsC5xOT7SaOv3VcBCZSXpPRir3y2rIk1vx4YBS/ZHRh5SynMuBCP0wbE64jfl8clQrC3q39MJGGFno4dXlcqEPzqRmi4kp6yx4XT0UIpJAZgWe3QgMPbjn4M2nLk6hB65RdrDpHtRJu34dn8YMOj85cHgLyJ1gTF3jvTnxod5Trh0xQTKmZIjABh1MXzil30Y86Oc0CazGCWDcOy+OQBXp0JiNcZxbTpe1SVVRr9gmLoZV1df8SoRwOxebuhQRNLIXq8dVnCrGlklnfyVGjZpUD6vuP4DQn3cxeG842QAAAAASUVORK5CYII=)](https://serverlesslibrary.net/sample/1c809aa2-2d4f-4fee-bc27-0c2c36844ac8)
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-11-orange.svg?style=flat-square)](#contributors-)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
+
 
 
 ![UrlShortener][UrlShortener]
@@ -12,12 +15,19 @@ A simple and easy to use and to deploy budget-friendly Url Shortener for everyon
 
 > If you don't own an Azure subscription already, you can create your **free** account today. It comes with 200$ credit, so you can experience almost everything without spending a dime. [Create your free Azure account today](https://azure.microsoft.com/en-us/free?WT.mc_id=azurlshortener-github-frbouche)
 
+Features:
+
+- 1-Click deployment.
+- Create Edit and Delete short URL.
+- Keep Statistics of your clicks.
+- Budget-friendly and 100% open-source.
+
 
 ## How To Deploy
 
 To deploy YOUR version of **Azure Url Shortener** you could fork this repo, but if you are looking for the easy way just click on the "Deploy to Azure".
 
-[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/?WT.mc_id=urlshortener-github-frbouche#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FFBoucher%2FAzUrlShortener%2Fmaster%2Fdeployment%2FazureDeploy.json)
+[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/?WT.mc_id=urlshortener-github-frbouche#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FFBoucher%2FAzUrlShortener%2Fmain%2Fdeployment%2FazureDeploy.json)
 
 To have all details and alternative deployment refer to the [Deployment Details](azFunctions-deployment.md) page.
 
@@ -64,6 +74,21 @@ If you are interested to learn more about what's under the hood, and get more de
 ---
 
 
+## What's Next?
+
+We are working on the **version 1.0** (ETA Summer 2020). This version will:
+
+- Use Azure Active Directory (AAD)
+- Client side website (more budget friendly) see GitHub project: [TinyBlazorAdmin](https://github.com/FBoucher/TinyBlazorAdmin) for more details.
+
+Optional (if not then soon after)
+
+- Statistics
+- Better Grid to display the URL
+
+---
+
+
 
 ## Contributing
 
@@ -89,6 +114,13 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="http://baaijte.net"><img src="https://avatars3.githubusercontent.com/u/1761079?v=4" width="100px;" alt=""/><br /><sub><b>Vincent Baaij</b></sub></a><br /><a href="https://github.com/FBoucher/AzUrlShortener/commits?author=vnbaaij" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/kmm7"><img src="https://avatars3.githubusercontent.com/u/13196402?v=4" width="100px;" alt=""/><br /><sub><b>kmm7</b></sub></a><br /><a href="https://github.com/FBoucher/AzUrlShortener/commits?author=kmm7" title="Code">💻</a> <a href="#ideas-kmm7" title="Ideas, Planning, & Feedback">🤔</a></td>
     <td align="center"><a href="https://github.com/fs366e2spm"><img src="https://avatars2.githubusercontent.com/u/52791126?v=4" width="100px;" alt=""/><br /><sub><b>fs366e2spm</b></sub></a><br /><a href="https://github.com/FBoucher/AzUrlShortener/issues?q=author%3Afs366e2spm" title="Bug reports">🐛</a> <a href="#ideas-fs366e2spm" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/Hedlund01"><img src="https://avatars1.githubusercontent.com/u/48281171?v=4" width="100px;" alt=""/><br /><sub><b>Hugo Hedlund</b></sub></a><br /><a href="https://github.com/FBoucher/AzUrlShortener/commits?author=Hedlund01" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/thefisk"><img src="https://avatars2.githubusercontent.com/u/39799908?v=4" width="100px;" alt=""/><br /><sub><b>Nathan Fisk</b></sub></a><br /><a href="https://github.com/FBoucher/AzUrlShortener/commits?author=thefisk" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://www.lexplore.com"><img src="https://avatars0.githubusercontent.com/u/3719489?v=4" width="100px;" alt=""/><br /><sub><b>Erik Alsmyr</b></sub></a><br /><a href="https://github.com/FBoucher/AzUrlShortener/issues?q=author%3Aalsmyr" title="Bug reports">🐛</a> <a href="https://github.com/FBoucher/AzUrlShortener/commits?author=alsmyr" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://jawn.net"><img src="https://avatars3.githubusercontent.com/u/1705112?v=4" width="100px;" alt=""/><br /><sub><b>Bernard Vander Beken</b></sub></a><br /><a href="https://github.com/FBoucher/AzUrlShortener/commits?author=jawn" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/IronManion"><img src="https://avatars0.githubusercontent.com/u/36028632?v=4" width="100px;" alt=""/><br /><sub><b>IronManion</b></sub></a><br /><a href="https://github.com/FBoucher/AzUrlShortener/commits?author=IronManion" title="Documentation">📖</a></td>
   </tr>
 </table>
 
@@ -103,9 +135,9 @@ This project follows the [all-contributors](https://github.com/all-contributors/
 > This project was inspire by a project created by [Jeremy Likness](https://github.com/JeremyLikness) that you can find here [jlik.me](https://github.com/JeremyLikness/jlik.me).
 
 
-[UrlShortener]: https://github.com/FBoucher/AzUrlShortener/raw/master/medias/UrlShortener_600.png
-[ThumbnailYTAzUrlShortener_EN]: https://github.com/FBoucher/AzUrlShortener/raw/master/medias/ThumbnailYTAzUrlShortener_EN.png
-[glo]: https://github.com/FBoucher/AzUrlShortener/raw/master/medias/glo-board_screenshot.png
-[AzFunctionGitSync]: https://github.com/FBoucher/AzUrlShortener/raw/master/medias/AzFunctionGitSync.png
+[UrlShortener]: https://github.com/FBoucher/AzUrlShortener/raw/main/medias/UrlShortener_600.png
+[ThumbnailYTAzUrlShortener_EN]: https://github.com/FBoucher/AzUrlShortener/raw/main/medias/ThumbnailYTAzUrlShortener_EN.png
+[glo]: https://github.com/FBoucher/AzUrlShortener/raw/main/medias/glo-board_screenshot.png
+[AzFunctionGitSync]: https://github.com/FBoucher/AzUrlShortener/raw/main/medias/AzFunctionGitSync.png
 
 
diff --git a/azFunctions-deployment.md b/azFunctions-deployment.md
@@ -4,7 +4,7 @@ This page describes step by step how to deploy the Azure URL Shortener. To learn
 
 ## Deployment with the `Deploy to Azure` Button
 
-[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/?WT.mc_id=urlshortener-github-frbouche#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FFBoucher%2FAzUrlShortener%2Fmaster%2Fdeployment%2FazureDeploy.json)
+[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/?WT.mc_id=urlshortener-github-frbouche#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FFBoucher%2FAzUrlShortener%2Fmain%2Fdeployment%2FazureDeploy.json)
 
 This will open the Azure Portal (portal.azure.com) in your subscription and create the required resources.
 
@@ -15,7 +15,7 @@ This will open the Azure Portal (portal.azure.com) in your subscription and crea
 - **Base Name**: This is how you would like to named your resources. Because some names need to be globally unique, the deployment will generate a suffix and append it to the end of your Base name.
 - **Frontend**: Select the frontend that will be deploy. Select 'none', if you don't want any. Frontend available: `adminBlazorWebsite`, `none`. 
 - **Default Url Redirect**: Default URL use when the key pass by the user is not found.
-- **GitHub URL and Branch**: Keep the default if you when to deploy from Frank's master repo. 
+- **GitHub URL and Branch**: Keep the default if you when to deploy from Frank's main repo. 
 
 #### Setting for adminBlazorWebsite (Required only if frontend = adminBlazorWebsite)
 

diff --git a/deployment/azureDeploy.json b/deployment/azureDeploy.json
@@ -36,9 +36,9 @@
         },
         "GitHubBranch": {
             "type": "string",
-            "defaultValue": "master",
+            "defaultValue": "main",
             "metadata": {
-                "description": "Name of the branch to use when deploying (Default = master)."
+                "description": "Name of the branch to use when deploying (Default = main)."
             }
         },
         "ExpireOn":{

diff --git a/deployment/debugARM.json b/deployment/debugARM.json
@@ -15,7 +15,7 @@
     "variables": {
         "frontendInfo": {
             "adminBlazorWebsite": { 
-                "armTemplateUrl": "https://raw.githubusercontent.com/FBoucher/AzUrlShortener/master/src/adminTools/adminBlazorWebsite/deployment/adminBlazorWebsite-deployAzure.json"
+                "armTemplateUrl": "https://raw.githubusercontent.com/FBoucher/AzUrlShortener/main/src/adminTools/adminBlazorWebsite/deployment/adminBlazorWebsite-deployAzure.json"
             }
         }
     },