Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2f4f2d8
created template for forget password
doradomiguel35 Feb 11, 2019
ba3adaf
setup default smtp default backend for testing
doradomiguel35 Feb 11, 2019
683d639
removed comments
doradomiguel35 Feb 11, 2019
ddc839e
can download compressed file of theme template just by clicking pay w…
doradomiguel35 Feb 11, 2019
0742076
can now change license type
doradomiguel35 Feb 12, 2019
ff6c7e6
pull remote changes
doradomiguel35 Feb 12, 2019
faf22f6
fixed remember me issue
doradomiguel35 Feb 12, 2019
101b989
can now send subscribe message on gmail account users, email accounts…
doradomiguel35 Feb 13, 2019
2ded572
added messages and error messags when subscribing, when a email is al…
doradomiguel35 Feb 13, 2019
21a359f
added subscribe feature in the details page, can send an email to use…
doradomiguel35 Feb 13, 2019
c89b817
added constant for domain url, user cannot see products and buy theme…
doradomiguel35 Feb 17, 2019
a179e7d
see products button disappears after logging in
doradomiguel35 Feb 17, 2019
211a6d9
Merge branch 'feature/rememberMe' into demo
doradomiguel35 Feb 17, 2019
79cf020
merge conflicts
doradomiguel35 Feb 17, 2019
de43abc
resolved merge conflicts
doradomiguel35 Feb 17, 2019
011fcc7
added download model for counting download times in a theme
doradomiguel35 Feb 17, 2019
e5f343a
can see how many downloads a theme has
doradomiguel35 Feb 18, 2019
0215977
modified home url so that it would not conflict with other urls
doradomiguel35 Feb 18, 2019
14de1fe
unstaged changes
doradomiguel35 Feb 18, 2019
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ static/
__pycache__/
env/
node_modules/
demo/
66 changes: 5 additions & 61 deletions assets/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,20 @@
"private": true,
"dependencies": {
"@angular/animations": "~7.1.0",
"@angular/cdk": "~7.2.2",
"@angular/common": "~7.1.0",
"@angular/compiler": "~7.1.0",
"@angular/core": "^7.0.0",
"@angular/forms": "~7.1.0",
"@angular/material": "~7.2.2",
"@angular/platform-browser": "~7.1.0",
"@angular/platform-browser-dynamic": "~7.1.0",
"@angular/router": "~7.1.0",
"@auth0/angular-jwt": "^2.1.0",
"@ng-bootstrap/ng-bootstrap": "^4.0.2",
"angular-jwt": "^0.1.10",
"angular-text-input-autocomplete": "^0.3.0",
"angular2-jwt": "^0.2.3",
"animate.css": "^3.7.0",
"bootstrap": "^4.0.0",
"core-js": "^2.5.4",
"ionicons": "^2.0.1",
"jquery": "^3.3.1",
"keyboardevent-key-polyfill": "^1.1.0",
"ng-select2": "^1.0.8",
"ng2-select2": "^1.0.0-beta.11",
"popper.js": "^1.14.1",
"retinajs": "^2.1.3",
"rxjs": "~6.3.3",
Expand Down
1 change: 1 addition & 0 deletions assets/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ <h4 class="mb-5">
<div class="d-flex align-items-center justify-content-between">
<div class="form-check">
<input type="checkbox" [checked]="rememberMe" (change)="rememberMe = !rememberMe" name="" class="form-check-input" id="rememberUser">
{{ rememberMe }}
<label class="form-check-label" for="rememberUser">
Remember me
</label>
Expand Down
17 changes: 11 additions & 6 deletions assets/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
import { Component, OnInit } from '@angular/core';
import { Component, HostListener, OnInit, OnDestroy} from '@angular/core';
import { AuthService} from './commons/services/auth/auth.service';
import { FormControl, FormBuilder, Validators } from '@angular/forms';
import { Router } from '@angular/router';
import { Location } from '@angular/common';
import { Title } from '@angular/platform-browser';

@Component({
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.css'],
providers: [AuthService]
})
export class AppComponent implements OnInit {

export class AppComponent implements OnInit{
title = 'angular';
usersForm;
errors;
rememberMe:boolean = false;
Expand All @@ -20,16 +21,20 @@ export class AppComponent implements OnInit {
private authService: AuthService,
private fb: FormBuilder,
private router: Router,
private location: Location,
private title: Title,
private location: Location
){ }

ngOnInit(){
this.usersForm = this.fb.group({
email : new FormControl('', [Validators.required, Validators.email]),
password : new FormControl('', Validators.required)
});

}

ngOnDestroy(){
if(this.rememberMe == false){
this.authService.removeToken();
}
}

get username(){
Expand Down
24 changes: 4 additions & 20 deletions assets/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
import { BrowserModule } from '@angular/platform-browser';
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { NgModule } from '@angular/core';
import { HttpClientModule,HTTP_INTERCEPTORS } from '@angular/common/http';
import { RouterModule, Routes } from "@angular/router";
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { AppRoutingModule } from './app-routing.module';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
import { polyfill } from 'keyboardevent-key-polyfill';
import { TextInputAutocompleteModule } from 'angular-text-input-autocomplete';
import { NgbPaginationModule, NgbAlertModule } from '@ng-bootstrap/ng-bootstrap';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';

//Service
import { TokenService } from './commons/services/interceptors/token.service';
Expand All @@ -23,28 +18,22 @@ import { CartComponent } from './components/cart/cart.component';
import { DetailsComponent } from './components/details/details.component';
import { AccountComponent } from './components/account/account.component';

//Pipes
import { CategoryPipe } from './commons/pipes/category/category.pipe';

//Routes
const routes: Routes = [
{ path: '', component: HomeComponent },
{ path: 'details/:id', component: DetailsComponent },
{ path: 'cart/:id', component: CartComponent },
{ path: 'details', component: DetailsComponent },
{ path: 'cart', component: CartComponent },
{ path: 'account', component: AccountComponent }

]

polyfill();

@NgModule({
declarations: [
AppComponent,
HomeComponent,
CartComponent,
DetailsComponent,
AccountComponent,
CategoryPipe,

],
imports: [
Expand All @@ -54,10 +43,6 @@ polyfill();
HttpClientModule,
FormsModule,
ReactiveFormsModule,
TextInputAutocompleteModule,
NgbPaginationModule,
NgbAlertModule,
NgbModule,
RouterModule.forRoot(routes, {onSameUrlNavigation: 'reload'}),
],
providers: [
Expand All @@ -67,8 +52,7 @@ polyfill();
multi: true
}
],
bootstrap: [AppComponent],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
bootstrap: [AppComponent]
})

export class AppModule { }
Expand Down
19 changes: 0 additions & 19 deletions assets/src/app/commons/pipes/category.pipe.ts

This file was deleted.

8 changes: 0 additions & 8 deletions assets/src/app/commons/pipes/category/category.pipe.spec.ts

This file was deleted.

18 changes: 0 additions & 18 deletions assets/src/app/commons/pipes/category/category.pipe.ts

This file was deleted.

3 changes: 1 addition & 2 deletions assets/src/app/commons/services/auth/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ export class AuthService {
}

getSessionToken(){
if(sessionStorage['token'] == null ||
sessionStorage['token'] == undefined){
if(sessionStorage['token'] == null){
return JSON.parse(null);
}
this.token = this.refreshToken(this.user);
Expand Down
12 changes: 0 additions & 12 deletions assets/src/app/commons/services/cart/cart.service.spec.ts

This file was deleted.

27 changes: 0 additions & 27 deletions assets/src/app/commons/services/cart/cart.service.ts

This file was deleted.

12 changes: 0 additions & 12 deletions assets/src/app/commons/services/details/details.service.spec.ts

This file was deleted.

Loading