Skip to content
Permalink
Browse files

Correction position boutons de connexion

  • Loading branch information...
DanoneKiD committed Jan 14, 2018
1 parent 1a90fe5 commit b8be1d4086d5bb684798a6c930fc59b463ebd1c9
@@ -92,6 +92,7 @@ public async Task<Error> ConnectJeedomByLogin()
{
var reponse = jsonrpc.GetRequestResponseDeserialized<Response<string>>();
config.ApiKey = reponse.result;
return jsonrpc.Error;
}
// Par sécurité on retourne sur https
config.Address.ProtocolType = Address.Protocol.Https;
@@ -1,7 +1,7 @@
{
"version": 2,
"version": 3,
"targets": {
"UAP,Version=v10.0": {
"UAP,Version=v10.0.14393": {
"Microsoft.CSharp/4.3.0": {
"type": "package",
"dependencies": {
@@ -2451,7 +2451,7 @@
}
}
},
"UAP,Version=v10.0/win10-arm": {
"UAP,Version=v10.0.14393/win10-arm": {
"Microsoft.CSharp/4.3.0": {
"type": "package",
"dependencies": {
@@ -4931,7 +4931,7 @@
}
}
},
"UAP,Version=v10.0/win10-arm-aot": {
"UAP,Version=v10.0.14393/win10-arm-aot": {
"Microsoft.CSharp/4.3.0": {
"type": "package",
"dependencies": {
@@ -5667,9 +5667,6 @@
},
"runtime.win10-arm-aot.runtime.native.System.IO.Compression/4.0.1": {
"type": "package",
"compile": {
"runtimes/win10-arm-aot/lib/netcore50/_._": {}
},
"runtime": {
"runtimes/win10-arm-aot/lib/netcore50/clrcompression.dll": {}
}
@@ -7450,7 +7447,7 @@
}
}
},
"UAP,Version=v10.0/win10-x64": {
"UAP,Version=v10.0.14393/win10-x64": {
"Microsoft.CSharp/4.3.0": {
"type": "package",
"dependencies": {
@@ -9939,7 +9936,7 @@
}
}
},
"UAP,Version=v10.0/win10-x64-aot": {
"UAP,Version=v10.0.14393/win10-x64-aot": {
"Microsoft.CSharp/4.3.0": {
"type": "package",
"dependencies": {
@@ -10678,9 +10675,6 @@
},
"runtime.win10-x64-aot.runtime.native.System.IO.Compression/4.0.1": {
"type": "package",
"compile": {
"runtimes/win10-x64-aot/lib/netcore50/_._": {}
},
"runtime": {
"runtimes/win10-x64-aot/lib/netcore50/clrcompression.dll": {}
}
@@ -12467,7 +12461,7 @@
}
}
},
"UAP,Version=v10.0/win10-x86": {
"UAP,Version=v10.0.14393/win10-x86": {
"Microsoft.CSharp/4.3.0": {
"type": "package",
"dependencies": {
}
}
},
"UAP,Version=v10.0/win10-x86-aot": {
"UAP,Version=v10.0.14393/win10-x86-aot": {
"Microsoft.CSharp/4.3.0": {
"type": "package",
"dependencies": {
},
"runtime.win10-x86-aot.runtime.native.System.IO.Compression/4.0.1": {
"type": "package",
"compile": {
"runtimes/win10-x86-aot/lib/netcore50/_._": {}
},
"runtime": {
"runtimes/win10-x86-aot/lib/netcore50/clrcompression.dll": {}
}
"Microsoft.NETCore.UniversalWindowsPlatform >= 5.3.3",
"Newtonsoft.Json >= 10.0.2"
],
"UAP,Version=v10.0": []
"UAP,Version=v10.0.14393": []
},
"packageFolders": {
"C:\\Users\\micha\\.nuget\\packages\\": {}
"C:\\Users\\RFRA1025\\.nuget\\packages\\": {},
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackagesFallback\\": {}
},
"project": {
"restore": {
"projectUniqueName": "C:\\Users\\micha\\Source\\Repos\\JeedomApp\\Jeedom\\Jeedom.csproj",
"projectUniqueName": "C:\\Users\\RFRA1025\\Documents\\Dev\\Perso\\JeedomApp\\JeedomApp\\Jeedom\\Jeedom.csproj",
"projectName": "Jeedom",
"projectPath": "C:\\Users\\micha\\Source\\Repos\\JeedomApp\\Jeedom\\Jeedom.csproj",
"projectJsonPath": "C:\\Users\\micha\\Source\\Repos\\JeedomApp\\Jeedom\\project.json",
"projectStyle": "ProjectJson"
"projectPath": "C:\\Users\\RFRA1025\\Documents\\Dev\\Perso\\JeedomApp\\JeedomApp\\Jeedom\\Jeedom.csproj",
"projectJsonPath": "C:\\Users\\RFRA1025\\Documents\\Dev\\Perso\\JeedomApp\\JeedomApp\\Jeedom\\project.json",
"packagesPath": "C:\\Users\\RFRA1025\\.nuget\\packages\\",
"outputPath": "C:\\Users\\RFRA1025\\Documents\\Dev\\Perso\\JeedomApp\\JeedomApp\\Jeedom\\obj\\",
"projectStyle": "ProjectJson",
"fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackagesFallback\\"
],
"configFilePaths": [
"C:\\Users\\RFRA1025\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.Fallback.config"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"http://nuget.syncfusion.com/nuget_xamarin/nuget/getsyncfusionpackages/xamarin": {},
"https://api.nuget.org/v3/index.json": {}
}
},
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3",
"Newtonsoft.Json": "10.0.2"
"Microsoft.NETCore.UniversalWindowsPlatform": "[5.3.3, )",
"Newtonsoft.Json": "[10.0.2, )"
},
"frameworks": {
"uap10.0": {}
"uap10.0.14393": {}
},
"runtimes": {
"win10-arm": {
@@ -52,23 +52,42 @@
x:Name="Manuel"
Margin="10,10,14,10"
Header="Manuel">
<Grid>
<localcontrols:ConnectControl
x:Name="pnConnectControl" />
<Button
x:Name="bConnect"
Click="bConnect_Click"
Content="Connexion" Margin="165,346,0,80"/>
<Button
x:Name="bdemo"
VerticalAlignment="Bottom"
Click="Demo_Click"
Content="Demo" Margin="38,0,0,80"/>
<RelativePanel>
<localcontrols:ConnectControl x:Name="pnConnectControl" RelativePanel.AlignHorizontalCenterWithPanel="True" />
<Grid
Width="100"
RelativePanel.AlignLeftWithPanel="True"
RelativePanel.AlignRightWithPanel="True"
RelativePanel.Below="pnConnectControl">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Button
x:Name="bConnect"
Grid.Row="0"
Margin="0,10,0,0"
HorizontalAlignment="Stretch"
Click="bConnect_Click"
Content="Connexion" />
<Button
x:Name="bdemo"
Grid.Row="1"
Margin="0,10,0,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Bottom"
Click="Demo_Click"
Content="Demo" />
</Grid>

<TextBlock
x:Name="ErrorMsg"
Foreground="Red"
Text="" Margin="16,383,-16,10" />
</Grid>
RelativePanel.AlignBottomWithPanel="True"
RelativePanel.AlignLeftWithPanel="True"
RelativePanel.AlignRightWithPanel="True"
Text="" />
</RelativePanel>
</PivotItem>
<PivotItem x:Name="Auto" Header="Automatique">
<TextBlock
Oops, something went wrong.

0 comments on commit b8be1d4

Please sign in to comment.
You can’t perform that action at this time.