chore(): resolve conflicts

Author: kamilmysliwiec

.github/ISSUE_TEMPLATE.md

@@ -5,16 +5,16 @@ ISSUES MISSING IMPORTANT INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION.
 -->
 
 ## I'm submitting a...
-<!-- 
+<!--
 Please search GitHub for a similar issue or PR before submitting.
 Check one of the following options with "x" -->
-<pre><code>
-[ ] Regression <!--(a behavior that used to work and stopped working in a new release)-->
-[ ] Bug report
-[ ] Feature request
-[ ] Documentation issue or request (new chapter/page)
-[ ] Support request => Please do not submit support request here, instead post your question on Stack Overflow.
-</code></pre>
+
+- [ ] Regression <!--(a behavior that used to work and stopped working in a new release)-->
+- [ ] Bug report
+- [ ] Feature request
+- [ ] Documentation issue or request (new chapter/page)
+- [ ] Support request => Please do not submit support request here, instead post your question on Stack Overflow.
+
 
 ## Current behavior
 <!-- Describe how the issue manifests. -->
@@ -33,11 +33,12 @@ Check one of the following options with "x" -->
 
 ## Environment
 
-<pre><code>
-For Tooling issues:
-- Node version: XX  <!-- run `node --version` -->
-- Platform:  <!-- Mac, Linux, Windows -->
+#### For Tooling issues:
+<!-- Run `node --version` -->
+- Node version: XX
+
+<!-- Mac, Linux, Windows -->
+- Platform:
 
-Others:
+#### Others:
 <!-- Anything else relevant?  Operating system version, IDE, package manager, ... -->
-</code></pre>

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,15 +8,15 @@ Please check if your PR fulfills the following requirements:
 What kind of change does this PR introduce?
 
 <!-- Please check the one that applies to this PR using "x". -->
-```
-[ ] Bugfix
-[ ] Feature
-[ ] Code style update (formatting, local variables)
-[ ] Refactoring (no functional changes, no api changes)
-[ ] Build related changes
-[ ] Docs
-[ ] Other... Please describe:
-```
+
+- [ ] Bugfix
+- [ ] Feature
+- [ ] Code style update (formatting, local variables)
+- [ ] Refactoring (no functional changes, no api changes)
+- [ ] Build related changes
+- [ ] Docs
+- [ ] Other... Please describe:
+
 
 ## What is the current behavior?
 <!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
@@ -28,10 +28,9 @@ Issue Number: N/A
 
 
 ## Does this PR introduce a breaking change?
-```
-[ ] Yes
-[ ] No
-```
+- [ ] Yes
+- [ ] No
+
 
 <!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->
 

content/application-context.md

@@ -19,15 +19,15 @@ The standalone application object allows you to obtain a reference to any instan
 
 ```typescript
 @@filename()
-const app = await NestFactory.create(AppModule);
+const app = await NestFactory.createApplicationContext(AppModule);
 const tasksService = app.get(TasksService);
 ```
 
 To access the `TasksService` instance we use the `get()` method. The `get()` method acts like a **query** that searches for an instance in each registered module. Alternatively, for strict context checking, pass an options object with the `strict: true` property. With this option in effect, you have to navigate through specific modules to obtain a particular instance from the selected context.
 
 ```typescript
 @@filename()
-const app = await NestFactory.create(AppModule);
+const app = await NestFactory.createApplicationContext(AppModule);
 const tasksService = app.select(TasksModule).get(TasksService, { strict: true });
 ```
 

content/cli/libraries.md

@@ -40,9 +40,9 @@ The files generated for a library are slightly different from those generated fo
     <div class="children">
       <div class="item">src</div>
       <div class="children">
-        <div class="item">my-library.service.ts</div>
-        <div class="item">my-library.module.ts</div>
         <div class="item">index.ts</div>
+        <div class="item">my-library.module.ts</div>
+        <div class="item">my-library.service.ts</div>
       </div>
       <div class="item">tsconfig.lib.json</div>
     </div>

content/cli/workspaces.md

@@ -32,14 +32,14 @@ nest new my-project
 We've constructed a _standard mode_ structure, with a folder structure that looks like this:
 
 <div class="file-tree">
+  <div class="item">node_modules</div>
   <div class="item">src</div>
   <div class="children">
     <div class="item">app.controller.ts</div>
-    <div class="item">app.service.ts</div>
     <div class="item">app.module.ts</div>
+    <div class="item">app.service.ts</div>
     <div class="item">main.ts</div>
   </div>
-  <div class="item">node_modules</div>
   <div class="item">nest-cli.json</div>
   <div class="item">package.json</div>
   <div class="item">tsconfig.json</div>
