Commit 6d28acec authored by Ayush's avatar Ayush

Workspace update

parent 77a949c6
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
<div *ngIf="isNew || isFile"></div> <div *ngIf="isNew || isFile"></div>
<div *ngIf="!isNew" class="file-buttons"> <div *ngIf="!isNew" class="file-buttons">
<button (click)="onDelete()" [class.disabled]="deleting || isErrorDeleting" <button *ngIf="!noEdits" (click)="onDelete()" [class.disabled]="deleting || isErrorDeleting"
[disabled]="deleting || isErrorDeleting">{{isErrorDeleting ? 'Error' : (deleting ? 'Deleting...' : 'Delete')}}</button> [disabled]="deleting || isErrorDeleting">{{isErrorDeleting ? 'Error' : (deleting ? 'Deleting...' : 'Delete')}}</button>
<button (click)="isExpanded = !isExpanded" *ngIf="!isFile">{{isExpanded ? 'Collapse' : 'Expand'}}</button> <button (click)="isExpanded = !isExpanded" *ngIf="!isFile">{{isExpanded ? 'Collapse' : 'Expand'}}</button>
<button (click)="isExpanded = true; creatingNewSub = 1" *ngIf="!isFile && level < 3" [class.disabled]="deleting" [disabled]="deleting">New Directory</button> <button (click)="isExpanded = true; creatingNewSub = 1" *ngIf="!noEdits && !isFile && level < 3" [class.disabled]="deleting" [disabled]="deleting">New Directory</button>
<button (click)="isExpanded = true; creatingNewSub = 2" *ngIf="!isFile" [class.disabled]="deleting" [disabled]="deleting">New File</button> <button (click)="isExpanded = true; creatingNewSub = 2" *ngIf="!noEdits && !isFile" [class.disabled]="deleting" [disabled]="deleting">New File</button>
<button *ngIf="isFile" [class.disabled]="deleting" [disabled]="deleting" <button *ngIf="!noEdits && isFile" [class.disabled]="deleting" [disabled]="deleting"
[routerLink]="getRouterLink()">Edit [routerLink]="getRouterLink()">Edit
</button> </button>
</div> </div>
...@@ -42,10 +42,10 @@ ...@@ -42,10 +42,10 @@
<app-file-dir-card (deleteDir)="deleteDirExec($event)" (deleteFile)="deleteFileExec($event)" <app-file-dir-card (deleteDir)="deleteDirExec($event)" (deleteFile)="deleteFileExec($event)"
*ngFor="let dir of directory.dirs" [directory]="dir" *ngFor="let dir of directory.dirs" [directory]="dir"
[isFile]="false" [isNew]="false" [level]="level + 1" [isFile]="false" [isNew]="false" [level]="level + 1"
[trace]="addToTraceDir(dir)"></app-file-dir-card> [trace]="addToTraceDir(dir)" [noEdits]="noEdits"></app-file-dir-card>
<app-file-dir-card (deleteDir)="deleteDirExec($event)" (deleteFile)="deleteFileExec($event)" <app-file-dir-card (deleteDir)="deleteDirExec($event)" (deleteFile)="deleteFileExec($event)"
*ngFor="let file of directory.files" [file]="file" *ngFor="let file of directory.files" [file]="file"
[isFile]="true" [isNew]="false" [level]="level + 1" [isFile]="true" [isNew]="false" [level]="level + 1"
[trace]="addToTraceFile(file)"></app-file-dir-card> [trace]="addToTraceFile(file)" [noEdits]="noEdits"></app-file-dir-card>
</div> </div>
...@@ -18,6 +18,7 @@ export class FileDirCardComponent implements OnInit { ...@@ -18,6 +18,7 @@ export class FileDirCardComponent implements OnInit {
@Input() trace: number[]; @Input() trace: number[];
@Input() isNew: boolean; @Input() isNew: boolean;
@Input() parentPath: string; @Input() parentPath: string;
@Input() noEdits = false;
deleting: boolean; deleting: boolean;
isExpanded = false; isExpanded = false;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</div> </div>
<app-file-dir-card *ngIf="creatingNew !== 0" [parentPath]="''" [isNew]="true" [isFile]="creatingNew === 2" (createFile)="createFileExec($event)" (createDir)="createDirExec($event)" (cancelled)="creatingNew = 0"></app-file-dir-card> <app-file-dir-card *ngIf="creatingNew !== 0" [parentPath]="''" [isNew]="true" [isFile]="creatingNew === 2" (createFile)="createFileExec($event)" (createDir)="createDirExec($event)" (cancelled)="creatingNew = 0"></app-file-dir-card>
<app-file-dir-card *ngFor="let dir of mainDir.dirs" [isFile]="false" [directory]="dir" [level]="0" [trace]="[mainDir.dirs.indexOf(dir)]" (deleteDir)="deleteDirExec($event)" (deleteFile)="deleteFileExec($event)" [isNew]="false"></app-file-dir-card> <app-file-dir-card *ngFor="let dir of mainDir.dirs" [isFile]="false" [directory]="dir" [level]="0" [trace]="[mainDir.dirs.indexOf(dir)]" (deleteDir)="deleteDirExec($event)" (deleteFile)="deleteFileExec($event)" [isNew]="false" [noEdits]="dir.name === 'attempts'"></app-file-dir-card>
<app-file-dir-card *ngFor="let file of mainDir.files" [isFile]="true" [file]="file" [level]="0" [trace]="[mainDir.files.indexOf(file)]" (deleteDir)="deleteDirExec($event)" (deleteFile)="deleteFileExec($event)" [isNew]="false"></app-file-dir-card> <app-file-dir-card *ngFor="let file of mainDir.files" [isFile]="true" [file]="file" [level]="0" [trace]="[mainDir.files.indexOf(file)]" (deleteDir)="deleteDirExec($event)" (deleteFile)="deleteFileExec($event)" [isNew]="false"></app-file-dir-card>
<!--<div [class.open]="uploadPopupActive" id="file-upload-cover"></div>--> <!--<div [class.open]="uploadPopupActive" id="file-upload-cover"></div>-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment