Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

most popular fix #30

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

most popular fix #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
123 changes: 63 additions & 60 deletions src/app/auth/signup/signup.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,73 @@
<div class="mid-wrapper">
<div class="bg-primary fs-4 p-3 text-center text-white fw-light">Enter your login credentials below. 1
</div>
<div class="login-box">


<div class="container my-5">

<div class="row justify-content-end">
<div class="col-lg-6 col-md-7 col-sm-10 col-xl-5 ">
<div class="bg-primary fs-4 p-3 text-center text-white fw-light">
Enter your login credentials below.
</div>
<div class="login-box">
<div class="container my-5">
<div class="row justify-content-end">
<div class="col-lg-6 col-md-7 col-sm-10 col-xl-5">
<form class="border p-4" novalidate [formGroup]="registerForm">
<!-- (ngSubmit)="login()" -->
<div class="mb-3 row">
<label
for="exampleInputEmail1"
class="col-sm-3 col-form-label text-md-end"
>User Name</label
>
<div class="col-sm-9">
<input
class="form-control"
id="inputEmail1"
name="username"
formControlName="user"
required
autofocus
/>
</div>
</div>
<div class="mb-3 row">
<label
for="exampleInputPassword1"
class="col-sm-3 col-form-label text-md-end"
>Password</label
>
<div class="col-sm-9">
<input
class="form-control"
id="inputPassword1"
type="password"
name="password"
formControlName="password"
required
/>
</div>
</div>
<div class="mb-3 form-check d-flex justify-content-end">
<div class="col-sm-9">
<input
type="checkbox"
id="persistLogin"
name="persistLogin"
formControlName="persistLogin"
/>

<form class="border p-4" novalidate [formGroup]="registerForm" >
<!-- (ngSubmit)="login()" -->
<div class="mb-3 row">
<label for="exampleInputEmail1" class="col-sm-3 col-form-label text-md-end">User Name</label>
<div class="col-sm-9">
<input class="form-control"
id="inputEmail1"
name="username"
formControlName="user"

required autofocus
/>


</div>
</div>
<div class="mb-3 row">
<label for="exampleInputPassword1" class="col-sm-3 col-form-label text-md-end">Password</label>
<div class="col-sm-9">
<input class="form-control"
id="inputPassword1"
type="password"
name="password"

formControlName="password"
required
/>


</div>
</div>
<div class="mb-3 form-check d-flex justify-content-end">
<div class="col-sm-9 ">
<input type="checkbox"
id="persistLogin"
name="persistLogin"
formControlName="persistLogin"
/>


<label for="persistLogin">Keep me logged in</label>
</div>
</div>
<!-- <button class="btn btn-danger rounded-0 w-100 btn-block" type="submit" >LOG-IN </button> -->
<!-- [disabled]="!registerForm.valid" -->
<a (click)="onSubmit()"
class="btn btn-danger rounded-0 w-100 btn-block">LOG-IN l</a>
</form>
</div>
<label for="persistLogin">Keep me logged in</label>
</div>
</div>
<!-- <button class="btn btn-danger rounded-0 w-100 btn-block" type="submit" >LOG-IN </button> -->
<!-- [disabled]="!registerForm.valid" -->
<a
(click)="onSubmit()"
class="btn btn-danger rounded-0 w-100 btn-block"
>LOG-IN
</a>
</form>
</div>
</div>
</div>
</div>
</div>



<!--
<div class="taxonomy container-fluid">
<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion src/app/header/header.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class HeaderComponent implements OnInit {
) { }