@@ -63,8 +63,8 @@ At this point, `nest` converts the existing structure to a **monorepo mode** str
         <div class="item">src</div>
         <div class="children">
           <div class="item">app.controller.ts</div>
-          <div class="item">app.service.ts</div>
           <div class="item">app.module.ts</div>
+          <div class="item">app.service.ts</div>
           <div class="item">main.ts</div>
         </div>
         <div class="item">tsconfig.app.json</div>
@@ -74,8 +74,8 @@ At this point, `nest` converts the existing structure to a **monorepo mode** str
         <div class="item">src</div>
         <div class="children">
           <div class="item">app.controller.ts</div>
-          <div class="item">app.service.ts</div>
           <div class="item">app.module.ts</div>
+          <div class="item">app.service.ts</div>
           <div class="item">main.ts</div>
         </div>
         <div class="item">tsconfig.app.json</div>

content/components.md

@@ -1,6 +1,6 @@
 ### Providers
 
-Providers are a fundamental concept in Nest. Many of the basic Nest classes may be treated as a provider – services, repositories, factories, helpers, and so on. The main idea of a provider is that it can **inject** dependencies; this means objects can create various relationships with each other, and the function of "wiring up" instances of objects can largely be delegated to the Nest runtime system.
+Providers are a fundamental concept in Nest. Many of the basic Nest classes may be treated as a provider – services, repositories, factories, helpers, and so on. The main idea of a provider is that it can be **injected** as dependency; this means objects can create various relationships with each other, and the function of "wiring up" instances of objects can largely be delegated to the Nest runtime system.
 
 <figure><img src="/assets/Components_1.png" /></figure>
 
@@ -197,8 +197,8 @@ This is how our directory structure should look now:
 <div class="children">
 <div class="item">cat.interface.ts</div>
 </div>
-<div class="item">cats.service.ts</div>
 <div class="item">cats.controller.ts</div>
+<div class="item">cats.service.ts</div>
 </div>
 <div class="item">app.module.ts</div>
 <div class="item">main.ts</div>

content/controllers.md

@@ -236,7 +236,7 @@ create() {
 
 To redirect a response to a specific URL, you can either use a `@Redirect()` decorator or a library-specific response object (and call `res.redirect()` directly).
 
-`@Redirect()` takes a required `url` argument, and an optional `statusCode` argument. The `statusCode` defaults to `302` (`Found`) if omitted.
+`@Redirect()` takes two arguments, `url` and `statusCode`, both are optional. The default value of `statusCode` is `302` (`Found`) if omitted.
 
 ```typescript
 @Get()

content/discover/who-uses.json

@@ -243,6 +243,10 @@
     "https://datenlotse.org",
     "https://bemum.co",
     "https://weoptimeye.ai",
-    "https://nemovote.com"
+    "https://nemovote.com",
+    "https://selleo.com",
+    "https://pchas.ir",
+    "https://tayeh.ir",
+    "https://forwardigital.co.uk"
   ]
 }

content/first-steps.md

@@ -21,13 +21,13 @@ $ npm i -g @nestjs/cli
 $ nest new project-name
 ```
 
-The `project` directory will be created, node modules and a few other boilerplate files will be installed, and a `src/` directory will be created and populated with several core files.
+The `project-name` directory will be created, node modules and a few other boilerplate files will be installed, and a `src/` directory will be created and populated with several core files.
 
 <div class="file-tree">
   <div class="item">src</div>
   <div class="children">
-    <div class="item">app.controller.ts</div>
     <div class="item">app.controller.spec.ts</div>
+    <div class="item">app.controller.ts</div>
     <div class="item">app.module.ts</div>
     <div class="item">app.service.ts</div>
     <div class="item">main.ts</div>

content/fundamentals/dependency-injection.md

@@ -1,6 +1,6 @@
 ### Custom providers
 
-In earlier chapters, we touched on various aspects of **Dependency Injection (DI)** and how it is used in Nest. One example of this is the [constructor based](https://docs.nestjs.com/providers#dependency-injection) dependency injection used to inject instances (often service providers) into classes. You won't be surprised to learn that Dependency Injection is built in to the Nest core in a fundamental way. So far, we've only explored one main pattern. As your application grows more complex, you may need to take advantage of the full features of the DI system, so let's explore them in more detail.
+In earlier chapters, we touched on various aspects of **Dependency Injection (DI)** and how it is used in Nest. One example of this is the [constructor based](https://docs.nestjs.com/providers#dependency-injection) dependency injection used to inject instances (often service providers) into classes. You won't be surprised to learn that Dependency Injection is built into the Nest core in a fundamental way. So far, we've only explored one main pattern. As your application grows more complex, you may need to take advantage of the full features of the DI system, so let's explore them in more detail.
 
 #### DI fundamentals