s426229/Poszukiwacz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: s426229:master
Branches Tags
s426229:master
s426229:develop
s426229:POS_Sprint_7
s426229:POS_Sprint_6
s426229:POS-46
s426229:POS_Sprint_5
s426229:POS_Sprint_4
s426229:POS_Sprint_3
s426229:POS_Sprint_2
s426229:POS_Sprint_1
..
compare: s426229:POS_Sprint_2
Branches Tags
s426229:master
s426229:develop
s426229:POS_Sprint_7
s426229:POS_Sprint_6
s426229:POS-46
s426229:POS_Sprint_5
s426229:POS_Sprint_4
s426229:POS_Sprint_3
s426229:POS_Sprint_2
s426229:POS_Sprint_1

No commits in common. "master" and "POS_Sprint_2" have entirely different histories.
master ... POS_Sprint

54 changed files with 886 additions and 2595 deletions
Show Stats Expand all files Collapse all files

400
Klient/Klient/Klient.Android/MainActivity.cs
View File

@ -12,100 +12,59 @@ using System.Collections.Generic;
using System.Security; using System.Security;
using System.Net; using System.Net;
using System.Linq; using System.Linq;
using Newtonsoft.Json;
using Klient.Droid.Modules;
using Android.Provider;
using Android.Content;
using Android.Graphics;
using Newtonsoft.Json.Linq;
using Com.Xamarin.Formsviewgroup;
using Android.Icu.Text;
using System.IO; using System.IO;
using Android.Media;
using System.Threading.Tasks;
using Java.IO;
using System.Net.Http.Headers;
namespace Klient.Droid namespace Klient.Droid
{ {
[Activity(Label = "Klient", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)] [Activity(Label = "Klient", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
{ {
Bitmap bitmap;
ByteArrayContent fileContent;
public static int PickImageId = 1000; public static int PickImageId = 1000;
private static readonly HttpClient client = new HttpClient(); private static readonly HttpClient client = new HttpClient();
public static Android.Content.Intent photo; public static Android.Content.Intent photo;
public string savedLogin = "";
public string savedName = "";
public string savedSurname = "";
public string savedEmail = "";
private string userId = "";
private string userToken = "";
protected override void OnCreate(Bundle savedInstanceState) protected override void OnCreate(Bundle savedInstanceState)
{ {
base.OnCreate(savedInstanceState); base.OnCreate(savedInstanceState);
global::Xamarin.Forms.Forms.Init(this, savedInstanceState); global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder(); LoadApplication(new App());
StrictMode.SetVmPolicy(builder.Build());
LoadApplication(new App());
SetContentView(Resource.Layout.ekranStartowy); SetContentView(Resource.Layout.ekranStartowy);
} }
[Java.Interop.Export("SignIn")] [Java.Interop.Export("SignIn")]
async public void SignIn(Android.Views.View v) async public void SignIn(View v)
{ {
var Login = FindViewById<EditText>(Resource.Id.Login).Text; var Login = FindViewById<EditText>(Resource.Id.Login).Text;
SecureString Password = new NetworkCredential("", FindViewById<EditText>(Resource.Id.Password).Text).SecurePassword; SecureString Password = new NetworkCredential("", FindViewById<EditText>(Resource.Id.Password).Text).SecurePassword;
if (Login.Length < 3 || Login.Length > 12)
{
SetContentView(Resource.Layout.ekranLogowania);
}
if (string.IsNullOrWhiteSpace(new NetworkCredential("", Password).Password)) if (string.IsNullOrWhiteSpace(new NetworkCredential("", Password).Password))
{ {
FindViewById<TextView>(Resource.Id.ErrorLogIn).Text = "Hasło nie może być puste ani zawierać spacji!"; SetContentView(Resource.Layout.ekranLogowania);
FindViewById<EditText>(Resource.Id.Password).Text = "";
} }
else
var values = new Dictionary<string, string>
{ {
var values = new Dictionary<string, string> { "login", Login },
{ { "password", new NetworkCredential("", Password).Password }
{ "login", Login }, };
{ "password", new NetworkCredential("", Password).Password }
};
var content = new FormUrlEncodedContent(values); var content = new FormUrlEncodedContent(values);
var response = await client.PostAsync("https://pixblocksaddition.azurewebsites.net/api/User/SignIn", content);
if (response.StatusCode == HttpStatusCode.OK) var response = await client.PostAsync("http://10.0.2.2:5001/api/User/SignIn", content);
{
var jsonString = await response.Content.ReadAsStringAsync();
dynamic jsonObject = JsonConvert.DeserializeObject(jsonString); if (response.StatusCode == HttpStatusCode.OK) SetContentView(Resource.Layout.ekranPoLogowaniu);
SetContentView(Resource.Layout.ekranPoLogowaniu);
savedLogin = jsonObject.user.login;
savedName = jsonObject.user.name;
savedEmail = jsonObject.user.email;
savedSurname = jsonObject.user.surname;
userId = jsonObject.user.id;
userToken = jsonObject.jwt.token;
client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", userToken);
}
else
{
string msg = await response.Content.ReadAsStringAsync();
FindViewById<TextView>(Resource.Id.ErrorLogIn).Text = msg;
FindViewById<EditText>(Resource.Id.Password).Text = "";
}
}
} }
[Java.Interop.Export("HelpLoginScreen")] [Java.Interop.Export("ResetPassword")]
public void GoToAboutScreen(View v) async public void ResetPassword()
{ {
SetContentView(Resource.Layout.ekranInformacji); SetContentView(Resource.Layout.ekranLogowania);
} }
[Java.Interop.Export("SignUp")] [Java.Interop.Export("SignUp")]
@ -117,81 +76,36 @@ namespace Klient.Droid
var Login = FindViewById<EditText>(Resource.Id.NewLogin).Text; var Login = FindViewById<EditText>(Resource.Id.NewLogin).Text;
SecureString Password = new NetworkCredential("", FindViewById<EditText>(Resource.Id.NewPassword).Text).SecurePassword; SecureString Password = new NetworkCredential("", FindViewById<EditText>(Resource.Id.NewPassword).Text).SecurePassword;
SecureString Password2 = new NetworkCredential("", FindViewById<EditText>(Resource.Id.RepeatPassword).Text).SecurePassword; SecureString Password2 = new NetworkCredential("", FindViewById<EditText>(Resource.Id.RepeatPassword).Text).SecurePassword;
if (Login.Length < 3 || Login.Length > 12)
{
FindViewById<TextView>(Resource.Id.ErrorRegister).Text = "Login musi mieć od 3 do 12 znaków!";
FindViewById<EditText>(Resource.Id.NewPassword).Text = "";
FindViewById<EditText>(Resource.Id.RepeatPassword).Text = "";
} if (new NetworkCredential("", Password).Password != new NetworkCredential("", Password2).Password)
else if (new NetworkCredential("", Password).Password.Length < 8 || new NetworkCredential("", Password).Password.Length > 20 || string.IsNullOrWhiteSpace(new NetworkCredential("", Password).Password))
{ {
FindViewById<TextView>(Resource.Id.ErrorRegister).Text = "Hasło musi mieć od 8 do 20 znaków!"; SetContentView(Resource.Layout.ekranRejestracji);
FindViewById<EditText>(Resource.Id.NewPassword).Text = "";
FindViewById<EditText>(Resource.Id.RepeatPassword).Text = "";
} }
else if (new NetworkCredential("", Password).Password != new NetworkCredential("", Password2).Password) var values = new Dictionary<string, string>
{ {
FindViewById<TextView>(Resource.Id.ErrorRegister).Text = "Hasła muszą być identyczne!"; { "email", Email },
FindViewById<EditText>(Resource.Id.NewPassword).Text = ""; { "name", Name },
FindViewById<EditText>(Resource.Id.RepeatPassword).Text = ""; { "surname", Surname },
} { "login", Login },
else if(string.IsNullOrEmpty(FindViewById<EditText>(Resource.Id.NewLogin).Text) || string.IsNullOrEmpty(FindViewById<EditText>(Resource.Id.Email).Text) || string.IsNullOrEmpty(FindViewById<EditText>(Resource.Id.NewPassword).Text) || string.IsNullOrEmpty(FindViewById<EditText>(Resource.Id.RepeatPassword).Text) || string.IsNullOrEmpty(FindViewById<EditText>(Resource.Id.Name).Text) || string.IsNullOrEmpty(FindViewById<EditText>(Resource.Id.Surname).Text)) { "password", new NetworkCredential("", Password).Password }
{ };
FindViewById<TextView>(Resource.Id.ErrorRegister).Text = "Wartości nie mogą być puste!";
FindViewById<EditText>(Resource.Id.NewPassword).Text = "";
FindViewById<EditText>(Resource.Id.RepeatPassword).Text = "";
}
else var content = new FormUrlEncodedContent(values);
{
var values = new Dictionary<string, string>
{
{ "email", Email },
{ "name", Name },
{ "surname", Surname },
{ "login", Login },
{ "password", new NetworkCredential("", Password).Password }
};
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();
var responseString = await response.Content.ReadAsStringAsync(); if (response.StatusCode == HttpStatusCode.OK) SetContentView(Resource.Layout.ekranLogowania);
if (response.StatusCode == HttpStatusCode.OK) SetContentView(Resource.Layout.ekranLogowania);
else
{
string msg = await response.Content.ReadAsStringAsync();
FindViewById<TextView>(Resource.Id.ErrorRegister).Text = msg;
FindViewById<EditText>(Resource.Id.Password).Text = "";
FindViewById<EditText>(Resource.Id.RepeatPassword).Text = "";
}
}
} }
[Java.Interop.Export("HelpRegisterScreen")] [Java.Interop.Export("HelpLoginScreen")]
public void GoToRegisterHelp(View v)
{
SetContentView(Resource.Layout.ekranPomocRejestracja);
}
[Java.Interop.Export("GoToProfile")]
public void GoBackToProfile(View v)
{
SetContentView(Resource.Layout.ekranProfil);
}
[Java.Interop.Export("GoToRegister")]
public void HelpLoginScreen(View v) public void HelpLoginScreen(View v)
{ {
SetContentView(Resource.Layout.ekranRejestracji); SetContentView(Resource.Layout.ekranRejestracji);
} }
[Java.Interop.Export("SignInMainScreen")] [Java.Interop.Export("SignInMainScreen")]
public void MainScreenSignIn(View v) public void MainScreenSignIn(View v)
{ {
@ -204,11 +118,12 @@ namespace Klient.Droid
SetContentView(Resource.Layout.ekranRejestracji); SetContentView(Resource.Layout.ekranRejestracji);
} }
[Java.Interop.Export("GoToMainScreenFromInformation")] [Java.Interop.Export("about")]
public void GoToMainScreenFromInformation(View v) public void MainScreenAbout(View v)
{ {
SetContentView(Resource.Layout.ekranStartowy); SetContentView(Resource.Layout.ekranStartowy);
} }
[Java.Interop.Export("LoadFromFolder")] [Java.Interop.Export("LoadFromFolder")]
public void LoadFile(View v) public void LoadFile(View v)
{ {
@ -219,259 +134,32 @@ namespace Klient.Droid
StartActivityForResult(Android.Content.Intent.CreateChooser(Intent, "Select Picture"), PickImageId); StartActivityForResult(Android.Content.Intent.CreateChooser(Intent, "Select Picture"), PickImageId);
} }
[Java.Interop.Export("LoadFromCamera")]
public void LoadFromCamera(View v)
{
Intent intent = new Intent(MediaStore.ActionImageCapture);
StartActivityForResult(intent, 0);
}
[Java.Interop.Export("GoToStart")]
public void GoToStart(View v)
{
SetContentView(Resource.Layout.ekranStartowy);
}
[Java.Interop.Export("GoToPoLogowaniu")]
public void GoToPoLogowaniu(View v)
{
SetContentView(Resource.Layout.ekranPoLogowaniu);
}
protected override void OnActivityResult(int requestCode, Result resultCode, Android.Content.Intent data) protected override void OnActivityResult(int requestCode, Result resultCode, Android.Content.Intent data)
{ {
SetContentView(Resource.Layout.ekranPoZdjeciu); SetContentView(Resource.Layout.ekranPoZdjeciu);
FindViewById<TextView>(Resource.Id.ErrorPhoto).Text = ""; Android.Net.Uri uri = data.Data;
if (requestCode == 0) photo = data;
{ FindViewById<ImageView>(Resource.Id.Preview).SetImageURI(uri);
photo = data;
base.OnActivityResult(requestCode, resultCode, data);
if (data != null)
{
bitmap = (Bitmap)data.Extras.Get("data");
byte[] bitmapData;
var stream = new MemoryStream();
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);
}
} }
[Java.Interop.Export("SendPhoto")] [Java.Interop.Export("SendPhoto")]
async public void UploadPhoto(View v) async public void UploadPhoto(View v)
{ {
if(photo.Data == null)
{
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("application/octet-stream");
fileContent.Headers.ContentDisposition = new ContentDispositionHeaderValue("form-data")
{
Name = "image",
FileName = Guid.NewGuid().ToString()
};
string boundary = "---8d0f01e6b3b5dafaaadaad";
MultipartFormDataContent formDataContent = new MultipartFormDataContent(boundary);
formDataContent.Add(fileContent);
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($"https://pixblocksaddition.azurewebsites.net/api/Search/{jsonString}");
if (second_response.StatusCode == HttpStatusCode.OK)
{
var second_jsonString = await response.Content.ReadAsStringAsync();
List<SearchResult> fullLink = JsonConvert.DeserializeObject<List<SearchResult>>(second_jsonString);
int end = 10;
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 + ": \n" + fullLink[i].link + "\n\n";
}
}
else
{
FindViewById<TextView>(Resource.Id.links).Text = "Coś poszło nie tak!";
}
}
else
{
string msg = await response.Content.ReadAsStringAsync();
FindViewById<TextView>(Resource.Id.ErrorPhoto).Text = msg;
}
}
using(var imageStream = ContentResolver.OpenInputStream(photo.Data)) using(var imageStream = ContentResolver.OpenInputStream(photo.Data))
using(var stramContent = new StreamContent(imageStream)) using(var stramContent = new StreamContent(imageStream))
using(var byteArrayContent = new ByteArrayContent(await stramContent.ReadAsByteArrayAsync())) using(var byteArrayContent = new ByteArrayContent(await stramContent.ReadAsByteArrayAsync()))
using(var formDataContent = new MultipartFormDataContent()) using(var formDataContent = new MultipartFormDataContent())
{ {
formDataContent.Add(byteArrayContent, "image", Guid.NewGuid() + ".jpg"); formDataContent.Add(byteArrayContent, "image", Guid.NewGuid() + ".jpg");
foreach (var content in formDataContent) foreach (var content in formDataContent)
{ {
content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(ContentResolver.GetType(photo.Data)); content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(ContentResolver.GetType(photo.Data));
break; break;
} }
var response = await client.PostAsync("https://pixblocksaddition.azurewebsites.net/api/Image/Process", formDataContent); var response = await client.PostAsync("http://10.0.2.2:5001/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($"https://pixblocksaddition.azurewebsites.net/api/Search/{jsonString}");
if(second_response.StatusCode == HttpStatusCode.OK)
{
var second_jsonString = await second_response.Content.ReadAsStringAsync();
List<SearchResult> fullLink = JsonConvert.DeserializeObject<List<SearchResult>>(second_jsonString);
int end = 10;
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";
}
}
else
{
FindViewById<TextView>(Resource.Id.links).Text = "Coś poszło nie tak!";
}
}
else
{
string msg = await response.Content.ReadAsStringAsync();
FindViewById<TextView>(Resource.Id.ErrorPhoto).Text = msg;
}
}
}
[Java.Interop.Export("GoToProfil")]
public void GoToProfile(View v)
{
SetContentView(Resource.Layout.ekranProfil);
FindViewById<EditText>(Resource.Id.ChangeName).Text = savedName;
FindViewById<EditText>(Resource.Id.ChangeSurname).Text = savedSurname;
FindViewById<EditText>(Resource.Id.ChangeEmail).Text = savedEmail;
FindViewById<TextView>(Resource.Id.ProfilPageLogin).Text = savedLogin;
}
[Java.Interop.Export("Save")]
public async void SaveChanges(View v)
{
var Name = FindViewById<EditText>(Resource.Id.ChangeName).Text;
var Surname = FindViewById<EditText>(Resource.Id.ChangeSurname).Text;
var Email = FindViewById<EditText>(Resource.Id.ChangeEmail).Text;
if (string.IsNullOrEmpty(Name))
{
Name = savedName;
}
if (string.IsNullOrEmpty(Email))
{
Email = savedEmail;
}
if (string.IsNullOrEmpty(Surname))
{
Surname = savedSurname;
}
var values = new Dictionary<string, string>
{
{ "id", userId },
{ "email", Email },
{ "name", Name },
{ "surname", Surname },
{ "login", savedLogin }
};
var content = new FormUrlEncodedContent(values);
var response = await client.PostAsync("https://pixblocksaddition.azurewebsites.net/api/User/Update", content);
if (response.StatusCode == HttpStatusCode.OK)
{
FindViewById<TextView>(Resource.Id.NullValueProfile).Text = "Zapisano!";
var jsonString = await response.Content.ReadAsStringAsync();
dynamic jsonObject = JsonConvert.DeserializeObject(jsonString);
savedLogin = jsonObject.login;
savedName = jsonObject.name;
savedEmail = jsonObject.email;
savedSurname = jsonObject.surname;
}
else
{
string msg = await response.Content.ReadAsStringAsync();
FindViewById<TextView>(Resource.Id.NullValueProfile).Text = msg;
} }
} }
[Java.Interop.Export("GetHistory")]
public async void GetUserHistory(View v)
{
SetContentView(Resource.Layout.ekranHistorii);
var response = await client.GetAsync("https://pixblocksaddition.azurewebsites.net/api/History");
if (response.StatusCode == HttpStatusCode.OK)
{
var jsonString = await response.Content.ReadAsStringAsync();
dynamic jsonObject = JsonConvert.DeserializeObject(jsonString);
var hs = (JArray)jsonObject.history;
List<string> history = hs.ToObject<List<string>>();
int end = 10;
int temp;
if (history.Count < 10) end = history.Count;
for (int i = 0; i < end; i++)
{
temp = i + 1;
FindViewById<TextView>(Resource.Id.history).Text = FindViewById<TextView>(Resource.Id.history).Text + "\n" + temp + ". " + history[i];
}
}
else
{
string msg = await response.Content.ReadAsStringAsync();
FindViewById<TextView>(Resource.Id.HistoryError).Text = msg;
}
}
[Java.Interop.Export("HelpPhoto")]
public void GotToHelpPhoto(View v)
{
SetContentView(Resource.Layout.ekranPomocZdjecie);
}
[Java.Interop.Export("LogOut")]
public void LogOut(View v)
{
SetContentView(Resource.Layout.ekranStartowy);
}
} }
} }

