Skip to content

Commit

Permalink
fixing user/team relation
Browse files Browse the repository at this point in the history
  • Loading branch information
yelmorabit committed Jul 26, 2020
1 parent 6b7bb27 commit 2187c71
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 33 deletions.
2 changes: 1 addition & 1 deletion src/main/resources/config/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spring:
show-sql: true
liquibase:
# Remove 'faker' if you do not want the sample data to be loaded automatically
contexts: dev, faker
contexts: dev
mail:
host: localhost
port: 25
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
This can be customized by adding or removing 'faker' in the 'spring.liquibase.contexts'
Spring Boot configuration key.
-->
<changeSet id="20200725125821-1-data" author="jhipster" context="faker">
<changeSet id="20200725125821-1-data" author="jhipster">
<loadData
file="config/liquibase/fake-data/team.csv"
file="config/liquibase/data/team.csv"
separator=";"
tableName="team">
<column name="id" type="numeric"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
This can be customized by adding or removing 'faker' in the 'spring.liquibase.contexts'
Spring Boot configuration key.
-->
<changeSet id="20200725125921-1-data" author="jhipster" context="faker">
<changeSet id="20200725125921-1-data" author="jhipster">
<loadData
file="config/liquibase/fake-data/area.csv"
file="config/liquibase/data/area.csv"
separator=";"
tableName="area">
<column name="id" type="numeric"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
-->
<changeSet id="20200725130021-1-data" author="jhipster" context="faker">
<loadData
file="config/liquibase/fake-data/seat.csv"
file="config/liquibase/data/seat.csv"
separator=";"
tableName="seat">
<column name="id" type="numeric"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@
This can be customized by adding or removing 'faker' in the 'spring.liquibase.contexts'
Spring Boot configuration key.
-->
<changeSet id="20200725130121-1-data" author="jhipster" context="faker">
<!--<changeSet id="20200725130121-1-data" author="jhipster" context="faker">
<loadData
file="config/liquibase/fake-data/reservation.csv"
separator=";"
tableName="reservation">
<column name="id" type="numeric"/>
<column name="start_date" type="datetime"/>
<column name="end_date" type="datetime"/>
<!-- jhipster-needle-liquibase-add-loadcolumn - JHipster (and/or extensions) can add load columns here -->
&lt;!&ndash; jhipster-needle-liquibase-add-loadcolumn - JHipster (and/or extensions) can add load columns here &ndash;&gt;
</loadData>
</changeSet>
</changeSet>-->

</databaseChangeLog>
11 changes: 11 additions & 0 deletions src/main/resources/config/liquibase/data/seat.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
id;number;status;aisle_seat;window_seat;middle_seat
1;1;AVAILABLE;true;false;false
2;2;AVAILABLE;true;true;false
3;3;AVAILABLE;true;true;true
4;4;BOOKED;true;true;true
5;5;AVAILABLE;false;false;false
6;6;BOOKED;true;true;false
7;7;BOOKED;true;false;false
8;8;BOOKED;false;false;true
9;9;BOOKED;false;true;true
10;10;AVAILABLE;true;true;false
2 changes: 1 addition & 1 deletion src/main/resources/config/liquibase/data/user.csv
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ id;login;password_hash;first_name;last_name;email;image_url;activated;lang_key;c
1;system;$2a$10$mE.qmcV0mFU5NcKh73TZx.z4ueI/.bDWbj0T1BYyqP481kGGarKLG;System;System;system@localhost;;true;en;system;system
2;anonymoususer;$2a$10$j8S5d7Sr7.8VTOYNviDPOeWX8KcYILUVJBsYV83Y5NtECayypx9lO;Anonymous;User;anonymous@localhost;;true;en;system;system
3;admin;$2a$10$gSAhZrxMllrbgj/kkK9UceBPpChGWJA7SYIb1Mqo.n5aNLq1/oRrC;Administrator;Administrator;admin@localhost;;true;en;system;system
4;user;$2a$10$VEjxo0jq2YG9Rbk2HmX9S.k1uZBGYUHdUcid3g/vfiEl7lwWgOH/K;User;User;user@localhost;;true;en;system;system
4;yelmorabit;$2a$10$VEjxo0jq2YG9Rbk2HmX9S.k1uZBGYUHdUcid3g/vfiEl7lwWgOH/K;User;User;[email protected];;true;en;system;system
11 changes: 0 additions & 11 deletions src/main/resources/config/liquibase/fake-data/reservation.csv

This file was deleted.

11 changes: 0 additions & 11 deletions src/main/resources/config/liquibase/fake-data/seat.csv

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/webapp/app/home/home.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1 class="display-4">Welcome, Dear Collaborator !</h1>
<div [ngSwitch]="isAuthenticated()">
<div class="alert alert-warning" *ngSwitchCase="false">
<span>If you want to </span>
<a class="alert-link" (click)="login()">sign in</a><span>, you can try the default accounts:<br/>- Administrator (login="admin" and password="admin") <br/>- User (login="user" and password="user").</span>
<a class="alert-link" (click)="login()">sign in</a><span>, you can try the default accounts:<br/>- Administrator (login="admin" and password="admin") <br/>- User (login="yelmorabit" and password="yelmorabit").</span>
</div>

<div class="alert alert-warning" *ngSwitchCase="false">
Expand Down

0 comments on commit 2187c71

Please sign in to comment.