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:develop
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 "develop" have entirely different histories.
master ... develop

11 changed files with 595 additions and 706 deletions
Show Stats Expand all files Collapse all files

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

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

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

File diff suppressed because it is too large Load Diff

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

@ -54,8 +54,8 @@
android:onClick="LoadFromCamera" /> android:onClick="LoadFromCamera" />
<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/helpPhoto" android:id="@+id/helpPhoto"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"

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

@ -27,17 +27,6 @@
android:layout_below="@+id/loginTip" android:layout_below="@+id/loginTip"
android:paddingTop="10dp" android:paddingTop="10dp"
android:textColor="#ff000000" /> 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 <TextView
android:text="To jest pomoc \n w rejestracji \n co miałem \n napisac" android:text="To jest pomoc \n w rejestracji \n co miałem \n napisac"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"

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

@ -154,8 +154,8 @@
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/helpRegister" android:id="@+id/helpRegister"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"

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"
]
} }
} }
} }

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"
}
}
}

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

@ -98,19 +98,18 @@ namespace Serwer.Api
// 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();

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