Serwer

Reviewed-on: #10

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();
 
@@ -223,8 +223,6 @@ namespace Klient.Droid
         public void LoadFromCamera(View v)
         { 
             Intent intent = new Intent(MediaStore.ActionImageCapture);
-            //Android.Net.Uri pictureUri = Android.Net.Uri.FromFile(new File(GetExternalFilesDir(Android.OS.Environment.DirectoryDcim), Guid.NewGuid().ToString().Replace(".", "")+".jpg"));
-            //intent.PutExtra(MediaStore.ExtraOutput, pictureUri);
             StartActivityForResult(intent, 0);
 
         }
@@ -249,24 +247,32 @@ namespace Klient.Droid
             {
                 photo = data;
                 base.OnActivityResult(requestCode, resultCode, data);
-                if(data != null)    bitmap = (Bitmap)data.Extras.Get("data");
+                if (data != null)
+                {
+                    bitmap = (Bitmap)data.Extras.Get("data");
 
                     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);
 
 
                     FindViewById<ImageView>(Resource.Id.Preview).SetImageBitmap(bitmap);
+                }
+                else SetContentView(Resource.Layout.ekranPoLogowaniu);
 
             }
             else if(requestCode == PickImageId)
+            {
+                if(data == null) SetContentView(Resource.Layout.ekranPoLogowaniu);
+                else
                 {
                     Android.Net.Uri uri = data.Data;
                     photo = data;
                     FindViewById<ImageView>(Resource.Id.Preview).SetImageURI(uri);
                 }
+            }
             else if(data == null)
             {
                 SetContentView(Resource.Layout.ekranPoLogowaniu);
@@ -291,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();
@@ -308,8 +314,9 @@ namespace Klient.Droid
                         if (fullLink.Count < 10) end = fullLink.Count;
                             for (int i = 0; i < end; i++)
                             {
-                            FindViewById<TextView>(Resource.Id.links).Text = FindViewById<TextView>(Resource.Id.links).Text + fullLink[i].title + ": " + 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
                     {
@@ -336,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();
@@ -408,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)
             {
@@ -431,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();
@@ -459,5 +466,12 @@ namespace Klient.Droid
         {
             SetContentView(Resource.Layout.ekranPomocZdjecie);
         }
+
+        [Java.Interop.Export("LogOut")]
+        public void LogOut(View v)
+        {
+            SetContentView(Resource.Layout.ekranStartowy);
+
+        }
     }
 }

Klient/Klient/Klient.Android/Poszukiwacz.csproj

@@ -181,6 +181,9 @@
   <ItemGroup>
     <AndroidResource Include="Resources\xml\file_paths.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\Obraz8.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>

Klient/Klient/Klient.Android/Resources/layout/ekranHistorii.xml

@@ -16,7 +16,7 @@
         android:layout_alignParentLeft="true"
         android:background="#ffbdd7f0"
         android:gravity="center"
-        android:onClick="GoToProfile" />
+        android:onClick="GoToPoLogowaniu" />
     <TextView
         android:text="Poszukiwacz 2021"
         android:textAppearance="?android:attr/textAppearanceSmall"

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_height="35.0dp"
+        android:layout_width="25.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"
@@ -45,15 +56,14 @@
         android:textColor="#ff000000"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true" />
-    <Button
-        android:text="Back"
+    <ImageButton
+        android:src="@drawable/obraz4"
         android:layout_width="38.5dp"
         android:layout_height="35.0dp"
         android:id="@+id/backRegisterHelp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="#ff0b31c8"
-        android:textColor="#fffcfcfc"
+        android:background="#ffbdd7f0"
         android:gravity="center"
         android:onClick="GoToRegister" />
 

Klient/Klient/Klient.Android/Resources/layout/ekranPomocZdjecie.xml

@@ -26,7 +26,7 @@
         android:gravity="center"
         android:onClick="GoToPoLogowaniu" />
     <TextView
-        android:text="W celu załadowania zdjęcia z pamięci telefonu \nwybierz ikonę folderu, w celu zrobnienia zdjęcia \nwybierz ikonę aparatu i postępuj jak przy robieniu zdjęcia. \nNa następnym ekranie zostanie wyświtlony \npodgląd załadowanego zdjęcia."
+        android:text="W celu załadowania zdjęcia z pamięci telefonu \nwybierz ikonę folderu, w celu zrobienia zdjęcia \nwybierz ikonę aparatu i postępuj jak przy robieniu zdjęcia. \nNa następnym ekranie zostanie wyświtlony \npodgląd załadowanego zdjęcia."
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

Klient/Klient/Klient.Android/Resources/layout/ekranProfil.xml

@@ -120,4 +120,13 @@
         android:layout_below="@id/Save"
         android:translationY="45dp"
         android:onClick="GetHistory" />
+    <ImageButton
+        android:src="@drawable/obraz8"
+        android:layout_width="35.0dp"
+        android:layout_height="35.0dp"
+        android:background="#ffbdd7f0"
+        android:id="@+id/LogOut"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:onClick="LogOut" />
 </RelativeLayout>

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_height="35.0dp"
+        android:layout_width="25.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/Framework/ExceptionHandlerMiddleware.cs

@@ -32,7 +32,7 @@ namespace Serwer.Api.Framework
         {
             var statusCode = HttpStatusCode.BadRequest;
             context.Response.StatusCode = (int)statusCode;
-            return context.Response.WriteAsync($"Error: {exception.Message}");
+            return context.Response.WriteAsync($"Błąd: {exception.Message}");
         }
     }
 }

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

@@ -98,8 +98,6 @@ 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)
-        {
-            if (env.IsDevelopment())
         {
             app.UseCors(builder =>
             {
@@ -107,9 +105,12 @@ namespace Serwer.Api
                 builder.AllowAnyMethod();
                 builder.AllowAnyOrigin();
             });
+            if (env.IsDevelopment())
+            {
+               
                 app.UseDeveloperExceptionPage();
-                app.UseSwagger();
-                app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "Serwer.Api v1"));
+                //app.UseSwagger();
+                //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