Skip to content

Commit

Permalink
Merge pull request #186 from thiagosantoscunha/master
Browse files Browse the repository at this point in the history
Melhor coesão na nomenclatura dos arquivos e remoção de um arquivo sem uso
  • Loading branch information
wantero authored Feb 4, 2019
2 parents 4e2a0f5 + ac2efa1 commit 1b82ec2
Show file tree
Hide file tree
Showing 30 changed files with 43 additions and 93 deletions.
8 changes: 4 additions & 4 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import { Ng2ImgMaxModule } from 'ng2-img-max';
import { fakeBackendProvider } from './core/helpers';

import { HomeComponent } from './components/home/home.component';
import { QuemSomosComponent } from './components/quem-somos/quem-somos.component';
import { ApoieProjetoComponent } from './components/apoie-projeto/apoie-projeto.component';
import { AboutComponent } from './components/about/about.component';
import { ContributeProjectComponent } from './components/contribute-project/contribute-project.component';
import { HeaderComponent } from './components/header/header.component';
import { FooterComponent } from './components/footer/footer.component';
import { FormComponent as BookFormComponent } from './components/book/form/form.component';
Expand Down Expand Up @@ -65,8 +65,8 @@ import {CustomReuseStrategy} from './core/router/custom-reuse-strategy';
BookFormComponent,
BookDetailComponent,
HomeComponent,
QuemSomosComponent,
ApoieProjetoComponent,
AboutComponent,
ContributeProjectComponent,
HeaderComponent,
FooterComponent,
RegisterComponent,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { QuemSomosComponent } from './quem-somos.component';
import { AboutComponent } from './about.component';

