Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions apps/devmx/src/app/app.sections.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ export const appSections: SectionHeaderOptions[] = [
icon: 'music/speaker',
roles: ['recruiter'],
},
// {
// label: 'Aprenda',
// route: ['/aprenda', 'administracao'],
// icon: 'book-opened',
// roles: ['member'],
// },
{
label: 'Aprenda',
route: ['/aprenda', 'administracao'],
icon: 'book-opened',
roles: ['member'],
},
{
label: 'Sobre você',
route: ['/conta', 'configuracoes'],
Expand Down
9 changes: 6 additions & 3 deletions apps/devmx/src/scss/components/_fab.theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,20 @@
}
}

.mat-mdc-fab.primary-fab {
.mat-mdc-fab.primary-fab,
.mat-mdc-mini-fab.primary-fab {
background-color: mat.get-theme-color($theme, primary-container);
color: mat.get-theme-color($theme, on-primary-container);
}

.mat-mdc-fab.secondary-fab {
.mat-mdc-fab.secondary-fab,
.mat-mdc-mini-fab.secondary-fab {
background-color: mat.get-theme-color($theme, secondary-container);
color: mat.get-theme-color($theme, on-secondary-container);
}

.mat-mdc-fab.tertiary-fab {
.mat-mdc-fab.tertiary-fab,
.mat-mdc-mini-fab.tertiary-fab {
background-color: mat.get-theme-color($theme, tertiary, 50);
color: mat.get-theme-color($theme, on-tertiary);
}
Expand Down
1 change: 1 addition & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
],
"sharedGlobals": ["{workspaceRoot}/.github/workflows/ci.yml"]
},
"nxCloudId": "66ed082b0f768c3e7a77e1a5",
"plugins": [
{
"plugin": "@nx/webpack/plugin",
Expand Down
4 changes: 2 additions & 2 deletions packages/academy/data-access/src/lib/academy.providers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { provideFacades, provideServices, provideUseCases } from './providers';
import { provideCourse, provideInstitution, provideSubject } from './providers';

export function provideAcademy() {
return [...provideServices(), ...provideUseCases(), ...provideFacades()];
return [...provideSubject(), ...provideInstitution(), ...provideCourse()];
}
23 changes: 23 additions & 0 deletions packages/academy/data-access/src/lib/providers/course.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { provideCourseHttpService } from '../infrastructure';
import { provideCourseFacade } from '../application';
import {
provideFindCoursesUseCase,
provideCreateCourseUseCase,
provideDeleteCourseUseCase,
provideUpdateCourseUseCase,
provideFindCourseByIDUseCase,
} from '@devmx/academy-domain/client';

export function provideCourse() {
return [
provideCourseHttpService(),

provideCreateCourseUseCase(),
provideFindCoursesUseCase(),
provideFindCourseByIDUseCase(),
provideUpdateCourseUseCase(),
provideDeleteCourseUseCase(),

provideCourseFacade(),
];
}
9 changes: 6 additions & 3 deletions packages/academy/data-access/src/lib/providers/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
export * from './facades';
export * from './services';
export * from './use-cases';
export * from './course';
export * from './facades';
export * from './nistitution';
export * from './services';
export * from './subject';
export * from './use-cases';
23 changes: 23 additions & 0 deletions packages/academy/data-access/src/lib/providers/nistitution.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { provideInstitutionHttpService } from '../infrastructure';
import { provideInstitutionFacade } from '../application';
import {
provideFindInstitutionsUseCase,
provideCreateInstitutionUseCase,
provideDeleteInstitutionUseCase,
provideUpdateInstitutionUseCase,
provideFindInstitutionByIDUseCase,
} from '@devmx/academy-domain/client';

export function provideInstitution() {
return [
provideInstitutionHttpService(),

provideCreateInstitutionUseCase(),
provideFindInstitutionsUseCase(),
provideFindInstitutionByIDUseCase(),
provideUpdateInstitutionUseCase(),
provideDeleteInstitutionUseCase(),

provideInstitutionFacade(),
];
}
23 changes: 23 additions & 0 deletions packages/academy/data-access/src/lib/providers/subject.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { provideSubjectHttpService } from '../infrastructure';
import { provideSubjectFacade } from '../application';
import {
provideFindSubjectsUseCase,
provideCreateSubjectUseCase,
provideDeleteSubjectUseCase,
provideUpdateSubjectUseCase,
provideFindSubjectByIDUseCase,
} from '@devmx/academy-domain/client';

export function provideSubject() {
return [
provideSubjectHttpService(),

provideCreateSubjectUseCase(),
provideFindSubjectsUseCase(),
provideFindSubjectByIDUseCase(),
provideUpdateSubjectUseCase(),
provideDeleteSubjectUseCase(),

provideSubjectFacade(),
];
}
3 changes: 2 additions & 1 deletion packages/academy/domain/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"version": "0.0.1",
"dependencies": {
"tslib": "^2.3.0",
"@devmx/shared-api-interfaces": "0.0.1"
"@devmx/shared-api-interfaces": "0.0.1",
"@devmx/shared-util-data": "0.0.1"
},
"type": "commonjs",
"main": "./src/index.js",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { CourseService } from '../services';
import { UseCase, Course, EditableCourse } from '@devmx/shared-api-interfaces';
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { CourseService } from '../services';

export class CreateCourseUseCase implements UseCase<EditableCourse, Course> {
constructor(private courseService: CourseService) {}
Expand All @@ -8,3 +9,7 @@ export class CreateCourseUseCase implements UseCase<EditableCourse, Course> {
return this.courseService.create(data);
}
}

export function provideCreateCourseUseCase() {
return createUseCaseProvider(CreateCourseUseCase, [CourseService]);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { InstitutionService } from '../services';
import {
UseCase,
Expand All @@ -14,3 +15,7 @@ export class CreateInstitutionUseCase
return this.institutionService.create(data);
}
}

export function provideCreateInstitutionUseCase() {
return createUseCaseProvider(CreateInstitutionUseCase, [InstitutionService]);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { SubjectService } from '../services';
import {
UseCase,
Expand All @@ -12,3 +13,7 @@ export class CreateSubjectUseCase implements UseCase<EditableSubject, Subject> {
return this.subjectService.create(data);
}
}

export function provideCreateSubjectUseCase() {
return createUseCaseProvider(CreateSubjectUseCase, [SubjectService]);
}
5 changes: 5 additions & 0 deletions packages/academy/domain/src/client/use-cases/delete-course.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { Course, UseCase } from '@devmx/shared-api-interfaces';
import { CourseService } from '../services';

Expand All @@ -8,3 +9,7 @@ export class DeleteCourseUseCase implements UseCase<string, Course | null> {
return this.courseService.delete(id);
}
}

export function provideDeleteCourseUseCase() {
return createUseCaseProvider(DeleteCourseUseCase, [CourseService]);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { Institution, UseCase } from '@devmx/shared-api-interfaces';
import { InstitutionService } from '../services';

Expand All @@ -10,3 +11,7 @@ export class DeleteInstitutionUseCase
return this.institutionService.delete(id);
}
}

export function provideDeleteInstitutionUseCase() {
return createUseCaseProvider(DeleteInstitutionUseCase, [InstitutionService]);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { Subject, UseCase } from '@devmx/shared-api-interfaces';
import { SubjectService } from '../services';

Expand All @@ -8,3 +9,7 @@ export class DeleteSubjectUseCase implements UseCase<string, Subject | null> {
return this.subjectService.delete(id);
}
}

export function provideDeleteSubjectUseCase() {
return createUseCaseProvider(DeleteSubjectUseCase, [SubjectService]);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { Course, UseCase } from '@devmx/shared-api-interfaces';
import { CourseService } from '../services';

Expand All @@ -8,3 +9,7 @@ export class FindCourseByIDUseCase implements UseCase<string, Course | null> {
return this.courseService.findOne(id);
}
}

export function provideFindCourseByIDUseCase() {
return createUseCaseProvider(FindCourseByIDUseCase, [CourseService]);
}
5 changes: 5 additions & 0 deletions packages/academy/domain/src/client/use-cases/find-courses.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { CourseService } from '../services';
import {
Page,
Expand All @@ -15,3 +16,7 @@ export class FindCoursesUseCase
return this.courseService.find(params);
}
}

export function provideFindCoursesUseCase() {
return createUseCaseProvider(FindCoursesUseCase, [CourseService]);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { Institution, UseCase } from '@devmx/shared-api-interfaces';
import { InstitutionService } from '../services';

Expand All @@ -10,3 +11,9 @@ export class FindInstitutionByIDUseCase
return this.institutionService.findOne(id);
}
}

