From 438fd96d53e24cf5169559b3652d2ae8b58d153b Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Tue, 14 Nov 2023 10:23:55 +0300 Subject: [PATCH] wigets rename & heades locale --- .../_modules/layout/header/header.component.html | 14 ++++++++++++++ src/app/_modules/layout/header/header.component.ts | 13 +++++++++++++ src/app/_modules/layout/layout.module.ts | 4 ++-- src/app/_modules/objects/objects.module.ts | 4 ++-- src/app/_modules/pages/pages.module.ts | 4 ++-- .../pages/sections/page-sections.module.ts | 4 ++-- .../_modules/pages/tree/pages-tree.component.ts | 3 --- .../drop-down/drop-down.component.html | 0 .../drop-down/drop-down.component.scss | 0 .../drop-down/drop-down.component.ts | 0 .../{viget => widjet}/ico/ico.component.html | 0 .../{viget => widjet}/ico/ico.component.scss | 0 .../{viget => widjet}/ico/ico.component.ts | 0 .../{viget => widjet}/qrcode/qrcode.component.html | 0 .../{viget => widjet}/qrcode/qrcode.component.scss | 0 .../{viget => widjet}/qrcode/qrcode.component.ts | 0 .../{viget => widjet}/slider/slider.component.html | 0 .../{viget => widjet}/slider/slider.component.scss | 0 .../{viget => widjet}/slider/slider.component.ts | 0 .../{viget => widjet}/switch/switch.component.html | 0 .../{viget => widjet}/switch/switch.component.scss | 0 .../{viget => widjet}/switch/switch.component.ts | 0 .../viget.module.ts => widjet/widjet.module.ts} | 2 +- src/environments/environment.ts | 6 +++--- 24 files changed, 39 insertions(+), 15 deletions(-) rename src/app/_modules/{viget => widjet}/drop-down/drop-down.component.html (100%) rename src/app/_modules/{viget => widjet}/drop-down/drop-down.component.scss (100%) rename src/app/_modules/{viget => widjet}/drop-down/drop-down.component.ts (100%) rename src/app/_modules/{viget => widjet}/ico/ico.component.html (100%) rename src/app/_modules/{viget => widjet}/ico/ico.component.scss (100%) rename src/app/_modules/{viget => widjet}/ico/ico.component.ts (100%) rename src/app/_modules/{viget => widjet}/qrcode/qrcode.component.html (100%) rename src/app/_modules/{viget => widjet}/qrcode/qrcode.component.scss (100%) rename src/app/_modules/{viget => widjet}/qrcode/qrcode.component.ts (100%) rename src/app/_modules/{viget => widjet}/slider/slider.component.html (100%) rename src/app/_modules/{viget => widjet}/slider/slider.component.scss (100%) rename src/app/_modules/{viget => widjet}/slider/slider.component.ts (100%) rename src/app/_modules/{viget => widjet}/switch/switch.component.html (100%) rename src/app/_modules/{viget => widjet}/switch/switch.component.scss (100%) rename src/app/_modules/{viget => widjet}/switch/switch.component.ts (100%) rename src/app/_modules/{viget/viget.module.ts => widjet/widjet.module.ts} (96%) diff --git a/src/app/_modules/layout/header/header.component.html b/src/app/_modules/layout/header/header.component.html index 29eb95a..93e5e46 100644 --- a/src/app/_modules/layout/header/header.component.html +++ b/src/app/_modules/layout/header/header.component.html @@ -6,9 +6,23 @@ LOGO +
{{locale.name}}
+ + + + + + + !!!!!!!!!! diff --git a/src/app/_modules/layout/header/header.component.ts b/src/app/_modules/layout/header/header.component.ts index e1bd9da..1d50f46 100644 --- a/src/app/_modules/layout/header/header.component.ts +++ b/src/app/_modules/layout/header/header.component.ts @@ -12,6 +12,7 @@ export class HeaderComponent { public menuItems = []; public loading: boolean = false; public error: string = ''; + public ddHidden:boolean; public locales = []; @@ -25,6 +26,7 @@ export class HeaderComponent { ngOnInit() { this.pagesService.root().subscribe(res => { this.locales = res.data; + console.log(this.locales) }); } @@ -39,4 +41,15 @@ export class HeaderComponent { openMobileMenu(){ this.router.navigate([{outlets: {slider: 'pages-menu'}}], {skipLocationChange: true}).then(); } + + + + + + + close() { + setTimeout(() => { + this.ddHidden = true; + }, 10); + } } diff --git a/src/app/_modules/layout/layout.module.ts b/src/app/_modules/layout/layout.module.ts index e2f257e..6dd8ccc 100644 --- a/src/app/_modules/layout/layout.module.ts +++ b/src/app/_modules/layout/layout.module.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {BrowserModule} from "@angular/platform-browser"; import {RouterModule} from "@angular/router"; import {FormsModule, ReactiveFormsModule} from "@angular/forms"; -import { VigetModule } from '@app/_modules/viget/viget.module'; +import { WidjetModule } from '@app/_modules/widjet/widjet.module'; import {PagesModule} from "@app/_modules/pages/pages.module"; import {HeaderComponent} from "@app/_modules/layout/header/header.component"; @@ -20,7 +20,7 @@ import { RightContentComponent } from './right-content/right-content.component'; ReactiveFormsModule, RouterModule, PagesModule, - VigetModule + WidjetModule ], declarations: [ GridComponent, diff --git a/src/app/_modules/objects/objects.module.ts b/src/app/_modules/objects/objects.module.ts index 9f47075..00d11dc 100644 --- a/src/app/_modules/objects/objects.module.ts +++ b/src/app/_modules/objects/objects.module.ts @@ -11,7 +11,7 @@ import {AuthGuard} from "@app/_helpers"; import {SliderFormComponent} from "@app/_modules/objects/form/slider/slider-form.component"; import {SliderFiltersComponent} from "@app/_modules/objects/filters/slider/slider-filters.component"; import {FormFrameComponent} from "@app/_modules/objects/form/frame/form-frame.component"; -import { VigetModule } from '../viget/viget.module'; +import { WidjetModule } from '../widjet/widjet.module'; const routes: Routes = [ {path: 'form/:target/:type', component: SliderFormComponent, outlet: 'slider', canActivate: [AuthGuard]}, @@ -27,7 +27,7 @@ const routes: Routes = [ RouterModule.forChild(routes), FormFieldsModule, FilterFieldsModule, - VigetModule + WidjetModule ], declarations: [ ObjectFormComponent, diff --git a/src/app/_modules/pages/pages.module.ts b/src/app/_modules/pages/pages.module.ts index 52602d0..d0d2b57 100644 --- a/src/app/_modules/pages/pages.module.ts +++ b/src/app/_modules/pages/pages.module.ts @@ -16,7 +16,7 @@ import {SwiperModule} from "swiper/angular"; import {PagesTreeComponent} from "@app/_modules/pages/tree/pages-tree.component"; import {PagesTreeItemComponent} from "@app/_modules/pages/tree/item/pages-tree-item.component"; import {SortablejsModule} from "ngx-sortablejs"; -import { VigetModule } from '../viget/viget.module'; +import { WidjetModule } from '../widjet/widjet.module'; import { SliderMenuComponent } from './menu/slider-menu/slider-menu.component'; @NgModule({ @@ -30,7 +30,7 @@ import { SliderMenuComponent } from './menu/slider-menu/slider-menu.component'; PaginationModule, SwiperModule, SortablejsModule, - VigetModule + WidjetModule ], declarations: [ PagesMenuComponent, diff --git a/src/app/_modules/pages/sections/page-sections.module.ts b/src/app/_modules/pages/sections/page-sections.module.ts index 37a5a0a..ee36ffc 100644 --- a/src/app/_modules/pages/sections/page-sections.module.ts +++ b/src/app/_modules/pages/sections/page-sections.module.ts @@ -4,7 +4,7 @@ import {FormsModule, ReactiveFormsModule} from "@angular/forms"; import {SwiperModule} from "swiper/angular"; import {ObjectsModule} from "@app/_modules/objects/objects.module"; -import { VigetModule } from '@app/_modules/viget/viget.module'; +import { WidjetModule } from '@app/_modules/widjet/widjet.module'; import {PageSectionsComponent} from "@app/_modules/pages/sections/list/page-sections.component"; import {PageSectionComponent} from "@app/_modules/pages/sections/item/page-section.component"; @@ -36,7 +36,7 @@ import {MemberSectionListComponent} from "@app/_modules/pages/sections/types/bas ReactiveFormsModule, ObjectsModule, SwiperModule, - VigetModule + WidjetModule ], declarations: [ PageMenuComponent, diff --git a/src/app/_modules/pages/tree/pages-tree.component.ts b/src/app/_modules/pages/tree/pages-tree.component.ts index 3818752..aa347e7 100644 --- a/src/app/_modules/pages/tree/pages-tree.component.ts +++ b/src/app/_modules/pages/tree/pages-tree.component.ts @@ -80,8 +80,5 @@ export class PagesTreeComponent { this.listsService.changed.next(event); }); } - } - - } diff --git a/src/app/_modules/viget/drop-down/drop-down.component.html b/src/app/_modules/widjet/drop-down/drop-down.component.html similarity index 100% rename from src/app/_modules/viget/drop-down/drop-down.component.html rename to src/app/_modules/widjet/drop-down/drop-down.component.html diff --git a/src/app/_modules/viget/drop-down/drop-down.component.scss b/src/app/_modules/widjet/drop-down/drop-down.component.scss similarity index 100% rename from src/app/_modules/viget/drop-down/drop-down.component.scss rename to src/app/_modules/widjet/drop-down/drop-down.component.scss diff --git a/src/app/_modules/viget/drop-down/drop-down.component.ts b/src/app/_modules/widjet/drop-down/drop-down.component.ts similarity index 100% rename from src/app/_modules/viget/drop-down/drop-down.component.ts rename to src/app/_modules/widjet/drop-down/drop-down.component.ts diff --git a/src/app/_modules/viget/ico/ico.component.html b/src/app/_modules/widjet/ico/ico.component.html similarity index 100% rename from src/app/_modules/viget/ico/ico.component.html rename to src/app/_modules/widjet/ico/ico.component.html diff --git a/src/app/_modules/viget/ico/ico.component.scss b/src/app/_modules/widjet/ico/ico.component.scss similarity index 100% rename from src/app/_modules/viget/ico/ico.component.scss rename to src/app/_modules/widjet/ico/ico.component.scss diff --git a/src/app/_modules/viget/ico/ico.component.ts b/src/app/_modules/widjet/ico/ico.component.ts similarity index 100% rename from src/app/_modules/viget/ico/ico.component.ts rename to src/app/_modules/widjet/ico/ico.component.ts diff --git a/src/app/_modules/viget/qrcode/qrcode.component.html b/src/app/_modules/widjet/qrcode/qrcode.component.html similarity index 100% rename from src/app/_modules/viget/qrcode/qrcode.component.html rename to src/app/_modules/widjet/qrcode/qrcode.component.html diff --git a/src/app/_modules/viget/qrcode/qrcode.component.scss b/src/app/_modules/widjet/qrcode/qrcode.component.scss similarity index 100% rename from src/app/_modules/viget/qrcode/qrcode.component.scss rename to src/app/_modules/widjet/qrcode/qrcode.component.scss diff --git a/src/app/_modules/viget/qrcode/qrcode.component.ts b/src/app/_modules/widjet/qrcode/qrcode.component.ts similarity index 100% rename from src/app/_modules/viget/qrcode/qrcode.component.ts rename to src/app/_modules/widjet/qrcode/qrcode.component.ts diff --git a/src/app/_modules/viget/slider/slider.component.html b/src/app/_modules/widjet/slider/slider.component.html similarity index 100% rename from src/app/_modules/viget/slider/slider.component.html rename to src/app/_modules/widjet/slider/slider.component.html diff --git a/src/app/_modules/viget/slider/slider.component.scss b/src/app/_modules/widjet/slider/slider.component.scss similarity index 100% rename from src/app/_modules/viget/slider/slider.component.scss rename to src/app/_modules/widjet/slider/slider.component.scss diff --git a/src/app/_modules/viget/slider/slider.component.ts b/src/app/_modules/widjet/slider/slider.component.ts similarity index 100% rename from src/app/_modules/viget/slider/slider.component.ts rename to src/app/_modules/widjet/slider/slider.component.ts diff --git a/src/app/_modules/viget/switch/switch.component.html b/src/app/_modules/widjet/switch/switch.component.html similarity index 100% rename from src/app/_modules/viget/switch/switch.component.html rename to src/app/_modules/widjet/switch/switch.component.html diff --git a/src/app/_modules/viget/switch/switch.component.scss b/src/app/_modules/widjet/switch/switch.component.scss similarity index 100% rename from src/app/_modules/viget/switch/switch.component.scss rename to src/app/_modules/widjet/switch/switch.component.scss diff --git a/src/app/_modules/viget/switch/switch.component.ts b/src/app/_modules/widjet/switch/switch.component.ts similarity index 100% rename from src/app/_modules/viget/switch/switch.component.ts rename to src/app/_modules/widjet/switch/switch.component.ts diff --git a/src/app/_modules/viget/viget.module.ts b/src/app/_modules/widjet/widjet.module.ts similarity index 96% rename from src/app/_modules/viget/viget.module.ts rename to src/app/_modules/widjet/widjet.module.ts index 0d26188..a7cec76 100644 --- a/src/app/_modules/viget/viget.module.ts +++ b/src/app/_modules/widjet/widjet.module.ts @@ -28,6 +28,6 @@ import { SwitchComponent } from './switch/switch.component'; SwitchComponent ] }) -export class VigetModule { +export class WidjetModule { } \ No newline at end of file diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 97f5634..6476e34 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,9 +4,9 @@ export const environment = { production: false, - apiUrl: 'http://api.vniigazv2.lc', - clientId: 4, - clientSecret: 'QC09jOPEU7mpfFerpLyAJRshFUW1T28GfhsYzJHc', + apiUrl: 'http://api.nircms.lc', + clientId: 2, + clientSecret: 'w2C4NlaPEi1cCamm45N43WNFgkzAn1Wp6TdwBElh', project: null };