20
Klient/Klient/Klient.Android/Modules/SearchResult.cs
View File

@ -1,20 +0,0 @@
using Android.App;
using Android.Content;
using Android.OS;
using Android.Runtime;
using Android.Views;
using Android.Widget;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Klient.Droid.Modules
{
public class SearchResult
{
public string title { get; set; }
public string link { get; set; }
public string snippet { get; set; }
}
}

49
Klient/Klient/Klient.Android/Poszukiwacz.csproj
View File

@ -36,7 +36,6 @@
<BundleAssemblies>false</BundleAssemblies> <BundleAssemblies>false</BundleAssemblies>
<MandroidI18n /> <MandroidI18n />
<Debugger>Xamarin</Debugger> <Debugger>Xamarin</Debugger>
<AndroidSupportedAbis />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -49,7 +48,6 @@
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime> <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Mono.Android" /> <Reference Include="Mono.Android" />
<Reference Include="Mono.Android.Export" /> <Reference Include="Mono.Android.Export" />
<Reference Include="System" /> <Reference Include="System" />
@ -59,9 +57,6 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials"> <PackageReference Include="Xamarin.Essentials">
<Version>1.5.3.2</Version> <Version>1.5.3.2</Version>
</PackageReference> </PackageReference>
@ -74,7 +69,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="MainActivity.cs" /> <Compile Include="MainActivity.cs" />
<Compile Include="Modules\SearchResult.cs" />
<Compile Include="Resources\Resource.designer.cs" /> <Compile Include="Resources\Resource.designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
@ -100,6 +94,7 @@
<AndroidResource Include="Resources\mipmap-xxxhdpi\launcher_foreground.png" /> <AndroidResource Include="Resources\mipmap-xxxhdpi\launcher_foreground.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Modules\" />
<Folder Include="Resources\drawable-hdpi\" /> <Folder Include="Resources\drawable-hdpi\" />
<Folder Include="Resources\drawable-xhdpi\" /> <Folder Include="Resources\drawable-xhdpi\" />
<Folder Include="Resources\drawable-xxhdpi\" /> <Folder Include="Resources\drawable-xxhdpi\" />
@ -142,48 +137,6 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
</AndroidResource> </AndroidResource>
</ItemGroup> </ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\Obraz3.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\ekranProfil.xml">
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\ekranPomocZdjecie.xml">
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\ekranHistorii.xml">
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\ekranInformacji.xml">
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\ekranZLinkami.xml">
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\ekranPomocRejestracja.xml">
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\Obraz4.png" />
</ItemGroup>
<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" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>

7
Klient/Klient/Klient.Android/Properties/AndroidManifest.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.Klient.Android" android:installLocation="internalOnly"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.Klient.Android" android:installLocation="preferExternal">
<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="27" /> <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<application android:label="Klient.Android" android:usesCleartextTraffic="true" android:theme="@style/Base.Theme.AppCompat.Light.DarkActionBar" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<application android:label="Klient.Android" android:usesCleartextTraffic="true" />
</manifest> </manifest>

1
Klient/Klient/Klient.Android/Properties/AssemblyInfo.cs
View File

@ -15,7 +15,6 @@ using Android.App;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: Application(Theme = "@style/Base.Theme.AppCompat.Light.DarkActionBar")]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //

1251
Klient/Klient/Klient.Android/Resources/Resource.designer.cs generated
View File

File diff suppressed because it is too large Load Diff

BIN
Klient/Klient/Klient.Android/Resources/drawable/Obraz3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 925 B

BIN
Klient/Klient/Klient.Android/Resources/drawable/Obraz4.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 361 B

BIN
Klient/Klient/Klient.Android/Resources/drawable/Obraz8.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 730 B

69
Klient/Klient/Klient.Android/Resources/layout/ekranHistorii.xml
View File

@ -1,69 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffbdd7f0">
<ImageButton
android:src="@drawable/obraz4"
android:layout_width="38.5dp"
android:layout_height="35.0dp"
android:id="@+id/backHistory"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:background="#ffbdd7f0"
android:gravity="center"
android:onClick="GoToPoLogowaniu" />
<TextView
android:text="Poszukiwacz 2021"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/text3"
android:textColor="#ff000000"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"/>
<TextView
android:text="Historia wyszukiwań"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/HistoryTitle"
android:textStyle="bold"
android:layout_centerHorizontal="true"
android:textSize="30dp"
android:paddingTop="5dp"
android:textColor="#ff000000" />
<TextView
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/history"
android:layout_below="@+id/HistoryError"
android:textColor="#ff000000"
android:paddingBottom="35dp"
android:focusableInTouchMode="true"
android:isScrollContainer="true"
android:fadeScrollbars="true"
android:scrollbars="vertical"
android:verticalScrollbarPosition="right"
android:scrollIndicators="right"
android:scrollbarAlwaysDrawVerticalTrack="true"
android:textIsSelectable="true"
android:paddingTop="10dp"/>
<TextView
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/HistoryError"
android:layout_below="@+id/HistoryTitle"
android:textColor="#ffff0000"
android:layout_centerInParent="true"
android:paddingTop="10dp" />
</RelativeLayout>

60
Klient/Klient/Klient.Android/Resources/layout/ekranInformacji.xml
View File

@ -1,60 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffbdd7f0"
android:paddingTop="30dp">
<TextView
android:text="Poszukiwacz"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/title"
android:layout_centerHorizontal="true"
android:textSize="50dp"
android:textStyle="bold"
android:textColor="#ff000000" />
<TextView
android:text="Poszukiwacz jest aplikacją mobilną pozwalającą na wyszukiwanie w Internece stron zawierających schematy i tutoriale na podstawie treści zadania. \n Jednocześnie pomaga w nauce, jaki i przyśpiesza proces dokonywania researchu danych. "
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/textView1"
android:layout_below="@id/title"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:textColor="#ff373737" />
<TextView
android:text="Poszukiwacz 2021"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/text1"
android:textColor="#ff000000"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" />
<ImageButton
android:src="@drawable/obraz4"
android:layout_width="38.5dp"
android:layout_height="35.0dp"
android:id="@+id/backInformation"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:background="#ffbdd7f0"
android:gravity="center"
android:onClick="GoToMainScreenFromInformation" />
</RelativeLayout>

115
Klient/Klient/Klient.Android/Resources/layout/ekranLogowania.xml
View File

@ -8,79 +8,70 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#ffbdd7f0" android:background="#ffbdd7f0"
> >
<android.support.design.widget.TextInputLayout
android:id="@+id/LayoutLogin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:hint="Login">
<EditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:id="@+id/Login"
android:layout_alignParentStart="false"
android:minWidth="25px"
android:minHeight="25px"
android:layout_centerInParent="false"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
android:inputType="text"
android:textColor="#ff000000"
android:textColorHint="#ff6c6767" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputEditText
android:id="@+id/LayoutPassword" android:layout_width="204.0dp"
android:layout_width="wrap_content" android:layout_height="58.0dp"
android:layout_height="wrap_content" android:id="@+id/Login"
app:passwordToggleEnabled="true" android:layout_alignParentStart="false"
android:layout_below="@+id/LayoutLogin" android:minWidth="25px"
android:minHeight="25px"
android:layout_centerInParent="false"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
app:passwordToggleTint="@android:color/darker_gray" android:layout_alignParentTop="true"
android:hint="Login"
android:gravity="center_horizontal|center_vertical"
android:textColor="#ff000000"
android:textColorHint="#ff6c6767" />
<android.support.design.widget.TextInputEditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:id="@+id/Password"
android:layout_centerHorizontal="true"
android:layout_below="@+id/Login"
android:hint="Hasło" android:hint="Hasło"
android:gravity="left"> android:gravity="center_horizontal|center_vertical"
<EditText android:inputType="none|textPassword"
android:layout_width="204.0dp" android:textColor="#ff000000"
android:layout_height="58.0dp" android:textColorHint="#ff6c6767" />
android:id="@+id/Password"
android:layout_centerHorizontal="true"
android:layout_below="@+id/Login"
android:inputType="none|textPassword"
android:textColor="#ff000000"
android:textColorHint="#ff6c6767" />
</android.support.design.widget.TextInputLayout>
<Button <Button
android:layout_width="100.5dp" android:layout_width="100.5dp"
android:layout_height="50dp" android:layout_height="50dp"
android:id="@+id/In" android:id="@+id/In"
android:layout_below="@id/LayoutPassword" android:layout_below="@id/Password"
android:layout_alignParentRight="false" android:layout_alignParentRight="false"
android:gravity="center" android:gravity="center"
android:onClick="SignIn" android:onClick="SignIn"
android:text="Zaloguj" android:text="Zaloguj"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:foregroundGravity="center" /> android:foregroundGravity="center" />
<ImageButton <Button
android:src="@drawable/obraz4" android:text=" Reset \n Hasła"
android:layout_width="38.5dp" android:layout_width="100.5dp"
android:layout_height="35.0dp" android:layout_height="50dp"
android:id="@+id/backLogowanie" android:id="@+id/Reset"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:background="#ffbdd7f0"
android:gravity="center" android:gravity="center"
android:onClick="GoToStart"/>
<TextView
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/ErrorLogIn"
android:textColor="#ffd60000"
android:layout_below="@id/In" android:layout_below="@id/In"
android:layout_centerHorizontal="true" /> android:layout_alignParentRight="false"
android:autoSizeTextType="uniform"
android:onClick="ResetPassword"
android:textColor="#ff790000"
android:layout_centerHorizontal="true"
android:foregroundGravity="center" />
<Button
android:text="?"
android:layout_width="35.0dp"
android:layout_height="35.0dp"
android:id="@+id/help"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:background="#ff0b31c8"
android:textColor="#fffcfcfc"
android:gravity="center"
android:onClick="HelpLoginScreen" />
<TextView <TextView
android:text="Poszukiwacz 2021" android:text="Poszukiwacz 2020"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -88,5 +79,15 @@
android:textColor="#ff000000" android:textColor="#ff000000"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true" />
<Switch
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/LoginPasswordSee"
android:layout_below="@id/Login"
android:layout_toRightOf="@id/Password" />
</RelativeLayout> </RelativeLayout>

25
Klient/Klient/Klient.Android/Resources/layout/ekranPoLogowaniu.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -21,7 +21,7 @@
android:layout_marginLeft="75dp" android:layout_marginLeft="75dp"
android:onClick="LoadFromFolder" /> android:onClick="LoadFromFolder" />
<TextView <TextView
android:text="Poszukiwacz 2021" android:text="Poszukiwacz 2020"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -52,25 +52,4 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="75dp" android:layout_marginRight="75dp"
android:onClick="LoadFromCamera" /> android:onClick="LoadFromCamera" />
<Button
android:text="?"
android:layout_width="25.0dp"
android:layout_height="25.0dp"
android:id="@+id/helpPhoto"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:background="#ff0b31c8"
android:textColor="#fffcfcfc"
android:gravity="center"
android:onClick="HelpPhoto" />
<ImageButton
android:src="@drawable/obraz3"
android:layout_width="63.5dp"
android:layout_height="70.5dp"
android:background="#ffbdd7f0"
android:id="@+id/Profile"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:onClick="GoToProfil"/>
</RelativeLayout> </RelativeLayout>

38
Klient/Klient/Klient.Android/Resources/layout/ekranPoZdjeciu.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -15,35 +15,7 @@
android:text="Wyślij zdjęcie" android:text="Wyślij zdjęcie"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/SendPhoto" android:id="@+id/SendPhoto"
android:onClick="SendPhoto" android:onClick="SendPhoto"/>
android:layout_below="@id/Preview" />
<TextView </LinearLayout>
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/ErrorPhoto"
android:layout_centerHorizontal="true"
android:layout_below="@id/SendPhoto"
android:textColor="#ffd60000" />
<ImageButton
android:src="@drawable/obraz4"
android:layout_width="38.5dp"
android:layout_height="35.0dp"
android:id="@+id/backZdjecie"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:background="#ffbdd7f0"
android:gravity="center"
android:onClick="GoToPoLogowaniu" />
<TextView
android:text="Poszukiwacz 2021"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/text1"
android:textColor="#ff000000"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" />
</RelativeLayout>

70
Klient/Klient/Klient.Android/Resources/layout/ekranPomocRejestracja.xml
View File

@ -1,70 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffbdd7f0">
<TextView
android:text="Login powinien składać się z 3 do 12 znaków!"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/loginTip"
android:paddingTop="20dp"
android:textColor="#ff000000" />
<TextView
android:text="Hasło musi się składać z 8 do 20 znaków!"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/passwordTip"
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"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/textView1"
android:textColor="#ffb1d5f8"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" />
<TextView
android:text="Poszukiwacz 2021"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/text1"
android:textColor="#ff000000"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" />
<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="#ffbdd7f0"
android:gravity="center"
android:onClick="GoToRegister" />
</RelativeLayout>

36
Klient/Klient/Klient.Android/Resources/layout/ekranPomocZdjecie.xml
View File

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffbdd7f0">
<TextView
android:text="Poszukiwacz 2021"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/text1"
android:textColor="#ff000000"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" />
<ImageButton
android:src="@drawable/obraz4"
android:layout_width="38.5dp"
android:layout_height="35.0dp"
android:id="@+id/backPomocZdjecie"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:background="#ffbdd7f0"
android:gravity="center"
android:onClick="GoToPoLogowaniu" />
<TextView
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"
android:id="@+id/textView1"
android:textColor="#ff000000" />
</RelativeLayout>

132
Klient/Klient/Klient.Android/Resources/layout/ekranProfil.xml
View File

@ -1,132 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffbdd7f0">
<TextView
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/ProfilPageLogin"
android:layout_centerHorizontal="true"
android:textStyle="bold"
android:textSize="30dp" />
<android.support.design.widget.TextInputLayout
android:id="@+id/LayoutNameC"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_below="@id/ProfilPageLogin"
android:hint="Imie"
android:layout_alignParentLeft="true">
<android.support.design.widget.TextInputEditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/ChangeName"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:capitalize="words"
android:textColorHint="#ff6c6767"
android:textColor="#ff000000"
android:inputType="none|textPersonName" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/LayoutSurnameC"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:hint="Nazwisko"
android:layout_below="@id/LayoutNameC"
android:layout_alignParentLeft="true">
<android.support.design.widget.TextInputEditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/ChangeSurname"
android:textColorHint="#ff6c6767"
android:textColor="#ff000000"
android:inputType="none|textPersonName" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/LayoutEmailC"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:hint="Adres email"
android:layout_below="@id/LayoutSurnameC"
android:layout_alignParentLeft="true">
<android.support.design.widget.TextInputEditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/ChangeEmail"
android:textColorHint="#ff6c6767"
android:textColor="#ff000000"
android:inputType="none|textEmailAddress" />
</android.support.design.widget.TextInputLayout>
<Button
android:text="Zapisz"
android:layout_width="100.5dp"
android:layout_height="50dp"
android:id="@+id/Save"
android:layout_below="@id/LayoutEmailC"
android:layout_centerHorizontal="true"
android:foregroundGravity="center"
android:gravity="center"
android:onClick="Save"/>
<TextView
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/NullValueProfile"
android:layout_centerHorizontal="true"
android:layout_below="@id/Save"
android:textColor="#ffd60000" />
<TextView
android:text="Poszukiwacz 2021"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/text3"
android:textColor="#ff000000"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" />
<ImageButton
android:src="@drawable/obraz4"
android:layout_width="38.5dp"
android:layout_height="35.0dp"
android:id="@+id/backProfil"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:background="#ffbdd7f0"
android:gravity="center"
android:onClick="GoToPoLogowaniu" />
<Button
android:text="Historia"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/GetHistory"
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>

235
Klient/Klient/Klient.Android/Resources/layout/ekranRejestracji.xml
View File