export function provideFindInstitutionByIDUseCase() {
return createUseCaseProvider(FindInstitutionByIDUseCase, [
InstitutionService,
]);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { InstitutionService } from '../services';
import {
Page,
Expand All @@ -15,3 +16,7 @@ export class FindInstitutionsUseCase
return this.institutionService.find(params);
}
}

export function provideFindInstitutionsUseCase() {
return createUseCaseProvider(FindInstitutionsUseCase, [InstitutionService]);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { Subject, UseCase } from '@devmx/shared-api-interfaces';
import { SubjectService } from '../services';

Expand All @@ -8,3 +9,7 @@ export class FindSubjectByIDUseCase implements UseCase<string, Subject | null> {
return this.subjectService.findOne(id);
}
}

export function provideFindSubjectByIDUseCase() {
return createUseCaseProvider(FindSubjectByIDUseCase, [SubjectService]);
}
5 changes: 5 additions & 0 deletions packages/academy/domain/src/client/use-cases/find-subjects.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { SubjectService } from '../services';
import {
Page,
Expand All @@ -15,3 +16,7 @@ export class FindSubjectsUseCase
return this.subjectService.find(params);
}
}

export function provideFindSubjectsUseCase() {
return createUseCaseProvider(FindSubjectsUseCase, [SubjectService]);
}
5 changes: 5 additions & 0 deletions packages/academy/domain/src/client/use-cases/update-course.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { UseCase, Course, EditableCourse } from '@devmx/shared-api-interfaces';
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { CourseService } from '../services';