ngOnInit(): void {
debugger;
// debugger;
var menu:any= localStorage.getItem('menu');
if(menu && JSON.parse(menu)){
this.jouralslect= true;
Expand Down
12 changes: 8 additions & 4 deletions src/app/journals/specific-prices/specific-prices.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,11 @@
table th{ font-size: 16px;

}

thead {

border-width: 1px;

}

table.mat-table.cdk-table.mat-elevation-z8.demo-table {
box-shadow: none;
Expand Down Expand Up @@ -147,10 +151,10 @@
/* .offset-md-4 {
margin-left: 15%!important;
} */
/* .input-group {
.input-group {

width: 369px!important;
} */
}
table.mat-table.cdk-table.mat-elevation-z8.demo-table {
box-shadow: none;
border: 0.5px solid grey;
Expand All @@ -174,7 +178,7 @@
}
.btn-info{
background-color:#4a90e2;
padding: 6px 27px;
padding: 9px 27px;
color: #fff;
}

Expand Down
8 changes: 4 additions & 4 deletions src/app/journals/specific-prices/specific-prices.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h1 class="stat ng-binding" style="color: brown">
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="col-md-4">
<!-- <div class="dropdown">
<button type="button" class="dropbtn">{{selectedCurrency}}<i class="fa fa-sort-down"
style="font-size:12px; vertical-align: 3px;"></i></button>
Expand All @@ -34,7 +34,7 @@ <h1 class="stat ng-binding" style="color: brown">

<!-- articlebutton -->
<button
class="btn btn-info dropdown-toggle"
class="btn btn-danger dropdown-toggle"
type="button"
id="dropdownMenuButton1"
data-bs-toggle="dropdown"
Expand Down Expand Up @@ -79,7 +79,7 @@ <h1 class="stat ng-binding" style="color: brown">
href="javascript:void(0)"
*ngFor="let item of currency"
(click)="currencySelect(item)"
><input type="checkbox" (click)="currencySelect(item)" style="border-radius: 0px;">&nbsp;&nbsp;&nbsp;{{ item }}</a
><input type="checkbox" />{{ item }}</a
>
</li>
</ul>
Expand All @@ -95,7 +95,7 @@ <h1 class="stat ng-binding" style="color: brown">
</button>
</div>
<!-- searchbar -->
<div class="col-md-6">
<div class="col-md-4 offset-md-4 my-2">
<!-- <label class="visible-xs visible-sm" for="searchBox">Search Report</label> -->
<div class="input-group input-integrated-button">
<input
Expand Down
9 changes: 4 additions & 5 deletions src/app/journals/specific-prices/specific-prices.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ interface USER {
export class SpecificPricesComponent implements OnInit {
displayedColumns: string[] = ['name', 'description', 'productType','price_interval','price_amount','options',];
currency:any=[];
selectedCurrency:any= ' All CURRENCIES';
selectedCurrency:any= 'Currencies';
masterdata:any;
dataSource: MatTableDataSource<USER> = new MatTableDataSource();
freeLabel= 'Free';
Expand All @@ -43,13 +43,12 @@ export class SpecificPricesComponent implements OnInit {
name: any;

productTypes:any=[
{key:"",value:'All'},
{key:"article-price",value:'Artile'},
{key:"issue-price",value:'Issue'},
{key:"article-price",value:'Article'},

{key:"",value:'All'}

];
selectedType:any= 'ALL';
selectedType:any= 'All';
pricearray:any
element:any

Expand Down
20 changes: 0 additions & 20 deletions src/app/journals/template/add-new-price/add-new-price.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +0,0 @@
.btn-danger{border-radius: 0px;
padding: 4px 12px;}
.btn-primary{border-radius: 0px;}

.input-group>.form-select {
border-radius: 0px;
padding: 6px 12px;
background-color: #4A90E2;color: white;
}
.form-control {
text-transform: capitalize;
}

:host ::ng-deep .mat-slide-toggle.mat-checked .mat-slide-toggle-thumb {
background-color: #ffffff!important;
}

:host ::ng-deep.mat-slide-toggle.mat-checked .mat-slide-toggle-bar{
background-color: #4A90E2;
}
18 changes: 8 additions & 10 deletions src/app/journals/template/add-new-price/add-new-price.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,19 @@ <h2>Add New Price</h2>
</div>
<div class="mb-3 row">
<label for="inputtext" class="col-sm-5 col-form-label">Currency</label>
<div class="col-sm-6" >
<div class="input-group mb-3 hour" style="width: 30%; color: white;" >
<select class="form-select" formControlName="currency" placeholder="CURRENCY" [(ngModel)]="currValue">

<option *ngFor= "let item of currency" value="{{item}}">{{item}}</option>
<div class="col-sm-6">
<div class="input-group mb-3 hour" style="width: 30%; color: white;">
<select class="form-select" formControlName="currency" aria-label="Disabled select example">
<option *ngFor= "let item of currency" value="{{item}}" >{{item}}</option>
</select>
</div>
</div>
</div>
<div class="mb-3 row">
<label for="inputtext" class="col-sm-5 col-form-label">Article Price</label>
<div class="col-sm-6">
<div class="input-group mb-3" >
<span class="input-group-text" id="#">{{currValue| filterPipe}}</span>
<div class="input-group mb-3">
<span class="input-group-text" id="#">€</span>
<input type="text" class="form-control" formControlName="price" placeholder="price" aria-label="price"
aria-describedby="#">
</div>
Expand All @@ -108,11 +107,10 @@ <h2>Add New Price</h2>
<div class="mb-3 row">
<label for="inputtext" class="col-sm-5 col-form-label">For Sale</label>
<div class="col-sm-6">
<!-- <label class="switch">
<label class="switch">
<input type="checkbox" formControlName="forsale" checked>
<span class="slider round"></span>
</label> -->
<mat-slide-toggle formControlName="forsale" ></mat-slide-toggle>
</label>
</div>
</div>
</form>
Expand Down
10 changes: 1 addition & 9 deletions src/app/journals/template/add-new-price/add-new-price.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {MAT_DIALOG_DATA,MatDialogRef} from '@angular/material/dialog';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Observable } from 'rxjs';


@Component({
selector: 'app-add-new-price',
templateUrl: './add-new-price.component.html',
Expand All @@ -19,14 +18,9 @@ export class AddNewPriceComponent implements OnInit {
currency:any=[];
sitedata:any;
pricedata:any= [];
currValue:any

notForSaleLabel= 'Not for Sale';

fromModel = new FormGroup({
doi : new FormControl(''),
selected_site : new FormControl(''),

selected_site : new FormControl('')
});

priceobj= new FormGroup({
Expand All @@ -36,7 +30,6 @@ export class AddNewPriceComponent implements OnInit {
forsale: new FormControl(''),
currency: new FormControl(''),
name:new FormControl('')

});


Expand Down Expand Up @@ -71,7 +64,6 @@ export class AddNewPriceComponent implements OnInit {


}


filterPrice(){

Expand Down
6 changes: 0 additions & 6 deletions src/app/reports/detailed/detailed.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,4 @@
background-color: #4A90E2;

}
.btn-primary{
border-radius: 0px;
}
.btn-danger{
border-radius: 0px;
}

4 changes: 2 additions & 2 deletions src/app/reports/detailed/detailed.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ <h5>
<div class="col-12 col-sm-12">
<div style="float:right;">
<button class="btn btn-danger btn-sm p-2" (click)="selectAllPublishers()">Run Report</button>
<button class="btn btn-primary m-1" (click)="exporter.exportTable('csv')"
style="color: white;" disabled>EXPORT(.CSV)</button>
<button class="btn btn-info m-1" (click)="exporter.exportTable('csv')"
style="color: white;">EXPORT(.CSV)</button>
</div>
</div>
</div>
Expand Down