Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
31a9d25
hotfix: remove missing component
vitalics Jul 13, 2017
e0f09ab
update news typing and mock
DrJekill352 Jul 13, 2017
fcc3171
fixe bem
DrJekill352 Jul 13, 2017
d1e1d05
fix: collapsed menu items positioning
vitalics Jul 13, 2017
7f1a16c
added routing for news-detail
DrJekill352 Jul 14, 2017
1e594ee
added news-detail page
DrJekill352 Jul 14, 2017
a2b41cd
fixe typing bug
DrJekill352 Jul 14, 2017
424a661
Merge remote-tracking branch 'origin/vitalics-register-page' into drj…
DrJekill352 Jul 14, 2017
30317a8
common-component/implements: typing for dropdown and inputs.
vitalics Jul 14, 2017
db04f8f
fix register page positioning
vitalics Jul 14, 2017
0f97782
fix: animations in master-page.
vitalics Jul 14, 2017
36a985b
Added news cretor and editor pages
DrJekill352 Jul 17, 2017
4c95be7
Merge remote-tracking branch 'origin/vitalics-register-page' into drj…
DrJekill352 Jul 17, 2017
fc0b805
hotfix: added missing typings
vitalics Jul 17, 2017
db8afaf
Merge remote-tracking branch 'origin/vitalics/common-api' into drjeki…
DrJekill352 Jul 17, 2017
3bffb22
hotfix
DrJekill352 Jul 17, 2017
0f7ed0c
fix position share button
DrJekill352 Jul 17, 2017
6c2e0d0
added navigate to news-edit
DrJekill352 Jul 17, 2017
8424a3a
fix position bugs
DrJekill352 Jul 17, 2017
6ef8b31
implements: redux dispatched values for routers and update layout
vitalics Jul 17, 2017
e49ef8c
added style for news-editor and news-feed pages
DrJekill352 Jul 17, 2017
a540b50
added style for news-editor page
DrJekill352 Jul 17, 2017
561b496
added style for news-feed page
DrJekill352 Jul 17, 2017
ee14561
Merge remote-tracking branch 'origin/drjekill352-news-detail' into dr…
DrJekill352 Jul 17, 2017
c54cc2c
added get content metod for news-editor page
DrJekill352 Jul 17, 2017
67ff5b2
update news typing
DrJekill352 Jul 18, 2017
81dd44b
update common calendar
DrJekill352 Jul 18, 2017
a9d875a
added event-calendar page
DrJekill352 Jul 18, 2017
e6e411e
fix: dropdown values and dispached in store
vitalics Jul 17, 2017
a385da2
Merge remote-tracking branch 'origin/vitalics/common-api' into drjeki…
DrJekill352 Jul 18, 2017
12f1dfb
hotfix: added missing typings
vitalics Jul 18, 2017
21a95df
Merge remote-tracking branch 'origin/vitalics/common-api' into drjeki…
DrJekill352 Jul 18, 2017
04ade93
hotfix
DrJekill352 Jul 18, 2017
0cdb4c2
update routing for news components
DrJekill352 Jul 18, 2017
7ad6063
update style for create news page
DrJekill352 Jul 18, 2017
a6f8d04
update style for news creator and editor pages
DrJekill352 Jul 18, 2017
00c07aa
hotfix
DrJekill352 Jul 19, 2017
6f192bb
fix style for news editor and creator page
DrJekill352 Jul 19, 2017
d4e7a68
add reducers for news
vitalics Jul 18, 2017
1e71345
Merge branch 'vitalics/redux' of https://github.com/Hubses/ScienceFes…
vitalics Jul 19, 2017
e03b68a
Merge remote-tracking branch 'origin/vitalics/redux' into drjekill352…
DrJekill352 Jul 19, 2017
80d3a5b
fix news actions and reducers
vitalics Jul 19, 2017
44b9874
Merge remote-tracking branch 'remotes/origin/drjekill352-news-detail'…
vitalics Jul 19, 2017
cc84c60
fix Some issues
vitalics Jul 19, 2017
84a21be
Add typing for common button
vitalics Jul 19, 2017
b150889
configure ngrx routing
vitalics Jul 19, 2017
9ab5bf0
redux 2.1
vitalics Jul 28, 2017
e401a68
redux 2.1
vitalics Sep 23, 2017
c2c56a0
make auth module
vitalics Sep 26, 2017
4f5a9f9
fix(auth) with nullable store
vitalics Sep 27, 2017
08e843a
create register
vitalics Sep 27, 2017
3a79627
fix(auth) double redirect
vitalics Sep 27, 2017
56c1f97
implements(auth): user roles
vitalics Sep 29, 2017
205dd80
implements(auth): home container
vitalics Oct 4, 2017
aea5026
fix(auth): multi casting effect
vitalics Oct 4, 2017
786665d
frontend(fix): auth casting effects
vitalics Nov 21, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion festival/frontend/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ root = true

