Skip to content

Commit

Permalink
Feat mac os projects viewer
Browse files Browse the repository at this point in the history
  • Loading branch information
Luciano-s404 committed Feb 21, 2023
1 parent 6b23500 commit bf05bb1
Show file tree
Hide file tree
Showing 28 changed files with 6,653 additions and 14,659 deletions.
1 change: 1 addition & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
"src/assets"
],
"styles": [
"@angular/material/prebuilt-themes/indigo-pink.css",
"src/styles.scss"
],
"scripts": []
Expand Down
20,934 changes: 6,340 additions & 14,594 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"@angular/fire": "^6.1.5",
"@angular/forms": "^14.2.6",
"@angular/localize": "^14.2.6",
"@angular/material": "^15.1.5",
"@angular/platform-browser": "^14.2.6",
"@angular/platform-browser-dynamic": "^14.2.6",
"@angular/router": "^14.2.6",
Expand Down Expand Up @@ -49,4 +50,4 @@
"karma-jasmine-html-reporter": "~1.7.0",
"typescript": "4.8.4"
}
}
}
4 changes: 2 additions & 2 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { NavbarComponent } from './shared/navbar/navbar.component';
import { AngularFireModule } from '@angular/fire';
import { MdbScrollspyModule } from 'mdb-angular-ui-kit/scrollspy';
import { environment } from 'src/environments/environment';

import {DragDropModule} from '@angular/cdk/drag-drop';

