Merge pull request #123 from tekdi/merge-release-1.0.0-to-main

Merge release 1.0.0 to main

.env

@@ -1,4 +1,6 @@
 BASE_URL="" # Middleware Path - eg : "https://middleware.prathamdigital.org"
 AUTH_API_TOKEN="" # User Auth Access Token
-TENANT_ID="" # Tenant Id of User
-CLOUD_STORAGE_URL="" #Use environment variable for S3 Cloud Storage URL
+NEXT_PUBLIC_TENANT_ID="" # Tenant Id of User
+NEXT_PUBLIC_CLOUD_STORAGE_URL="" # Use environment variable for S3 Cloud Storage URL - should have / at the end.
+NEXT_PUBLIC_CHANNEL_ID="" # Channel Id of knowlg-inQuiry setup
+NEXT_PUBLIC_FRAMEWORK_ID="" # Framework Id of knowlg-inQuiry setup

.github/workflows/dev-deployment.yaml

@@ -6,8 +6,7 @@ env:
   EKS_CLUSTER_NAME: ${{ secrets.EKS_CLUSTER_NAME_DEV }}
   AWS_REGION: ${{ secrets.AWS_REGION_NAME }}
 jobs:
-  build:
-
+  build_dev:
     name: Deployment
     runs-on: ubuntu-latest
     steps:
@@ -32,7 +31,8 @@ jobs:
     - name: Copy .env file
       env:
        ENV_FILE_CONTENT: ${{ secrets.ENV_FILE_CONTENT_DEV }}
-      run: printf "%s" "$ENV_FILE_CONTENT" > manifest/configmap.yaml
+      run: printf "%s" "$ENV_FILE_CONTENT" > manifest/configmap.yaml 
+      # run: echo "$ENV_FILE_CONTENT" > manifest/configmap.yaml
     - name: Copy .env file in the code
       env:
        DEV_ENV: ${{ secrets.DEV_ENV }}
@@ -89,4 +89,4 @@ jobs:
         sleep 10
         kubectl get pods
         kubectl get services
-        kubectl get deployment 
+        kubectl get deployment 

.github/workflows/qa-deployment.yaml

@@ -2,7 +2,7 @@ name: Deploy to Tekdi-QA-Server
 on:
   push:
     branches:
-      - main
+      - release-1.0.0
 jobs:
    deploy:
     runs-on: ubuntu-latest

next.config.js

@@ -31,6 +31,10 @@ const nextConfig = {
         source: "/action/asset/v1/upload/:identifier*", // Match asset upload routes
         destination: "/api/fileUpload", // Forward asset uploads to fileUpload.js
       },
+      {
+        source: "/assets/pdfjs/:path*", // Match any URL starting with /workspace/content/assets/
+        destination: "/assets/:path*", // Serve the assets from the public folder
+      },
       {
         source: "/action/content/v3/upload/url/:identifier*", // Match content upload with 'url' in the path
         destination:
@@ -58,7 +62,7 @@ const nextConfig = {
       },
       {
         source: "/assets/public/:path*", // Match any URL starting with /assets/public/
-        destination: `${process.env.CLOUD_STORAGE_URL}/:path*`, // Forward to S3, stripping "/assets/public"
+        destination: `${process.env.NEXT_PUBLIC_CLOUD_STORAGE_URL}/:path*`, // Forward to S3, stripping "/assets/public"
       },
       {
         source: "/workspace/content/assets/:path*", // Match any URL starting with /workspace/content/assets/
@@ -125,6 +129,11 @@ const nextConfig = {
           "./UploadEditor": "/src/pages/upload-editor.tsx",
           "./Collection": "/src/pages/collection.tsx",
           "./SunbirdPlayers": "/src/pages/sunbirdPlayers.tsx",
+          "./Review": "/src/pages/workspace/content/review/index.tsx",
+          "./UpReview": "/src/pages/workspace/content/up-review/index.tsx",
+          "./DiscoverContent": "/src/pages/workspace/content/discover-contents/index.tsx",
+
+
         },
       })
     );

package.json

@@ -9,12 +9,12 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@emotion/react": "11.11.4",
-    "@emotion/styled": "11.11.5",
+    "@emotion/react": "^11.11.4",
+    "@emotion/styled": "^11.11.5",
     "@module-federation/nextjs-mf": "^8.5.5",
     "@module-federation/utilities": "3.0.11",
-    "@mui/icons-material": "^5.15.20",
-    "@mui/material": "^5.16.0",
+    "@mui/icons-material": "^5.15.15",
+    "@mui/material": "^5.15.21",
     "@project-sunbird/sunbird-collection-editor-web-component": "^1.6.0",
     "async": "^3.2.5",
     "body-parser": "^1.20.2",
@@ -30,6 +30,7 @@
     "jquery": "^3.7.1",
     "jquery-ui-dist": "^1.13.3",
     "jquery.fancytree": "^2.38.3",
+    "ka-table": "^11.3.0",
     "lodash": "^4.17.21",
     "mathjax-full": "^3.2.2",
     "multer": "^1.4.5-lts.1",
@@ -40,7 +41,8 @@
     "reflect-metadata": "^0.1.13",
     "svg2img": "^1.0.0-beta.2",
     "url": "^0.11.3",
-    "uuid": "^10.0.0"
+    "uuid": "^10.0.0",
+    "zustand": "^5.0.1"
   },
   "devDependencies": {
     "@types/jquery": "^3.5.31",