Skip to content

Commit

Permalink
Merge pull request #105 from kzi-nastava/feat/MainWindow
Browse files Browse the repository at this point in the history
[Add] main window
  • Loading branch information
anasinik authored Mar 31, 2024
2 parents 01d2fd0 + 24d55d2 commit dac55f9
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 2 deletions.
6 changes: 5 additions & 1 deletion LangLang/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:LangLang"
mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800">
Title="LangSchool" Height="450" Width="800">
<Grid>
<Button Content="Director" HorizontalAlignment="Left" Height="82" Margin="86,217,0,0" VerticalAlignment="Top" Width="606" Click="DirectorWindow"/>
<Button Content="Tutor" HorizontalAlignment="Left" Height="79" Margin="86,115,0,0" VerticalAlignment="Top" Width="314"/>
<Button Content="Student" HorizontalAlignment="Left" Height="79" Margin="405,115,0,0" VerticalAlignment="Top" Width="280"/>
<Button Content="Register" HorizontalAlignment="Left" Height="70" Margin="186,336,0,0" VerticalAlignment="Top" Width="380"/>

</Grid>
</Window>
20 changes: 19 additions & 1 deletion LangLang/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
using System;
using LangLang.Core.Controller;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using LangLang.Core.Controller;

Check warning on line 8 in LangLang/MainWindow.xaml.cs

View workflow job for this annotation

GitHub Actions / build

The using directive for 'LangLang.Core.Controller' appeared previously in this namespace
using LangLang.View;
using System;

Check warning on line 10 in LangLang/MainWindow.xaml.cs

View workflow job for this annotation

GitHub Actions / build

The using directive for 'System' appeared previously in this namespace
using System.Collections.Generic;

Check warning on line 11 in LangLang/MainWindow.xaml.cs

View workflow job for this annotation

GitHub Actions / build

The using directive for 'System.Collections.Generic' appeared previously in this namespace
using System.Linq;

Check warning on line 12 in LangLang/MainWindow.xaml.cs

View workflow job for this annotation

GitHub Actions / build

The using directive for 'System.Linq' appeared previously in this namespace
using System.Text;

Check warning on line 13 in LangLang/MainWindow.xaml.cs

View workflow job for this annotation

GitHub Actions / build

The using directive for 'System.Text' appeared previously in this namespace
Expand All @@ -20,9 +29,18 @@ namespace LangLang
/// </summary>
public partial class MainWindow : Window
{
private TutorController tutorController { get; set; }

public MainWindow()
{
InitializeComponent();
}

private void DirectorWindow(object sender, RoutedEventArgs e)
{
//DirectorWindow window = new DirectorWindow();
//window.Show();
}

}
}

0 comments on commit dac55f9

Please sign in to comment.