rename pages

7 files changed, 11 insertions, 33 deletions

diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj
index dfd029d..f433093 100644
--- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj
+++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj
@@ -140,11 +140,11 @@
     <Compile Include="View\PersonalInfoPage.xaml.cs">
       <DependentUpon>PersonalInfoPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\PlanPage.xaml.cs">
-      <DependentUpon>PlanPage.xaml</DependentUpon>
+    <Compile Include="View\ApartmentPlanPage.xaml.cs">
+      <DependentUpon>ApartmentPlanPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\ResidentsPage.xaml.cs">
-      <DependentUpon>ResidentsPage.xaml</DependentUpon>
+    <Compile Include="View\ApartmentResidentsPage.xaml.cs">
+      <DependentUpon>ApartmentResidentsPage.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -213,11 +213,11 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\PlanPage.xaml">
+    <Page Include="View\ApartmentPlanPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\ResidentsPage.xaml">
+    <Page Include="View\ApartmentResidentsPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml
index 4f8b466..df51ff8 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml
@@ -1,5 +1,5 @@
 <Page
-    x:Class="ApartmentManager.View.ApartmentPlanPage"
+    x:Class="ApartmentManager.View.PlanPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:ApartmentManager.View"
@@ -8,15 +8,7 @@
     mc:Ignorable="d">
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <StackPanel Orientation="Horizontal" Margin="50" VerticalAlignment="Center" HorizontalAlignment="Center" >
-            <Button Background="{x:Null}" Margin="20,0,20,0" >
-                <SymbolIcon Symbol="Back" ></SymbolIcon>
-            </Button>
-            <Image Height="500" Width="1000" />
-            <Button Background="{x:Null}" Margin="20,0,20,0" >
-                <SymbolIcon Symbol="Forward" ></SymbolIcon>
-            </Button>
-        </StackPanel>
+        <Image  Source="ms-appx:///Assets/plan.jpg"  Margin="50"></Image>
+
     </Grid>
-    
 </Page>
diff --git a/ApartmentManager/ApartmentManager/View/PlanPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs
index bce6221..bce6221 100644
--- a/ApartmentManager/ApartmentManager/View/PlanPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml
index c68b1bc..c68b1bc 100644
--- a/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs
index 46e9f6f..46e9f6f 100644
--- a/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/PlanPage.xaml b/ApartmentManager/ApartmentManager/View/PlanPage.xaml
deleted file mode 100644
index df51ff8..0000000
--- a/ApartmentManager/ApartmentManager/View/PlanPage.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.PlanPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:ApartmentManager.View"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Image  Source="ms-appx:///Assets/plan.jpg"  Margin="50"></Image>
-
-    </Grid>
-</Page>
diff --git a/ApartmentManager/HousingWebApi/HousingWebApi.csproj b/ApartmentManager/HousingWebApi/HousingWebApi.csproj
index f824c8e..6f8fde1 100644
--- a/ApartmentManager/HousingWebApi/HousingWebApi.csproj
+++ b/ApartmentManager/HousingWebApi/HousingWebApi.csproj
@@ -151,12 +151,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Models\Apartment.cs" />
     <Compile Include="Controllers\ApartmentsController.cs" />
     <Compile Include="Controllers\DefectsController.cs" />
     <Compile Include="Controllers\PastContractOwnersController.cs" />
     <Compile Include="Controllers\ResidentsController.cs" />
     <Compile Include="Controllers\UsersController.cs" />
-    <Compile Include="Models\Apartment.cs" />
     <Compile Include="App_Start\BundleConfig.cs" />
     <Compile Include="App_Start\FilterConfig.cs" />
     <Compile Include="App_Start\RouteConfig.cs" />
@@ -198,8 +198,8 @@
     <Compile Include="Models\PastContractOwner.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Models\Resident.cs" />
-    <Compile Include="Models\User.cs" />
     <Compile Include="ResidentList.cs" />
+    <Compile Include="Models\User.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\HelpPage\HelpPage.css" />