[*]
charset = utf-8
indent_style = space
indent_style = tab
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true
Expand Down
12 changes: 11 additions & 1 deletion festival/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,22 @@
"@angular/router": "^4.2.0",
"@ngrx/core": "^1.2.0",
"@ngrx/effects": "^2.0.3",
"@ngrx/router-store": "^1.2.6",
"@ngrx/store": "^2.2.2",
"@ngrx/store-devtools": "^3.2.4",
"@ngrx/store-log-monitor": "^3.0.2",
"@ngx-translate/core": "^7.0.0",
"@ngx-translate/http-loader": "^0.1.0",
"angular2-virtual-scroll": "^0.1.7",
"ap-angular2-fullcalendar": "^1.3.1",
"core-js": "^2.4.1",
"hammerjs": "^2.0.8",
"localize-router": "^0.7.1",
"moment": "^2.18.1",
"ng2-ckeditor": "^1.1.9",
"ng2-translate": "^5.0.0",
"ngrx-store-freeze": "^0.1.9",
"reselect": "^3.0.1",
"rxjs": "^5.1.0",
"zone.js": "^0.8.4"
},
Expand All @@ -47,10 +56,11 @@
"karma": "~1.4.1",
"karma-chrome-launcher": "~2.0.0",
"karma-cli": "~1.0.1",
"karma-coverage-istanbul-reporter": "^0.2.0",
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "^0.2.2",
"karma-coverage-istanbul-reporter": "^0.2.0",
"protractor": "~5.1.0",
"remote-redux-devtools": "^0.5.12",
"ts-node": "~2.0.0",
"tslint": "~4.5.0",
"typescript": "~2.2.0"
Expand Down
156 changes: 0 additions & 156 deletions festival/frontend/src/app.module.ts

This file was deleted.

30 changes: 30 additions & 0 deletions festival/frontend/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { HomeComponent } from './home/home.component';

const routes: Routes = [
{
path: '',
redirectTo: 'home',
pathMatch: 'full'
},
{
path: 'home',
component: HomeComponent
},
{
path: 'event',
loadChildren: './event/event.module#EventModule'
},
{
path: 'auth',
loadChildren: './auth/auth.module#AuthModule'
}
];

@NgModule({
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule],
providers: []
})
export class AppRoutingModule { }
20 changes: 20 additions & 0 deletions festival/frontend/src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<div class="row">
<div class="col-md-2">
<button *ngIf="showSidebar$ | async" type="button" class="btn btn-default" (click)="closeSidebar()">Hide sidebar</button>
<button *ngIf="!(showSidebar$ | async)" type="button" class="btn btn-default" (click)="openSidebar()">Show sidebar</button>
<ul *ngIf="showSidebar$ | async" class="nav nav-pills nav-stacked">
<li role="presentation" [routerLinkActive]="['active']">
<a [routerLink]="['/auth']">auth</a>
</li>
<li role="presentation" [routerLinkActive]="['active']">
<a [routerLink]="['/auth/register']">Register</a>
</li>
<li role="presentation" [routerLinkActive]="['active']">
<a [routerLink]="['/two', 1]">Two</a>
</li>
</ul>
</div>
<div class="col-md-10">
<router-outlet></router-outlet>
</div>
</div>
27 changes: 27 additions & 0 deletions festival/frontend/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { Component } from '@angular/core';
import { Store } from '@ngrx/store';
import { Observable } from 'rxjs/Observable';
import * as root from './shared/reducers';
import * as ui from './shared/actions/ui-state';

@Component({
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.css']
})
export class AppComponent {
showSidebar$: Observable<boolean>;


constructor(private store: Store<root.State>) {
this.showSidebar$ = this.store.select(root.getShowSidebar);
}

openSidebar() {
this.store.dispatch(new ui.OpenSidebarAction());
}

closeSidebar() {
this.store.dispatch(new ui.CloseSidebarAction());
}
}
37 changes: 37 additions & 0 deletions festival/frontend/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { HttpModule } from '@angular/http';
import { StoreModule } from '@ngrx/store';
import { RouterStoreModule } from '@ngrx/router-store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';

import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { rootReducer } from './shared/reducers/index';
import { HomeComponent } from './home/home.component';
import { SharedModule } from './shared/shared.module';

@NgModule({
declarations: [
AppComponent,
HomeComponent
],
imports: [
BrowserModule,
FormsModule,
HttpModule,
AppRoutingModule,
StoreModule.provideStore(rootReducer),
RouterStoreModule.connectRouter(),
StoreDevtoolsModule.instrumentOnlyWithExtension(),
SharedModule.forRoot()
],
providers: [],
bootstrap: [AppComponent]
})
export class AppModule {
constructor() {
console.log('AppModule instantiated.');
}
}
Loading