merge conflicts

.eslintrc.js

@@ -6,6 +6,7 @@ module.exports = {
         '.eslintrc.js',
         'scripts',
         'build',
+        'dist',
         'coverage.webpack.js',
         'karma.conf.js',
         'tailwind.config.js',
@@ -112,7 +113,7 @@ module.exports = {
             },
         },
         {
-            files: ['server/**/*.ts'],
+            files: ['{server,test}/**/*.ts'],
             parserOptions: {
                 project: 'server/tsconfig.json',
                 tsconfigRootDir: __dirname,

.github/workflows/pr-e2e-test.yml

@@ -41,20 +41,7 @@ jobs:
         run: |
           wget https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2204-x86_64-100.6.1.deb
           sudo apt install ./mongodb-database-tools-*-100.6.1.deb
-      - run: mongoimport test/heroes.json # TODO find a way to run this inside the mongo service container, then the `Setup mongodb-tools` would not be needed neither
-
-      - name: Create es index
-        run: curl -X PUT localhost:9200/heroes
-      - name: Update index to have 0 replicas # TODO es create 1 repl set per node by default, index status is yellow.
-        run: |
-          curl -X PUT http://localhost:9200/heroes/_settings -H "Content-Type: application/json" -d '{
-              "index" : {
-                  "number_of_replicas" : 0
-              }
-          }'
-      - name: Inject data into es
-        run: |
-          curl -X PUT http://localhost:9200/heroes/_create/1 -H "Content-Type: application/json" -d @test/heroes.json
+      - run: mongoimport test/heroes.json --jsonArray # TODO find a way to run this inside the mongo service container, then the `Setup mongodb-tools` would not be needed neither
 
       - name: Install dependencies
         run: npm i

client/angular.json

@@ -30,9 +30,6 @@
               "simple-web-site/src/public"
             ],
             "styles": [
-              {
-                "input": "simple-web-site/src/theme.scss"
-              },
               "simple-web-site/src/styles.scss"
             ],
             "scripts": []
@@ -86,9 +83,6 @@
               "simple-web-site/src/public"
             ],
             "styles": [
-              {
-                "input": "simple-web-site/src/theme.scss"
-              },
               "simple-web-site/src/styles.scss"
             ],
             "scripts": []
@@ -125,9 +119,6 @@
               "simple-web-site/src/public"
             ],
             "styles": [
-              {
-                "input": "simple-web-site/src/theme.scss"
-              },
               "simple-web-site/src/styles.scss"
             ],
             "scripts": [],

client/simple-web-site/src/app/hero/hero.component.html

@@ -1,24 +1,37 @@
 <mat-card>
   <mat-card-header>
     <mat-card-title
-      ><a
-        class="underline"
-        routerLink="/search"
-        [queryParams]="{ q: hero().homeTown }"
-        >{{ hero().homeTown }}</a
-      >
+    ><a
+      class="underline"
+      routerLink="/search"
+      [queryParams]="{ q: hero().homeTown }"
+    >{{ hero().homeTown }}</a
+    >
     </mat-card-title>
     <mat-card-subtitle>{{ hero().squadName }}</mat-card-subtitle>
   </mat-card-header>
   <mat-card-content>
+    <p>{{ hero().secretBase }}</p>
     <p>{{ hero().content }}</p>
-    <mat-list>
-      <mat-list-item *ngFor="let member of hero()?.members || []">
-        <p>{{ member.name }}</p>
-        <p>{{ member.age }}</p>
-        <p>{{ member.powers }}</p>
-        <p>{{ member.secretIdentity }}</p>
-      </mat-list-item>
-    </mat-list>
+    <div *ngFor="let member of hero()?.members || []" class="my-2 border-solid border-2">
+      <mat-list>
+        <mat-list-item>
+          <span matListItemTitle>member name</span>
+          <span matListItemLine>{{ member.name }}</span>
+        </mat-list-item>
+        <mat-list-item>
+          <span matListItemTitle>member age</span>
+          <span matListItemLine>{{ member.age }}</span>
+        </mat-list-item>
+        <mat-list-item>
+          <span matListItemTitle>member powers</span>
+          <span matListItemLine>{{ member.powers }}</span>
+        </mat-list-item>
+        <mat-list-item>
+          <span matListItemTitle>member secretIdentity</span>
+          <span matListItemLine>{{ member.secretIdentity }}</span>
+        </mat-list-item>
+      </mat-list>
+    </div>
   </mat-card-content>
 </mat-card>