@NgModule({
declarations: [
Expand All @@ -23,7 +23,7 @@ import { environment } from 'src/environments/environment';
MdbDropdownModule,
MdbScrollspyModule,
BrowserAnimationsModule,
AngularFireModule.initializeApp(environment.firebaseConfig),
AngularFireModule.initializeApp(environment.firebaseConfig)
],
providers: [],
bootstrap: [AppComponent],
Expand Down
14 changes: 7 additions & 7 deletions src/app/public/home/about-me/about-me.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
<div class="card-body">
<!-- ESPAÑOL -->
<div *ngIf="lang == 'es'">
<h5 class="card-title text-center">Sobre mí</h5>
<h4 class="card-title text-center">Sobre mí</h4>
<p class="card-text mt-4">
Soy un persona muy entusiasta y creativa, me gusta mucho aportar mis ideas y perspectiva para generar
distintas soluciones, me gusta mucho trabajar en equipo y ayudar a los demas.
distintas soluciones, disfruto de trabajar en equipo y ayudar a los demas.
</p>
<p>
Mi meta es ser mentor de quienes recien comienzan a aprender, para que puedan formarse como buenos
desarrolladores, y que puedan crecer en el mundo de la programación.
</p>
<br>
<p>
Actualmente estoy tabajando en:
<img width="320px" src="../../../../assets/img/me/ma-logo.webp" alt="">
Actualmente trabajo en:
<img width="310px" src="../../../../assets/img/me/ma-logo.webp" alt="">
<br>
Una empresa de seguros, que esta en la etapa de transformacion digital.
Yo estoy asignado al equipo de desarrollo de la Aplicacion movil para asegurados
Expand All @@ -25,17 +25,17 @@ <h5 class="card-title text-center">Sobre mí</h5>

<!-- INGLES -->
<div *ngIf="lang == 'en'">
<h5 class="card-title text-center">About me</h5>
<h4 class="card-title text-center">About me</h4>
<p class="card-text mt-4">
I am a very enthusiastic and creative person, I like to contribute my ideas and perspective to generate different solutions, I like to work in team and help the others.
I am a very enthusiastic and creative person, I like to contribute my ideas and perspective to generate different solutions, enjoy to work in team and help the others.
</p>
<p>
My goal is to be a mentor for those who just start to learn, so that they can form themselves as good developers, and that they can grow in the world of programming.
</p>
<br>
<p>
I am currently working at:
<img width="320px" src="../../../../assets/img/me/ma-logo.webp" alt="">
<img width="310px" src="../../../../assets/img/me/ma-logo.webp" alt="">
<br>
A company of insurances, that is in the stage of digital transformation.
I am assigned to the development team of the mobile application for insured
Expand Down
2 changes: 1 addition & 1 deletion src/app/public/home/about-me/about-me.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { LangService } from 'src/app/shared/services/lang.service';
styleUrls: ['./about-me.component.scss']
})
export class AboutMeComponent implements OnInit {
linkCV ='https://drive.google.com/file/d/1eLt-cvRD_par698JdlCLSoKjOOKR4Azx/view?usp=sharing';
linkCV ='https://drive.google.com/file/d/1R0mj4MV-KaQe21EGELs3F2PwGoTkUYXs/view?usp=sharing';
gitUrl = 'https://github.com/attrix182';
linkedinURL ='https://www.linkedin.com/in/luciano-sinisterra-4a413913b/';
lang:string = 'es';
Expand Down
8 changes: 6 additions & 2 deletions src/app/public/home/home-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { HomeComponent } from './home.component';
import { ProjectsComponent } from './projects/projects.component';

const routes: Routes = [{ path: '', component: HomeComponent }];
const routes: Routes = [
{ path: '', component: HomeComponent },
{ path: 'mac', component: ProjectsComponent }
];

@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class HomeRoutingModule { }
export class HomeRoutingModule {}
5 changes: 3 additions & 2 deletions src/app/public/home/home.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { HttpClientModule } from '@angular/common/http';
import { AboutMeComponent } from './about-me/about-me.component';
import { ProjectsComponent } from './projects/projects.component';
import { FooterComponent } from 'src/app/shared/footer/footer.component';

import {DragDropModule} from '@angular/cdk/drag-drop';
@NgModule({
declarations: [
HomeComponent,
Expand All @@ -22,7 +22,8 @@ import { FooterComponent } from 'src/app/shared/footer/footer.component';
CommonModule,
HomeRoutingModule,
MdbCarouselModule,
HttpClientModule
HttpClientModule,
DragDropModule
],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
Expand Down
23 changes: 23 additions & 0 deletions src/app/public/home/projects copy/projects.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<div class="title-section text-center">
<h3 *ngIf="lang == 'es'">Proyectos</h3>
<h3 *ngIf="lang == 'en'">Projects</h3>
</div>
<div class="row row-cols-1 row-cols-md-3 g-4 mt-2 text-center" style="margin: auto; width: 97vw">
<div *ngFor="let project of projects">
<div class="col card-hold" data-aos="fade-up">
<div class="card h-100">
<img src="{{ project.image }}" class="card-img-top" alt="{{ project.name }}" />
<article class="card-body">
<h5 class="card-title">{{ project.name }}</h5>
<p class="card-text">
{{ project.description }}
</p>
<section class="container-buttons">
<a target="_blank" href="{{ project.linkDemo }}" class="btn btn-dark">Demo</a>
<a target="_blank" href="{{ project.linkRepo }}" class="btn btn-dark">Repo</a>
</section>
</article>
</div>
</div>
</div>
</div>
15 changes: 15 additions & 0 deletions src/app/public/home/projects copy/projects.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
.title-section{
color: white;
}

.card-hold{
padding: 15px;

}

.container-buttons{
display: flex;
justify-content: space-around;
align-items: center;
}

25 changes: 25 additions & 0 deletions src/app/public/home/projects copy/projects.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { ProjectsComponent } from './projects.component';

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

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

beforeEach(() => {
fixture = TestBed.createComponent(ProjectsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
85 changes: 85 additions & 0 deletions src/app/public/home/projects copy/projects.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import { Component, OnInit } from '@angular/core';
import { LangService } from 'src/app/shared/services/lang.service';

@Component({
selector: 'app-projects',
templateUrl: './projects.component.html',
styleUrls: ['./projects.component.scss']
})
export class ProjectsComponent implements OnInit {
lang: string = 'es';
projects: any;
projects_es = [
{
name: 'Sala de juegos',
description: 'Este proyecto consiste en un web con registro/login, varios minijuegos y un control de score',
linkDemo: 'https://tpsaladejuegosutn.web.app/',
linkRepo: 'https://github.com/attrix182/salaDeJuegosLAB4',
image: '../../../../assets/img/salaDeJuegos.webp'
},
{
name: 'Feedbackcito',
description: 'Este proyecto consiste en un web para crear sesiones de feedback. A las cuales se puede acceder por un codigo QR ',
linkDemo: 'https://feedbackcito.com.ar',
linkRepo: 'https://github.com/attrix182/feedbackcito',
image: '../../../../assets/img/feedbackcito.webp'
},
{
name: 'Stylefy',
description:
'Este proyecto consiste en mi propia biblioteca de estilos, para agilizar la construcción de nuevos proyectos',
linkDemo: 'https://stylefy.netlify.app/',
linkRepo: 'https://github.com/attrix182/stylefy',
image: '../../../../assets/img/stylefy.webp'
}
];

projects_en = [
{
name: 'Game Room',
description: 'This project consists in a web with registration/login, several games and a control of score',
linkDemo: 'https://tpsaladejuegosutn.web.app/',
linkRepo: 'https://github.com/attrix182/salaDeJuegosLAB4',
image: '../../../../assets/img/salaDeJuegos.webp'
},
{
name: 'Feedbackcito',
description: 'This project consists in a web to create feedback sessions. To which you can access by a QR code',
linkDemo: 'https://feedbackcito.com.ar',
linkRepo: 'https://github.com/attrix182/feedbackcito',
image: '../../../../assets/img/feedbackcito.webp'
},
{
name: 'Stylefy',
description: 'This project consists in my own library of styles, to simplify the construction of new projects',
linkDemo: 'https://stylefy.netlify.app/',
linkRepo: 'https://github.com/attrix182/stylefy',
image: '../../../../assets/img/stylefy.webp'
}
];

constructor(private langSVC: LangService) {}

ngOnInit(): void {
this.getLang();
this.setLangProjects();
}

setLangProjects() {
switch (this.lang) {
case 'es':
this.projects = this.projects_es;
break;
case 'en':
this.projects = this.projects_en;
break;
}
}

getLang() {
this.langSVC.getLang$().subscribe((lang) => {
this.lang = lang;
this.setLangProjects();
});
}
}
55 changes: 32 additions & 23 deletions src/app/public/home/projects/projects.component.html
Original file line number Diff line number Diff line change
@@ -1,25 +1,34 @@
<div class="title-section text-center"><h3>Proyectos</h3></div>
<div class="row row-cols-1 row-cols-md-3 g-4 mt-2 text-center" style="margin:auto;width: 97vw;">

<div *ngFor="let project of projects">
<div class="col card-hold" data-aos="fade-up">
<div class="card h-100">
<img
src="{{project.image}}"
class="card-img-top"
alt="{{project.name}}"
/>
<article class="card-body">
<h5 class="card-title">{{project.name}}</h5>
<p class="card-text">
{{project.description}}
</p>
<section class="container-buttons">
<a target="_blank" href="{{project.linkDemo}}" class="btn btn-dark">Demo</a>
<a target="_blank" href="{{project.linkRepo}}" class="btn btn-dark">Repo</a>
</section>
</article>
<section>
<div class="mac-frame">
<img class="img-frame" src="assets/img/macbook-frame.webp" alt="" />

<section class="screen">

<div class="screen-content" *ngIf="showDesktop">
<section class="desktop">
<div class="desktop-folder" *ngFor="let project of projects">

<div cdkDragBoundary=".screen" cdkDrag>
<button class="folder" (click)="openFolder()">
<div class="img-cotainer">
<img src="assets/img/mac-folder.webp" alt="" />
</div>
<p>{{ project.name }}</p>
</button>
</div>

</div>
</section>
</div>
</div>


<section *ngIf="showFolder">
<div class="folder-open">

</div>
</section>


</section>
</div>
</div>
</section>
Loading

0 comments on commit bf05bb1

Please sign in to comment.