export class UpdateCourseUseCase implements UseCase<EditableCourse, Course> {
Expand All @@ -8,3 +9,7 @@ export class UpdateCourseUseCase implements UseCase<EditableCourse, Course> {
return this.courseService.update(data.id, data);
}
}

export function provideUpdateCourseUseCase() {
return createUseCaseProvider(UpdateCourseUseCase, [CourseService]);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { InstitutionService } from '../services';
import {
UseCase,
Expand All @@ -14,3 +15,7 @@ export class UpdateInstitutionUseCase
return this.institutionService.update(data.id, data);
}
}

export function provideUpdateInstitutionUseCase() {
return createUseCaseProvider(UpdateInstitutionUseCase, [InstitutionService]);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { createUseCaseProvider } from '@devmx/shared-util-data/client';
import { SubjectService } from '../services';
import {
UseCase,
Expand All @@ -12,3 +13,7 @@ export class UpdateSubjectUseCase implements UseCase<EditableSubject, Subject> {
return this.subjectService.update(data.id, data);
}
}

export function provideUpdateSubjectUseCase() {
return createUseCaseProvider(UpdateSubjectUseCase, [SubjectService]);
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { AccountFeatureAboutComponent } from './account-feature-about.component';
import { accountFeatureAboutProviders } from './account-feature-about.providers';
import { aboutUserResolver, aboutUserSchemaResolver } from './resolvers';
import { User } from '@devmx/shared-api-interfaces';
import { AboutUserContainer } from './containers';
import { Route } from '@angular/router';

Expand All @@ -17,11 +16,6 @@ export const accountFeatureAboutRoutes: Route[] = [
children: [
{
path: '',
data: {
breadcrumb: (data: { user: User }) => {
return data.user.displayName;
},
},
title: 'Sobre um usuário',
resolve: { about: aboutUserResolver },
component: AboutUserContainer,
Expand Down
3 changes: 3 additions & 0 deletions packages/account/feature-about/src/lib/components/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export * from './user-presentations/user-presentations.component';
export * from './user-events/user-events.component';
export * from './user-skills/user-skills.component';
Loading
Loading