Update README.md

Fixed broken links

.github/workflows/build-images.yaml

@@ -0,0 +1,50 @@
+name: Publish Docker Images
+
+on:
+  push:
+    branches:
+      - 'main'
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        service:
+          - name: frontend
+            context: ./worklenz-frontend
+            container_name: worklenz_frontend
+          - name: backend
+            context: ./worklenz-backend
+            container_name: worklenz_backend
+    steps:
+      - name: Checkout the codebase
+        uses: actions/checkout@v4
+
+      - name: Login to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository_owner }}/${{ matrix.service.container_name }}
+          flavor: |
+            latest=true     
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ${{ matrix.service.context }}
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

README.md

@@ -7,17 +7,17 @@
 </h1>
 
 <p align="center">
-    <a href="https://worklenz.com/features/task-management/">Task Management</a> |
+    <a href="https://worklenz.com/task-management/">Task Management</a> |
-    <a href="https://worklenz.com/features/time-tracking/">Time Tracking</a> |
+    <a href="https://worklenz.com/time-tracking/">Time Tracking</a> |
-    <a href="https://worklenz.com/features/analytics/">Analytics</a> |
+    <a href="https://worklenz.com/analytics/">Analytics</a> |
-    <a href="https://worklenz.com/features/resource-management/">Resource Management</a> |
+    <a href="https://worklenz.com/resource-management/">Resource Management</a> |
-    <a href="https://worklenz.com/features/templates/">Project Templates</a>
+    <a href="https://worklenz.com/templates/">Project Templates</a>
 </p>
 
 <p align="center">
     <a href="https://worklenz.com" target="_blank">
       <img
-        src="https://worklenz.s3.amazonaws.com/assets/screenshots/hero.png"
+        src="https://worklenz.s3.amazonaws.com/assets/screenshots/hero-view.png"
         alt="Worklenz"
         width="1200"
       />
@@ -59,7 +59,7 @@ This repository contains the frontend and backend code for Worklenz.
 <p align="center">
   <a href="https://worklenz.com/features/task-management/" target="_blank">
     <img
-      src="https://worklenz.s3.amazonaws.com/assets/screenshots/task-views.png"
+      src="https://worklenz.s3.amazonaws.com/assets/screenshots/task-views-view.png"
       alt="Worklenz task views"
       width="1024"
     />
@@ -68,7 +68,7 @@ This repository contains the frontend and backend code for Worklenz.
 <p align="center">
   <a href="https://worklenz.com/features/time-tracking/" target="_blank">
     <img
-      src="https://worklenz.s3.amazonaws.com/assets/screenshots/time-tracking.png"
+      src="https://worklenz.s3.amazonaws.com/assets/screenshots/time-tracking-view.png"
       alt="Worklenz time tracking"
       width="1024"
     />
@@ -77,7 +77,7 @@ This repository contains the frontend and backend code for Worklenz.
 <p align="center">
   <a href="https://worklenz.com/features/analytics/" target="_blank">
     <img
-      src="https://worklenz.s3.amazonaws.com/assets/screenshots/analytics.png"
+      src="https://worklenz.s3.amazonaws.com/assets/screenshots/analytics-view.png"
       alt="Worklenz analytics"
       width="1024"
     />
@@ -86,7 +86,7 @@ This repository contains the frontend and backend code for Worklenz.
 <p align="center">
   <a href="https://worklenz.com/features/resource-management/" target="_blank">
     <img
-      src="https://worklenz.s3.amazonaws.com/assets/screenshots/scheduler.png"
+      src="https://worklenz.s3.amazonaws.com/assets/screenshots/schedule-view.png"
       alt="Worklenz scheduler"
       width="1024"
     />
@@ -95,7 +95,7 @@ This repository contains the frontend and backend code for Worklenz.
 <p align="center">
   <a href="https://worklenz.com/features/templates/" target="_blank">
     <img
-      src="https://worklenz.s3.amazonaws.com/assets/screenshots/templates.png"
+      src="https://worklenz.s3.amazonaws.com/assets/screenshots/templates-view.png"
       alt="Worklenz templates"
       width="1024"
     />

docker-compose.yml

