-
-
-
+
-
-
- Bienvenidos a Comunity Fest and Code
- - - - -
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts
index 5ba9fef..63949bc 100644
--- a/src/app/pages/home/home.component.ts
+++ b/src/app/pages/home/home.component.ts
@@ -1,43 +1,26 @@
import { Component, OnInit, EventEmitter, Input, Output } from '@angular/core';
import { auth } from 'firebase-admin';
import { Observable } from 'rxjs';
-import { ElementId } from 'src/app/models/element';
-import { AuthService } from 'src/app/services/auth.service';
-import { FirestoreService } from 'src/app/services/firebase.service';
-
-import {SponsorsComponent} from '../section/sponsor/sponsors/sponsors.component'
+import { ElementId } from 'src/app/shared/models/element';
+import { AuthService } from 'src/app/core/services/auth.service';
+import { FirestoreService } from 'src/app/core/services/firebase.service';
+import { Comunidad, Taller } from '../../shared/models/collections';
@Component({
selector: 'app-home',
templateUrl: './home.component.html',
- styleUrls: ['./home.component.scss']
+ styleUrls: ['./home.component.css'],
})
export class HomeComponent implements OnInit {
displayName: any;
users: ElementId[] = [];
user: any;
- constructor(private auth: AuthService, private fsService: FirestoreService) {
-
-
- }
- onActivate(component: SponsorsComponent) {
- /*if (component == "sponsor") {
- console.log("----------------loaded sponsor component-----------------")
- //component.list = this.sponsors;
- } else if (component =="course") {
- console.log("----------------loaded course component-----------------")
- //component.list = this.sponsors;
- }else
- console.log("----------------loaded otro component-----------------", component)*/
-
- }
+ comunidades: Comunidad[] = [];
+ constructor(private auth: AuthService, private fsService: FirestoreService) {}
ngOnInit(): void {
-
-
+ this.fsService.getCollection('comunidades', 5).subscribe((v: any) => {
+ this.comunidades = v;
+ });
}
- async doConsult() {
-
- }
-
}
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index a42a94a..491b849 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -1,100 +1,106 @@
import { Component, OnInit } from '@angular/core';
-import { AuthService } from '../../../app/services/auth.service';
+import { AuthService } from '../../core/services/auth.service';
import { Router } from '@angular/router';
import Swal from 'sweetalert2';
import { NgForm } from '@angular/forms';
-import { UserModel } from 'src/app/models/user.model';
+import { UserModel } from 'src/app/shared/models/user.model';
import { AngularFirestore } from '@angular/fire/firestore';
@Component({
selector: 'app-login',
- templateUrl: './login.html', //templateUrl: './login.component.html',
- styleUrls: ['./login.component.css']
+ templateUrl: './login.html', //templateUrl: './login.component.html',
+ styleUrls: ['./login.component.css'],
})
export class LoginComponent implements OnInit {
-
user: UserModel = {} as UserModel;
recordarme = false;
- errMsg = "";
-
- constructor(private authLogin: AuthService,
- private router: Router, public authService: AuthService,
- private db: AngularFirestore) { }
+ errMsg = '';
- ngOnInit(): void {
- }
- loginGmail(){
+ constructor(
+ private authLogin: AuthService,
+ private router: Router,
+ public authService: AuthService,
+ private db: AngularFirestore
+ ) {}
- this.authLogin.GoogleAuth().then(val=>{
- this.router.navigateByUrl('/home');
- }).catch(error =>{
- this.router.navigateByUrl('/register');
- })
+ ngOnInit(): void {}
+ loginGmail() {
+ this.authLogin
+ .GoogleAuth()
+ .then((val) => {
+ this.router.navigateByUrl('/home');
+ })
+ .catch((error) => {
+ this.router.navigateByUrl('/register');
+ });
}
- recoveryPass(mail: string){
- this.errMsg = "";
- Swal
- .fire({
- title: "Inserta tu email",
- input: "email",
- showCancelButton: true,
- confirmButtonText: "Recuperar",
- cancelButtonText: "Cancelar",
- })
- .then(resultado => {
- if (resultado.value) {
- let email = resultado.value;
-
- Swal.fire("Enviando mensaje a ",email,"info");
- this.authService.recoveryPassword(email).then(()=>{
- this.errMsg = "Email enviado a "+email;
- this.user.email ="";
- this.user.password ="";
- Swal.close();
- Swal.fire("Mensaje Enviado ",email,"success");
- }).catch((error) => {
+ recoveryPass(mail: string) {
+ this.errMsg = '';
+ Swal.fire({
+ title: 'Inserta tu email',
+ input: 'email',
+ showCancelButton: true,
+ confirmButtonText: 'Recuperar',
+ cancelButtonText: 'Cancelar',
+ }).then((resultado) => {
+ if (resultado.value) {
+ let email = resultado.value;
+
+ Swal.fire('Enviando mensaje a ', email, 'info');
+ this.authService
+ .recoveryPassword(email)
+ .then(() => {
+ this.errMsg = 'Email enviado a ' + email;
+ this.user.email = '';
+ this.user.password = '';
+ Swal.close();
+ Swal.fire('Mensaje Enviado ', email, 'success');
+ })
+ .catch((error) => {
// An error happened.
- this.errMsg = "Email NO enviado!: "+ error.message;
+ this.errMsg = 'Email NO enviado!: ' + error.message;
Swal.close();
- Swal.fire("Mensaje No Enviado ",error.message,"error");
- }).finally( ()=>{
+ Swal.fire('Mensaje No Enviado ', error.message, 'error');
+ })
+ .finally(() => {
//Swal.close();
});
-
- }
+ }
});
-
}
- loginFace(){
-
- this.authLogin.FacebookAuth().then(val=>{
- this.router.navigateByUrl('/home');
- }).catch(error =>{
- this.router.navigateByUrl('/register');
- })
+ loginFace() {
+ this.authLogin
+ .FacebookAuth()
+ .then((val) => {
+ this.router.navigateByUrl('/home');
+ })
+ .catch((error) => {
+ this.router.navigateByUrl('/register');
+ });
}
async onLogin(form: NgForm) {
- this.errMsg = "";
- if ( !form.valid ) {
- this.errMsg = "Tus datos contienen algún error.";
- return;
+ this.errMsg = '';
+ if (!form.valid) {
+ this.errMsg = 'Tus datos contienen algún error.';
+ return;
}
try {
- await this.authService.login(this.user).then(res=>{
- if (res.code) {
- Swal.fire("Error al iniciar sesión",res.message,"error");
- console.log("error login: "+res);
- }else{
- this.router.navigate(['/home']);
- }
- }).catch(error=>{
- Swal.fire("Error al iniciar sesión",error.message,"error");
- console.log("error login: "+error);
- });
-
+ await this.authService
+ .login(this.user)
+ .then((res) => {
+ if (res.code) {
+ Swal.fire('Error al iniciar sesión', res.message, 'error');
+ console.log('error login: ' + res);
+ } else {
+ this.router.navigate(['/home']);
+ }
+ })
+ .catch((error) => {
+ Swal.fire('Error al iniciar sesión', error.message, 'error');
+ console.log('error login: ' + error);
+ });
} catch (error) {
-
- console.log("error login: "+error);
+ console.log('error login: ' + error);
}
}
}
diff --git a/src/app/pages/perfil/perfil-rutas.module.ts b/src/app/pages/perfil/perfil-rutas.module.ts
deleted file mode 100644
index dcb8184..0000000
--- a/src/app/pages/perfil/perfil-rutas.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import {PrincipalComponent } from './principal/principal.component';
-
-const routes: Routes = [
-
- {
- path: 'principal',
- component: PrincipalComponent
- }
-
-
-];
-
-@NgModule({
- imports: [
- RouterModule.forChild(routes)
- ],
- exports: [RouterModule],
-})
-export class PerfilRutasModule {
-
-}
diff --git a/src/app/pages/perfil/perfil.module.ts b/src/app/pages/perfil/perfil.module.ts
deleted file mode 100644
index bfcf24f..0000000
--- a/src/app/pages/perfil/perfil.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-
-
-import { ReactiveFormsModule, FormsModule } from '@angular/forms';
-import { PerfilRutasModule } from './perfil-rutas.module';
-
-@NgModule({
- declarations: [],
- imports: [
- CommonModule,
- PerfilRutasModule,
- ReactiveFormsModule,
- FormsModule
- ],
- entryComponents: []
-})
-export class PerfilModule { }
diff --git a/src/app/pages/perfil/principal/principal.component.html b/src/app/pages/perfil/principal/principal.component.html
deleted file mode 100644
index b3b5725..0000000
--- a/src/app/pages/perfil/principal/principal.component.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
+
-
\ No newline at end of file
+ Talleres
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
- Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Actividad Reciente
-Te has unido al evento Community Fest and Code
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Community Fest and Code
-
-
-
- Abandonar
- Más información
-
-
- {{ user?.uid }}
- {{ user?.displayName }}
- {{ user?.emailVerified }}
- {{ user?.providerData[0]?.providerId }}
- {{ user?.apiKey }}
- {{ user?.isAnonymous }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
\ No newline at end of file
+ profilegrupos works!
diff --git a/src/app/pages/profile/profilegrupos/profilegrupos.component.spec.ts b/src/app/pages/profile/profilegrupos/profilegrupos.component.spec.ts new file mode 100644 index 0000000..e480245 --- /dev/null +++ b/src/app/pages/profile/profilegrupos/profilegrupos.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ProfilegruposComponent } from './profilegrupos.component'; + +describe('ProfilegruposComponent', () => { + let component: ProfilegruposComponent; + let fixture: ComponentFixtureprofileinsignias works!
diff --git a/src/app/pages/profile/profileinsignias/profileinsignias.component.spec.ts b/src/app/pages/profile/profileinsignias/profileinsignias.component.spec.ts new file mode 100644 index 0000000..2923753 --- /dev/null +++ b/src/app/pages/profile/profileinsignias/profileinsignias.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ProfileinsigniasComponent } from './profileinsignias.component'; + +describe('ProfileinsigniasComponent', () => { + let component: ProfileinsigniasComponent; + let fixture: ComponentFixtureprofileventos works!
diff --git a/src/app/pages/profile/profileventos/profileventos.component.spec.ts b/src/app/pages/profile/profileventos/profileventos.component.spec.ts new file mode 100644 index 0000000..db4d36b --- /dev/null +++ b/src/app/pages/profile/profileventos/profileventos.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ProfileventosComponent } from './profileventos.component'; + +describe('ProfileventosComponent', () => { + let component: ProfileventosComponent; + let fixture: ComponentFixture
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/pages/section/comunidad/comunidades/comunidades.component.ts b/src/app/pages/section/comunidad/comunidades/comunidades.component.ts
index 31fc803..1923bec 100644
--- a/src/app/pages/section/comunidad/comunidades/comunidades.component.ts
+++ b/src/app/pages/section/comunidad/comunidades/comunidades.component.ts
@@ -1,24 +1,20 @@
import { Component, OnInit } from '@angular/core';
-import { ElementId } from 'src/app/models/element';
-import { FirestoreService } from 'src/app/services/firebase.service';
+import { ElementId } from 'src/app/shared/models/element';
+import { FirestoreService } from 'src/app/core/services/firebase.service';
@Component({
selector: 'app-comunidades',
templateUrl: './comunidades.component.html',
- styleUrls: ['./comunidades.component.css']
+ styleUrls: ['./comunidades.component.css'],
})
export class ComunidadesComponent implements OnInit {
- comunidades:ElementId[] = [{uid:'as',name:'nombre'}];
+ comunidades: ElementId[] = [{ uid: 'as', name: 'nombre' }];
constructor(private fsService: FirestoreService) {
- this.fsService.getCollection("comunidades").subscribe(data => {
-
+ this.fsService.getCollection('comunidades').subscribe((data) => {
this.comunidades = data;
console.log('getting sponsors: ', data);
});
- }
-
-
- ngOnInit(): void {
}
+ ngOnInit(): void {}
}
diff --git a/src/app/pages/section/counter/counter-routing.module.ts b/src/app/pages/section/counter/counter-routing.module.ts
deleted file mode 100644
index ed0d610..0000000
--- a/src/app/pages/section/counter/counter-routing.module.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { CounterComponent } from './counter/counter.component';
-
-const routes: Routes = [
- {
- path: '**',
- component: CounterComponent
- }
-];
-
-@NgModule({
- imports: [RouterModule.forChild(routes)],
- exports: [RouterModule]
-})
-export class CounterRoutingModule { }
diff --git a/src/app/pages/section/counter/counter/counter.component.css b/src/app/pages/section/counter/counter.component.css
similarity index 100%
rename from src/app/pages/section/counter/counter/counter.component.css
rename to src/app/pages/section/counter/counter.component.css
diff --git a/src/app/pages/section/counter/counter/counter.component.html b/src/app/pages/section/counter/counter.component.html
similarity index 100%
rename from src/app/pages/section/counter/counter/counter.component.html
rename to src/app/pages/section/counter/counter.component.html
diff --git a/src/app/pages/section/counter/counter/counter.component.spec.ts b/src/app/pages/section/counter/counter.component.spec.ts
similarity index 100%
rename from src/app/pages/section/counter/counter/counter.component.spec.ts
rename to src/app/pages/section/counter/counter.component.spec.ts
diff --git a/src/app/pages/section/counter/counter/counter.component.ts b/src/app/pages/section/counter/counter.component.ts
similarity index 82%
rename from src/app/pages/section/counter/counter/counter.component.ts
rename to src/app/pages/section/counter/counter.component.ts
index 728684e..056d15f 100644
--- a/src/app/pages/section/counter/counter/counter.component.ts
+++ b/src/app/pages/section/counter/counter.component.ts
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
-import {TimeService, ActualReloj} from '../../../../services/time.service';
+import {TimeService, ActualReloj} from '../../../core/services/time.service';
import {Observable} from 'rxjs';
@Component({
@@ -22,7 +22,7 @@ export class CounterComponent implements OnInit {
) { }
ngOnInit(): void {
- this.datos$ = this.segundo.getInfoReloj( new Date('2022-02-28') );
+ this.datos$ = this.segundo.getInfoReloj( new Date("2022-02-28") );
this.datos$.subscribe(x => {
this.dia = x.dia;
this.hora = x.hora;
diff --git a/src/app/pages/section/counter/counter.module.ts b/src/app/pages/section/counter/counter.module.ts
deleted file mode 100644
index ceccd9d..0000000
--- a/src/app/pages/section/counter/counter.module.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-import { CounterRoutingModule } from './counter-routing.module';
-import { CounterComponent } from './counter/counter.component';
-
-
-@NgModule({
- declarations: [CounterComponent],
- imports: [
- CommonModule,
- CounterRoutingModule
- ]
-})
-export class CounterModule { }
diff --git a/src/app/pages/section/course/courses/courses.component.css b/src/app/pages/section/course/courses/courses.component.css
deleted file mode 100644
index 1662a55..0000000
--- a/src/app/pages/section/course/courses/courses.component.css
+++ /dev/null
@@ -1,40 +0,0 @@
-.perfil-redondo {
- border-radius: 100%;
- object-fit: cover;
- }
-
- .talleres-personalizado {
- max-height: calc(70vh - 250px);
- overflow: auto;
- }
- /* Tamaño del scroll */
- .talleres-personalizado::-webkit-scrollbar {
- width: 5px;
- height: 5px;
- }
-
- /* Estilos barra (thumb) de scroll */
- .talleres-personalizado::-webkit-scrollbar-thumb {
- background: #ccc;
- border-radius: 4px;
- }
-
- .talleres-personalizado::-webkit-scrollbar-thumb:active {
- background-color: #999999;
- }
-
- .talleres-personalizado::-webkit-scrollbar-thumb:hover {
- background: #b3b3b3;
- box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.2);
- }
-
- /* Estilos track de scroll */
- .talleres-personalizado::-webkit-scrollbar-track {
- background: #e1e1e1;
- border-radius: 4px;
- }
-
- .talleres-personalizado::-webkit-scrollbar-track:hover,
- .talleres-personalizado::-webkit-scrollbar-track:active {
- background: #d4d4d4;
- }
\ No newline at end of file
diff --git a/src/app/pages/section/course/courses/courses.component.html b/src/app/pages/section/course/courses/courses.component.html
deleted file mode 100644
index f13829e..0000000
--- a/src/app/pages/section/course/courses/courses.component.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Hoy
- - -
-
\ No newline at end of file
diff --git a/src/app/pages/section/sponsor/sponsor-routing.module.ts b/src/app/pages/section/sponsor/sponsor-routing.module.ts
index 3c0d893..85201dd 100644
--- a/src/app/pages/section/sponsor/sponsor-routing.module.ts
+++ b/src/app/pages/section/sponsor/sponsor-routing.module.ts
@@ -3,7 +3,7 @@ import { RouterModule, Routes } from '@angular/router';
import { SponsorsComponent } from './sponsors/sponsors.component';
const routes: Routes = [
- {path: '**', component: SponsorsComponent}
+ {path:'**',component:SponsorsComponent}
];
@NgModule({
diff --git a/src/app/pages/section/sponsor/sponsor.module.ts b/src/app/pages/section/sponsor/sponsor.module.ts
index 13494c7..5f75e0f 100644
--- a/src/app/pages/section/sponsor/sponsor.module.ts
+++ b/src/app/pages/section/sponsor/sponsor.module.ts
@@ -3,15 +3,13 @@ import { CommonModule } from '@angular/common';
import { SponsorRoutingModule } from './sponsor-routing.module';
import { SponsorsComponent } from './sponsors/sponsors.component';
-import {SwiperModule} from 'swiper/angular';
@NgModule({
declarations: [SponsorsComponent],
imports: [
CommonModule,
- SponsorRoutingModule,
- SwiperModule
+ SponsorRoutingModule
]
})
export class SponsorModule { }
diff --git a/src/app/pages/section/sponsor/sponsors/sponsors.component.css b/src/app/pages/section/sponsor/sponsors/sponsors.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/pages/section/sponsor/sponsors/sponsors.component.html b/src/app/pages/section/sponsor/sponsors/sponsors.component.html
index 8d1b259..54fef10 100644
--- a/src/app/pages/section/sponsor/sponsors/sponsors.component.html
+++ b/src/app/pages/section/sponsor/sponsors/sponsors.component.html
@@ -1,129 +1,5 @@
-
-
-
-
-
-
-
-
- - - La próxima edición regresa en el 2022, en la cual se planea involucrar a todos los programadores - independientemente del área de conocimiento que se encuentre, todo con un mismo propósito de - aprender en comunidad. - - -
- --
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
- Bezael
-
-
-
-
-
-
-
-
-
-
-
- Bezael
-
-
-
-
-
-
-
-
-
-
-
- Bezael
-
-
-
-
-
-
-
-
-
-
-
- Bezael
-
-
-
+
-
-
-
-
-
-
-
- 
-
-
- 
-
-
- 
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Sponsors:
+-
+
- {{sponsor.id}} +
- {{sponsor.name}} +
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/src/app/pages/shared/header/header.component.ts b/src/app/pages/shared/header/header.component.ts
index 55a622e..5daeef4 100644
--- a/src/app/pages/shared/header/header.component.ts
+++ b/src/app/pages/shared/header/header.component.ts
@@ -1,37 +1,37 @@
import { Component, OnInit } from '@angular/core';
-import { NavbarService } from '../../../services/navbar.service';
-import { AuthService } from '../../../services/auth.service';
+import { NavbarService } from '../../../core/services/navbar.service';
+import { AuthService } from '../../../core/services/auth.service';
import { Router } from '@angular/router';
import { Observable } from 'rxjs';
@Component({
selector: 'app-header',
templateUrl: './header.component.html',
- styleUrls: ['./header.component.css']
+ styleUrls: ['./header.component.css'],
})
export class HeaderComponent implements OnInit {
public user$: Observable
+
+
diff --git a/src/app/shared/components/comunidad/comunidad.component.spec.ts b/src/app/shared/components/comunidad/comunidad.component.spec.ts
new file mode 100644
index 0000000..d36f186
--- /dev/null
+++ b/src/app/shared/components/comunidad/comunidad.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ComunidadComponent } from './comunidad.component';
+
+describe('ComunidadComponent', () => {
+ let component: ComunidadComponent;
+ let fixture: ComponentFixtureTalleres:
+-
+
- {{course.id}} +
- {{course.title}} +
+
diff --git a/src/app/shared/components/taller/taller.component.spec.ts b/src/app/shared/components/taller/taller.component.spec.ts
new file mode 100644
index 0000000..9c1bccc
--- /dev/null
+++ b/src/app/shared/components/taller/taller.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TallerComponent } from './taller.component';
+
+describe('TallerComponent', () => {
+ let component: TallerComponent;
+ let fixture: ComponentFixture
+
+ {{ taller.date.toDate() | date }}
+
+
+
+ {{ taller.title }}
+ + By + {{ taller.autor }} +
+