+
+
+ Forget password?
+
+
diff --git a/assets/src/app/app.component.ts b/assets/src/app/app.component.ts
index 5ac9619..d6f7179 100644
--- a/assets/src/app/app.component.ts
+++ b/assets/src/app/app.component.ts
@@ -1,9 +1,10 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, HostListener } 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';
+import { domain_url } from './commons/constants/global.constants';
@Component({
selector: 'app-root',
@@ -11,10 +12,19 @@ import { Title } from '@angular/platform-browser';
styleUrls: ['./app.component.css'],
providers: [AuthService]
})
+
export class AppComponent implements OnInit {
+ @HostListener("window:beforeunload",["$event"])
+ clearLocalStorage(event){
+ if(JSON.parse(localStorage.getItem('remember')) === false){
+ localStorage.clear();
+ }
+ }
+
usersForm;
errors;
rememberMe:boolean = false;
+ forgetPasswordUrl = "http://"+domain_url+":8000/user/password_reset/";
constructor(
private authService: AuthService,
@@ -29,11 +39,12 @@ export class AppComponent implements OnInit {
email : new FormControl('', [Validators.required, Validators.email]),
password : new FormControl('', Validators.required)
});
+ console.log(JSON.parse(localStorage.getItem('remember')));
}
- get username(){
- return this.usersForm.get('username');
+ get email(){
+ return this.usersForm.get('email');
}
get password(){
diff --git a/assets/src/app/commons/constants/global.constants.ts b/assets/src/app/commons/constants/global.constants.ts
new file mode 100644
index 0000000..e31b3b3
--- /dev/null
+++ b/assets/src/app/commons/constants/global.constants.ts
@@ -0,0 +1,12 @@
+ export const domain_url = 'localhost';
+
+ // home urls
+ export const home_theme = '/home/theme/';
+ export const home_category = '/home/theme/category/';
+ export const home_subscribe = '/home/theme/subscribe/';
+
+// categories
+ export const categories = ['Angular JS','E-Commerce','General','Bootstrap 4'];
+
+ //user
+ export let user_object:any;
\ No newline at end of file
diff --git a/assets/src/app/commons/services/auth/auth.service.ts b/assets/src/app/commons/services/auth/auth.service.ts
index 792ca97..54daab2 100644
--- a/assets/src/app/commons/services/auth/auth.service.ts
+++ b/assets/src/app/commons/services/auth/auth.service.ts
@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
+import { domain_url } from '../../constants/global.constants';
@Injectable({
providedIn: 'root'
@@ -8,13 +9,14 @@ export class AuthService {
rememberMe:boolean;
token;
user;
+
constructor(private http: HttpClient) { }
// Generate token upon login
loginAuth(user,remember){
- this.rememberMe = remember;
- this.user = user;
- return this.http.post("http://localhost:8000/user/login/", user)
+ localStorage['remember'] = JSON.stringify(remember);
+ localStorage['user'] = JSON.stringify(user);
+ return this.http.post("http://"+domain_url+":8000/user/login/", user)
.toPromise()
.then(
response => {
@@ -31,7 +33,7 @@ export class AuthService {
// Generate token upon register
registerAuth(user){
- return this.http.post("http://localhost:8000/user/register/", user)
+ return this.http.post("http://"+domain_url+":8000/user/register/", user)
.toPromise()
.then(
response => {
@@ -44,7 +46,7 @@ export class AuthService {
}
refreshToken(user){
- return this.http.get("http://localhost:8000/user/refresh/", user)
+ return this.http.get("http://"+domain_url+":8000/user/refresh/", user)
.toPromise()
.then(
response => {
@@ -60,34 +62,16 @@ export class AuthService {
setToken(token){
this.token = token;
- if(this.rememberMe == true){
- localStorage['token'] = JSON.stringify(token);
- }
- else{
- sessionStorage['token'] = JSON.stringify(token);
- }
+ localStorage['token'] = JSON.stringify(token);
}
getToken(){
- if(this.rememberMe == true){
let token = localStorage.getItem('token');
return JSON.parse(token);
- }
- this.getSessionToken();
- }
- getSessionToken(){
- if(sessionStorage['token'] == null ||
- sessionStorage['token'] == undefined){
- return JSON.parse(null);
- }
- this.token = this.refreshToken(this.user);
- sessionStorage['token'] = JSON.stringify(this.token);
-
- let token = sessionStorage.getItem('token');
- return JSON.parse(token);
}
+
removeToken(){
localStorage.removeItem('token');
}
diff --git a/assets/src/app/commons/services/cart/cart.service.ts b/assets/src/app/commons/services/cart/cart.service.ts
index f202955..0657973 100644
--- a/assets/src/app/commons/services/cart/cart.service.ts
+++ b/assets/src/app/commons/services/cart/cart.service.ts
@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { domain_url } from '../../constants/global.constants';
@Injectable({
providedIn: 'root'
@@ -7,11 +8,13 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
export class CartService {
httpHeaders = new HttpHeaders({'Content-type':'application/json'});
+ edit;
+
constructor(
private http: HttpClient) { }
getThemeCart(id){
- return this.http.get('http://localhost:8000/home/theme/cart/'+id+'/', {headers: this.httpHeaders})
+ return this.http.get('http://'+domain_url+':8000/home/theme/cart/'+id+'/', {headers: this.httpHeaders})
.toPromise()
.then(
response => {
@@ -24,4 +27,51 @@ export class CartService {
}
)
}
+
+ buyThemeService(id){
+ return this.http.get('http://'+domain_url+':8000/details/download/'+id+'/', {headers: this.httpHeaders})
+ .toPromise()
+ .then(
+ response => {
+ return response;
+ }
+ )
+ .catch(
+ error => {
+ return error;
+ }
+ )
+
+ }
+
+ editLicenseService(id,license_id){
+ this.edit = {'id': id, 'license_id': license_id}
+ return this.http.post('http://'+domain_url+':8000/home/theme/edit_license/', this.edit)
+ .toPromise()
+ .then(
+ response => {
+ return response;
+ }
+ )
+ .catch(
+ error => {
+ return error;
+ }
+ )
+ }
+
+ incrementDownloadService(id){
+ return this.http.get('http://'+domain_url+':8000/details/download/'+id+'/')
+ .toPromise()
+ .then(
+ response => {
+ return response;
+ }
+ )
+ .catch(
+ error => {
+ return error;
+ }
+ )
+ }
}
diff --git a/assets/src/app/commons/services/details/details.service.ts b/assets/src/app/commons/services/details/details.service.ts
index 7762845..c24e312 100644
--- a/assets/src/app/commons/services/details/details.service.ts
+++ b/assets/src/app/commons/services/details/details.service.ts
@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { domain_url } from '../../constants/global.constants';
@Injectable({
providedIn: 'root'
@@ -11,7 +12,7 @@ export class DetailsService {
private http: HttpClient) { }
getThemeDetailsService(id){
- return this.http.get('http://localhost:8000/home/theme/details/'+id+'/', {headers: this.httpHeaders})
+ return this.http.get('http://'+domain_url+':8000/home/theme/details/'+id+'/', {headers: this.httpHeaders})
.toPromise()
.then(
response =>{
@@ -26,7 +27,7 @@ export class DetailsService {
}
createReviewService(comment){
- return this.http.post("http://localhost:8000/details/createReview/",comment)
+ return this.http.post("http://"+domain_url+":8000/details/createReview/",comment)
.toPromise()
.then(
response => {
@@ -39,4 +40,19 @@ export class DetailsService {
}
);
}
+
+ subscribeService(data){
+ return this.http.post("http://"+domain_url+":8000/home/theme/subscribe/",data)
+ .toPromise()
+ .then(
+ response => {
+ return response;
+ }
+ )
+ .catch(
+ error => {
+ return error;
+ }
+ )
+ }
}
diff --git a/assets/src/app/commons/services/home/home.service.ts b/assets/src/app/commons/services/home/home.service.ts
index d9b62c2..19c7ef3 100644
--- a/assets/src/app/commons/services/home/home.service.ts
+++ b/assets/src/app/commons/services/home/home.service.ts
@@ -1,6 +1,7 @@
import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Observable } from 'rxjs';
+import { domain_url, home_theme, home_category, home_subscribe} from '../../constants/global.constants';
@Injectable({
providedIn: 'root'
@@ -9,12 +10,10 @@ export class HomeService {
httpHeaders = new HttpHeaders({'Content-type': 'application/json'});
public categories;
- constructor(private http: HttpClient) {
- this.categories = this.getCategory();
- }
+ constructor(private http: HttpClient) {}
- getThemes(){
- return this.http.get("http://localhost:8000/home/theme/", {headers: this.httpHeaders})
+ getThemes(auth){
+ return this.http.get("http://"+domain_url+":8000"+home_theme+auth+"/", {headers: this.httpHeaders})
.toPromise()
.then(
response => {
@@ -29,7 +28,23 @@ export class HomeService {
}
getCategory(){
- return this.http.get("http://localhost:8000/home/theme/category/", {headers: this.httpHeaders})
+ return this.http.get("http://"+domain_url+":8000"+home_category, {headers: this.httpHeaders})
+ .toPromise()
+ .then(
+ response => {
+ return response;
+ }
+ )
+ .catch(
+ error => {
+ return error;
+ }
+ )
+ }
+
+ subscribeService(data){
+ console.log('clicked');
+ return this.http.post("http://"+domain_url+":8000"+home_subscribe, data)
.toPromise()
.then(
response => {
diff --git a/assets/src/app/components/account/account.component.html b/assets/src/app/components/account/account.component.html
index 2ad48c1..0f7fbb8 100644
--- a/assets/src/app/components/account/account.component.html
+++ b/assets/src/app/components/account/account.component.html
@@ -67,7 +67,6 @@
diff --git a/assets/src/app/components/cart/cart.component.html b/assets/src/app/components/cart/cart.component.html
index e398c47..8368118 100644
--- a/assets/src/app/components/cart/cart.component.html
+++ b/assets/src/app/components/cart/cart.component.html
@@ -2,7 +2,7 @@
-
\ No newline at end of file
+
+
+
diff --git a/assets/src/app/components/cart/cart.component.ts b/assets/src/app/components/cart/cart.component.ts
index 735e6cd..4f4803e 100644
--- a/assets/src/app/components/cart/cart.component.ts
+++ b/assets/src/app/components/cart/cart.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { CartService } from '../../commons/services/cart/cart.service';
import { ActivatedRoute } from '@angular/router';
import { Title } from '@angular/platform-browser';
+import { domain_url } from '../../commons/constants/global.constants';
@Component({
selector: 'app-cart',
@@ -13,6 +14,9 @@ export class CartComponent implements OnInit {
theme;
discount;
dis_price;
+ url = domain_url;
+ category;
+
constructor(
private cartService: CartService,
private route: ActivatedRoute,
@@ -51,6 +55,52 @@ export class CartComponent implements OnInit {
)
}
+ buyTheme(event,theme_id){
+ console.log('clicked');
+ this.cartService.buyThemeService(theme_id)
+ .then(
+ response => {
+ return response;
+ }
+ )
+ .catch(
+ error => {
+ return error;
+ }
+ )
+ }
+
+ changeLicense(event,theme_id,license_id){
+ this.cartService.editLicenseService(theme_id,license_id)
+ .then(
+ response => {
+ this.themeCart();
+ return response;
+ }
+ )
+ .catch(
+ error => {
+ return error;
+ }
+ )
+ }
+
+ incrementDownload(id){
+ console.log('clicked');
+ this.cartService.incrementDownloadService(id)
+ .then(
+ response => {
+ console.log(response);
+ return response;
+ }
+ )
+ .catch(
+ error => {
+ return error;
+ }
+ )
+ }
+
}
diff --git a/assets/src/app/components/details/details.component.html b/assets/src/app/components/details/details.component.html
index bcd60f4..a02e49e 100644
--- a/assets/src/app/components/details/details.component.html
+++ b/assets/src/app/components/details/details.component.html
@@ -22,7 +22,7 @@
@@ -108,7 +108,7 @@
- 
+ 
+
+
\ No newline at end of file
diff --git a/assets/src/app/components/details/details.component.ts b/assets/src/app/components/details/details.component.ts
index 6565c90..50170bc 100644
--- a/assets/src/app/components/details/details.component.ts
+++ b/assets/src/app/components/details/details.component.ts
@@ -1,6 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { DetailsService } from '../../commons/services/details/details.service';
+import { domain_url } from '../../commons/constants/global.constants';
import { Title } from '@angular/platform-browser';
import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms';
@@ -19,6 +20,9 @@ export class DetailsComponent implements OnInit {
reviews;
content;
token;
+ subscribe;
+ message;
+ url = domain_url
constructor(
private route: ActivatedRoute,
@@ -40,6 +44,10 @@ export class DetailsComponent implements OnInit {
rating : new FormControl('')
});
+ this.subscribe = this.fb.group({
+ email : new FormControl('', Validators.required),
+ });
+
}
get review(){
@@ -50,6 +58,10 @@ export class DetailsComponent implements OnInit {
return this.review.get('rating');
}
+ get email(){
+ return this.subscribe.get('email');
+ }
+
// get details of the theme
getThemeDetails(){
this.detailsService.getThemeDetailsService(this.theme_id)
@@ -90,6 +102,7 @@ export class DetailsComponent implements OnInit {
this.getThemeDetails();
this.review.reset();
this.currentRate =0
+ return response;
}
)
.catch(
@@ -99,6 +112,20 @@ export class DetailsComponent implements OnInit {
)
}
+ // subscribe user (details page)
+ subscribeMarket(){
+ this.detailsService.subscribeService(this.subscribe.value)
+ .then(
+ response => {
+ this.message = response.message;
+ return response;
+ }
+ )
+ .catch(
+ error => {
+ return error;
+ }
+ )
+ }
-
}
diff --git a/assets/src/app/components/home/home.component.html b/assets/src/app/components/home/home.component.html
index 0310313..e35902c 100644
--- a/assets/src/app/components/home/home.component.html
+++ b/assets/src/app/components/home/home.component.html
@@ -5,7 +5,12 @@
+ See products
+
+
+
@@ -66,7 +71,12 @@ 
-
+ {{ theme.name }}
- 
+ 
@@ -73,7 +73,7 @@
- {{ theme.name }}
(20 Downloads)
+({{ theme.downloads }} Downloads)
{{ theme.name }}
Screenshots
+
@@ -342,12 +342,17 @@
+