Merge pull request #2803 from Leantime/mergingProd

Merging prod

.codebuddy/.gitignore

@@ -0,0 +1 @@
+db/

.dev/dev-apache-site.conf

@@ -2,8 +2,8 @@
 	ServerAdmin webmaster@localhost
 	DocumentRoot /var/www/html/public
 
-	ErrorLog /var/www/html/logs/apacheError.log
-	CustomLog /var/www/html/logs/access.log combined
+	ErrorLog /var/www/html/storage/logs/apacheError.log
+	CustomLog /var/www/html/storage/logs/access.log combined
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -16,6 +16,6 @@
 
     SetEnv HTTPS "on"
 
-	ErrorLog /var/www/html/logs/apacheError.log
-	CustomLog /var/www/html/logs/access.log combined
+	ErrorLog /var/www/html/storage/logs/apacheError.log
+	CustomLog /var/www/html/storage/logs/access.log combined
 </VirtualHost>

.dev/dev-apache2.conf

@@ -131,7 +131,7 @@ HostnameLookups Off
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog /var/www/html/logs/apacheError.log
+ErrorLog /var/www/html/storage/logs/apacheError.log
 
 #
 # LogLevel: Control the severity of messages logged to the error_log.

.dev/docker-compose.tests.yaml

@@ -2,9 +2,6 @@
 # This docker compose file is used to build the environment for our testing framework in codeception
 # It is not to be used for development
 #
-
-version: "3.9"
-
 services:
   leantime-dev:
     volumes:
@@ -21,7 +18,9 @@ services:
       LEAN_DB_PASSWORD: 'leantime'
       LEAN_DB_DATABASE: 'leantime_test'
       LEAN_DB_PORT: '3306'
-
+    depends_on:
+      db:
+        condition: service_healthy
   db:
     environment:
       MYSQL_DATABASE: leantime_test

.dev/docker-compose.yaml

@@ -1,30 +1,26 @@
-version: "3.9"
-
 networks:
   leantime:
-    external: false
-    driver: bridge
-
+      external: false
+      driver: bridge
 volumes:
   mysql:
   s3ninja-data:
-
 services:
   leantime-dev:
     build: .
     ports:
       - "8001:8080" #Using ports that are hopefully available. format is: 80XX
       - "44301:443" #Using ports that are hopefully available. format is: 443XX (available range is 44300–44399)
     volumes:
-      - "../:/var/www/html"
-      - "./xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini"
-      - "./error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini"
+     - "../:/var/www/html"
+     - "./xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini"
+     - "./error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini"
     environment:
-      LEAN_DB_HOST: "db"
-      LEAN_DB_USER: "leantime"
-      LEAN_DB_PASSWORD: "leantime"
-      LEAN_DB_DATABASE: "leantime"
-      LEAN_DB_PORT: "3306"
+      LEAN_DB_HOST: 'db'
+      LEAN_DB_USER: 'leantime'
+      LEAN_DB_PASSWORD: 'leantime'
+      LEAN_DB_DATABASE: 'leantime'
+      LEAN_DB_PORT: '3306'
     extra_hosts:
       - "host.docker.internal:host-gateway"
     depends_on:
@@ -38,16 +34,15 @@ services:
       - "6379"
     networks:
       - leantime
-
   db:
     image: mysql:8.0
     ports:
       - "3306"
     environment:
-      MYSQL_ROOT_PASSWORD: "leantime"
-      MYSQL_USER: "leantime"
-      MYSQL_PASSWORD: "leantime"
-      MYSQL_DATABASE: "leantime"
+      MYSQL_ROOT_PASSWORD: 'leantime'
+      MYSQL_USER: 'leantime'
+      MYSQL_PASSWORD: 'leantime'
+      MYSQL_DATABASE: 'leantime'
     networks:
       - leantime
     volumes:
@@ -59,17 +54,16 @@ services:
       retries: 20
 
   selenium:
-    image: selenium/standalone-firefox
+    image: selenium/standalone-chromium
     shm_size: 2gb
     environment:
-      - SCREEN_WIDTH=1920
-      - SCREEN_HEIGHT=1080
+      - SCREEN_WIDTH=2560
+      - SCREEN_HEIGHT=1440
     ports:
       - "4444"
       - "7900"
     networks:
       - leantime
-
   maildev:
     image: maildev/maildev
     environment:
@@ -79,7 +73,6 @@ services:
       - "8081"
     networks:
       - leantime
-
   phpmyadmin:
     image: phpmyadmin
     ports:
@@ -89,7 +82,6 @@ services:
       - PMA_PORT=3306
     networks:
       - leantime
-
   s3ninja:
     image: scireum/s3-ninja
     ports:

.dev/test.env

@@ -10,11 +10,11 @@ LEAN_APP_DIR = ''                             # Base of application without trai
 LEAN_DEBUG = 1                                # Debug flag
 
 # Database
-LEAN_DB_HOST = 'db'                           # Database host
-LEAN_DB_USER = 'leantime'                     # Database username
-LEAN_DB_PASSWORD = 'leantime'                 # Database password
-LEAN_DB_DATABASE = 'leantime_test'            # Database name
-LEAN_DB_PORT = '3306'                         # Database port
+LEAN_DB_HOST='localhost'                                # Database host
+LEAN_DB_USER='root'                          # Database username
+LEAN_DB_PASSWORD='test'                      # Database password
+LEAN_DB_DATABASE='leantime'                      # Database name
+LEAN_DB_PORT='3306'                              # Database port
 
 ## Optional Configuraiton, you may ommit these from your .env file
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,52 @@
+name: Bug Report
+description: File a bug report.
+title: "[Bug]: "
+labels: ["Bug"]
+assignees: 
+  - marcelfolaron
+body:
+  - type: markdown
+    attributes:
+      value: "Thank you for taking the time to submit a bug report. If you have problems with the installation or other questions please use the [discussion forum](https://github.com/Leantime/leantime/discussions) or our [discord server](https://discord.gg/4zMzJtAq9z)"
+  - type: dropdown
+    attributes:
+      label: What is your set up? 
+      options:
+        - Cloud Hosted
+        - Self Hosted Server
+        - Self Hosted Docker
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: "Which Leantime version are you using (see footer bottom right)"
+      placeholder: "3.x.x"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the issue
+      placeholder: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: textarea
+    id: repro
+    attributes:
+      label: Reproduction steps
+      description: "How do you trigger this bug? Please walk us through it step by step."
+      value: |
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional Notes
+      description: "Please add any additional context you can share"
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,36 @@
+name: Feature request
+description: Suggest an idea for this project.
+title: "[Feature]: "
+labels: ["Feature"]
+assignees: 
+  - marcelfolaron
+body:
+  - type: markdown
+    attributes:
+      value: "Thank you for taking the time to submit a feature request. If you have problems with the installation or other questions please use the [discussion forum](https://github.com/Leantime/leantime/discussions) or our [discord server](https://discord.gg/4zMzJtAq9z)"
+  - type: dropdown
+    attributes:
+      label: What is your set up? 
+      options:
+        - Cloud Hosted
+        - Self Hosted Server
+        - Self Hosted Docker
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem? Please describe
+      description: A clear and concise description of what the problem is. 
+      placeholder: Ex. I'm always frustrated when [...]
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+      placeholder:
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: "Add any other context or screenshots about the feature request here."
+    validations:

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,17 @@
-#### Description
+### Description
 
-Please include a short description of the suggested change and the reasoning behind the approach you have chosen.
+*Please include a short description of the suggested change and the reasoning behind the approach you have chosen.*
 
-#### Link to ticket
+### Link to ticket
 
-Please add a link to the GitHub issue being addressed by this change.
+*Please add a link to the GitHub issue being addressed by this change.*
 
 ### Type
 
-[] Fix
-[] Feature
-[] Cleanup 
+- [ ] Fix
+- [ ] Feature
+- [ ] Cleanup 
 
-#### Screenshot of the result
+### Screenshot of the result
 
-If your change affects the user interface, you should include a screenshot of the result with the pull request.
+*If your change affects the user interface, you should include a screenshot of the result with the pull request.*

.github/workflows/acceptancetests.yml

@@ -1,4 +1,4 @@
-name: Tests
+name: Acceptance Tests (Selenium)
 
 on:
   workflow_dispatch:
@@ -8,23 +8,8 @@ on:
     branches: [ "master", "*.*-dev" ]
 
 jobs:
-  unit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Run Unit Tests
-        run: make unit-test
-
-      - name: Store screenshots
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: unit-test
-          path: tests/_output
-
   acceptance:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3