client/simple-web-site/src/app/hero/hero.component.ts

@@ -1,13 +1,7 @@
 import { NgForOf } from '@angular/common';
 import { ChangeDetectionStrategy, Component, input } from '@angular/core';
-import {
-  MatCard,
-  MatCardContent,
-  MatCardHeader,
-  MatCardSubtitle,
-  MatCardTitle,
-} from '@angular/material/card';
-import { MatList, MatListItem } from '@angular/material/list';
+import { MatCardModule } from '@angular/material/card';
+import { MatListModule } from '@angular/material/list';
 import { RouterLink } from '@angular/router';
 
 import { Hero } from '../model/hero';
@@ -16,15 +10,10 @@ import { Hero } from '../model/hero';
   selector: 'app-hero',
   standalone: true,
   imports: [
-    MatCard,
-    MatCardContent,
-    MatCardHeader,
-    MatCardSubtitle,
-    MatCardTitle,
-    MatList,
-    MatListItem,
     NgForOf,
     RouterLink,
+    MatCardModule,
+    MatListModule,
   ],
   templateUrl: './hero.component.html',
   styleUrl: './hero.component.scss',

client/simple-web-site/src/app/search/search.component.html

@@ -24,19 +24,21 @@
   <mat-divider></mat-divider>
 
   <div class="flex">
-    <div class="flex-grow" data-testid="esResult">
+    <div class="flex-grow basis-0" data-testid="esResult">
       <h1>Search Result From ES:</h1>
-      <section class="flex flex-wrap justify-between">
+      <section class="flex flex-col flex-wrap justify-between">
         <ng-container *ngFor="let hero of heroesFromES$ | async">
-          <app-hero [hero]="hero"></app-hero>
+          <app-hero [hero]="hero" class="my-2"></app-hero>
+          <mat-divider></mat-divider>
         </ng-container>
       </section>
     </div>
-    <div class="flex-grow" data-testid="mongoResult">
+    <div class="flex-grow basis-0" data-testid="mongoResult">
       <h1 class="flex">Search Result From Mongo:</h1>
-      <section class="flex flex-wrap justify-between">
+      <section class="flex flex-col flex-wrap justify-between">
         <ng-container *ngFor="let hero of heroesFromMongo$ | async">
-          <app-hero [hero]="hero"></app-hero>
+          <app-hero [hero]="hero" class="my-2"></app-hero>
+          <mat-divider></mat-divider>
         </ng-container>
       </section>
     </div>

client/simple-web-site/src/styles.scss

@@ -1,14 +1,15 @@
+@import "material-theme";
+@import 'color';
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
 
-@import 'color';
-
 html,
 body {
   margin: 0;
 }
 
 .active {
-  background: $my-blue;
+  background: $my-blue !important;
 }

tailwind.config.js → client/tailwind.config.js