@ -1,127 +1,96 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#ffbdd7f0"> android:background="#ffbdd7f0">
<android.support.design.widget.TextInputLayout
android:id="@+id/LayoutName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:hint="Imie"
android:layout_alignParentLeft="true">
<android.support.design.widget.TextInputEditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/Name"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:capitalize="words"
android:textColorHint="#ff6c6767"
android:textColor="#ff000000"
android:inputType="none|textPersonName" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputEditText
android:id="@+id/LayoutSurname" android:layout_width="204.0dp"
android:layout_width="wrap_content" android:layout_height="58.0dp"
android:layout_height="wrap_content" android:minWidth="25px"
android:layout_centerHorizontal="true" android:minHeight="25px"
android:id="@+id/Name"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:capitalize="words"
android:textColorHint="#ff6c6767"
android:textColor="#ff000000"
android:hint="Imie"
android:gravity="center"
android:inputType="none|textPersonName" />
<android.support.design.widget.TextInputEditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/Surname"
android:hint="Nazwisko" android:hint="Nazwisko"
android:layout_below="@id/LayoutName" android:textColorHint="#ff6c6767"
android:layout_alignParentLeft="true"> android:layout_below="@id/Name"
<android.support.design.widget.TextInputEditText android:gravity="center"
android:layout_width="204.0dp" android:textColor="#ff000000"
android:layout_height="58.0dp" android:inputType="none|textPersonName" />
android:minWidth="25px" <android.support.design.widget.TextInputEditText
android:minHeight="25px" android:layout_width="204.0dp"
android:id="@+id/Surname" android:layout_height="58.0dp"
android:textColorHint="#ff6c6767" android:minWidth="25px"
android:layout_below="@id/Name" android:minHeight="25px"
android:textColor="#ff000000" android:id="@+id/Email"
android:inputType="none|textPersonName" /> android:layout_below="@+id/NewLogin"
</android.support.design.widget.TextInputLayout> android:hint="Email"
<android.support.design.widget.TextInputLayout android:gravity="center"
android:id="@+id/LayoutEmail" android:textColorHint="#ff6c6767"
android:layout_width="wrap_content" android:textColor="#ff000000"
android:layout_height="wrap_content" android:inputType="none|textEmailAddress" />
android:layout_centerHorizontal="true" <android.support.design.widget.TextInputEditText
android:hint="Adres email" android:layout_width="204.0dp"
android:layout_below="@id/LayoutSurname" android:layout_height="58.0dp"
android:layout_alignParentLeft="true"> android:minWidth="25px"
<android.support.design.widget.TextInputEditText android:minHeight="25px"
android:layout_width="204.0dp" android:id="@+id/NewPassword"
android:layout_height="58.0dp"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/Email"
android:textColorHint="#ff6c6767"
android:textColor="#ff000000"
android:inputType="none|textEmailAddress" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/LayoutNewPassword1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:passwordToggleEnabled="true"
app:passwordToggleTint="@android:color/darker_gray"
android:layout_centerHorizontal="true"
android:hint="Hasło" android:hint="Hasło"
android:layout_below="@id/LayoutEmail" android:layout_below="@+id/Email"
android:layout_alignParentLeft="true"> android:gravity="center"
<android.support.design.widget.TextInputEditText android:inputType="none|textPassword"
android:layout_width="204.0dp" android:textColorHint="#ff6c6767" />
android:layout_height="58.0dp" <android.support.design.widget.TextInputEditText
android:minWidth="25px" android:layout_width="204.0dp"
android:minHeight="25px" android:layout_height="58.0dp"
android:textColor="#ff000000" android:minWidth="25px"
android:textColorHint="#ff6c6767" android:minHeight="25px"
android:id="@+id/NewPassword" android:id="@+id/RepeatPassword"
android:inputType="none|textPassword" /> android:layout_below="@+id/NewPassword"
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/LayoutNewPassword2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:hint="Powtórz hasło" android:hint="Powtórz hasło"
app:passwordToggleEnabled="true" android:inputType="none|textPassword"
app:passwordToggleTint="@android:color/darker_gray" android:gravity="center"
android:layout_below="@id/LayoutNewPassword1" android:textColorHint="#ff6c6767"
android:layout_alignParentLeft="true"> android:textColor="#ff000000" />
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
android:layout_width="204.0dp" android:layout_width="204.0dp"
android:layout_height="58.0dp" android:layout_height="58.0dp"
android:minWidth="25px" android:minWidth="25px"
android:minHeight="25px" android:minHeight="25px"
android:id="@+id/RepeatPassword" android:id="@+id/NewLogin"
android:inputType="none|textPassword" android:hint="Login"
android:textColor="#ff000000" android:gravity="center"
android:textColorHint="#ff6c6767" /> android:textColorHint="#ff6c6767"
</android.support.design.widget.TextInputLayout> android:textColor="#ff000000"
<android.support.design.widget.TextInputLayout android:layout_below="@+id/Surname" />
android:id="@+id/LayoutNewLogin" <Switch
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:id="@+id/PasswordSee1"
android:hint="Login" android:layout_toRightOf="@id/NewPassword"
android:layout_below="@id/LayoutNewPassword2" android:layout_below="@id/Email" />
android:layout_alignParentLeft="true"> <Switch
<android.support.design.widget.TextInputEditText android:layout_width="wrap_content"
android:layout_width="204.0dp" android:layout_height="wrap_content"
android:layout_height="58.0dp" android:id="@+id/PasswordSee2"
android:minWidth="25px" android:layout_toRightOf="@id/RepeatPassword"
android:minHeight="25px" android:layout_below="@id/NewPassword"
android:id="@+id/NewLogin" android:checked="false" />
android:textColor="#ff000000"
android:layout_below="@+id/Surname" />
</android.support.design.widget.TextInputLayout>
<Button <Button
android:text=" Załóż \n konto" android:text=" Załóż \n konto"
android:layout_width="100.5dp" android:layout_width="100.5dp"
@ -129,13 +98,21 @@
android:id="@+id/SignUp" android:id="@+id/SignUp"
android:autoSizeTextType="uniform" android:autoSizeTextType="uniform"
android:gravity="center" android:gravity="center"
android:layout_below="@id/LayoutNewLogin" android:layout_below="@id/RepeatPassword"
android:layout_alignParentRight="false" android:layout_alignParentRight="false"
android:foregroundGravity="center" android:foregroundGravity="center"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:onClick="SignUp" /> android:onClick="SignUp" />
<TextView <TextView
android:text="Poszukiwacz 2021" android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/text2"
android:layout_below="@id/Email"
android:layout_alignParentRight="false"
android:layout_toRightOf="@id/NewPassword" />
<TextView
android:text="Poszukiwacz 2020"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -143,35 +120,7 @@
android:textColor="#ff000000" android:textColor="#ff000000"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true" />
<TextView
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/ErrorRegister"
android:textColor="#ffd60000"
android:layout_below="@id/SignUp"
android:layout_centerHorizontal="true" />
<Button
android:text="?"
android:layout_width="25.0dp"
android:layout_height="25.0dp"
android:id="@+id/helpRegister"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:background="#ff0b31c8"
android:textColor="#fffcfcfc"
android:gravity="center"
android:onClick="HelpRegisterScreen" />
<ImageButton
android:src="@drawable/obraz4"
android:layout_width="38.5dp"
android:layout_height="35.0dp"
android:id="@+id/backRejestracja"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:background="#ffbdd7f0"
android:gravity="center"
android:onClick="GoToStart" />
</RelativeLayout> </RelativeLayout>

19
Klient/Klient/Klient.Android/Resources/layout/ekranStartowy.xml
View File

@ -20,7 +20,7 @@
android:textSize="45dp" android:textSize="45dp"
android:layout_marginVertical="100dp" /> android:layout_marginVertical="100dp" />
<TextView <TextView
android:text="Poszukiwacz 2021" android:text="Poszukiwacz 2020"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -30,15 +30,26 @@
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true" />
<Button <Button
android:text="?" android:text="?"
android:layout_width="25.0dp" android:layout_width="35.0dp"
android:layout_height="25.0dp" android:layout_height="35.0dp"
android:id="@+id/about" android:id="@+id/help"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:background="#ff0b31c8" android:background="#ff0b31c8"
android:textColor="#fffcfcfc" android:textColor="#fffcfcfc"
android:gravity="center" android:gravity="center"
android:onClick="HelpLoginScreen" /> android:onClick="HelpLoginScreen" />
<Button
android:text="I"
android:layout_width="35.0dp"
android:layout_height="35.0dp"
android:id="@+id/about"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:background="#ff0b31c8"
android:textColor="#fffcfcfc"
android:gravity="center"
android:onClick="AboutMainScreen" />
<Button <Button
android:text="Zaloguj" android:text="Zaloguj"
android:layout_width="200.0dp" android:layout_width="200.0dp"

70
Klient/Klient/Klient.Android/Resources/layout/ekranZLinkami.xml
View File

@ -1,70 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffbdd7f0">
<TextView
android:text="Proponowane materiały"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/linkTitle"
android:textStyle="bold"
android:layout_centerHorizontal="true"
android:translationY="5dp"
android:textColor="#ff000000" />
<TextView
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/links"
android:layout_below="@+id/LinkError"
android:textColor="#ff393939"
android:linksClickable="true"
android:autoLink="web"
android:fadeScrollbars="true"
android:scrollbars="vertical"
android:verticalScrollbarPosition="right"
android:scrollIndicators="right"
android:paddingBottom="35dp"
android:scrollbarAlwaysDrawVerticalTrack="true"
android:isScrollContainer="true"
android:textIsSelectable="true"
android:focusableInTouchMode="true"
android:paddingTop="10dp" />
<TextView
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/linkTitle"
android:id="@+id/LinkError"
android:textColor="#ffff0000"
android:layout_centerInParent="true"
android:paddingTop="10dp" />
<ImageButton
android:src="@drawable/obraz4"
android:layout_width="38.5dp"
android:layout_height="35.0dp"
android:id="@+id/backToSendPhoto"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:background="#ffbdd7f0"
android:gravity="center"
android:onClick="GoToPoLogowaniu" />
<TextView
android:text="Poszukiwacz 2021"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/text1"
android:textColor="#ff000000"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" />
</RelativeLayout>

3
Klient/Klient/Klient.Android/Resources/values/styles.xml
View File

@ -4,7 +4,7 @@
<style name="MainTheme" parent="MainTheme.Base"> <style name="MainTheme" parent="MainTheme.Base">
</style> </style>
<!-- Base theme applied no matter what API --> <!-- Base theme applied no matter what API -->
<style name="MainTheme.Base" parent="Theme.AppCompat"> <style name="MainTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
<!--If you are using revision 22.1 please use just windowNoTitle. Without android:--> <!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<!--We will be using the toolbar so no need to show ActionBar--> <!--We will be using the toolbar so no need to show ActionBar-->
@ -20,7 +20,6 @@
<!-- You can also set colorControlNormal, colorControlActivated <!-- You can also set colorControlNormal, colorControlActivated
colorControlHighlight and colorSwitchThumbNormal. --> colorControlHighlight and colorSwitchThumbNormal. -->
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>
<item name="android:textColorHint">#ff000000</item>
<item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item> <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
</style> </style>

5
Klient/Klient/Klient.Android/Resources/xml/file_paths.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<cache-path name="my_images"
path="path" />
</paths>

6
Serwer/Serwer.Api/.config/dotnet-tools.json
View File

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

28
Serwer/Serwer.Api/Controllers/HistoryController.cs
View File

@ -1,28 +0,0 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Serwer.Infrastructure.Services;
using System;
using System.Threading.Tasks;
namespace Serwer.Api.Controllers
{
[Route("api/[controller]")]
[ApiController]
public class HistoryController: ControllerBase
{
private readonly IHistoryService _historyService;
public HistoryController(IHistoryService historyService)
{
_historyService = historyService;
}
[Authorize]
[HttpGet()]
public async Task<IActionResult> Get()
{
var id = User.Identity.Name;
var history = await _historyService.GetAsync(Guid.Parse(id));
return Ok(history);
}
}
}

8
Serwer/Serwer.Api/Controllers/ImageController.cs
View File