@@ -0,0 +1,83 @@
+services:
+  frontend:
+    image: ghcr.io/worklenz/worklenz-frontend
+    build:
+      context: ./worklenz-frontend
+      dockerfile: Dockerfile
+    container_name: worklenz_frontend
+    ports:
+      - "4200:4200"
+    depends_on:
+      backend:
+        condition: service_started
+    networks:
+      - worklenz    
+
+  backend:
+    image: ghcr.io/worklenz/worklenz-backend
+    build:
+      context: ./worklenz-backend
+      dockerfile: Dockerfile
+    container_name: worklenz_backend
+    ports:
+      - "3000:3000"
+    depends_on:
+      db:
+        condition: service_healthy
+    environment:
+      - ANGULAR_DIST_DIR
+      - ANGULAR_SRC_DIR
+      - AWS_REGION
+      - BACKEND_PUBLIC_DIR
+      - BACKEND_VIEWS_DIR
+      - COMMIT_BUILD_IMMEDIATELY
+      - COOKIE_SECRET
+      - DB_HOST
+      - DB_MAX_CLIENTS
+      - DB_NAME
+      - DB_PASSWORD
+      - DB_PORT
+      - DB_USER
+      - GOOGLE_CALLBACK_URL
+      - GOOGLE_CLIENT_ID
+      - GOOGLE_CLIENT_SECRET
+      - HOSTNAME
+      - LOGIN_FAILURE_REDIRECT
+      - NODE_ENV
+      - PORT
+      - SESSION_NAME
+      - SESSION_SECRET
+      - SLACK_WEBHOOK
+      - SOCKET_IO_CORS
+      - SOURCE_EMAIL
+      - USE_PG_NATIVE
+      - BUCKET
+      - REGION
+      - S3_URL
+      - S3_ACCESS_KEY_ID
+      - S3_SECRET_ACCESS_KEY
+    networks:
+      - worklenz  
+
+  db:
+    image: postgres:15
+    container_name: worklenz_db
+    environment:
+      POSTGRES_DB: "${DB_NAME}"
+      POSTGRES_PASSWORD: "${DB_PASSWORD}"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -d ${DB_NAME} -U ${DB_USER}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    networks:
+      - worklenz  
+    volumes:
+      - worklenz_postgres_data:/var/lib/postgresql/data
+      - ./worklenz-backend/database/:/docker-entrypoint-initdb.d
+
+volumes:
+  worklenz_postgres_data:
+
+networks:
+  worklenz:

worklenz-frontend/Dockerfile

@@ -8,4 +8,4 @@ RUN npm install -g @angular/cli
 
 RUN npm install
 
-CMD ["npm", "start"]
+CMD ["npm", "run", "start-docker"]

worklenz-frontend/angular.json

@@ -36,13 +36,20 @@
                 "glob": "**/*",
                 "input": "./node_modules/@ant-design/icons-angular/src/inline-svg/",
                 "output": "/assets/"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/tinymce",
+                "output": "/tinymce/"
               }
             ],
             "styles": [
               "src/theme.less",
               "src/styles.scss"
             ],
-            "scripts": [],
+            "scripts": [
+              "node_modules/tinymce/tinymce.min.js"
+            ],
             "serviceWorker": true,
             "ngswConfigPath": "ngsw-config.json",
             "allowedCommonJsDependencies": [

worklenz-frontend/package-lock.json

@@ -36,7 +36,7 @@
         "ngx-doc-viewer": "^15.0.1",
         "ngx-socket-io": "^4.5.1",
         "rxjs": "~7.4.0",
-        "tinymce": "^6.7.3",
+        "tinymce": "^6.8.3",
         "tslib": "^2.6.1",
         "zone.js": "^0.13.1"
       },
@@ -15327,9 +15327,9 @@
       "dev": true
     },
     "node_modules/tinymce": {
-      "version": "6.7.3",
+      "version": "6.8.3",
-      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.7.3.tgz",
+      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.8.3.tgz",
-      "integrity": "sha512-J7WmYIi/gt1RvZ6Ap2oQiUjzAoiS9pfV+d4GnKuZuPu8agmlAEAInNmMvMjfCNBzHv4JnZXY7qlHUAI0IuYQVA=="
+      "integrity": "sha512-3fCHKAeqT+xNwBVESf6iDbDV0VNwZNmfrkx9c/6Gz5iB8piMfaO6s7FvoiTrj1hf1gVbfyLTnz1DooI6DhgINQ=="
     },
     "node_modules/tmp": {
       "version": "0.2.1",

worklenz-frontend/package.json

@@ -4,6 +4,7 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve --proxy-config proxy.config.json --disable-host-check",
+    "start-docker": "ng serve --proxy-config proxy-docker.config.json --disable-host-check --host 0.0.0.0",
     "build": "ng build --extract-licenses --common-chunk --delete-output-path --output-hashing=all",
     "watch": "ng build --watch --configuration development",
     "test": "ng test",
@@ -44,7 +45,7 @@
     "ngx-doc-viewer": "^15.0.1",
     "ngx-socket-io": "^4.5.1",
     "rxjs": "~7.4.0",
-    "tinymce": "^6.7.3",
+    "tinymce": "^6.8.3",
     "tslib": "^2.6.1",
     "zone.js": "^0.13.1"
   },

worklenz-frontend/proxy-docker.config.json

