Commit 83f1145d authored by Χάρης Παπαδόπουλος's avatar Χάρης Παπαδόπουλος
Browse files

resolved well known app.settings conflict

parents d8fec8b5 0208cd57
...@@ -23,13 +23,13 @@ class OAuthOSTConsumer implements AuthenticationProviderInterface ...@@ -23,13 +23,13 @@ class OAuthOSTConsumer implements AuthenticationProviderInterface
protected $request_token_url = 'https://www1.gsis.gr/gsisapps/gsisdemo/oauth/request_token'; protected $request_token_url = 'https://www1.gsis.gr/gsisapps/gsisdemo/oauth/request_token';
protected $user_authorization_url = 'https://www1.gsis.gr/gsisapps/gsisdemo/oauth/confirm_access'; protected $user_authorization_url = 'https://www1.gsis.gr/gsisapps/gsisdemo/oauth/confirm_access';
protected $access_token_url = 'https://www1.gsis.gr/gsisapps/gsisdemo/oauth/access_token'; protected $access_token_url = 'https://www1.gsis.gr/gsisapps/gsisdemo/oauth/access_token';
protected $signature_method = 'PLAINTEXT'; protected $signature_method = 'PLAINTEXT';
protected $api_url = 'https://www1.gsis.gr/gsisapps/gsisdemo/gsisdemoservice/resource_one'; protected $api_url = 'https://www1.gsis.gr/gsisapps/gsisdemo/gsisdemoservice/resource_one';
protected $callback_url = 'http://eepal.dev/drupal/oauth/cb'; protected $callback_url = 'http://localhost/angular/eepal-front/drupal/oauth/cb';
protected $logout_url = 'https://www1.gsis.gr/testgsisapps/gsisdemo/logout.htm?logout_token='; protected $logout_url = 'https://www1.gsis.gr/testgsisapps/gsisdemo/logout.htm?logout_token=';
/** /**
* The config factory. * The config factory.
* *
* @var \Drupal\Core\Config\ConfigFactoryInterface * @var \Drupal\Core\Config\ConfigFactoryInterface
*/ */
......
...@@ -37,9 +37,57 @@ ...@@ -37,9 +37,57 @@
p { p {
margin-bottom: 0; margin-bottom: 0;
} }
.left-choices {
h4{
font-weight: bold;
font-size: 1rem;
}
}
.btn-primary {
background-color:#fd9665;
border: none!important;
width: 200px;
padding:5px 10px;
}
}
.main-content{
.btn {
background-color:#fd9665;
border: none!important;
}
.btn-primary {
background-color:#fd9665;
border: none!important;
width: 120px;
}
li.list-group-item{
color: black;
background-color: white;
border: none!important;
padding: 0.3rem 0.3rem!important;
h5{
font-size: 1rem;
}
}
} }
} }
} }
......
export class AppSettings { export class AppSettings {
public static get API_ENDPOINT(): string { public static get API_ENDPOINT(): string {
// return 'http://localhost/drupal'; return 'http://localhost/angular/eepal-front/drupal';
return 'http://eepal.dev/drupal'; // return 'http://localhost/drupal';
// return 'http://eepal.dev/drupal';
>>>>>>> 0208cd5744d4249ccc7427202917ae1ab0415d86
// return 'http://eduslim2.minedu.gov.gr/drupal'; // return 'http://eduslim2.minedu.gov.gr/drupal';
} }
} }
<div class="subfooter"> <div class="subfooter">
<div class="container">
<div class="text-center hidden-md-down">
<a><img class="img-fluid" src="../myschool/assets/images/footer-logos.png" alt="" /></a>
</div>
</div>
</div> </div>
<footer class="footer"> <footer class="footer">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-3"><span class="ft-text">Copyright (c) ΥΠ.Π.Ε.Θ. 2012-2013</span></div> <div class="col-xs-12 col-md-3"><span class="ft-text">Copyright (c) ΥΠ.Π.Ε.Θ. 2017</span></div>
<div class="cols-xs-12 col-md-6 text-center"> <div class="cols-xs-12 col-md-6 text-center">
<span class="ft-text"><a href="#">ΟΡΟΙ ΧΡΗΣΗΣ – ΕΜΠΙΣΤΕΥΤΙΚΟΤΗΤΑ</a></span> <span class="ft-text"><a href="#">ΟΡΟΙ ΧΡΗΣΗΣ – ΕΜΠΙΣΤΕΥΤΙΚΟΤΗΤΑ</a></span>
<span class="ft-text"><a href="#">ΠΡΟΣΩΠΙΚΑ ΔΕΔΟΜΕΝΑ</a></span> <span class="ft-text"><a href="#">ΠΡΟΣΩΠΙΚΑ ΔΕΔΟΜΕΝΑ</a></span>
</div> </div>
<div class="col-xs-12 col-md-3"><span class="ft-text">Version 0.58.2013.430</span></div> <div class="col-xs-12 col-md-3"><span class="ft-text">Version 1</span></div>
</div> </div>
</div> </div>
</footer> </footer>
import {Component} from '@angular/core';
import { Router } from '@angular/router';
import {Router, ActivatedRoute, Params} from '@angular/router';
import {OnInit, Component} from '@angular/core';
import { LoginInfoActions } from '../actions/logininfo.actions';
import {
FormBuilder,
FormsModule,
FormGroup,
FormControl,
FormArray
} from '@angular/forms';
import {GlobalEventsManager} from "../services/login-service";
=======
import { AppSettings } from '../app.settings';
@Component({
selector: 'home',
template: `
<div>
<h4>Στοιχεία Σύνδεσης</h4>
<form [formGroup]="formGroup">
<div class="form-group">
<div *ngIf = "loginerror " class = "alert alert-danger">Λάθος στοιχεία εισόδου</div>
<label for="UserName">Όνομα Χρήστη</label>
<input class="form-control" type="text" formControlName="UserName" cols="10" required>
</div>
<div *ngIf = "usernamevalidation " class = "alert alert-danger">Απαιτείται το όνομα χρήστη</div>
<div class="form-group">
<label for="Paswd">Κωδικός Ασφαλείας</label>
<input class="form-control" type="password" formControlName="Paswd" cols="10" required>
</div>
<div *ngIf = "passvalidation " class = "alert alert-danger">Απαιτείται ο κωδικός πρόσβασης</div>
<div class="row">
<div class="col-md-2 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-center" (click)="onLoginSuccessfully()">
Συνέχεια
</button>
</div>
</div>
<form [formGroup]="formGroup" method = "POST" action="http://eepal.dev/drupal/oauth/login" #form>
<input type="hidden" name="X-oauth-enabled" value="true">
<div class="row">
<div class="col-md-2 col-md-offset-5">
<button type="submit" class="btn-primary btn-lg pull-center" (click)="form.submit()">
Είσοδος μέσω TaxisNet<span class="glyphicon glyphicon-menu-right"></span>
</button>
</div>
</div>
</form>
</div>
`
})
export default class Home {
public logined = false;
public formGroup: FormGroup;
usernamevalidation = false;
passvalidation = false;
loginerror = false;
constructor(private fb: FormBuilder,
private router: Router,
private globalEventsManager: GlobalEventsManager) {
=======
export default class Home implements OnInit{
public formGroup: FormGroup;
constructor(private fb: FormBuilder,
private _ata: LoginInfoActions,
private activatedRoute: ActivatedRoute) {
>>>>>>> 830874b9f9533be54e9e43e3c3229884b3eeb119
this.formGroup = this.fb.group({
UserName: [],
Paswd : []
});
};
ngOnInit() {
// subscribe to router event
this.activatedRoute.queryParams.subscribe((params: Params) => {
let authToken = params['auth_token'];
let authRole = params['auth_role'];
this._ata.saveLoginInfo({auth_token: authToken, auth_role: authRole});
console.log(authToken);
});
}
private onLoginSuccessfully(data : any) : void {
if (this.formGroup.value.UserName == null)
{
this.usernamevalidation = true;
}
else
{
this.usernamevalidation = false;
}
if (this.formGroup.value.Paswd == null)
{
this.passvalidation = true;
}
else
{
this.passvalidation = false;
}
if ((this.formGroup.value.UserName == "admin") && (this.formGroup.value.Paswd == "admin"))
{
this.globalEventsManager.showNavBar(true);
this.router.navigate(['/amka-fill']);
}
else
{
this.loginerror = true;
}
}
}
<div class="main-wrapper"> <div class="main-wrapper">
<div class="container" id="content"> <div class="container" id="content">
<div class="row"> <div class="row">
<div class="col-sm-12"><p class="crumb">Αρχική σελίδα</p></div> <div class="col-sm-12"><p class="crumb">Αρχική σελίδα</p></div>
</div>
<div class="row">
<div class="col-sm-12 col-md-2 hidden-md-down">
<div class="left-sidebar">
<div class="navig-left-img">
<img src="../myschool/assets/images/default.png" alt="">
</div>
<div style="bottom:25px;padding-top:50px" class="help">
<p class="small-text">Ομάδα Υποστήριξης</p>
<p class="small-text"><i class="fa fa-phone fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;801 200 8040</p><br><p></p><p class="small-text">Ομάδα Υποστήριξης Πανελληνίων Εξ.</p><p class="small-text"><i class="fa fa-phone fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;801 300 3021</p><br>
<p class="small-text">Καταγραφή Προβλημάτων</p>
</div>
</div> </div>
</div> <div class="row">
<div class="col-sm-12 col-md-10"> <div class="col-sm-12 col-md-3 hidden-md-down">
<div class="main-content"> <div class="left-sidebar">
<div class="panel panel-primary"> <div class="navig-left-img">
<div class="panel-heading"> <img src="../myschool/assets/images/default.png" alt="">
<h3 class="panel-title">{{path || 'home' | camelcase }}</h3>
</div>
<div class="panel-body">
<router-outlet></router-outlet>
</div> </div>
<div class="left-choices">
<application-preview-select></application-preview-select>
</div>
</div> </div>
</div> </div>
<div class="col-sm-12 col-md-9">
<div class="main-content">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">{{path || 'home' | camelcase }}</h3>
</div>
<div class="panel-body">
<router-outlet></router-outlet>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> \ No newline at end of file
import {Component} from '@angular/core';
import {GlobalEventsManager} from "../../services/login-service";
@Component({
selector: 'reg-navbar',
templateUrl: 'navbar.component.html',
})
export default class NavbarComponent {
showNavBar: boolean = false;
constructor(private globalEventsManager: GlobalEventsManager) {
this.globalEventsManager.showNavBarEmitter.subscribe((mode)=>{
if (mode !== null) {
this.showNavBar = mode;
}
});
}
}
>>>>>>> 830874b9f9533be54e9e43e3c3229884b3eeb119
...@@ -36,10 +36,9 @@ import {AppSettings} from '../../app.settings'; ...@@ -36,10 +36,9 @@ import {AppSettings} from '../../app.settings';
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-2 col-md-offset-5"> <div class="col-md-12 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-center" (click)="saveSelected()"> <button type="button" class="btn-primary btn-lg pull-right" (click)="saveSelected()">
Συνέχεια<span class="glyphicon glyphicon-menu-right"></span> Συνέχεια </button>
</button>
</div> </div>
<div *ngIf="emptyselection==true"> <div *ngIf="emptyselection==true">
Παρακαλώ συμπληρώστε το ΑΜΚΑ του μαθητή Παρακαλώ συμπληρώστε το ΑΜΚΑ του μαθητή
......
<div class="row equal"> <div class="row equal">
<div class="col-md-8"> <div class="col-md-12">
<form novalidate (ngSubmit)="onSubmit(studentDataGroup)" [formGroup]="studentDataGroup"> <form novalidate (ngSubmit)="onSubmit(studentDataGroup)" [formGroup]="studentDataGroup">
<div *ngFor="let studentDataField$ of studentDataFields$ | async; "> </div> <div *ngFor="let studentDataField$ of studentDataFields$ | async; "> </div>
<!-- <!--
...@@ -135,8 +135,8 @@ ...@@ -135,8 +135,8 @@
<span class="glyphicon glyphicon-menu-left"></span>Πίσω <span class="glyphicon glyphicon-menu-left"></span>Πίσω
</button> </button>
</div> </div>
<div class="col-md-2"> <div class="col-md-8">
<button type="button" class="btn-primary btn-lg pull-center" (click)="submitSelected()" [disabled]="studentDataGroup.invalid"> <button type="button" class="btn-primary btn-lg pull-right" (click)="submitSelected()" [disabled]="studentDataGroup.invalid">
Συνέχεια<span class="glyphicon glyphicon-menu-right"></span> Συνέχεια<span class="glyphicon glyphicon-menu-right"></span>
</button> </button>
</div> </div>
...@@ -145,6 +145,3 @@ ...@@ -145,6 +145,3 @@
</form> </form>
</div> </div>
<div class="col-md-4">
<application-preview-select></application-preview-select>
</div>
...@@ -18,6 +18,7 @@ import { IEpalClasses } from '../../store/epalclasses/epalclasses.types'; ...@@ -18,6 +18,7 @@ import { IEpalClasses } from '../../store/epalclasses/epalclasses.types';
import { IAmkaFills } from '../../store/amkafill/amkafills.types'; import { IAmkaFills } from '../../store/amkafill/amkafills.types';
import {AppSettings} from '../../app.settings'; import {AppSettings} from '../../app.settings';
@Component({ @Component({
selector: 'application-preview-select', selector: 'application-preview-select',
template: ` template: `
...@@ -33,7 +34,7 @@ import {AppSettings} from '../../app.settings'; ...@@ -33,7 +34,7 @@ import {AppSettings} from '../../app.settings';
<ul class="list-group" style="margin-bottom: 20px;"> <ul class="list-group" style="margin-bottom: 20px;">
<div *ngFor="let epalclass$ of epalclasses$ | async;"> <div *ngFor="let epalclass$ of epalclasses$ | async;">
<li class="list-group-item"> <li class="list-group-item">
Τάξη εισαγωγής: {{epalclass$.name}} Τάξη εισαγωγής: {{epalclass$.name }}
</li> </li>
</div> </div>
</ul> </ul>
...@@ -48,13 +49,13 @@ import {AppSettings} from '../../app.settings'; ...@@ -48,13 +49,13 @@ import {AppSettings} from '../../app.settings';
<ul class="list-group" style="margin-bottom: 20px;"> <ul class="list-group" style="margin-bottom: 20px;">
<div *ngFor="let sectorField$ of sectorFields$ | async;"> <div *ngFor="let sectorField$ of sectorFields$ | async;">
<li class="list-group-item" *ngIf="sectorField$.selected === true" > <li class="list-group-item" *ngIf="sectorField$.selected === true" >
{{sectorField$.name}} {{sectorField$.name }}
</li> </li>
</div> </div>
<div *ngFor="let sector$ of sectors$ | async;"> <div *ngFor="let sector$ of sectors$ | async;">
<li class="list-group-item" *ngIf="sector$.sector_selected === true" > <li class="list-group-item" *ngIf="sector$.sector_selected === true" >
{{sector$.sector_name}} {{sector$.sector_name }}
</li> </li>
</div> </div>
</ul> </ul>
...@@ -70,7 +71,7 @@ import {AppSettings} from '../../app.settings'; ...@@ -70,7 +71,7 @@ import {AppSettings} from '../../app.settings';
<div *ngFor="let sector$ of sectors$ | async;"> <div *ngFor="let sector$ of sectors$ | async;">
<div *ngFor="let course$ of sector$.courses;" > <div *ngFor="let course$ of sector$.courses;" >
<li class="list-group-item" *ngIf="course$.selected === true"> <li class="list-group-item" *ngIf="course$.selected === true">
{{course$.course_name}} {{course$.course_name }}
</li> </li>
</div> </div>
</div> </div>
...@@ -90,7 +91,7 @@ import {AppSettings} from '../../app.settings'; ...@@ -90,7 +91,7 @@ import {AppSettings} from '../../app.settings';
Προτίμηση {{epal$.order_id}}: {{epal$.epal_name}} Προτίμηση {{epal$.order_id}}: {{epal$.epal_name}}
</li> </li>
<li class="list-group-item" *ngIf="epal$.selected === true && epal$.order_id === 0"> <li class="list-group-item" *ngIf="epal$.selected === true && epal$.order_id === 0">
{{epal$.epal_name}} {{epal$.epal_name }}
</li> </li>
</div> </div>
</div> </div>
...@@ -98,14 +99,14 @@ import {AppSettings} from '../../app.settings'; ...@@ -98,14 +99,14 @@ import {AppSettings} from '../../app.settings';
<div *ngFor="let region$ of regions$ | async;"> <div *ngFor="let region$ of regions$ | async;">
<div *ngFor="let epal$ of region$.epals; " > <div *ngFor="let epal$ of region$.epals; " >
<li class="list-group-item" *ngIf="epal$.selected === true && epal$.order_id === 2"> <li class="list-group-item" *ngIf="epal$.selected === true && epal$.order_id === 2">
Προτίμηση {{epal$.order_id}}: {{epal$.epal_name}} Προτίμηση {{epal$.order_id}}: {{epal$.epal_name }}
</li> </li>
</div> </div>
</div> </div>
<div *ngFor="let region$ of regions$ | async;"> <div *ngFor="let region$ of regions$ | async;">
<div *ngFor="let epal$ of region$.epals; " > <div *ngFor="let epal$ of region$.epals; " >
<li class="list-group-item" *ngIf="epal$.selected === true && epal$.order_id === 3"> <li class="list-group-item" *ngIf="epal$.selected === true && epal$.order_id === 3">
Προτίμηση {{epal$.order_id}}: {{epal$.epal_name}} Προτίμηση {{epal$.order_id}}: {{epal$.epal_name }}
</li> </li>
</div> </div>
</div> </div>
...@@ -126,10 +127,10 @@ import {AppSettings} from '../../app.settings'; ...@@ -126,10 +127,10 @@ import {AppSettings} from '../../app.settings';
<ul class="list-group" style="margin-bottom: 20px;"> <ul class="list-group" style="margin-bottom: 20px;">
<div *ngFor="let studentDataField$ of studentDataFields$ | async;"> <div *ngFor="let studentDataField$ of studentDataFields$ | async;">
<li class="list-group-item"> <li class="list-group-item">
Όνομα μαθητή: {{studentDataField$.name}} Όνομα μαθητή: {{studentDataField$.name }}
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
Επώνυμο μαθητή: {{studentDataField$.studentsurname}} Επώνυμο μαθητή: {{studentDataField$.studentsurname }}
</li> </li>
</div> </div>
<div *ngFor="let selectedAmkaFill$ of selectedAmkaFills$ | async;"> <div *ngFor="let selectedAmkaFill$ of selectedAmkaFills$ | async;">
......
...@@ -32,8 +32,8 @@ import {AppSettings} from '../../app.settings'; ...@@ -32,8 +32,8 @@ import {AppSettings} from '../../app.settings';
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-2 col-md-offset-5"> <div class="col-md-12 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-center" (click)="saveSelected()"> <button type="button" class="btn-primary btn-lg pull-right" (click)="saveSelected()">
Συνέχεια<span class="glyphicon glyphicon-menu-right"></span> Συνέχεια<span class="glyphicon glyphicon-menu-right"></span>
</button> </button>
</div> </div>
......
...@@ -30,8 +30,8 @@ import {AppSettings} from '../../app.settings'; ...@@ -30,8 +30,8 @@ import {AppSettings} from '../../app.settings';
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-2 col-md-offset-5"> <div class="col-md-12 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-center" (click)="saveSelected()"> <button type="button" class="btn-primary btn-lg pull-right" (click)="saveSelected()">
Συνέχεια<span class="glyphicon glyphicon-menu-right"></span> Συνέχεια<span class="glyphicon glyphicon-menu-right"></span>
</button> </button>
</div> </div>
......
...@@ -24,7 +24,7 @@ import {AppSettings} from '../../app.settings'; ...@@ -24,7 +24,7 @@ import {AppSettings} from '../../app.settings';
selector: 'course-fields-select', selector: 'course-fields-select',
template: ` template: `
<div class="row equal"> <div class="row equal">
<div class="col-md-8"> <div class="col-md-12">
<form [formGroup]="formGroup"> <form [formGroup]="formGroup">
<div formArrayName="formArray"> <div formArrayName="formArray">
<ul class="list-group"> <ul class="list-group">
...@@ -52,8 +52,8 @@ import {AppSettings} from '../../app.settings'; ...@@ -52,8 +52,8 @@ import {AppSettings} from '../../app.settings';
</ul> </ul>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-2 col-md-offset-5"> <div class="col-md-12 col-md-offset-5">
<button type="button" class="btn-primary btn-lg pull-center" (click)="navigateToApplication()" [disabled] = "numSelected === 0" > <button type="button" class="btn-primary btn-lg pull-right" (click)="navigateToApplication()" [disabled] = "numSelected === 0" >
Συνέχεια<span class="glyphicon glyphicon-menu-right"></span> Συνέχεια<span class="glyphicon glyphicon-menu-right"></span>
</button> </button>
</div> </div>
...@@ -62,11 +62,6 @@ import {AppSettings} from '../../app.settings'; ...@@ -62,11 +62,6 @@ import {AppSettings} from '../../app.settings';
</div> </div>
<div class="col-md-4">
<application-preview-select></application-preview-select>
</div>
</div> </div>
` `
}) })
...@@ -137,7 +132,7 @@ import {AppSettings} from '../../app.settings'; ...@@ -137,7 +132,7 @@ import {AppSettings} from '../../app.settings';
} }
toggleBackgroundColor(ind) { toggleBackgroundColor(ind) {
return ((this.regionActive === ind) ? "cyan" : "#eeeeee"); return ((this.regionActive === ind) ? "#fd9665" : "white");