Skip to content

Dirty useless fix #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zzz3bra merged 1 commit into from
Jul 20, 2017
Merged

Dirty useless fix #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions festival/frontend/src/app/components/sidenav/sidenav.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,71 +1,71 @@
<div class="menu">
<div class="menu__item">
<sf-common-button routerLink="/feed" routerLinkActive="active">
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollpsed }" type="library_books"></sf-common-icon>
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollapsed }" type="library_books"></sf-common-icon>
<div class="text" *ngIf="!isCollapsed">
events and news
</div>
</sf-common-button>
</div>
<div class="menu__item">
<sf-common-button routerLink="/feed/news" routerLinkActive="active">
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollpsed }" type="content_copy"></sf-common-icon>
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollapsed }" type="content_copy"></sf-common-icon>
<div class="text" *ngIf="!isCollapsed">
news
</div>
</sf-common-button>
</div>
<div class="menu__item">
<sf-common-button routerLink="/feed/events" routerLinkActive="active">
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollpsed }" type="book"></sf-common-icon>
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollapsed }" type="book"></sf-common-icon>
<div class="text" *ngIf="!isCollapsed">
events
</div>
</sf-common-button>
</div>
<div class="menu__item">
<sf-common-button routerLink="/calendar" routerLinkActive="active">
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollpsed }" type="date_range"></sf-common-icon>
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollapsed }" type="date_range"></sf-common-icon>
<div class="text" *ngIf="!isCollapsed">
calendar
</div>
</sf-common-button>
</div>
<div class="menu__item">
<sf-common-button routerLink="/personal" routerLinkActive="active">
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollpsed }" type="settings"></sf-common-icon>
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollapsed }" type="settings"></sf-common-icon>
<div class="text" *ngIf="!isCollapsed">
personal settings
</div>
</sf-common-button>
</div>
<div class="menu__item">
<sf-common-button routerLink="/feed/works" routerLinkActive="active">
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollpsed }" type="content_paste"></sf-common-icon>
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollapsed }" type="content_paste"></sf-common-icon>
<div class="text" *ngIf="!isCollapsed">
works
</div>
</sf-common-button>
</div>
<div class="menu__item">
<sf-common-button routerLink="/approve" routerLinkActive="active">
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollpsed }" type="dashboard"></sf-common-icon>
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollapsed }" type="dashboard"></sf-common-icon>
<div class="text" *ngIf="!isCollapsed">
approve
</div>
</sf-common-button>
</div>
<div class="menu__item">
<sf-common-button routerLink="/statistic" routerLinkActive="active">
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollpsed }" type="show_chart"></sf-common-icon>
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollapsed }" type="show_chart"></sf-common-icon>
<div class="text" *ngIf="!isCollapsed">
statistic
</div>
</sf-common-button>
</div>
<div class="menu__item">
<sf-common-button routerLink="/about" routerLinkActive="active">
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollpsed }" type="help"></sf-common-icon>
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollapsed }" type="help"></sf-common-icon>
<div class="text" *ngIf="!isCollapsed">
about
</div>
Expand All @@ -74,7 +74,7 @@
<div class="menu__item--space"></div>
<div class="menu__item--end">
<sf-common-button (click)="collapse()">
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollpsed }" type={{iconArrowsType}}></sf-common-icon>
<sf-common-icon [ngClass]="{'icon--collapsed':isCollapsed, 'icon--extend':!isCollapsed }" type={{iconArrowsType}}></sf-common-icon>
<div class="text" *ngIf="!isCollapsed">
collapse
</div>
Expand Down
9 changes: 6 additions & 3 deletions festival/frontend/src/commonApp/common.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ import {
MapComponent,
HeaderComponent,
TextAreaComponent,
FileChooseComponent
FileChooseComponent,
TableComponent
} from './';


Expand Down Expand Up @@ -59,7 +60,8 @@ import {
HeaderComponent,
CalendarComponent,
TextAreaComponent,
FileChooseComponent
FileChooseComponent,
TableComponent
],
providers: [/* TODO: Providers go here */],
exports: [
Expand All @@ -81,7 +83,8 @@ import {
HeaderComponent,
CalendarComponent,
TextAreaComponent,
FileChooseComponent
FileChooseComponent,
TableComponent
],
schemas: [NO_ERRORS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA]
})
Expand Down
8 changes: 8 additions & 0 deletions festival/frontend/src/typings.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,11 @@ declare namespace sf.enums.user {
// admin
// }
}
declare namespace sf.entities {
export interface User {
email: string;
password: string;
phone?: number;
position?: string;
}
}