app.component.html

<!--The content below is only a placeholder and can be replaced.-->
<div>
  <moya-organization-list style="float:top, left;"></moya-organization-list>
  <h1 style="text-align:center; margin-left:25%; display:inline-block">
    Welcome to {{ title }}!
  </h1>
  <a style="float:right; font-size:20px; margin-top: 20px" href="#">Moya Login</a>
</div>
<<<<<<< HEAD
<div style="width:50%; float:left">
  <h2 style="margin-left: 10px">Tulevat tapahtumat</h2>
  <moya-event-list [organisation]="currentOrganisation" style="margin-top:5em;"></moya-event-list>
</div>
<div style="width:50%; float:right">
  <h2>Ei omaa organisaatiota?</h2>
  <button (click)="newOrg()">Luo uusi organisaatio</button>
</div>
=======
<moya-event-list></moya-event-list>
<moya-new-organization></moya-new-organization>
>>>>>>> 4a78b3257e1ab2f6f8dbc3b774802a9865ca5d4f