diff --git a/package-lock.json b/package-lock.json index f7287ca4..f4409834 100644 --- a/package-lock.json +++ b/package-lock.json @@ -309,6 +309,14 @@ "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-11.1.5.tgz", "integrity": "sha512-BRRHMrgw9tG0BezTnfszzFTlpW9B9Zh5kyZF/pxqfJxpUsZ0aA/uXlL4cloe4+msQ6yIdu1/jhUCDInwSzmpFw==" }, + "@swimlane/ngx-dnd": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-dnd/-/ngx-dnd-3.1.0.tgz", + "integrity": "sha512-Ph7fpK+H8OkS7TyFjNGRn+sLwrmvJbnx9hieiTlKtEgB9kGU39qkZx6eGBdzs5MOsLRd8OP8DnVhiuf4XSm7cA==", + "requires": { + "dragula": "3.7.2" + } + }, "@types/jasmine": { "version": "2.5.54", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.54.tgz", @@ -342,14 +350,6 @@ "integrity": "sha512-UBYHWph6P3tutkbXpW6XYg9ZPbTKjw/YC2hGG1/GEvWwTbvezBUv3h+mmUFw79T3RFPnmedpiXdOBbXX+4l0jg==", "dev": true }, - "@withinpixels/ngx-dnd": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@withinpixels/ngx-dnd/-/ngx-dnd-3.1.0.tgz", - "integrity": "sha512-xdKp0T/JuETNVRWgRxbcx+pD6THX8OBw50wpsfi7AeK/wmvXEI1U28quh1a30T298QA7i5sofbTByUGm/XIfLg==", - "requires": { - "dragula": "3.7.2" - } - }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", diff --git a/package.json b/package.json index 4bde7abd..579ced12 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@ngx-translate/core": "9.0.1", "@swimlane/ngx-charts": "7.0.1", "@swimlane/ngx-datatable": "11.1.5", - "@withinpixels/ngx-dnd": "3.1.0", + "@swimlane/ngx-dnd": "3.1.0", "angular-calendar": "0.22.1", "classlist.js": "1.1.20150312", "core-js": "2.5.3", diff --git a/src/app/navigation/i18n/en.ts b/src/app/navigation/i18n/en.ts index e6a6da10..413e8250 100644 --- a/src/app/navigation/i18n/en.ts +++ b/src/app/navigation/i18n/en.ts @@ -3,22 +3,10 @@ export const locale = { data: { 'NAV': { 'APPLICATIONS': 'Applications', - 'DASHBOARDS' : 'Dashboards', - 'CALENDAR' : 'Calendar', - 'ECOMMERCE' : 'E-Commerce', - 'MAIL' : { - 'TITLE': 'Mail', + 'SAMPLE' : { + 'TITLE': 'Sample', 'BADGE': '25' - }, - 'MAIL_NGRX' : { - 'TITLE': 'Mail Ngrx', - 'BADGE': '13' - }, - 'CHAT' : 'Chat', - 'FILE_MANAGER': 'File Manager', - 'CONTACTS' : 'Contacts', - 'TODO' : 'To-Do', - 'SCRUMBOARD' : 'Scrumboard' + } } } }; diff --git a/src/app/navigation/i18n/tr.ts b/src/app/navigation/i18n/tr.ts index 7eb06307..1ce912a7 100644 --- a/src/app/navigation/i18n/tr.ts +++ b/src/app/navigation/i18n/tr.ts @@ -3,22 +3,10 @@ export const locale = { data: { 'NAV': { 'APPLICATIONS': 'Programlar', - 'DASHBOARDS' : 'Kontrol Paneli', - 'CALENDAR' : 'Takvim', - 'ECOMMERCE' : 'E-Ticaret', - 'MAIL' : { - 'TITLE': 'Posta', + 'SAMPLE' : { + 'TITLE': 'Örnek', 'BADGE': '15' - }, - 'MAIL_NGRX' : { - 'TITLE': 'Posta Ngrx', - 'BADGE': '13' - }, - 'CHAT' : 'Sohbet', - 'FILE_MANAGER': 'Dosya Yöneticisi', - 'CONTACTS' : 'Kişiler', - 'TODO' : 'Yapılacaklar', - 'SCRUMBOARD' : 'Proje' + } } } }; diff --git a/src/app/navigation/navigation.model.ts b/src/app/navigation/navigation.model.ts index c9f4cefa..aee3a8c8 100644 --- a/src/app/navigation/navigation.model.ts +++ b/src/app/navigation/navigation.model.ts @@ -16,13 +16,13 @@ export class FuseNavigationModel implements FuseNavigationModelInterface { 'id' : 'sample', 'title': 'Sample', - 'translate': 'NAV.MAIL.TITLE', + 'translate': 'NAV.SAMPLE.TITLE', 'type' : 'item', 'icon' : 'email', 'url' : '/sample', 'badge': { 'title': 25, - 'translate': 'NAV.MAIL.BADGE', + 'translate': 'NAV.SAMPLE.BADGE', 'bg' : '#F44336', 'fg' : '#FFFFFF' }