Bump Version to 9.5.1

.dockerignore

@@ -0,0 +1,3 @@
+*Dockerfile*
+*docker-compose*
+node_modules

3CX_TAPI.user.js

@@ -1,11 +1,11 @@
 // ==UserScript==
 // @name          3CX TAPI
 // @namespace     http://cp-solutions.at
-// @version       9.5.0
+// @version       9.5.1
 // @author        Daniel Triendl <d.triendl@cp-solutions.at>
 // @copyright     Copyright CP Solutions GmbH
 // @source        https://source.cp-austria.at/CPATRD/3cx_tapi.git
-// @downloadURL   https://source.cp-austria.at/CPATRD/3cx_tapi.git/raw/branch/master/3CX_TAPI.user.js
+// @downloadURL   https://3cxtapi.cp-austria.at/3CX_TAPI.user.js
 // @match         https://192.168.0.154:5001/*
 // @match         https://cpsolution.my3cx.at:5001/*
 // @require       https://cdn.jsdelivr.net/gh/CoeJoder/waitForKeyElements.js@v1.2/waitForKeyElements.js

client/config/metadata.cjs

@@ -7,7 +7,7 @@ module.exports = {
   author: pkg.author,
   copyright: 'Copyright CP Solutions GmbH',
   source: pkg.repository.url,
-  downloadURL: `${pkg.repository.url}/raw/branch/master/3CX_TAPI.user.js`,
+  downloadURL: 'https://3cxtapi.cp-austria.at/3CX_TAPI.user.js',
   match: [
     'https://192.168.0.154:5001/*',
     'https://cpsolution.my3cx.at:5001/*'

client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "3cx-tapi",
   "description": "3CX CP Tapi and Projectmanager integration",
-  "version": "9.5.0",
+  "version": "9.5.1",
   "author": {
     "name": "Daniel Triendl",
     "email": "d.triendl@cp-solutions.at"

client/readme.md

@@ -38,15 +38,11 @@ just install a package and import it in your js file. webpack will pack them wit
 npm run build
 ```
 
-`dist/index.prod.user.js` is the final script.
+`dist/3CX TAPI.prod.user.js` is the final script.
 
 ## distribution
 
-```
+Userscript is included in server docker image
-cp "dist/3CX TAPI.prod.user.js" ../3CX_TAPI.user.js
-```
-
-And commit 3CX_TAPI.user.js
 
 ## see also
 

publish.bat

@@ -2,7 +2,7 @@
 setlocal
 cd /d %~dp0
 
-docker build -t source.cp-austria.at/cpatrd/3cx_tapi:latest -f Dockerfile ..
+docker build -t source.cp-austria.at/cpatrd/3cx_tapi:latest -f server/src/CPATapi.Server/Dockerfile .
 if errorlevel 1 (
     echo.
     echo ERROR: Docker build failed!

server/src/CPATapi.Client/CPATapi.Client.csproj

@@ -7,7 +7,7 @@
     <PackageId>CPATapi.Client</PackageId>
     <Authors>Daniel Triendl</Authors>
     <Company>CP Solutions GmbH</Company>
-    <Version>9.4.0</Version>
+    <Version>9.5.1</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 

server/src/CPATapi.Server/CPATapi.Server.csproj

@@ -8,7 +8,7 @@
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..</DockerfileContext>
     <OpenApiDocumentsDirectory>.</OpenApiDocumentsDirectory>
-    <Version>9.4.0</Version>
+    <Version>9.5.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,4 +26,8 @@
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.7" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
 </Project>

server/src/CPATapi.Server/Dockerfile

@@ -6,14 +6,22 @@ USER $APP_UID
 WORKDIR /app
 EXPOSE 8080
 
+# This stage is used to build the userscript project
+FROM node:lts-alpine AS build-userscript
+WORKDIR /src
+COPY client .
+RUN npm ci
+RUN npm run build
+#RUN ls -la /src/dist
+
 # This stage is used to build the service project
 FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY ["CPATapi.Server/CPATapi.Server.csproj", "CPATapi.Server/"]
+COPY ["server/src/CPATapi.Server/CPATapi.Server.csproj", "server/src/CPATapi.Server/CPATapi.Server.csproj"]
-RUN dotnet restore "CPATapi.Server/CPATapi.Server.csproj"
+RUN dotnet restore "server/src/CPATapi.Server/CPATapi.Server.csproj"
 COPY . .
-WORKDIR "/src/CPATapi.Server"
+WORKDIR "/src/server/src/CPATapi.Server"
 RUN dotnet build "./CPATapi.Server.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
 # This stage is used to publish the service project to be copied to the final stage
@@ -25,4 +33,5 @@ RUN dotnet publish "./CPATapi.Server.csproj" -c $BUILD_CONFIGURATION -o /app/pub
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
+COPY --from=build-userscript ["/src/dist/3CX TAPI.prod.user.js", "./wwwroot/3CX_TAPI.user.js"]
 ENTRYPOINT ["dotnet", "CPATapi.Server.dll"]

server/src/CPATapi.Server/Program.cs

@@ -30,6 +30,7 @@ if (app.Environment.IsDevelopment())
     app.UseDeveloperExceptionPage();
 }
 
+app.MapStaticAssets();
 app.MapOpenApi();
 app.UseSwaggerUI(options =>
 {