seach bar ok

anis
Tmadkaud 6 years ago
parent 26dc279a9b
commit 47a11b87ef

@ -25,8 +25,10 @@ var config = require('./config/database');
//mongoose.Promise = require('bluebird');
mongoose.connect(config.database);
app.use(function(req, res, next) {
res.header("Access-Control-Allow-Origin", "*");
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
res.setHeader('Access-Control-Allow-Origin', '*');
res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS, PUT, PATCH, DELETE');
res.setHeader('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
res.setHeader('Access-Control-Allow-Credentials', true);
next();
});
app.use(session({

@ -34,8 +34,8 @@ var credentials = {
cert: certificate,
passphrase: 'titi'
};
var server = https.createServer(credentials, app);
//var server = https.createServer(credentials, app);
var server = http.createServer(app);
// server.setSecure(credentials);
/**

@ -48,7 +48,13 @@ const storage = multer.diskStorage({
}
});
router.use(function(req, res, next) {
res.setHeader('Access-Control-Allow-Origin', '*');
res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS, PUT, PATCH, DELETE');
res.setHeader('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
res.setHeader('Access-Control-Allow-Credentials', true);
next();
});
/* GET home page. */
router.get('/', function(req, res, next) {
res.send('Express RESTful API');

@ -12,6 +12,10 @@
</div>
</div>
<mdb-completer [label]="'Find folder'" initialValue="Find folder" (selected)="openFolder('searchStr')" name="autocomplete" [(ngModel)]="searchStr" [datasource]="dataService" [minSearchLength]="0">
</mdb-completer>
<div class="box-container align-middle" fxLayout="column" [ngStyle.lt-sm]="'min-height: 400;'">
<dropzone *ngIf="type === 'component'" class="dropzone-container" [config]="config" [disabled]="disabled" fxLayout="row" fxLayoutAlign="start strech" fxFlex="auto" [message]="'Click or drag file here to upload'" (error)="onUploadError($event)" (success)="onUploadSuccess($event)"></dropzone>
@ -32,7 +36,7 @@
</div>
<div class="topButtons">
<button type="button" class="btn btn-primary btn-sm" mdbTooltip="Back To : {{mainFolder.parent}}" placement="top" (click)="backToParentFolder()" *ngIf="mainFolder.path !== 'Home'"><i class="fa fa-chevron-left" aria-hidden="true"></i> {{mainFolder.parent}}</button>
<button type="button" class="btn btn-primary btn-sm" mdbTooltip="Back To : {{mainFolder?.parent}}" placement="top" (click)="backToParentFolder()" *ngIf="mainFolder?.path !== 'Home'"><i class="fa fa-chevron-left" aria-hidden="true"></i> {{mainFolder?.parent}}</button>
<button type="button" class="btn btn-primary btn-sm" mdbTooltip="Nouveau dossier" placement="top" (click)="createBool()" *ngIf="isClickCreateFolder === false">
<i class="fa fa-plus-circle" aria-hidden="true"><i class="fa fa-folder-o" aria-hidden="true"></i></i>

@ -16,6 +16,8 @@ import { DropzoneComponent , DropzoneDirective,
import { CompleterService } from '../typescripts/pro';
@Component({
selector: 'app-book',
templateUrl: './book.component.html',
@ -47,6 +49,23 @@ export class BookComponent implements OnInit, OnDestroy {
// config: DropzoneConfigInterface;
//myDropzone: Dropzone;
droptestt:any;
allItems: any;
searchStr: String;
dataService: any;
protected searchData = [
{ color: 'red'},
{ color: 'green'},
{ color: 'blue'},
{ color: 'cyan'},
{ color: 'magenta'},
{ color: 'yellow'},
{ color: 'black'},
];
public type: string = 'component';
@ -64,12 +83,26 @@ export class BookComponent implements OnInit, OnDestroy {
@ViewChild(DropzoneDirective) directiveRef?: DropzoneDirective;
constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public sanitizer: DomSanitizer) {
constructor(private completerService: CompleterService, private http: HttpClient, private router: Router, private route: ActivatedRoute, public sanitizer: DomSanitizer) {
this.httpOptions = {
headers: new HttpHeaders({ 'Authorization': localStorage.getItem('jwtToken'), 'Access-Control-Allow-Origin' : '*'}),
pathFolder: ''
};
this.http.get('/api/getCurrentUser', this.httpOptions).subscribe(user => {
this.currentUser = user;
this.openFolder('Home');
}, err => {
if (err.status === 401) {
this.router.navigate(['Home']);
}
});
this.isClickCreateFolder = false;
this.fileChooseName = 'None';
this.filesToUpload = [];
this.test = '';
this.sizeFile = 0;
}
sendMessage() {
console.log('caca');
@ -131,19 +164,7 @@ export class BookComponent implements OnInit, OnDestroy {
}
ngOnInit() {
this.httpOptions = {
headers: new HttpHeaders({ 'Authorization': localStorage.getItem('jwtToken'), 'Access-Control-Allow-Origin' : '*'}),
pathFolder: ''
};
this.http.get('/api/getCurrentUser', this.httpOptions).subscribe(user => {
this.currentUser = user;
this.openFolder('Home');
}, err => {
if (err.status === 401) {
this.router.navigate(['login']);
}
});
}
deleteFile(fileToDelete) {
@ -186,6 +207,12 @@ export class BookComponent implements OnInit, OnDestroy {
this.http.post('/api/getFileAppList', {owner: this.currentUser.username.toString()}).subscribe(files => {
if (files) {
this.allUserAppFile = files;
this.allItems = (this.allUserAppFolder.concat(this.allUserAppFile));
this.dataService = this.completerService.local(this.allItems, 'name', 'path');
for (let f of this.allUserAppFile){
console.log(f.name);
//f.fileTab = this.getfiles(f);
@ -246,6 +273,7 @@ export class BookComponent implements OnInit, OnDestroy {
console.log(this.currentUser.username.toString());
this.setAllUserAppFolder.emit(this.currentUser.username.toString());
this.getAllUserAppFiles();
} else {
this.allUserAppFolder = [];
@ -285,6 +313,12 @@ export class BookComponent implements OnInit, OnDestroy {
openFolder(path: String) {
if(this.searchStr !== undefined ? path === 'searchStr' : false){
path = this.searchStr;
}
this.httpOptions.pathFolder = path;
this.isClickCreateFolder = false;
@ -292,6 +326,7 @@ export class BookComponent implements OnInit, OnDestroy {
this.http.post('/api/getMainFolder', {path: path, owner: this.currentUser.username.toString()}).subscribe(folder => {
if (folder) {
this.mainFolder = folder;
console.log('folder : ' + folder);
this.getfolders();
this.getAllUserAppFolder();
this.getfiles();

@ -348,4 +348,4 @@
</footer>
<!--/.Footer-->
<!--<button (click)="facebook()" class="btn-floating btn-fb"><i class="fa fa-facebook"></i></button>-->
<button (click)="facebook()" class="btn-floating btn-fb"><i class="fa fa-facebook"></i></button>

@ -75,9 +75,7 @@ export class MainComponent implements OnInit {
if(this.allUserAppFolder !== undefined) {
tempp = this.allUserAppFolder;
test = tempp.filter((folder) => folder.origin === name);
if(test[0] !== undefined){
console.log(test[0].origin);
}
}
return test;
}
@ -88,7 +86,7 @@ export class MainComponent implements OnInit {
if (files) {
this.allUserAppFile = files;
for (let f of this.allUserAppFile){
console.log(f.name);
//console.log(f.name);
//f.fileTab = this.getfiles(f);
}
// return files;
@ -106,7 +104,7 @@ export class MainComponent implements OnInit {
this.allUserAppFolder = folders;
for (let f of this.allUserAppFolder){
f.origin = this.setOriginFolder(f.path);
console.log('origin : ' + f.origin);
//console.log('origin : ' + f.origin);
}
this.getAllUserAppFiles();

Loading…
Cancel
Save