Serwer

Klient/Klient/Klient.Android/MainActivity.cs

@@ -77,7 +77,7 @@ namespace Klient.Droid
                 };
 
                 var content = new FormUrlEncodedContent(values);
-                var response = await client.PostAsync("http://10.0.2.2:5001/api/User/SignIn", content);
+                var response = await client.PostAsync("https://pixblocksaddition.azurewebsites.net/api/User/SignIn", content);
 
                 if (response.StatusCode == HttpStatusCode.OK)
                 {
@@ -159,7 +159,7 @@ namespace Klient.Droid
 
                 var content = new FormUrlEncodedContent(values);
 
-                var response = await client.PostAsync("http://10.0.2.2:5001/api/User/Register", content);
+                var response = await client.PostAsync("https://pixblocksaddition.azurewebsites.net/api/User/Register", content);
 
                 var responseString = await response.Content.ReadAsStringAsync();
 
@@ -253,7 +253,7 @@ namespace Klient.Droid
 
                     byte[] bitmapData;
                     var stream = new MemoryStream();
-                    bitmap.Compress(Bitmap.CompressFormat.Jpeg, 60, stream);
+                    bitmap.Compress(Bitmap.CompressFormat.Png, 100, stream);
                     bitmapData = stream.ToArray();
                     fileContent = new ByteArrayContent(bitmapData);
 
@@ -297,13 +297,13 @@ namespace Klient.Droid
                 MultipartFormDataContent formDataContent = new MultipartFormDataContent(boundary);
                 formDataContent.Add(fileContent);
 
-                var response = await client.PostAsync("http://10.0.2.2:5001/api/Image/Process", formDataContent);
+                var response = await client.PostAsync("https://pixblocksaddition.azurewebsites.net/api/Image/Process", formDataContent);
                 if (response.StatusCode == HttpStatusCode.OK)
                 {
                     var jsonString = await response.Content.ReadAsStringAsync();
                     FindViewById<TextView>(Resource.Id.ErrorPhoto).Text = "Przesłano zdjęcie!";
                     SetContentView(Resource.Layout.ekranZLinkami);
-                    var second_response = await client.GetAsync($"http://10.0.2.2:5001/api/Search/{jsonString}");
+                    var second_response = await client.GetAsync($"https://pixblocksaddition.azurewebsites.net/api/Search/{jsonString}");
                     if (second_response.StatusCode == HttpStatusCode.OK)
                     {
                         var second_jsonString = await response.Content.ReadAsStringAsync();
@@ -312,10 +312,11 @@ namespace Klient.Droid
 
                         int end = 10;
                         if (fullLink.Count < 10) end = fullLink.Count;
-                        for (int i = 0; i < end; i++)
+                            for (int i = 0; i < end; i++)
-                        {
+                            {
-                            FindViewById<TextView>(Resource.Id.links).Text = FindViewById<TextView>(Resource.Id.links).Text + fullLink[i].title + ": \n" + fullLink[i].link + "\n\n";
+                                FindViewById<TextView>(Resource.Id.links).Text = FindViewById<TextView>(Resource.Id.links).Text + fullLink[i].title + ": \n" + fullLink[i].link + "\n\n";
-                        }
+                            }
+
                     }
                     else
                     {
@@ -342,13 +343,13 @@ namespace Klient.Droid
                     content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(ContentResolver.GetType(photo.Data));
                     break;
                 }
-                var response = await client.PostAsync("http://10.0.2.2:5001/api/Image/Process", formDataContent);
+                var response = await client.PostAsync("https://pixblocksaddition.azurewebsites.net/api/Image/Process", formDataContent);
                 if(response.StatusCode == HttpStatusCode.OK)
                 {
                     var jsonString = await response.Content.ReadAsStringAsync();
                     FindViewById<TextView>(Resource.Id.ErrorPhoto).Text = "Przesłano zdjęcie!";
                     SetContentView(Resource.Layout.ekranZLinkami);
-                    var second_response = await client.GetAsync($"http://10.0.2.2:5001/api/Search/{jsonString}");
+                    var second_response = await client.GetAsync($"https://pixblocksaddition.azurewebsites.net/api/Search/{jsonString}");
                     if(second_response.StatusCode == HttpStatusCode.OK)
                     {
                         var second_jsonString = await second_response.Content.ReadAsStringAsync();
@@ -414,7 +415,7 @@ namespace Klient.Droid
                     { "login", savedLogin }
                 };
                 var content = new FormUrlEncodedContent(values);
-                var response = await client.PostAsync("http://10.0.2.2:5001/api/User/Update", content);
+                var response = await client.PostAsync("https://pixblocksaddition.azurewebsites.net/api/User/Update", content);
 
             if (response.StatusCode == HttpStatusCode.OK)
             {
@@ -437,7 +438,7 @@ namespace Klient.Droid
         public async void GetUserHistory(View v)
         {
             SetContentView(Resource.Layout.ekranHistorii);
-            var response = await client.GetAsync("http://10.0.2.2:5001/api/History");
+            var response = await client.GetAsync("https://pixblocksaddition.azurewebsites.net/api/History");
             if (response.StatusCode == HttpStatusCode.OK)
             {
                 var jsonString = await response.Content.ReadAsStringAsync();

Klient/Klient/Klient.Android/Resources/layout/ekranPoLogowaniu.xml

@@ -54,8 +54,8 @@
         android:onClick="LoadFromCamera" />
     <Button
         android:text="?"
-        android:layout_width="35.0dp"
+        android:layout_width="25.0dp"
-        android:layout_height="35.0dp"
+        android:layout_height="25.0dp"
         android:id="@+id/helpPhoto"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"

Klient/Klient/Klient.Android/Resources/layout/ekranPomocRejestracja.xml

@@ -27,6 +27,17 @@
         android:layout_below="@+id/loginTip"
         android:paddingTop="10dp"
         android:textColor="#ff000000" />
+    <TextView
+        android:text="Wszystkie pola formularza są wymagane!"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="25px"
+        android:minHeight="25px"
+        android:id="@+id/GeneralTip"
+        android:layout_below="@+id/passwordTip"
+        android:paddingTop="10dp"
+        android:textColor="#ff000000" />
     <TextView
         android:text="To jest pomoc \n w rejestracji \n co miałem  \n napisac"
         android:textAppearance="?android:attr/textAppearanceSmall"

Klient/Klient/Klient.Android/Resources/layout/ekranRejestracji.xml

@@ -154,8 +154,8 @@
         android:layout_centerHorizontal="true" />
     <Button
         android:text="?"
-        android:layout_width="35.0dp"
+        android:layout_width="25.0dp"
-        android:layout_height="35.0dp"
+        android:layout_height="25.0dp"
         android:id="@+id/helpRegister"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"

Serwer/Serwer.Api/.config/dotnet-tools.json

@@ -7,6 +7,12 @@
       "commands": [
         "dotnet-ef"
       ]
+    },
+    "swashbuckle.aspnetcore.cli": {
+      "version": "5.6.3",
+      "commands": [
+        "swagger"
+      ]
     }
   }
 }

Serwer/Serwer.Api/Properties/ServiceDependencies/PixBlocksAddition - Web Deploy/apis1.arm.json

@@ -0,0 +1,80 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "resourceGroupName": {
+      "type": "string",
+      "defaultValue": "PixBlocksAdditionResourceGroup",
+      "metadata": {
+        "_parameterType": "resourceGroup",
+        "description": "Name of the resource group for the resource. It is recommended to put resources under same resource group for better tracking."
+      }
+    },
+    "resourceGroupLocation": {
+      "type": "string",
+      "defaultValue": "centralus",
+      "metadata": {
+        "_parameterType": "location",
+        "description": "Location of the resource group. Resource groups could have different location than resources."
+      }
+    },
+    "resourceLocation": {
+      "type": "string",
+      "defaultValue": "[parameters('resourceGroupLocation')]",
+      "metadata": {
+        "_parameterType": "location",
+        "description": "Location of the resource. By default use resource group's location, unless the resource provider is not supported there."
+      }
+    }
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Resources/resourceGroups",
+      "name": "[parameters('resourceGroupName')]",
+      "location": "[parameters('resourceGroupLocation')]",
+      "apiVersion": "2019-10-01"
+    },
+    {
+      "type": "Microsoft.Resources/deployments",
+      "name": "[concat(parameters('resourceGroupName'), 'Deployment', uniqueString(concat('SerwerApi', subscription().subscriptionId)))]",
+      "resourceGroup": "[parameters('resourceGroupName')]",
+      "apiVersion": "2019-10-01",
+      "dependsOn": [
+        "[parameters('resourceGroupName')]"
+      ],
+      "properties": {
+        "mode": "Incremental",
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "resources": [
+            {
+              "name": "SerwerApiapi",
+              "type": "Microsoft.ApiManagement/service",
+              "location": "[parameters('resourceLocation')]",
+              "properties": {},
+              "sku": {
+                "name": "Consumption",
+                "capacity": 0
+              },
+              "identity": null,
+              "apiVersion": "2019-12-01"
+            },
+            {
+              "type": "Microsoft.ApiManagement/service/apis",
+              "name": "SerwerApiapi/SerwerApi",
+              "properties": {},
+              "apiVersion": "2019-12-01",
+              "dependsOn": [
+                "SerwerApiapi"
+              ]
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "metadata": {
+    "_dependencyType": "apis.azure"
+  }
+}

Serwer/Serwer.Api/Properties/serviceDependencies.PixBlocksAddition - Web Deploy.json

@@ -0,0 +1,8 @@
+{
+  "dependencies": {
+    "apis1": {
+      "resourceId": "/subscriptions/[parameters('subscriptionId')]/resourceGroups/[parameters('resourceGroupName')]/providers/Microsoft.ApiManagement/service/SerwerApiapi/apis/SerwerApi",
+      "type": "apis.azure"
+    }
+  }
+}

Serwer/Serwer.Api/Properties/serviceDependencies.json

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "apis1": {
+      "type": "apis"
+    }
+  }
+}

Serwer/Serwer.Api/Startup.cs

@@ -99,17 +99,18 @@ namespace Serwer.Api
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
+            app.UseCors(builder =>
+            {
+                builder.AllowAnyHeader();
+                builder.AllowAnyMethod();
+                builder.AllowAnyOrigin();
+            });
             if (env.IsDevelopment())
             {
-                app.UseCors(builder =>
+               
-                    {
-                        builder.AllowAnyHeader();
-                        builder.AllowAnyMethod();
-                        builder.AllowAnyOrigin();
-                    });
                 app.UseDeveloperExceptionPage();
-                app.UseSwagger();
+                //app.UseSwagger();
-                app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "Serwer.Api v1"));
+                //app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "Serwer.Api v1"));
             }
             app.UseRouting();
 

Serwer/Serwer.sln

@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30717.126
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Tests", "Serwer.Tests\Serwer.Tests.csproj", "{4169F6FD-E08D-4329-BF87-A1411A9F1EF4}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Core", "Serwer.Core\Serwer.Core.csproj", "{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Infrastructure", "Serwer.Infrastructure\Serwer.Infrastructure.csproj", "{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}"
@@ -24,10 +22,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4169F6FD-E08D-4329-BF87-A1411A9F1EF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4169F6FD-E08D-4329-BF87-A1411A9F1EF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4169F6FD-E08D-4329-BF87-A1411A9F1EF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4169F6FD-E08D-4329-BF87-A1411A9F1EF4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Release|Any CPU.ActiveCfg = Release|Any CPU