@@ -1,6 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  content: ['client/simple-web-site/src/**/*.{html,ts}'],
+  content: ['./**/*.{html,ts,js}'],
   theme: {
     extend: {
       screens: {
@@ -15,5 +15,5 @@ module.exports = {
     },
   },
   plugins: [],
-  important: true,
+  important: false,
 };

package.json

@@ -37,7 +37,7 @@
     "test:playwright": "npx playwright test"
   },
   "lint-staged": {
-    "*.{js,ts,css,scss,html,md}": [
+    "{client,server}*.{js,ts,css,scss,html,md}": [
       "eslint --fix"
     ]
   },
@@ -121,7 +121,6 @@
     "ajv": "^8.12.0",
     "allure-commandline": "^2.29.0",
     "allure-playwright": "^3.0.0-beta.5",
-    "autoprefixer": "^10.4.20",
     "commitizen": "^4.3.0",
     "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
@@ -143,12 +142,13 @@
     "lint-staged": "^15.2.10",
     "mongoose": "^8.9.2",
     "nyc": "^15.1.0",
-    "postcss": "^8.4.49",
     "prettier": "^3.4.2",
     "reflect-metadata": "^0.2.0",
     "rxjs": "^7.8.1",
     "standard-version": "^9.5.0",
-    "tailwindcss": "^3.4.16",
+    "tailwindcss": "^3.4.17",
+    "postcss": "^8.4.49",
+    "autoprefixer": "^10.4.20",
     "three": "^0.165.0",
     "tslib": "^2.3.0",
     "typescript": "~5.5.4",

server/.env

@@ -2,3 +2,4 @@ ENV_NAME=development
 DATABASE_PROTOCOL=mongodb://
 DATABASE_HOST=localhost:27017/
 DATABASE_NAME=test
+PORT=3000

server/.env.production

@@ -2,3 +2,4 @@ ENV_NAME=production
 DATABASE_PROTOCOL=mongodb://
 DATABASE_HOST=localhost:27017/
 DATABASE_NAME=test
+PORT=3001

server/nest-cli.json

@@ -9,6 +9,10 @@
         "include": "../.env.production",
         "outDir": "../build/.env"
       },
+      {
+        "include": "./assets/*",
+        "outDir": "../build"
+      },
       {
         "include": "../package.json",
         "outDir": "../build/package.json"

server/src/app.module.ts

@@ -8,6 +8,7 @@ import * as Joi from 'joi';
 
 import { AppController } from 'src/app.controller';
 import { AppService } from 'src/app.service';
+import { EsService } from 'src/es/es.service';
 import { HeroesModule } from 'src/heroes/heroes.module';
 
 const ENV = process.env.NODE_ENV;
@@ -53,6 +54,6 @@ const ENV = process.env.NODE_ENV;
     HeroesModule,
   ],
   controllers: [AppController],
-  providers: [AppService],
+  providers: [AppService, EsService],
 })
 export class AppModule {}

server/src/assets/heroes.json

@@ -0,0 +1,50 @@
+[
+  {
+    "squadName": "Super hero squad",
+    "homeTown": "Metro City",
+    "formed": 2016,
+    "secretBase": "Super tower",
+    "active": true,
+    "members": [
+      {
+        "name": "Molecule Man",
+        "age": 29,
+        "secretIdentity": "Dan Jukes",
+        "powers": [
+          "Radiation resistance",
+          "Turning tiny",
+          "Radiation blast"
+        ]
+      },
+      {
+        "name": "Madame Uppercut",
+        "age": 39,
+        "secretIdentity": "Jane Wilson",
+        "powers": [
+          "Million tonne punch",
+          "Damage resistance",
+          "Superhuman reflexes"
+        ]
+      },
+      {
+        "name": "Eternal Flame",
+        "age": 1000000,
+        "secretIdentity": "Unknown",
+        "powers": [
+          "Immortality",
+          "Heat Immunity",
+          "Inferno",
+          "Teleportation",
+          "Interdimensional travel"
+        ]
+      }
+    ]
+  },
+  {
+    "squadName": "Lonely Super hero",
+    "homeTown": "Lonely City",
+    "formed": 2025,
+    "secretBase": "Lonely tower",
+    "active": false
+  }
+]

server/src/assets/test.json

@@ -0,0 +1,3 @@
+{
+  "description": "this file is for testing nestJS build process, which should output this file to build/assets folder"
+}