diff --git a/docker-compose.yml b/docker-compose.yml index cbcffce..a77bf3c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: ports: - "8080:80" volumes: - - ./src:/var/www/src + - ./www/app_php:/var/www/src - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf depends_on: - php @@ -13,7 +13,7 @@ services: php: image: php:8.3-fpm volumes: - - ./src:/var/www/src + - ./www/app_php:/var/www/src restart: unless-stopped python: diff --git a/nu b/nu deleted file mode 100644 index c4ea804..0000000 --- a/nu +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -echo "Test" - -echo "Rulăm un test..." - -NUMAR=5 - -if [ $NUMAR -ge 3 ]; then - echo "Numărul $NUMAR este mai mare sau egal cu 3." -else - echo "Numărul este mai mic decât 3." -fi - -echo "Test finalizat!" - -for i in {1..5}; do - echo "Numărul: $i" -done - -i=1 - -while [ $i -le 5 ]; do - echo "i = $i" - i=$((i + 1)) -done - -while true; do - read -p "Scrie ceva (sau 'stop' pentru ieșire): " text - - if [ "$text" = "stop" ]; then - break - fi - - echo "Ai scris: $text" -done - - -if [ -z "$NUMAR" ]; then - echo "Variabila NUMAR este goala!" - exit 1 -fi - -if [ "$NUMAR" -eq 10 ]; then - echo "E 10" -else - echo "Nu e 10" -fi - - - -read -p "Alege (start/stop/restart): " cmd - -case $cmd in - start) - echo "Pornesc serverul" - ;; - stop) - echo "Oprire server" - ;; - restart) - echo "Restart server" - ;; - *) - echo "Comandă necunoscută" - ;; -esac - -for item in rosu verde albastru; do - echo "Culoare: $item" -done - -salut() { - echo "Salut, $1!" -} - -salut "Alex" - - -echo "O modificare pe branch-ul dev" - -echo "Altă modificare pe branch-ul dev" -echo "Pushuit cu cheie ssh fara user si parola" diff --git a/nu merge b/nu merge deleted file mode 100644 index 7e7120d..0000000 --- a/nu merge +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/bash - -echo "Rulăm un test..." - -NUMAR=5 - -if [ $NUMAR -ge 3 ]; then - echo "Numărul $NUMAR este mai mare sau egal cu 3." -else - echo "Numărul este mai mic decât 3." -fi - -echo "Test finalizat!" - -for i in {1..5}; do - echo "Numărul: $i" -done - -i=1 - -while [ $i -le 5 ]; do - echo "i = $i" - i=$((i + 1)) -done - -while true; do - read -p "Scrie ceva (sau 'stop' pentru ieșire): " text - - if [ "$text" = "stop" ]; then - break - fi - - echo "Ai scris: $text" -done - - -if [ -z "$NUMAR" ]; then - echo "Variabila NUMAR este goala!" - exit 1 -fi - -if [ "$NUMAR" -eq 10 ]; then - echo "E 10" -else - echo "Nu e 10" -fi - - - -read -p "Alege (start/stop/restart): " cmd - -case $cmd in - start) - echo "Pornesc serverul" - ;; - stop) - echo "Oprire server" - ;; - restart) - echo "Restart server" - ;; - *) - echo "Comandă necunoscută" - ;; -esac - -for item in rosu verde albastru; do - echo "Culoare: $item" -done - -salut() { - echo "Salut, $1!" -} - -salut "Alex" - - -echo "O modificare pe branch-ul dev" - -echo "Altă modificare pe branch-ul dev" -echo "Pushuit cu cheie ssh fara user si parola" diff --git a/www/script_php.php b/script_php.php similarity index 100% rename from www/script_php.php rename to script_php.php diff --git a/src/index.php b/www/app_php/index.php similarity index 100% rename from src/index.php rename to www/app_php/index.php diff --git a/www/programDotNet/bin/Debug/net8.0/programDotNet.dll b/www/programDotNet/bin/Debug/net8.0/programDotNet.dll index 50f03b4..8ba1813 100644 Binary files a/www/programDotNet/bin/Debug/net8.0/programDotNet.dll and b/www/programDotNet/bin/Debug/net8.0/programDotNet.dll differ diff --git a/www/programDotNet/bin/Debug/net8.0/programDotNet.pdb b/www/programDotNet/bin/Debug/net8.0/programDotNet.pdb index b3ee545..5d2f825 100644 Binary files a/www/programDotNet/bin/Debug/net8.0/programDotNet.pdb and b/www/programDotNet/bin/Debug/net8.0/programDotNet.pdb differ diff --git a/www/programDotNet/bin/Debug/net8.0/programDotNet.staticwebassets.endpoints.json b/www/programDotNet/bin/Debug/net8.0/programDotNet.staticwebassets.endpoints.json deleted file mode 100644 index 5576e88..0000000 --- a/www/programDotNet/bin/Debug/net8.0/programDotNet.staticwebassets.endpoints.json +++ /dev/null @@ -1 +0,0 @@ -{"Version":1,"ManifestType":"Build","Endpoints":[]} \ No newline at end of file diff --git a/www/programDotNet/obj/Debug/net8.0/programDotNet.GeneratedMSBuildEditorConfig.editorconfig b/www/programDotNet/obj/Debug/net8.0/programDotNet.GeneratedMSBuildEditorConfig.editorconfig index dd00d6b..b84085f 100644 --- a/www/programDotNet/obj/Debug/net8.0/programDotNet.GeneratedMSBuildEditorConfig.editorconfig +++ b/www/programDotNet/obj/Debug/net8.0/programDotNet.GeneratedMSBuildEditorConfig.editorconfig @@ -1,7 +1,5 @@ is_global = true build_property.TargetFramework = net8.0 -build_property.TargetFrameworkIdentifier = .NETCoreApp -build_property.TargetFrameworkVersion = v8.0 build_property.TargetPlatformMinVersion = build_property.UsingMicrosoftNETSdkWeb = true build_property.ProjectTypeGuids = @@ -19,5 +17,3 @@ build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = build_property.MSBuildProjectDirectory = /app build_property._RazorSourceGeneratorDebug = -build_property.EffectiveAnalysisLevelStyle = 8.0 -build_property.EnableCodeStyleSeverity = diff --git a/www/programDotNet/obj/Debug/net8.0/programDotNet.GlobalUsings.g.cs b/www/programDotNet/obj/Debug/net8.0/programDotNet.GlobalUsings.g.cs index 5e6145d..025530a 100644 --- a/www/programDotNet/obj/Debug/net8.0/programDotNet.GlobalUsings.g.cs +++ b/www/programDotNet/obj/Debug/net8.0/programDotNet.GlobalUsings.g.cs @@ -1,17 +1,17 @@ // -global using Microsoft.AspNetCore.Builder; -global using Microsoft.AspNetCore.Hosting; -global using Microsoft.AspNetCore.Http; -global using Microsoft.AspNetCore.Routing; -global using Microsoft.Extensions.Configuration; -global using Microsoft.Extensions.DependencyInjection; -global using Microsoft.Extensions.Hosting; -global using Microsoft.Extensions.Logging; -global using System; -global using System.Collections.Generic; -global using System.IO; -global using System.Linq; -global using System.Net.Http; -global using System.Net.Http.Json; -global using System.Threading; -global using System.Threading.Tasks; +global using global::Microsoft.AspNetCore.Builder; +global using global::Microsoft.AspNetCore.Hosting; +global using global::Microsoft.AspNetCore.Http; +global using global::Microsoft.AspNetCore.Routing; +global using global::Microsoft.Extensions.Configuration; +global using global::Microsoft.Extensions.DependencyInjection; +global using global::Microsoft.Extensions.Hosting; +global using global::Microsoft.Extensions.Logging; +global using global::System; +global using global::System.Collections.Generic; +global using global::System.IO; +global using global::System.Linq; +global using global::System.Net.Http; +global using global::System.Net.Http.Json; +global using global::System.Threading; +global using global::System.Threading.Tasks; diff --git a/www/programDotNet/obj/Debug/net8.0/programDotNet.assets.cache b/www/programDotNet/obj/Debug/net8.0/programDotNet.assets.cache index 01ba0a4..04d51e8 100644 Binary files a/www/programDotNet/obj/Debug/net8.0/programDotNet.assets.cache and b/www/programDotNet/obj/Debug/net8.0/programDotNet.assets.cache differ diff --git a/www/programDotNet/obj/Debug/net8.0/programDotNet.csproj.CoreCompileInputs.cache b/www/programDotNet/obj/Debug/net8.0/programDotNet.csproj.CoreCompileInputs.cache index ca69b65..98c11f0 100644 --- a/www/programDotNet/obj/Debug/net8.0/programDotNet.csproj.CoreCompileInputs.cache +++ b/www/programDotNet/obj/Debug/net8.0/programDotNet.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -78e56dd823ebe82c5116b011dea1d4f07d11c07a6cbca67c3b275ceeafa27f13 +e9330eaf0428b40e8599ac23a52ec780ad006a9006d294392fe6cc89c2049101 diff --git a/www/programDotNet/obj/Debug/net8.0/programDotNet.csproj.FileListAbsolute.txt b/www/programDotNet/obj/Debug/net8.0/programDotNet.csproj.FileListAbsolute.txt index f8e6ffb..9f63a98 100644 --- a/www/programDotNet/obj/Debug/net8.0/programDotNet.csproj.FileListAbsolute.txt +++ b/www/programDotNet/obj/Debug/net8.0/programDotNet.csproj.FileListAbsolute.txt @@ -16,11 +16,8 @@ /app/obj/Debug/net8.0/programDotNet.pdb /app/obj/Debug/net8.0/programDotNet.genruntimeconfig.cache /app/obj/Debug/net8.0/ref/programDotNet.dll -/app/bin/Debug/net8.0/programDotNet.staticwebassets.endpoints.json -/app/obj/Debug/net8.0/rpswa.dswa.cache.json -/app/obj/Debug/net8.0/rjimswa.dswa.cache.json -/app/obj/Debug/net8.0/rjsmrazor.dswa.cache.json -/app/obj/Debug/net8.0/rjsmcshtml.dswa.cache.json -/app/obj/Debug/net8.0/staticwebassets.build.json.cache -/app/obj/Debug/net8.0/staticwebassets.build.endpoints.json -/app/obj/Debug/net8.0/swae.build.ex.cache +/app/obj/Debug/net8.0/staticwebassets/msbuild.programDotNet.Microsoft.AspNetCore.StaticWebAssets.props +/app/obj/Debug/net8.0/staticwebassets/msbuild.build.programDotNet.props +/app/obj/Debug/net8.0/staticwebassets/msbuild.buildMultiTargeting.programDotNet.props +/app/obj/Debug/net8.0/staticwebassets/msbuild.buildTransitive.programDotNet.props +/app/obj/Debug/net8.0/staticwebassets.pack.json diff --git a/www/programDotNet/obj/Debug/net8.0/programDotNet.dll b/www/programDotNet/obj/Debug/net8.0/programDotNet.dll index 50f03b4..8ba1813 100644 Binary files a/www/programDotNet/obj/Debug/net8.0/programDotNet.dll and b/www/programDotNet/obj/Debug/net8.0/programDotNet.dll differ diff --git a/www/programDotNet/obj/Debug/net8.0/programDotNet.pdb b/www/programDotNet/obj/Debug/net8.0/programDotNet.pdb index b3ee545..5d2f825 100644 Binary files a/www/programDotNet/obj/Debug/net8.0/programDotNet.pdb and b/www/programDotNet/obj/Debug/net8.0/programDotNet.pdb differ diff --git a/www/programDotNet/obj/Debug/net8.0/ref/programDotNet.dll b/www/programDotNet/obj/Debug/net8.0/ref/programDotNet.dll index 43fb6c4..d97290c 100644 Binary files a/www/programDotNet/obj/Debug/net8.0/ref/programDotNet.dll and b/www/programDotNet/obj/Debug/net8.0/ref/programDotNet.dll differ diff --git a/www/programDotNet/obj/Debug/net8.0/refint/programDotNet.dll b/www/programDotNet/obj/Debug/net8.0/refint/programDotNet.dll index 43fb6c4..d97290c 100644 Binary files a/www/programDotNet/obj/Debug/net8.0/refint/programDotNet.dll and b/www/programDotNet/obj/Debug/net8.0/refint/programDotNet.dll differ diff --git a/www/programDotNet/obj/Debug/net8.0/rjsmcshtml.dswa.cache.json b/www/programDotNet/obj/Debug/net8.0/rjsmcshtml.dswa.cache.json deleted file mode 100644 index e33a92d..0000000 --- a/www/programDotNet/obj/Debug/net8.0/rjsmcshtml.dswa.cache.json +++ /dev/null @@ -1 +0,0 @@ -{"GlobalPropertiesHash":"fLV7naKvKWbTYVUHjkIjTJtm/olHDr/EnsWwdgzzqYA=","FingerprintPatternsHash":"gq3WsqcKBUGTSNle7RKKyXRIwh7M8ccEqOqYvIzoM04=","PropertyOverridesHash":"8ZRc1sGeVrPBx4lD717BgRaQekyh78QKV9SKsdt638U=","InputHashes":["bzO0TEjhBVNhYEvqtsf/ty9AgBtGHyRIrjLs/G4sxxw="],"CachedAssets":{},"CachedCopyCandidates":{}} \ No newline at end of file diff --git a/www/programDotNet/obj/Debug/net8.0/rjsmrazor.dswa.cache.json b/www/programDotNet/obj/Debug/net8.0/rjsmrazor.dswa.cache.json deleted file mode 100644 index 3edb6e9..0000000 --- a/www/programDotNet/obj/Debug/net8.0/rjsmrazor.dswa.cache.json +++ /dev/null @@ -1 +0,0 @@ -{"GlobalPropertiesHash":"MMRCzYhPUzk/dvjkevA6gVPm5Xq+/bKRMXBsywen2EU=","FingerprintPatternsHash":"gq3WsqcKBUGTSNle7RKKyXRIwh7M8ccEqOqYvIzoM04=","PropertyOverridesHash":"8ZRc1sGeVrPBx4lD717BgRaQekyh78QKV9SKsdt638U=","InputHashes":["bzO0TEjhBVNhYEvqtsf/ty9AgBtGHyRIrjLs/G4sxxw="],"CachedAssets":{},"CachedCopyCandidates":{}} \ No newline at end of file diff --git a/www/programDotNet/obj/Debug/net8.0/staticwebassets.build.endpoints.json b/www/programDotNet/obj/Debug/net8.0/staticwebassets.build.endpoints.json deleted file mode 100644 index 5576e88..0000000 --- a/www/programDotNet/obj/Debug/net8.0/staticwebassets.build.endpoints.json +++ /dev/null @@ -1 +0,0 @@ -{"Version":1,"ManifestType":"Build","Endpoints":[]} \ No newline at end of file diff --git a/www/programDotNet/obj/Debug/net8.0/staticwebassets.build.json b/www/programDotNet/obj/Debug/net8.0/staticwebassets.build.json index c4a6c9e..0183053 100644 --- a/www/programDotNet/obj/Debug/net8.0/staticwebassets.build.json +++ b/www/programDotNet/obj/Debug/net8.0/staticwebassets.build.json @@ -1 +1,11 @@ -{"Version":1,"Hash":"R9B4kODIeQ+F5JrbWKZU4XVNo0G1PgbmB01uJL2Dn04=","Source":"programDotNet","BasePath":"/","Mode":"Root","ManifestType":"Build","ReferencedProjectsConfiguration":[],"DiscoveryPatterns":[],"Assets":[],"Endpoints":[]} \ No newline at end of file +{ + "Version": 1, + "Hash": "iKrrIYpJZohPz31GBVLhzn4bAYo7qnEuRFes2tPKNgE=", + "Source": "programDotNet", + "BasePath": "_content/programDotNet", + "Mode": "Default", + "ManifestType": "Build", + "ReferencedProjectsConfiguration": [], + "DiscoveryPatterns": [], + "Assets": [] +} \ No newline at end of file diff --git a/www/programDotNet/obj/Debug/net8.0/staticwebassets.build.json.cache b/www/programDotNet/obj/Debug/net8.0/staticwebassets.build.json.cache deleted file mode 100644 index 5769c74..0000000 --- a/www/programDotNet/obj/Debug/net8.0/staticwebassets.build.json.cache +++ /dev/null @@ -1 +0,0 @@ -R9B4kODIeQ+F5JrbWKZU4XVNo0G1PgbmB01uJL2Dn04= \ No newline at end of file diff --git a/www/programDotNet/obj/Debug/net8.0/staticwebassets/msbuild.build.programDotNet.props b/www/programDotNet/obj/Debug/net8.0/staticwebassets/msbuild.build.programDotNet.props new file mode 100644 index 0000000..5a6032a --- /dev/null +++ b/www/programDotNet/obj/Debug/net8.0/staticwebassets/msbuild.build.programDotNet.props @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/www/programDotNet/obj/Debug/net8.0/staticwebassets/msbuild.buildMultiTargeting.programDotNet.props b/www/programDotNet/obj/Debug/net8.0/staticwebassets/msbuild.buildMultiTargeting.programDotNet.props new file mode 100644 index 0000000..d9f7ea6 --- /dev/null +++ b/www/programDotNet/obj/Debug/net8.0/staticwebassets/msbuild.buildMultiTargeting.programDotNet.props @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/www/programDotNet/obj/Debug/net8.0/staticwebassets/msbuild.buildTransitive.programDotNet.props b/www/programDotNet/obj/Debug/net8.0/staticwebassets/msbuild.buildTransitive.programDotNet.props new file mode 100644 index 0000000..93c3357 --- /dev/null +++ b/www/programDotNet/obj/Debug/net8.0/staticwebassets/msbuild.buildTransitive.programDotNet.props @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/www/programDotNet/obj/Debug/net8.0/swae.build.ex.cache b/www/programDotNet/obj/Debug/net8.0/swae.build.ex.cache deleted file mode 100644 index e69de29..0000000 diff --git a/www/programDotNet/obj/programDotNet.csproj.nuget.dgspec.json b/www/programDotNet/obj/programDotNet.csproj.nuget.dgspec.json index 5bc9be6..ac27306 100644 --- a/www/programDotNet/obj/programDotNet.csproj.nuget.dgspec.json +++ b/www/programDotNet/obj/programDotNet.csproj.nuget.dgspec.json @@ -37,8 +37,7 @@ "enableAudit": "true", "auditLevel": "low", "auditMode": "direct" - }, - "SdkAnalysisLevel": "10.0.100" + } }, "frameworks": { "net8.0": { @@ -54,20 +53,6 @@ ], "assetTargetFallback": true, "warn": true, - "downloadDependencies": [ - { - "name": "Microsoft.AspNetCore.App.Ref", - "version": "[8.0.22, 8.0.22]" - }, - { - "name": "Microsoft.NETCore.App.Host.linux-arm64", - "version": "[8.0.22, 8.0.22]" - }, - { - "name": "Microsoft.NETCore.App.Ref", - "version": "[8.0.22, 8.0.22]" - } - ], "frameworkReferences": { "Microsoft.AspNetCore.App": { "privateAssets": "none" @@ -76,7 +61,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/10.0.101/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.416/PortableRuntimeIdentifierGraph.json" } } } diff --git a/www/programDotNet/obj/programDotNet.csproj.nuget.g.props b/www/programDotNet/obj/programDotNet.csproj.nuget.g.props index 9575c2c..112d2bb 100644 --- a/www/programDotNet/obj/programDotNet.csproj.nuget.g.props +++ b/www/programDotNet/obj/programDotNet.csproj.nuget.g.props @@ -7,7 +7,7 @@ /root/.nuget/packages/ /root/.nuget/packages/ PackageReference - 7.0.0 + 6.11.1 diff --git a/www/programDotNet/obj/project.assets.json b/www/programDotNet/obj/project.assets.json index 801cc54..3f96cde 100644 --- a/www/programDotNet/obj/project.assets.json +++ b/www/programDotNet/obj/project.assets.json @@ -43,8 +43,7 @@ "enableAudit": "true", "auditLevel": "low", "auditMode": "direct" - }, - "SdkAnalysisLevel": "10.0.100" + } }, "frameworks": { "net8.0": { @@ -60,20 +59,6 @@ ], "assetTargetFallback": true, "warn": true, - "downloadDependencies": [ - { - "name": "Microsoft.AspNetCore.App.Ref", - "version": "[8.0.22, 8.0.22]" - }, - { - "name": "Microsoft.NETCore.App.Host.linux-arm64", - "version": "[8.0.22, 8.0.22]" - }, - { - "name": "Microsoft.NETCore.App.Ref", - "version": "[8.0.22, 8.0.22]" - } - ], "frameworkReferences": { "Microsoft.AspNetCore.App": { "privateAssets": "none" @@ -82,7 +67,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/10.0.101/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.416/PortableRuntimeIdentifierGraph.json" } } } diff --git a/www/programDotNet/obj/project.nuget.cache b/www/programDotNet/obj/project.nuget.cache index e6c6a09..d946ce9 100644 --- a/www/programDotNet/obj/project.nuget.cache +++ b/www/programDotNet/obj/project.nuget.cache @@ -1,12 +1,8 @@ { "version": 2, - "dgSpecHash": "83bfm2dKkvU=", + "dgSpecHash": "A0EP6Bndszc=", "success": true, "projectFilePath": "/app/programDotNet.csproj", - "expectedPackageFiles": [ - "/root/.nuget/packages/microsoft.netcore.app.ref/8.0.22/microsoft.netcore.app.ref.8.0.22.nupkg.sha512", - "/root/.nuget/packages/microsoft.aspnetcore.app.ref/8.0.22/microsoft.aspnetcore.app.ref.8.0.22.nupkg.sha512", - "/root/.nuget/packages/microsoft.netcore.app.host.linux-arm64/8.0.22/microsoft.netcore.app.host.linux-arm64.8.0.22.nupkg.sha512" - ], + "expectedPackageFiles": [], "logs": [] } \ No newline at end of file