Fix merge conflicts

Author: ShawnKupfer

.openpublishing.redirection.json

@@ -5120,6 +5120,91 @@ achievements:
   title: Manage device identity with Microsoft Entra join and Enterprise State Roaming
   summary: Evaluate options to manage device identities in Microsoft Entra ID. Allow users to join devices in Microsoft Entra ID. Require devices to be marked as compliant. Enable Enterprise State Roaming.
   iconUrl: /training/achievements/manage-device-identity-ad-join.svg
+- uid: learn.azure.create-custom-roles-rbac.badge
+  type: badge
+  title: Create custom roles for Azure resources with role-based access control (RBAC)
+  summary: Understand the structure of role definitions for access control. Identify the role properties to use that define your custom role permissions. Create an Azure custom role and assign to a user.
+  iconUrl: /training/achievements/create-custom-azure-roles-with-rbac.svg
+- uid: learn.language.typescript-namespaces-organize-code.badge
+  type: badge
+  title: Organize code using TypeScript namespaces
+  summary: TypeScript provides two ways to organize code - namespaces and modules. This module explains how to organize TypeScript code using namespaces.
+  iconUrl: /training/achievements/typescript/typescript-namespaces-organize-code.svg
+- uid: learn.language.typescript-work-external-libraries.badge
+  type: badge
+  title: Access external libraries from TypeScript
+  summary: TypeScript provides two ways to organize your code, namespaces and modules. This module introduces you to modules in TypeScript (referred to as external modules in previous versions.)
+  iconUrl: /training/achievements/typescript/typescript-work-external-libraries.svg
+- uid: learn.language.typescript-get-started.badge
+  type: badge
+  title: Get started with TypeScript
+  summary: This module introduces you to the TypeScript language, why it was created, and how to use it for JavaScript development. You'll also set up a TypeScript development environment for future exercises.
+  iconUrl: /training/achievements/typescript/typescript-get-started.svg
+- uid: learn.language.typescript-implement-interfaces.badge
+  type: badge
+  title: Implement interfaces in TypeScript
+  summary: JavaScript doesn't support interfaces so, as a JavaScript developer, you may or may not have experience with them. In TypeScript, you can use interfaces as you would in traditional object-oriented programming. You can also use interfaces to define object types and this is the primary focus of this module.
+  iconUrl: /training/achievements/typescript/typescript-implement-interfaces.svg
+- uid: learn.typescript-develop-typed-functions.badge 
+  type: badge
+  title: Develop typed functions by using TypeScript
+  summary: If you know how to write functions in JavaScript, you know how to write functions in TypeScript. But TypeScript adds some new capabilities to the standard JavaScript functions to make them easier to work with.
+  iconUrl: /training/achievements/typescript/typescript-develop-typed-functions.svg
+- uid: learn.language.typescript-generics.badge
+  type: badge
+  title: Define generics in TypeScript
+  summary: Generics are code templates that you can define and reuse throughout your codebase. They provide a way to tell functions, classes, or interfaces what type you want to use when you call it.
+  iconUrl: /training/achievements/typescript/typescript-generics.svg
+- uid: learn.language.build-javascript-applications-typescript.trophy
+  type: trophy
+  title: Build JavaScript applications using TypeScript
+  summary: TypeScript offers all the features of JavaScript, plus an additional layer on top of these - the TypeScript type system. In this learning path, you’ll learn how using TypeScript for JavaScript development can help you build more robust code, reduce runtime type errors, take advantage of modern features before they are available in JavaScript, and work better with development teams.
+  iconUrl: /training/achievements/typescript/build-javascript-applications-typescript.svg
+- uid: learn.language.typescript-declare-variable-types.badge
+  type: badge
+  title: Declare variable types in TypeScript
+  summary: JavaScript is a dynamically typed language. While this makes declaring variables easy, it can in some cases lead to unexpected results. The static type system in TypeScript enables you to describe the shape of an object, providing better documentation, and allowing TypeScript to validate that your code is working correctly. In TypeScript, declarations of namespaces, classes, properties, functions, variables, and other language entities associate types with those entities. The way that a type is formed and associated with a language entity depends on the kind of entity. This module introduces some of the available types and shows how to associate them with variables. Later modules examine how interfaces, functions, and classes use static typing.
+  iconUrl: /training/achievements/typescript/typescript-declare-variable-types.svg
+- uid: learn.language.typescript-declare-instantiate-classes.badge
+  type: badge
+  title: Declare and instantiate classes in TypeScript
+  summary: Classes in TypeScript extend the ES6 functionality by adding TypeScript-specific features like type annotations for class members, access modifiers, and the ability to specify required or optional parameters. Another benefit of using TypeScript is that you can use it to develop with classes and then compile them down to JavaScript that works across all major browsers and platforms, as needed.
+  iconUrl: /training/achievements/typescript/typescript-declare-instantiate-classes.svg
+- uid: learn.intro-to-azure-sql-edge.badge
+  type: badge
+  title: Introduction to Azure SQL Edge
+  summary: Describe how Azure SQL Edge enables developers to use the same Transact-SQL (T-SQL) API to develop apps for the edge. Evaluate whether Azure SQL Edge provides the same security and performance as Microsoft SQL Server.
+  iconUrl: /training/achievements/generic-badge.svg
+- uid: learn-sqlserver.deploying-sql-server-linux.badge
+  type: badge
+  title: Deploy SQL Server on Linux
+  summary: Learn about the software and hardware prerequisites to run SQL Server on Linux and then discover the straightforward steps to install SQL Server on Linux. You will also learn additional tasks, such as installing command-line tools.
+  iconUrl: /training/achievements/sqlserver/deploying-on-sql-server-on-linux.svg
+- uid: learn.language.vue-dynamic-rendering.badge
+  type: badge
+  title: Dynamic page displays with Vue.js
+  summary: One of the goals of any web framework is to update the display based on data values. This module explores how to make your page dynamic based on those values and how to display lists of information.
+  iconUrl: /training/achievements/vue-dynamic-rendering.svg
+- uid: learn.language.vue-get-started.badge
+  type: badge
+  title: Get started with Vue
+  summary: Vue.js is a progressive web framework that allows developers to get up and running quickly, with just the addition of a script tag. But Vue.js can also grow with you. You can use it to create large scalable applications. In this module, you'll explore the core concepts of Vue.js and how to get started.
+  iconUrl: /training/achievements/vue-get-started.svg
+- uid: learn.languages.vue-first-steps.trophy
+  type: trophy
+  title: Take your first steps with Vue.js
+  summary: Vue.js is a progressive web framework allowing developers to get up and running quickly, with the addition of a `script` tag. However, Vue.js can also grow with you, and can be used to create large scalable applications.
+  iconUrl: /training/achievements/vue-first-steps.svg
+- uid: learn.language.vue-cli-components.badge
+  type: badge
+  title: Getting started with Vue CLI and single-file components in Vue.js.
+  summary: Although it's possible to create Vue.js applications by using purely JavaScript, most developers need more power and flexibility. By using Vue CLI and single-file components, you can use more robust tooling to enhance the development experience. We'll see how to use Vue CLI to bootstrap an application, and how to create reusable components in Vue.
+  iconUrl: /training/achievements/vue-cli-components.svg
+- uid: learn.language.vue-data-events.badge
+  type: badge
+  title: Work with data and events in Vue.js
+  summary: Dynamic web applications typically allow users to interact with the page and data. In this module, you'll see how to add forms to a Vue.js page and respond to user events. You'll also see how to add computed values that can be calculated based on updates to the data.
+  iconUrl: /training/achievements/vue-data-events.svg
 - uid: learn.introduction-to-visual-studio-code.badge
   type: badge
   title: Introduction to Visual Studio Code
