Skip to content
This repository was archived by the owner on Nov 21, 2024. It is now read-only.

Commit facdda6

Browse files
committed
fix(generators): Rename app template folder
1 parent dba6616 commit facdda6

49 files changed

Lines changed: 1340 additions & 0 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<<%=app.name%>-navbar></<%=app.name%>-navbar>
2+
<router-outlet></router-outlet>

srcgen/web-app-empty/apps/%app.name%/src/app/app.component.scss

Whitespace-only changes.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import { takeUntil } from 'rxjs/operators';
2+
3+
import { Component, ComponentFactoryResolver, Injector, ViewContainerRef, ViewEncapsulation } from '@angular/core';
4+
import { NavigationEnd, Router } from '@angular/router';
5+
import { RuckenCoreRuI18n, translate } from '@rucken/core';
6+
import { <%=app.classPrefix%>CoreRuI18n } from '@<%=app.name%>/core';
7+
import { <%=app.classPrefix%>WebRuI18n } from '@<%=app.name%>/web';
8+
import { AlertModalComponent, BaseAppComponent, RuckenWebRuI18n } from '@rucken/web';
9+
import * as _ from 'lodash';
10+
import { defineLocale } from 'ngx-bootstrap/bs-moment';
11+
import { enGb, ru } from 'ngx-bootstrap/locale';
12+
13+
import { <%=app.classPrefix%>RuI18n } from './i18n/ru.i18n';
14+
15+
defineLocale('ru', ru);
16+
defineLocale('en', enGb);
17+
18+
@Component({
19+
selector: '<%=app.name%>-root',
20+
templateUrl: './app.component.html',
21+
styleUrls: ['./app.component.scss'],
22+
entryComponents: [AlertModalComponent],
23+
encapsulation: ViewEncapsulation.None
24+
})
25+
export class <%=app.classPrefix%>AppComponent extends BaseAppComponent {
26+
27+
languages = [{
28+
code: 'ru',
29+
title: translate('Russian'),
30+
dic: _.merge(RuckenCoreRuI18n, RuckenWebRuI18n, <%=app.classPrefix%>CoreRuI18n, <%=app.classPrefix%>WebRuI18n, <%=app.classPrefix%>RuI18n)
31+
}, {
32+
code: 'en',
33+
title: translate('English'),
34+
dic: null
35+
}];
36+
37+
constructor(
38+
public injector: Injector,
39+
public viewContainerRef: ViewContainerRef,
40+
public resolver: ComponentFactoryResolver,
41+
public router: Router
42+
) {
43+
super(injector, viewContainerRef, resolver);
44+
}
45+
}
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
import { ModuleWithProviders, NgModule } from '@angular/core';
2+
import { FormsModule } from '@angular/forms';
3+
import { HttpClientModule } from '@angular/common/http';
4+
import { BrowserModule } from '@angular/platform-browser';
5+
import { PreloadAllModules, RouterModule } from '@angular/router';
6+
import { TranslateModule, TranslateLoader, TranslateFakeLoader } from '@ngx-translate/core';
7+
import {
8+
AppService,
9+
EndpointHelper,
10+
HttpHelper,
11+
RepositoryHelper,
12+
RuckenCoreServices,
13+
ThemesService,
14+
TokenService,
15+
} from '@rucken/core';
16+
import { <%=app.classPrefix%>CoreServices } from '@<%=app.name%>/core';
17+
import {
18+
AlertModalModule,
19+
AuthModalModule,
20+
BaseResourceSelectInputConfig,
21+
RuckenWebServices,
22+
SelectInputConfig,
23+
TableColumnConfig,
24+
TextInputConfig,
25+
WebAppService,
26+
WebThemesService,
27+
WebTokenService,
28+
} from '@rucken/web';
29+
import { HomeGuardService, SharedModule } from '@rucken/web';
30+
import { LaddaModule } from 'angular2-ladda';
31+
import {
32+
ComponentLoaderFactory,
33+
PaginationConfig,
34+
PopoverConfig,
35+
PositioningService,
36+
TabsetConfig,
37+
TooltipConfig,
38+
} from 'ngx-bootstrap';
39+
40+
import { <%=app.classPrefix%>AppComponent } from './app.component';
41+
import { <%=app.classPrefix%>Routes } from './app.routes';
42+
import { <%=app.classPrefix%>NavbarModule } from './controls/navbar/navbar.module';
43+
import { <%=app.classPrefix%>HomeGuardService } from './shared/guards/home-guard.service';
44+
import { <%=app.classPrefix%>EndpointHelper } from './shared/helpers/endpoint.helper';
45+
import { <%=app.classPrefix%>HttpHelper } from './shared/helpers/http.helper';
46+
47+
@NgModule({
48+
declarations: [
49+
<%=app.classPrefix%>AppComponent
50+
],
51+
imports: [
52+
BrowserModule,
53+
FormsModule,
54+
HttpClientModule,
55+
LaddaModule.forRoot({
56+
style: 'expand-left',
57+
spinnerColor: 'white',
58+
spinnerLines: 12
59+
}),
60+
TranslateModule.forRoot({
61+
loader: { provide: TranslateLoader, useClass: TranslateFakeLoader }
62+
}),
63+
SharedModule.forRoot(),
64+
AlertModalModule.forRoot(),
65+
<%=app.classPrefix%>NavbarModule.forRoot(),
66+
RouterModule.forRoot(<%=app.classPrefix%>Routes, { useHash: true, preloadingStrategy: PreloadAllModules })
67+
],
68+
providers: [
69+
ComponentLoaderFactory,
70+
PositioningService,
71+
TooltipConfig,
72+
PaginationConfig,
73+
TabsetConfig,
74+
PopoverConfig,
75+
RuckenCoreServices,
76+
RuckenWebServices,
77+
<%=app.classPrefix%>CoreServices,
78+
BaseResourceSelectInputConfig,
79+
TextInputConfig,
80+
SelectInputConfig,
81+
TableColumnConfig,
82+
{ provide: ThemesService, useClass: WebThemesService },
83+
{ provide: AppService, useClass: WebAppService },
84+
{ provide: TokenService, useClass: WebTokenService },
85+
{ provide: RepositoryHelper, useClass: RepositoryHelper },
86+
{ provide: EndpointHelper, useClass: <%=app.classPrefix%>EndpointHelper },
87+
{ provide: HttpHelper, useClass: <%=app.classPrefix%>HttpHelper },
88+
{ provide: HomeGuardService, useClass: <%=app.classPrefix%>HomeGuardService }
89+
],
90+
bootstrap: [<%=app.classPrefix%>AppComponent]
91+
})
92+
export class <%=app.classPrefix%>AppModule {
93+
static forRoot(): ModuleWithProviders {
94+
return { ngModule: <%=app.classPrefix%>AppModule };
95+
}
96+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
import { Routes } from '@angular/router';
2+
import { AuthGuardService, HomeGuardService } from '@rucken/web';
3+
4+
import { <%=app.classPrefix%>AccountPageRoutes } from './pages/account-page/account-page.routes';
5+
import { <%=app.classPrefix%>AdminPageRoutes } from './pages/admin-page/admin-page.routes';
6+
import { <%=app.classPrefix%>HomePageRoutes } from './pages/home-page/home-page.routes';
7+
import { <%=app.classPrefix%>ThemesPageRoutes } from './pages/themes-page/themes-page.routes';
8+
9+
export const <%=app.classPrefix%>Routes: Routes = [
10+
{ path: '', redirectTo: '/home', pathMatch: 'full' },
11+
{
12+
path: 'home',
13+
loadChildren: './pages/home-page/home-page.module#<%=app.classPrefix%>HomePageModule',
14+
data: <%=app.classPrefix%>HomePageRoutes[0].data,
15+
canActivate: [HomeGuardService]
16+
},
17+
{
18+
path: 'themes',
19+
loadChildren: './pages/themes-page/themes-page.module#<%=app.classPrefix%>ThemesPageModule',
20+
data: <%=app.classPrefix%>ThemesPageRoutes[0].data,
21+
canActivate: [AuthGuardService]
22+
},
23+
{
24+
path: 'admin',
25+
loadChildren: './pages/admin-page/admin-page.module#<%=app.classPrefix%>AdminPageModule',
26+
data: <%=app.classPrefix%>AdminPageRoutes[1].data,
27+
canActivate: [AuthGuardService]
28+
},
29+
{
30+
path: 'account',
31+
loadChildren: './pages/account-page/account-page.module#<%=app.classPrefix%>AccountPageModule',
32+
data: <%=app.classPrefix%>AccountPageRoutes[1].data,
33+
canActivate: [AuthGuardService]
34+
},
35+
{
36+
path: '**',
37+
redirectTo: 'home'
38+
}
39+
];
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!-- Fixed navbar -->
2+
<nav class="app-navbar navbar navbar-default navbar-fixed-top">
3+
<div class="container-fluid">
4+
<div class="navbar-header">
5+
<button type="button" class="navbar-toggle collapsed pointer" data-toggle="collapse" data-target="#navbar" aria-expanded="false"
6+
aria-controls="navbar" (click)="isCollapsed = !isCollapsed">
7+
<span class="sr-only" translate>Menu</span>
8+
<span class="icon-bar"></span>
9+
<span class="icon-bar"></span>
10+
<span class="icon-bar"></span>
11+
</button>
12+
<a class="navbar-brand pointer">
13+
<span (click)="go(['/'])" translate><%=app.title%></span>
14+
<span class="badge" (click)="showChangeLog()">{{version}}</span>
15+
</a>
16+
</div>
17+
<div id="navbar" class="navbar-collapse collapse" [collapse]="isCollapsed">
18+
<ul class="nav navbar-nav navbar-right">
19+
<li *ngFor="let item of childrenRoutes" [class.active]="router.isActive(item.url)" class="pointer">
20+
<a [routerLink]="[item.name]">{{item.title | translate}}</a>
21+
</li>
22+
<li class="dropdown pointer">
23+
<a (click)="languagesIsCollapsed = !languagesIsCollapsed" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
24+
aria-expanded="false">{{'Language' | translate}} <span class="caret"></span></a>
25+
<ul class="dropdown-menu" [collapse]="languagesIsCollapsed">
26+
<li *ngFor="let lang of languages" [class.active]="currentLanguage==lang.code"><a (click)="currentLanguage=lang.code">{{lang.title | translate}}</a></li>
27+
</ul>
28+
</li>
29+
<li *ngIf="account" class="pointer">
30+
<a (click)="showLogoutModal()" translate>Logout</a>
31+
</li>
32+
<li *ngIf="!account" class="pointer">
33+
<a (click)="showLoginModal()" translate>Login</a>
34+
</li>
35+
</ul>
36+
</div>
37+
<!--/.nav-collapse -->
38+
</div>
39+
</nav>

srcgen/web-app-empty/apps/%app.name%/src/app/controls/navbar/navbar.component.scss

Whitespace-only changes.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { Component, Injector } from '@angular/core';
2+
import { AuthModalComponent, ConfirmModalComponent, NavbarComponent } from '@rucken/web';
3+
4+
import { <%=app.classPrefix%>Routes } from './../../app.routes';
5+
6+
@Component({
7+
selector: '<%=app.name%>-navbar',
8+
templateUrl: './navbar.component.html',
9+
styleUrls: ['./navbar.component.scss'],
10+
entryComponents: [ConfirmModalComponent, AuthModalComponent]
11+
})
12+
export class <%=app.classPrefix%>NavbarComponent extends NavbarComponent {
13+
14+
initRoutes() {
15+
this.childrenRoutes = <%=app.classPrefix%>Routes;
16+
}
17+
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import { NgModule, ModuleWithProviders } from '@angular/core';
2+
import { <%=app.classPrefix%>NavbarComponent } from './navbar.component';
3+
import { SharedModule } from '@rucken/web';
4+
import { ConfirmModalModule, AuthModalModule } from '@rucken/web';
5+
import { CollapseModule } from 'ngx-bootstrap/collapse';
6+
import { RouterModule } from '@angular/router';
7+
8+
@NgModule({
9+
imports: [
10+
SharedModule.forRoot(),
11+
ConfirmModalModule.forRoot(),
12+
AuthModalModule.forRoot(),
13+
CollapseModule.forRoot(),
14+
RouterModule
15+
],
16+
declarations: [
17+
<%=app.classPrefix%>NavbarComponent
18+
],
19+
exports: [
20+
<%=app.classPrefix%>NavbarComponent
21+
],
22+
entryComponents: [<%=app.classPrefix%>NavbarComponent]
23+
})
24+
export class <%=app.classPrefix%>NavbarModule {
25+
static forRoot(): ModuleWithProviders {
26+
return {
27+
ngModule: <%=app.classPrefix%>NavbarModule,
28+
providers: []
29+
};
30+
}
31+
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
export const <%=app.classPrefix%>RuI18n = {
2+
'': {
3+
'project-id-version': '',
4+
'pot-creation-date': '',
5+
'po-revision-date': '',
6+
'last-translator': '',
7+
'language-team': '',
8+
'language': 'ru',
9+
'mime-version': '1.0',
10+
'content-type': 'text/plain; charset=UTF-8',
11+
'content-transfer-encoding': '8bit',
12+
'x-generator': 'Poedit 2.0.4',
13+
'plural-forms': 'nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);'
14+
},
15+
'Loading...': 'Загрузка...',
16+
'Russian': 'Русский',
17+
'English': 'Английский',
18+
'Account': 'Личный кабинет',
19+
'Profile': 'Профиль',
20+
'Admin': 'Администрирование',
21+
'Groups': 'Группы',
22+
'Users': 'Пользователи',
23+
'Home': 'Домашняя страница',
24+
'Projects': 'Проекты',
25+
'Themes': 'Темы',
26+
'Language': 'Язык',
27+
'Menu': 'Меню',
28+
'Rucken: <%=app.classPrefix%>': 'Rucken: <%=app.classPrefix%>',
29+
'Logout': 'Выйти',
30+
'Login': 'Вход',
31+
'Tasks': 'Задачи',
32+
'Changes': 'Изменения'
33+
};

0 commit comments

Comments
 (0)