@@ -0,0 +1,24 @@
+{
+  "/api": {
+    "target": "http://backend:3000/",
+    "headers": {
+      "language": "en",
+      "Accept": "application/json",
+      "Content-Type": "application/json; charset=utf-8"
+    },
+    "secure": false,
+    "changeOrigin": true,
+    "logLevel": "debug"
+  },
+  "/secure": {
+    "target": "http://backend:3000/",
+    "headers": {
+      "language": "en",
+      "Accept": "application/json",
+      "Content-Type": "application/json; charset=utf-8"
+    },
+    "secure": false,
+    "changeOrigin": true,
+    "logLevel": "debug"
+  }
+}

worklenz-frontend/src/app/administrator/components/task-view/task-view-description/task-view-description.component.html

@@ -11,7 +11,6 @@
       class="description-editor"
       [class.editing]="isEditing"
       [init]="CONFIG"
-      [apiKey]="apiKey"
       [(ngModel)]="service.model.task.description"
       (onBlur)="onDescriptionInputBlur()"
       #descriptionEditor

worklenz-frontend/src/app/administrator/components/task-view/task-view-description/task-view-description.component.ts

@@ -25,8 +25,9 @@ export class TaskViewDescriptionComponent implements OnInit, OnDestroy {
   @ViewChild("descriptionInput", {static: false}) descriptionInput!: ElementRef;
   @ViewChild("descriptionEditor", {static: false}) descriptionEditor!: EditorComponent;
 
-  readonly apiKey = "4nquevykvy1i0q0v62ksxuu3nz1muy8i5fsqpj3wp9qm2mgp";
   readonly CONFIG = {
+    base_url: '/tinymce',
+    suffix: '.min',
     plugins: "lists link code wordcount",
     toolbar: 'blocks bold italic underline strikethrough | checklist numlist bullist link | alignleft aligncenter alignright alignjustify',
     menubar: false,

worklenz-frontend/src/app/administrator/components/task-view/task-view.module.ts

@@ -51,7 +51,7 @@ import {NzPopconfirmModule} from 'ng-zorro-antd/popconfirm';
 import {NzCardModule} from "ng-zorro-antd/card";
 import {NzTableModule} from "ng-zorro-antd/table";
 import {NzProgressModule} from "ng-zorro-antd/progress";
-import {EditorModule} from '@tinymce/tinymce-angular';
+import {EditorModule, TINYMCE_SCRIPT_SRC} from '@tinymce/tinymce-angular';
 import {TaskViewTimeLogComponent} from './task-view-time-log/task-view-time-log.component';
 import {NzListModule} from "ng-zorro-antd/list";
 import {NzEmptyModule} from "ng-zorro-antd/empty";
@@ -99,7 +99,8 @@ import {TaskCommentMentionPipe} from "@pipes/task-comment-mention.pipe";
     TaskViewComponent
   ],
   providers: [
-    SearchByNamePipe
+    SearchByNamePipe,
+    { provide: TINYMCE_SCRIPT_SRC, useValue: 'tinymce/tinymce.min.js' }
   ],
   imports: [
     CommonModule,

worklenz-frontend/src/app/administrator/settings/project-template-edit-view/components/phase-settings-drawer/phase-settings-drawer.component.ts

@@ -4,7 +4,6 @@ import {ProjectTemplateService} from "@services/project-template.service";
 import {PtTaskPhasesApiService} from "@api/pt-task-phases-api.service";
 import {ITaskPhase} from "@interfaces/api-models/task-phase";
 import {PhaseColorCodes} from "@shared/constants";
-import {load} from "@angular-devkit/build-angular/src/utils/server-rendering/esm-in-memory-file-loader";
 
 @Component({
   selector: 'worklenz-phase-settings-drawer',

worklenz-frontend/src/app/administrator/settings/project-template-edit-view/components/row/task-description/task-description.component.html

@@ -21,7 +21,6 @@
           class="description-editor-list"
           [class.editing]="isEditing"
           [init]="CONFIG"
-          [apiKey]="apiKey"
           [(ngModel)]="task.description"
           (onBlur)="submit()"
           #descriptionEditor

worklenz-frontend/src/app/administrator/settings/project-template-edit-view/components/row/task-description/task-description.component.ts

@@ -28,8 +28,9 @@ export class TaskDescriptionComponent implements OnInit, OnDestroy {
   show = false;
   loading = false;
 
-  readonly apiKey = "4nquevykvy1i0q0v62ksxuu3nz1muy8i5fsqpj3wp9qm2mgp";
   readonly CONFIG = {
+    base_url: '/tinymce',
+    suffix: '.min',
     plugins: "lists link code wordcount",
     toolbar: 'blocks bold italic underline strikethrough | checklist numlist bullist link | alignleft aligncenter alignright alignjustify',
     menubar: false,