@@ -5135,3 +5220,23 @@ achievements:
   title: Introduction to programming
   summary: Learn about programming languages and the tools that developers use to create software.
   iconUrl: /training/achievements/student-evangelism/web-development-101-introduction.svg
+- uid: learn.student-evangelism.web-development-101.functions.badge
+  type: badge
+  title: Create modular code by using functions in JavaScript
+  summary: Functions are the building blocks for any application you'll create. With functions, you can create named, reusable sections of code to help make it more readable and maintainable. This module explores the core concepts of functions.
+  iconUrl: /training/achievements/student-evangelism/web-development-101-functions.svg
+- uid: learn.student-evangelism.web-development-101-if-else.badge
+  type: badge
+  title: Make decisions with JavaScript
+  summary: This lesson covers the basics of JavaScript if/else decision-making concepts. You'll learn how comparing variables, using Booleans, and using if/else statements allow you to make decisions in your code.
+  iconUrl: /training/achievements/student-evangelism/web-development-101-if-else.svg
+- uid: learn.student-evangelism.web-development-101.trophy
+  type: trophy
+  title: Web Development for Beginners
+  summary: Learn the basics of web development, including programming languages and tools, and web accessibility.
+  iconUrl: /training/achievements/student-evangelism/web-development-101.svg
+- uid: learn.student-evangelism.web-development-101-loops-arrays.badge
+  type: badge
+  title: JavaScript arrays and loops
+  summary: Learn how to manipulate and store data within JavaScript.
+  iconUrl: /training/achievements/student-evangelism/web-development-101-loops-arrays.svg