describe('QuemSomosComponent', () => {
let component: QuemSomosComponent;
let fixture: ComponentFixture<QuemSomosComponent>;
describe('AboutComponent', () => {
let component: AboutComponent;
let fixture: ComponentFixture<AboutComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ QuemSomosComponent ]
declarations: [ AboutComponent ]
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(QuemSomosComponent);
fixture = TestBed.createComponent(AboutComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import { Contributor } from 'src/app/core/models/contributor';
import { ContributorsService } from 'src/app/core/services/contributors/contributors.service';

@Component({
selector: 'app-quem-somos',
templateUrl: './quem-somos.component.html',
styleUrls: ['./quem-somos.component.css'],
selector: 'app-about',
templateUrl: './about.component.html',
styleUrls: ['./about.component.css'],
providers: [
ContributorsService
]
})
export class QuemSomosComponent implements OnInit {
export class AboutComponent implements OnInit {

contributors: Contributor[] = [];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { DebugElement } from '@angular/core';

import { ApoieProjetoComponent } from './apoie-projeto.component';
import { ContributeProjectComponent } from './contribute-project.component';

describe('ApoieProjetoComponent', () => {
let component: ApoieProjetoComponent;
let fixture: ComponentFixture<ApoieProjetoComponent>;
describe('ContributeProjectComponent', () => {
let component: ContributeProjectComponent;
let fixture: ComponentFixture<ContributeProjectComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ApoieProjetoComponent ]
declarations: [ ContributeProjectComponent ]
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(ApoieProjetoComponent);
fixture = TestBed.createComponent(ContributeProjectComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ import { ToolsService } from '../../core/services/tools/tools.service';
import { CareersService } from '../../core/services/careers/careers.service';

@Component({
selector: 'app-apoie-projeto',
templateUrl: './apoie-projeto.component.html',
styleUrls: ['./apoie-projeto.component.css'],
selector: 'app-contribute-project',
templateUrl: './contribute-project.component.html',
styleUrls: ['./contribute-project.component.css'],
providers: [
TechnologiesService,
ToolsService,
CareersService
]
})
export class ApoieProjetoComponent implements OnInit {
export class ContributeProjectComponent implements OnInit {

technologies: CardItem[] = [];
tools: CardItem[] = [];
Expand Down
50 changes: 0 additions & 50 deletions src/app/components/quem-somos/footer.component.css

This file was deleted.

8 changes: 4 additions & 4 deletions src/app/core/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ import { RegisterComponent } from '../components/register/register.component';
import { LoginComponent } from '../components/login/login.component';
import { PanelComponent } from '../components/panel/panel.component';
import { AccountComponent } from '../components/account/account.component';
import { QuemSomosComponent } from '../components/quem-somos/quem-somos.component';
import { ApoieProjetoComponent } from '../components/apoie-projeto/apoie-projeto.component';
import { ContributeProjectComponent } from '../components/contribute-project/contribute-project.component';
import { ChangePasswordComponent } from '../components/change-password/change-password.component';
import { ResetPasswordComponent } from '../components/reset-password/reset-password.component';
import { ForgotPasswordComponent } from '../components/forgot-password/forgot-password.component';
import { ContactUsComponent } from '../components/contact-us/contact-us.component';
import { RequestedsComponent } from '../components/book/requesteds/requesteds.component';
import { DonationsComponent } from '../components/book/donations/donations.component';
import { AboutComponent } from '../components/about/about.component';

const routes: Routes = [
{
Expand Down Expand Up @@ -61,11 +61,11 @@ const routes: Routes = [
},
{
path: 'quem-somos',
component: QuemSomosComponent
component: AboutComponent
},
{
path: 'apoie-projeto',
component: ApoieProjetoComponent
component: ContributeProjectComponent
},
{
path: 'register',
Expand Down
12 changes: 6 additions & 6 deletions src/app/core/services/careers/careers.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,47 +9,47 @@ export class CareersService {

const careers: CardItem[] = [
{
image: 'assets/img/apoie-projeto/business_plan.jpg',
image: 'assets/img/contribute-project/business_plan.jpg',
title: 'Business Plan',
text: 'Estratégia, motivação, liderança.<br/><br/><br/>',
links: [
{url: this.linkedinUrl, content: 'Linkedin'}
]
},
{
image: 'assets/img/apoie-projeto/marketing.jpg',
image: 'assets/img/contribute-project/marketing.jpg',
title: 'Marketing',
text: 'Divulgação, patrocínio, parcerias, fidelização.<br/><br/>',
links: [
{url: this.linkedinUrl, content: 'Linkedin'}
]
},
{
image: 'assets/img/apoie-projeto/vendas.jpg',
image: 'assets/img/contribute-project/vendas.jpg',
title: 'Vendas',
text: 'Tudo é venda, mesmo que não seja comercial. Ideias, engajamento.',
links: [
{url: this.linkedinUrl, content: 'Linkedin'}
]
},
{
image: 'assets/img/apoie-projeto/rh.jpg',
image: 'assets/img/contribute-project/rh.jpg',
title: 'RH',
text: 'Engajamento do time. Motivação.<br/><br/><br/>',
links: [
{url: this.linkedinUrl, content: 'Linkedin'}
]
},
{
image: 'assets/img/apoie-projeto/juridico.jpg',
image: 'assets/img/contribute-project/juridico.jpg',
title: 'Jurídico',
text: 'Que cuidados devemos tomar?',
links: [
{url: this.linkedinUrl, content: 'Linkedin'}
]
},
{
image: 'assets/img/apoie-projeto/cientista_dados.jpg',
image: 'assets/img/contribute-project/cientista_dados.jpg',
title: 'Data Science',
text: 'Explorar. Apresentar. Prever.',
links: [
Expand Down
8 changes: 4 additions & 4 deletions src/app/core/services/technologies/technologies.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export class TechnologiesService {
public getTechnologies(): CardItem[] {
const technologies: CardItem[] = [
{
image: 'assets/img/apoie-projeto/dotnet.jpg',
image: 'assets/img/contribute-project/dotnet.jpg',
title: 'Backend',
text: '.Net core 2.x, C#, SQL Server, Web api',
links: [
Expand All @@ -15,7 +15,7 @@ export class TechnologiesService {
]
},
{
image: 'assets/img/apoie-projeto/angular.jpg',
image: 'assets/img/contribute-project/angular.jpg',
title: 'Frontend',
text: 'Angular 6, Bootstrap 4, HTML 5',
links: [
Expand All @@ -24,7 +24,7 @@ export class TechnologiesService {
]
},
{
image: 'assets/img/apoie-projeto/ionic.jpg',
image: 'assets/img/contribute-project/ionic.jpg',
title: 'Mobile',
text: 'Cordova, Ionic, Angular<br/>',
links: [
Expand All @@ -33,7 +33,7 @@ export class TechnologiesService {
]
},
{
image: 'assets/img/apoie-projeto/qa.jpg',
image: 'assets/img/contribute-project/qa.jpg',
title: 'QA',
text: 'C#, xUnit, Selenium<br/><br/>',
links: [
Expand Down
10 changes: 5 additions & 5 deletions src/app/core/services/tools/tools.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export class ToolsService {
public getTools(): CardItem[] {
const tools: CardItem[] = [
{
image: 'assets/img/apoie-projeto/slack.jpg',
image: 'assets/img/contribute-project/slack.jpg',
title: 'Slack',
text: 'Comunicação, colaboração e integração. Uma das ferramentas favoritas dos devs.',
links: [
Expand All @@ -14,7 +14,7 @@ export class ToolsService {
]
},
{
image: 'assets/img/apoie-projeto/trello.jpg',
image: 'assets/img/contribute-project/trello.jpg',
title: 'Trello',
text: 'Chegou a hora de contribuir! Peque uma tarefa, coloque no seu nome e mova pra DOING.',
links: [
Expand All @@ -23,23 +23,23 @@ export class ToolsService {
]
},
{
image: 'assets/img/apoie-projeto/github.jpg',
image: 'assets/img/contribute-project/github.jpg',
title: 'Git Hub',
text: 'Aqui nós temos o cuidado de ter um histórico educativo, onde cada commit conta uma estória.',
links: [
{url: 'https://github.com/SharebookBR', content: 'Website'}
]
},
{
image: 'assets/img/apoie-projeto/appveyor.jpg',
image: 'assets/img/contribute-project/appveyor.jpg',
title: 'AppVeyor',
text: 'Solução fácil e amigável para integração e deploy contínuo. Integrado com Slack.',
links: [
{url: 'https://www.appveyor.com/', content: 'Website'}
]
},
{
image: 'assets/img/apoie-projeto/smarteraspnet.jpg',
image: 'assets/img/contribute-project/smarteraspnet.jpg',
title: 'Smarter ASP.NET',
text: 'Hospedagem boa e barata pro seu App. Usando o link abaixo vc ajuda nosso projeto.',
links: [
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes

0 comments on commit 1b82ec2

Please sign in to comment.