Merge pull request #122 from UPHRH-platform/uat_issue_fix

Created by: RoopashreeLakshmikeshava

UAT issue - Change of hall ticket to 'Exams' | Nudged tab in secretary login

src/app/modules/grievance-modules/components/grievance-management/grievance-management.component.ts

@@ -313,6 +313,16 @@ export class GrievanceManagementComponent  {
         isJunk: true
       }
       break;
+      case 'Nudged': 
+      this.getGrievancesRequest = {
+        ...this.getGrievancesRequest,
+        filter:{
+          status:['OPEN']
+        },
+        priority: "HIGH",
+        isJunk: false
+      }
+      break;
       default: 
       this.getGrievancesRequest
       break;

src/app/shared/config/tabs.config.ts

@@ -19,7 +19,11 @@ export const Tabs = {
         {
             name: "Junk",
             id: 'junk'
-        } 
+        },
+        {
+            name: "Nudged",
+            id: 'nudged'
+        }
     ],
     'Nodal Officer': [
         {

src/app/shared/services/config/dropdown.config.json

@@ -10,7 +10,7 @@
             "name": "Assessment"
         },{
             "id": 4,
-            "name": "Hall Ticket"
+            "name": "Exams"
         },{
             "id": -1,
             "name": "Others"

docker-compose.yml

+version: '3'
+services:
+  grievance-app:
+    image: greievance-app-2:latest
+    ports:
+      - '4200:80'

dockerfile

-# Use an official Node.js runtime as the base image
 FROM node:16-alpine AS build
 
-# Set the working directory
+
 WORKDIR /app
 
-# Copy package.json and package-lock.json to the working directory
+
 COPY package*.json ./
 
-# Install app dependencies
+
 RUN npm install
 
-# Copy app source code to the working directory
-COPY . .
 
-# Copy the appropriate environment file
+COPY . .
 COPY ./src/environments/environment.prod.ts ./src/environments/environment.ts
 
-# Build the Angular app
-RUN npm run build
+RUN npm run build --prod
+
 
-# Use a lightweight web server to serve the app
 FROM nginx:alpine
+
+RUN rm -rf /usr/share/nginx/html/*
+
+
 COPY --from=build /app/dist/grievance-app /usr/share/nginx/html
+
+COPY nginx.conf /etc/nginx/nginx.conf
+
+
 EXPOSE 80
+EXPOSE 443
 
-# Start the nginx web server
 CMD ["nginx", "-g", "daemon off;"]

nginx.conf

+worker_processes 1;
+
+
+events {
+    worker_connections 1024;
+}
+
+
+http {
+    server {
+        listen 80;
+        server_name 10.0.2.18;
+
+
+        root /usr/share/nginx/html;
+        index index.html index.htm;
+        include /etc/nginx/mime.types;
+
+
+        gzip on;
+        gzip_http_version 1.1;
+        gzip_disable      "MSIE [1-6]\.";
+        gzip_min_length   256;
+        gzip_vary         on;
+        gzip_proxied      expired no-cache no-store private auth;
+        gzip_types        text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+        gzip_comp_level   9;
+
+
+        # location ~* \.(eot|ttf|woff|woff2|js|json)$ {
+        #     add_header Access-Control-Allow-Origin *;
+        # }
+
+
+        # location ~ \.js {
+        #     add_header Content-Type application/x-javascript;
+        # }
+
+
+        location / {
+            try_files $uri $uri/ /index.html;
+        }
+    }
+}
+