@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Serwer.Infrastructure.Services; using Serwer.Infrastructure.Services;
using System; using System;
@ -14,13 +13,12 @@ namespace Serwer.Api.Controllers
[ApiController] [ApiController]
public class ImageController : ControllerBase public class ImageController : ControllerBase
{ {
private readonly IImageHandler _imageService; private readonly IImageService _imageService;
public ImageController(IImageHandler imageService) public ImageController(IImageService imageService)
{ {
_imageService = imageService; _imageService = imageService;
} }
[Authorize]
[HttpPost("Process")] [HttpPost("Process")]
public async Task<IActionResult> Process([FromForm]IFormFile image) public async Task<IActionResult> Process([FromForm]IFormFile image)
{ {

31
Serwer/Serwer.Api/Controllers/SearchController.cs
View File

@ -1,31 +0,0 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Serwer.Infrastructure.Services;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Serwer.Api.Controllers
{
[Route("api/[controller]")]
[ApiController]
public class SearchController : ControllerBase
{
private readonly ISearchService _searchService;
public SearchController(ISearchService searchService)
{
_searchService = searchService;
}
[Authorize]
[HttpGet("{query}")]
public async Task<IActionResult> Search(string query)
{
var id = User.Identity.Name;
var results = await _searchService.Search(Guid.Parse(id), query);
return Ok(results);
}
}
}

11
Serwer/Serwer.Api/Controllers/UserController.cs
View File

@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Serwer.Infrastructure.DTO; using Serwer.Infrastructure.DTO;
using Serwer.Infrastructure.Services; using Serwer.Infrastructure.Services;
@ -36,14 +35,6 @@ namespace Serwer.Api.Controllers
return Ok(user); return Ok(user);
} }
[Authorize]
[HttpPost("Update")]
public async Task<IActionResult> Update([FromForm]UpdateUserModel request)
{
var user = await _userService.UpdateAsync(request);
return Ok(user);
}
[HttpGet("Test")] [HttpGet("Test")]
public IActionResult Test() public IActionResult Test()
{ {

38
Serwer/Serwer.Api/Framework/ExceptionHandlerMiddleware.cs
View File

@ -1,38 +0,0 @@
using Microsoft.AspNetCore.Http;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Threading.Tasks;
namespace Serwer.Api.Framework
{
public class ExceptionHandlerMiddleware
{
private readonly RequestDelegate _next;
public ExceptionHandlerMiddleware(RequestDelegate next)
{
_next = next;
}
public async Task Invoke(HttpContext context)
{
try
{
await _next(context);
}
catch (Exception ex)
{
await HandleExceptionAsync(context, ex);
}
}
private static Task HandleExceptionAsync(HttpContext context, Exception exception)
{
var statusCode = HttpStatusCode.BadRequest;
context.Response.StatusCode = (int)statusCode;
return context.Response.WriteAsync($"Błąd: {exception.Message}");
}
}
}

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

@ -1,80 +0,0 @@
{
"$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"
}
}

8
Serwer/Serwer.Api/Properties/serviceDependencies.PixBlocksAddition - Web Deploy.json
View File

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

7
Serwer/Serwer.Api/Properties/serviceDependencies.json
View File

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

50
Serwer/Serwer.Api/Startup.cs
View File

@ -15,7 +15,6 @@ using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens; using Microsoft.IdentityModel.Tokens;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi.Models;
using Serwer.Api.Framework;
using Serwer.Core.Repositories; using Serwer.Core.Repositories;
using Serwer.Infrastructure.Mappers; using Serwer.Infrastructure.Mappers;
using Serwer.Infrastructure.Repositories; using Serwer.Infrastructure.Repositories;
@ -42,30 +41,9 @@ namespace Serwer.Api
services.AddSwaggerGen(c => services.AddSwaggerGen(c =>
{ {
c.SwaggerDoc("v1", new OpenApiInfo { Title = "Serwer.Api", Version = "v1" }); c.SwaggerDoc("v1", new OpenApiInfo { Title = "Serwer.Api", Version = "v1" });
var jwtSecurityScheme = new OpenApiSecurityScheme
{
Scheme = "bearer",
BearerFormat = "JWT",
Name = "JWT Authentication",
In = ParameterLocation.Header,
Type = SecuritySchemeType.Http,
Description = "Put **_ONLY_** your JWT Bearer token on textbox below!",
Reference = new OpenApiReference
{
Id = JwtBearerDefaults.AuthenticationScheme,
Type = ReferenceType.SecurityScheme
}
};
c.AddSecurityDefinition(jwtSecurityScheme.Reference.Id, jwtSecurityScheme);
c.AddSecurityRequirement(new OpenApiSecurityRequirement
{
{ jwtSecurityScheme, Array.Empty<string>() }
});
}); });
var hostEnviroment = new HostEnviroment { RootPath = WebRootPath }; var hostEnviroment = new HostEnviroment { RootPath = WebRootPath};
var jwtSettings = new JwtSettings() var jwtSettings = new JwtSettings()
{ {
Issuer = "PoszukiwaczInc", Issuer = "PoszukiwaczInc",
@ -89,33 +67,27 @@ namespace Serwer.Api
services.AddSingleton<IMapper>(AutoMapperConfig.Initialize()); services.AddSingleton<IMapper>(AutoMapperConfig.Initialize());
services.AddSingleton<IJwtHandler, JwtHandler>(sp => new JwtHandler(jwtSettings)); services.AddSingleton<IJwtHandler, JwtHandler>(sp => new JwtHandler(jwtSettings));
services.AddScoped<IUserRepository, UserRepository>(); services.AddScoped<IUserRepository, UserRepository>();
services.AddScoped<IHistoryRepository, HistoryRepository>(); services.AddScoped<IImageService, ImageService>();
services.AddScoped<IImageHandler, ImageHandler>();
services.AddScoped<IUserService, UserService>(); services.AddScoped<IUserService, UserService>();
services.AddScoped<IHistoryService, HistoryService>();
services.AddScoped<ISearchService, SearchService>();
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IWebHostEnvironment env) public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{ {
app.UseCors(builder =>
{
builder.AllowAnyHeader();
builder.AllowAnyMethod();
builder.AllowAnyOrigin();
});
if (env.IsDevelopment()) if (env.IsDevelopment())
{ {
app.UseCors(builder =>
{
builder.AllowAnyHeader();
builder.AllowAnyMethod();
builder.AllowAnyOrigin();
});
app.UseDeveloperExceptionPage(); 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(); app.UseRouting();
app.UseMiddleware(typeof(ExceptionHandlerMiddleware));
app.UseAuthentication(); app.UseAuthentication();
app.UseAuthorization(); app.UseAuthorization();

13
Serwer/Serwer.Core/Domain/SearchResult.cs
View File

@ -1,13 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Serwer.Core.Domain
{
public class SearchResult
{
}
}

15
Serwer/Serwer.Core/Domain/User.cs
View File

@ -18,22 +18,21 @@ namespace Serwer.Core.Domain
public DateTime UpdatedAt { get; protected set; } public DateTime UpdatedAt { get; protected set; }
protected User() { } protected User() { }
public User(Guid id, string email, string name, string surname, string login, string password) public User(string email, string name, string surname, string login, string password)
{ {
Id = id; Id = Guid.NewGuid();
SetEmail(email); SetEmail(email);
SetName(name); SetName(name);
SetSurname(surname); SetSurname(surname);
SetLogin(login); SetLogin(login);
SetPassword(password); SetPassword(password);
CreatedAt = DateTime.UtcNow;
} }
public void SetEmail(string email) public void SetEmail(string email)
{ {
if (string.IsNullOrWhiteSpace(email)) if (string.IsNullOrWhiteSpace(email))
{ {
throw new Exception("Email nie może być pusty."); throw new Exception("Email cannot be empty");
} }
if (Email == email) if (Email == email)
{ {
@ -48,7 +47,7 @@ namespace Serwer.Core.Domain
{ {
if (string.IsNullOrWhiteSpace(name)) if (string.IsNullOrWhiteSpace(name))
{ {
throw new Exception("Imię nie może być puste."); throw new Exception("Name cannot be empty");
} }
if (Name == name) if (Name == name)
{ {
@ -63,7 +62,7 @@ namespace Serwer.Core.Domain
{ {
if (string.IsNullOrWhiteSpace(surname)) if (string.IsNullOrWhiteSpace(surname))
{ {
throw new Exception("Nazwisko nie może być puste."); throw new Exception("Surname cannot be empty");
} }
if (Surname == surname) if (Surname == surname)
{ {
@ -78,7 +77,7 @@ namespace Serwer.Core.Domain
{ {
if (string.IsNullOrWhiteSpace(login)) if (string.IsNullOrWhiteSpace(login))
{ {
throw new Exception("Login nie może być pusty."); throw new Exception("Login cannot be empty");
} }
if (Login == login) if (Login == login)
{ {
@ -93,7 +92,7 @@ namespace Serwer.Core.Domain
{ {
if (string.IsNullOrWhiteSpace(password)) if (string.IsNullOrWhiteSpace(password))
{ {
throw new Exception("Hasło nie może być puste."); throw new Exception("Password cannot be empty");
} }
if (Password == password) if (Password == password)
{ {

32
Serwer/Serwer.Core/Domain/UserHistory.cs
View File

@ -1,32 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Serwer.Core.Domain
{
public class UserHistory
{
private readonly ISet<string> _history;
public User User { get; protected set; }
public List<string> History
{
get
{
return _history.Select(x => x).ToList();
}
}
public UserHistory(User user)
{
User = user;
_history = new HashSet<string>();
}
public void Add(string query)
{
_history.Add(query);
}
}
}

15
Serwer/Serwer.Core/Repositories/IHistoryRepository.cs
View File

@ -1,15 +0,0 @@
using Serwer.Core.Domain;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Serwer.Core.Repositories
{
public interface IHistoryRepository
{
Task AddAsync(User user, string query);
Task<UserHistory> GetAsync(User user);
}
}

15
Serwer/Serwer.Infrastructure/DTO/SearchResultDto.cs
View File

@ -1,15 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Serwer.Infrastructure.DTO
{
public class SearchResultDTO
{
public string Title { get; set; }
public string Link { get; set; }
public string Snippet { get; set; }
}
}

1
Serwer/Serwer.Infrastructure/DTO/UserDto.cs
View File

@ -8,7 +8,6 @@ namespace Serwer.Infrastructure.DTO
{ {
public class UserDto public class UserDto
{ {
public Guid Id { get; set; }
public string Email { get; set; } public string Email { get; set; }
public string Name { get; set; } public string Name { get; set; }
public string Surname { get; set; } public string Surname { get; set; }

14
Serwer/Serwer.Infrastructure/DTO/UserHistoryDto.cs
View File

@ -1,14 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Serwer.Infrastructure.DTO
{
public class UserHistoryDto
{
public List<string> History { get; set; }
public UserDto User { get; set; }
}
}

74
Serwer/Serwer.Infrastructure/Framework/OCRResponseData.cs
View File

@ -1,74 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Serwer.Infrastructure.Framework
{
public class OCRResponseData
{
/// <summary>
/// Error message
/// </summary>
public string ErrorMessage { get; set; }
/// <summary>
/// Available pages
/// </summary>
public int AvailablePages { get; set; }
/// <summary>
/// OCRed text
/// </summary>
public List<List<string>> OCRText { get; set; }
/// <summary>
/// Output file1 URL
/// </summary>
public string OutputFileUrl { get; set; }
/// <summary>
/// Output file2 URL
/// </summary>
public string OutputFileUrl2 { get; set; }
/// <summary>
/// Output file3 URL
/// </summary>
public string OutputFileUrl3 { get; set; }
/// <summary>
/// Reserved
/// </summary>
public List<List<string>> Reserved { get; set; }
/// <summary>
/// OCRWords
/// </summary>
public List<List<OCRWSWord>> OCRWords { get; set; }
/// <summary>
/// Task description
/// </summary>
public string TaskDescription { get; set; }
/// <summary>
/// Constructor
/// </summary>
public OCRResponseData()
{
OCRText = new List<List<string>>();
Reserved = new List<List<string>>();
OCRWords = new List<List<OCRWSWord>>();
}
}
public class OCRWSWord
{
public int Top;
public int Left;
public int Height;
public int Width;
public string OCRWord;
}
}

1
Serwer/Serwer.Infrastructure/Mappers/AutoMapperConfig.cs
View File

@ -15,7 +15,6 @@ namespace Serwer.Infrastructure.Mappers
=> new MapperConfiguration(cfg => => new MapperConfiguration(cfg =>
{ {
cfg.CreateMap<User, UserDto>(); cfg.CreateMap<User, UserDto>();
cfg.CreateMap<UserHistory, UserHistoryDto>();
}) })
.CreateMapper(); .CreateMapper();
} }

31
Serwer/Serwer.Infrastructure/Repositories/HistoryRepository.cs
View File

@ -1,31 +0,0 @@
using Serwer.Core.Domain;
using Serwer.Core.Repositories;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Serwer.Infrastructure.Repositories
{
public class HistoryRepository: IHistoryRepository
{
private static ISet<UserHistory> _history = new HashSet<UserHistory>();
public async Task AddAsync(User user, string query)
{
var history = _history.FirstOrDefault(x => x.User.Id == user.Id);
if(history == null)
{
history = new UserHistory(user);
}
history.Add(query);
await Task.FromResult(_history.Add(history));
}
public async Task<UserHistory> GetAsync(User user)
{
var history = _history.FirstOrDefault(x => x.User.Id == user.Id);
return await Task.FromResult(history);
}
}
}

36
Serwer/Serwer.Infrastructure/Services/HistoryService.cs
View File

@ -1,36 +0,0 @@
using AutoMapper;
using Serwer.Core.Domain;
using Serwer.Core.Repositories;
using Serwer.Infrastructure.DTO;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Serwer.Infrastructure.Services
{
public class HistoryService: IHistoryService
{
private readonly IHistoryRepository _historyRepository;
private readonly IUserRepository _userRepository;
private readonly IMapper _mapper;
public HistoryService(IHistoryRepository historyRepository, IUserRepository userRepository, IMapper mapper)
{
_historyRepository = historyRepository;
_userRepository = userRepository;
_mapper = mapper;
}
public async Task<UserHistoryDto> GetAsync(Guid userId)
{
var user = await _userRepository.GetAsync(userId);
if(user == null)
{
throw new Exception("Coś poszło nie tak.");
}
var history = await _historyRepository.GetAsync(user);
return _mapper.Map<UserHistoryDto>(history);
}
}
}

5
Serwer/Serwer.Infrastructure/Services/IImageHandler.cs
View File

@ -1,5 +1,4 @@
using Serwer.Core.Domain; using System;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@ -9,6 +8,6 @@ namespace Serwer.Infrastructure.Services
{ {
public interface IImageHandler public interface IImageHandler
{ {
Task<string> Process(string name, string contentType, byte[] bytes);
} }
} }

5
Serwer/Serwer.Infrastructure/Services/IHistoryService.cs → Serwer/Serwer.Infrastructure/Services/IImageService.cs
View File

@ -1,5 +1,4 @@
using Serwer.Core.Domain; using Serwer.Core.Domain;
using Serwer.Infrastructure.DTO;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -8,8 +7,8 @@ using System.Threading.Tasks;
namespace Serwer.Infrastructure.Services namespace Serwer.Infrastructure.Services
{ {
public interface IHistoryService public interface IImageService
{ {
Task<UserHistoryDto> GetAsync(Guid userId); Task<string> Process(string name, string contentType, byte[] bytes);
} }
} }

13
Serwer/Serwer.Infrastructure/Services/ISearchService.cs
View File

@ -1,13 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Serwer.Infrastructure.DTO;
namespace Serwer.Infrastructure.Services
{
public interface ISearchService
{
Task<IList<SearchResultDTO>> Search(Guid userId, string query);
}
}

2
Serwer/Serwer.Infrastructure/Services/IUserService.cs
View File

@ -1,5 +1,4 @@
using Serwer.Infrastructure.DTO; using Serwer.Infrastructure.DTO;
using Serwer.Infrastructure.ViewModels;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -12,6 +11,5 @@ namespace Serwer.Infrastructure.Services
{ {
Task RegisterAsync(string email, string name, string surname, string login, string password); Task RegisterAsync(string email, string name, string surname, string login, string password);
Task<SignedUserDto> SignInAsync(string login, string password); Task<SignedUserDto> SignInAsync(string login, string password);
Task<UserDto> UpdateAsync(UpdateUserModel userModel);
} }
} }

77
Serwer/Serwer.Infrastructure/Services/ImageHandler.cs
View File

@ -1,85 +1,12 @@
using Newtonsoft.Json; using System;
using Serwer.Core.Domain;
using Serwer.Infrastructure.Framework;
using Serwer.Infrastructure.Settings;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Net;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Tesseract;
namespace Serwer.Infrastructure.Services namespace Serwer.Infrastructure.Services
{ {
public class ImageHandler : IImageHandler class ImageHandler
{ {
private readonly ISet<File> _files = new HashSet<File>();
private readonly string _env;
public ImageHandler(IHostEnviroment hostEnviroment)
{
_env = hostEnviroment.RootPath;
}
public async Task<string> Process(string name, string contentType, byte[] bytes)
{
string license_code = "FC935C59-F248-48A3-9970-8A6BDB66FA86";
string user_name = "poszukiwacz";
string ocrURL = @"http://www.ocrwebservice.com/restservices/processDocument?gettext=true&outputformat=txt&language=polish";
byte[] uploadData = bytes;
HttpWebRequest request = CreateHttpRequest(ocrURL, user_name, license_code, "POST");
request.ContentLength = uploadData.Length;
// Send request
using (System.IO.Stream post = request.GetRequestStream())
{
post.Write(uploadData, 0, (int)uploadData.Length);
}
try
{
// Get response
using (HttpWebResponse response = request.GetResponse() as HttpWebResponse)
{
// Parse JSON response
string strJSON = new System.IO.StreamReader(response.GetResponseStream()).ReadToEnd();
OCRResponseData ocrResponse = JsonConvert.DeserializeObject<OCRResponseData>(strJSON);
return await Task.FromResult(ocrResponse.OCRText.First().First());
}
}
catch (WebException wex)
{
var x = string.Format("OCR API Error. HTTPCode:{0}", ((HttpWebResponse)wex.Response).StatusCode);
throw wex;
}
/*
var engine = new TesseractEngine(System.IO.Path.Combine(_env, "tessdata"),"eng+equ", EngineMode.Default);
var img = Pix.LoadFromMemory(bytes);
var res = engine.Process(img);
var txt = res.GetText();
return await Task.FromResult(txt);
*/
}
private static HttpWebRequest CreateHttpRequest(string address_url, string user_name, string license_code, string http_method)
{
Uri address = new Uri(address_url);
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(address);
byte[] authBytes = Encoding.UTF8.GetBytes(string.Format("{0}:{1}", user_name, license_code).ToCharArray());
request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(authBytes);
request.Method = http_method;
request.Timeout = 600000;
// Specify Response format to JSON or XML (application/json or application/xml)
request.ContentType = "application/json";
return request;
}
} }
} }

30
Serwer/Serwer.Infrastructure/Services/ImageService.cs Normal file
View File

@ -0,0 +1,30 @@
using Serwer.Core.Domain;
using Serwer.Infrastructure.Settings;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Tesseract;
namespace Serwer.Infrastructure.Services
{
public class ImageService : IImageService
{
private readonly ISet<File> _files = new HashSet<File>();
private readonly string _env;
public ImageService(IHostEnviroment hostEnviroment)
{
_env = hostEnviroment.RootPath;
}
public async Task<string> Process(string name, string contentType, byte[] bytes)
{
var engine = new TesseractEngine(System.IO.Path.Combine(_env, "tessdata"),"eng+equ", EngineMode.Default);
var img = Pix.LoadFromMemory(bytes);
var res = engine.Process(img);
var txt = res.GetText();
return await Task.FromResult(txt);
}
}
}

89
Serwer/Serwer.Infrastructure/Services/SearchService.cs
View File

@ -1,89 +0,0 @@
using Google.Apis.Customsearch.v1;
using Google.Apis.Services;
using Newtonsoft.Json;
using Serwer.Core.Repositories;
using Serwer.Infrastructure.DTO;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
namespace Serwer.Infrastructure.Services
{
public class SearchService : ISearchService
{
private readonly IImageHandler _imageHandler;
private readonly IHistoryRepository _historyRepository;
private readonly IUserRepository _userRepository;
private const string apiKey = "AIzaSyCagG6QyQyBuJNb1YDuK25qSzoC0Rrjo0c";
private const string searchEngineId = "17b946686537c46e3";
public SearchService(IImageHandler imageHandler, IHistoryRepository historyRepository, IUserRepository userRepository)
{
_imageHandler = imageHandler;
_historyRepository = historyRepository;
_userRepository = userRepository;
}
public async Task<IList<SearchResultDTO>> Search(Guid userId, string query)
{
var user = await _userRepository.GetAsync(userId);
if(user == null)
{
throw new Exception("Coś poszło nie tak.");
}
await _historyRepository.AddAsync(user, query);
var queries = query.Split('.').ToList();
if (queries.Count > 2)
{
var q0 = queries[0].Split(' ');
if (q0.Length < 3)
{
queries.RemoveAt(0);
}
if(queries.Last().Length < 5)
{
queries.RemoveAt(queries.Count - 1);
}
}
query = String.Join(".", queries);
var result = await sendRequest(query);
if(result.Count == 0)
{
result = await sendRequest(queries.Last());
}
return result;
}
private async Task<List<SearchResultDTO>> sendRequest(string query)
{
WebRequest webRequest = WebRequest.Create($"https://www.googleapis.com/customsearch/v1?key={apiKey}&cx={searchEngineId}&q={query}");
using (var stream = new StreamReader(webRequest.GetResponse().GetResponseStream()))
{
var response = await stream.ReadToEndAsync();
dynamic jsonData = JsonConvert.DeserializeObject(response);
var results = new List<SearchResultDTO>();
try
{
foreach (var item in jsonData.items)
{
results.Add(new SearchResultDTO
{
Title = item.title,
Link = item.link,
Snippet = item.snippet
});
}
return results;
}
catch(Exception)
{
return results;
}
}
}
}
}

28
Serwer/Serwer.Infrastructure/Services/UserService.cs
View File

@ -3,7 +3,6 @@ using Serwer.Core.Domain;
using Serwer.Core.Repositories; using Serwer.Core.Repositories;
using Serwer.Infrastructure.DTO; using Serwer.Infrastructure.DTO;
using Serwer.Infrastructure.Mappers; using Serwer.Infrastructure.Mappers;
using Serwer.Infrastructure.ViewModels;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -29,9 +28,9 @@ namespace Serwer.Infrastructure.Services
{ {
if(await _userRepository.GetAsync(login) != null) if(await _userRepository.GetAsync(login) != null)
{ {
throw new Exception($"Użytkownik z loginem: {login} już istnieje."); throw new Exception($"User with login: {login} already exists.");
} }
var user = new User(Guid.NewGuid(), email, name, surname, login, password); var user = new User(email, name, surname, login, password);
await _userRepository.AddAsync(user); await _userRepository.AddAsync(user);
} }
@ -40,11 +39,11 @@ namespace Serwer.Infrastructure.Services
var user = await _userRepository.GetAsync(login); var user = await _userRepository.GetAsync(login);
if(user == null) if(user == null)
{ {
throw new Exception("Nie znaleziono użytkownika."); throw new Exception("User not found.");
} }
if(user.Password != password) if(user.Password != password)
{ {
throw new Exception("Hasło niepoprawne."); throw new Exception("Incorrect password.");
} }
var jwt = _jwtHandler.CreateToken(user.Id); var jwt = _jwtHandler.CreateToken(user.Id);
@ -55,24 +54,5 @@ namespace Serwer.Infrastructure.Services
Jwt = _mapper.Map<JwtDto>(jwt) Jwt = _mapper.Map<JwtDto>(jwt)
}; };
} }
public async Task<UserDto> UpdateAsync(UpdateUserModel userModel)
{
var user = await _userRepository.GetAsync(userModel.Id);
if(user == null)
{
throw new Exception("Nie znaleziono użytkownika.");
}
var userLoginTaken = await _userRepository.GetAsync(userModel.Login);
if(userLoginTaken != null && userLoginTaken.Id != user.Id)
{
throw new Exception("Login jest już zajęty.");
}
var newUser = new User(user.Id, userModel.Email, userModel.Name, userModel.Surname, userModel.Login, user.Password);
await _userRepository.UpdateAsync(newUser);
newUser = await _userRepository.GetAsync(user.Id);
return _mapper.Map<UserDto>(newUser);
}
} }
} }

2
Serwer/Serwer.Infrastructure/Serwer.Infrastructure.csproj
View File

@ -6,8 +6,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper" Version="10.1.1" /> <PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="Google.Apis.Customsearch.v1" Version="1.49.0.2084" />
<PackageReference Include="Google.Apis.CustomSearchAPI.v1" Version="1.49.0.2172" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.8.0" /> <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.8.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.8.0" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.8.0" />
<PackageReference Include="Tesseract" Version="4.1.1" /> <PackageReference Include="Tesseract" Version="4.1.1" />

17
Serwer/Serwer.Infrastructure/ViewModels/UpdateUserModel.cs
View File

@ -1,17 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Serwer.Infrastructure.ViewModels
{
public class UpdateUserModel
{
public Guid Id { get; set; }
public string Email { get; set; }
public string Name { get; set; }
public string Surname { get; set; }
public string Login { get; set; }
}
}

94
Serwer/Serwer.sln
View File

@ -1,44 +1,50 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 16
VisualStudioVersion = 16.0.30717.126 VisualStudioVersion = 16.0.30717.126
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Core", "Serwer.Core\Serwer.Core.csproj", "{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Tests", "Serwer.Tests\Serwer.Tests.csproj", "{4169F6FD-E08D-4329-BF87-A1411A9F1EF4}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Infrastructure", "Serwer.Infrastructure\Serwer.Infrastructure.csproj", "{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Core", "Serwer.Core\Serwer.Core.csproj", "{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}"
ProjectSection(ProjectDependencies) = postProject EndProject
{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82} = {115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82} Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Infrastructure", "Serwer.Infrastructure\Serwer.Infrastructure.csproj", "{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}"
EndProjectSection ProjectSection(ProjectDependencies) = postProject
EndProject {115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82} = {115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Api", "Serwer.Api\Serwer.Api.csproj", "{335159FF-5AB8-48E5-A04C-778A46058204}" EndProjectSection
ProjectSection(ProjectDependencies) = postProject EndProject
{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82} = {115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82} Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Api", "Serwer.Api\Serwer.Api.csproj", "{335159FF-5AB8-48E5-A04C-778A46058204}"
{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C} = {523E9EE6-B8D9-4E08-A9A0-50D7F872C79C} ProjectSection(ProjectDependencies) = postProject
EndProjectSection {115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82} = {115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}
EndProject {523E9EE6-B8D9-4E08-A9A0-50D7F872C79C} = {523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}
Global EndProjectSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution EndProject
Debug|Any CPU = Debug|Any CPU Global
Release|Any CPU = Release|Any CPU GlobalSection(SolutionConfigurationPlatforms) = preSolution
EndGlobalSection Debug|Any CPU = Debug|Any CPU
GlobalSection(ProjectConfigurationPlatforms) = postSolution Release|Any CPU = Release|Any CPU
{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU EndGlobalSection
{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Debug|Any CPU.Build.0 = Debug|Any CPU GlobalSection(ProjectConfigurationPlatforms) = postSolution
{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Release|Any CPU.ActiveCfg = Release|Any CPU {4169F6FD-E08D-4329-BF87-A1411A9F1EF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Release|Any CPU.Build.0 = Release|Any CPU {4169F6FD-E08D-4329-BF87-A1411A9F1EF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4169F6FD-E08D-4329-BF87-A1411A9F1EF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Debug|Any CPU.Build.0 = Debug|Any CPU {4169F6FD-E08D-4329-BF87-A1411A9F1EF4}.Release|Any CPU.Build.0 = Release|Any CPU
{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Release|Any CPU.ActiveCfg = Release|Any CPU {115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Release|Any CPU.Build.0 = Release|Any CPU {115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Debug|Any CPU.Build.0 = Debug|Any CPU
{335159FF-5AB8-48E5-A04C-778A46058204}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Release|Any CPU.ActiveCfg = Release|Any CPU
{335159FF-5AB8-48E5-A04C-778A46058204}.Debug|Any CPU.Build.0 = Debug|Any CPU {115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Release|Any CPU.Build.0 = Release|Any CPU
{335159FF-5AB8-48E5-A04C-778A46058204}.Release|Any CPU.ActiveCfg = Release|Any CPU {523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{335159FF-5AB8-48E5-A04C-778A46058204}.Release|Any CPU.Build.0 = Release|Any CPU {523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Debug|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection {523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Release|Any CPU.ActiveCfg = Release|Any CPU
GlobalSection(SolutionProperties) = preSolution {523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Release|Any CPU.Build.0 = Release|Any CPU
HideSolutionNode = FALSE {335159FF-5AB8-48E5-A04C-778A46058204}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
EndGlobalSection {335159FF-5AB8-48E5-A04C-778A46058204}.Debug|Any CPU.Build.0 = Debug|Any CPU
GlobalSection(ExtensibilityGlobals) = postSolution {335159FF-5AB8-48E5-A04C-778A46058204}.Release|Any CPU.ActiveCfg = Release|Any CPU
SolutionGuid = {30A333CB-6AC2-4EAD-B05B-926DB9690CED} {335159FF-5AB8-48E5-A04C-778A46058204}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
EndGlobal GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {30A333CB-6AC2-4EAD-B05B-926DB9690CED}
EndGlobalSection
EndGlobal