Skip to content

Commit 1440696

Browse files
committed
minor UI and meta data updates
1 parent e3ddef8 commit 1440696

File tree

4 files changed

+19
-24
lines changed

4 files changed

+19
-24
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ This is the list of features in this git client. There might be some features I
3939
16. Merge branches
4040
17. Handle Rebase conflicts (show conflicts, one click mark as resolved)
4141
18. Handle Merge conflicts
42-
19. Search for SHAs
42+
19. Search for SHAs
43+
20. Search for commit messages

TODO.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
. Handle cherrypick
2+
. Revert commit
23
. Delete local branch
34
. Delete remote branch
45
. Handle passwords for cloning
@@ -9,7 +10,7 @@
910
. Select multiple files while staging, unstaging, rebase modal, etc.
1011
. Prevent CSRF attacks.
1112
. Handle CRLF errors.
12-
. Implement searching for commits/hashes/authors/commit messages
13+
. Implement searching for commits/authors/file changes/file
1314
. Implement copy path for all paths (file-selector)
1415
. Modularize file selectors
1516
. Git bisect
@@ -21,7 +22,6 @@
2122
. Move service into different file
2223
. Move modals into their own files
2324
. Convert all get requests to post
24-
. Revert commit
2525
. Squash commits
2626
. Handle conflicts from merge, stash
2727
. Handle Rebase Cases // https://git-scm.com/docs/git-status
@@ -72,4 +72,6 @@
7272
-. Handle merging // https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
7373
-. encodeURIComponent instead of complex >>> structure.
7474
-. Add loaders to all git operations
75-
-. Start program using custom port
75+
-. Start program using custom port
76+
-. Search for commit hashes
77+
-. Search for commit messages

public/js/app/webgit-home/repo-detail/repo-detail.css

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -117,22 +117,6 @@
117117
#commit-modal .modal-dialog {
118118
max-width: 90%;
119119
}
120-
/*
121-
.file-status.untracked::after {
122-
content: '?'
123-
}
124-
125-
.file-status.added::after {
126-
content: 'A'
127-
}
128-
129-
.file-status.modified::after {
130-
content: 'M'
131-
}
132-
133-
.file-status.deleted::after {
134-
content: 'D'
135-
}*/
136120

137121
.staging-action-buttons-container {
138122
padding: 15px 0;
@@ -409,4 +393,12 @@
409393
flex-direction: column;
410394
justify-content: center;
411395
align-items: center;
396+
}
397+
398+
.btn-stage-all-files {
399+
margin-right: 10px;
400+
}
401+
402+
.btn-unstage-files {
403+
margin-left: 10px;
412404
}

public/js/app/webgit-home/repo-detail/repo-detail.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ <h5 class="modal-title">Commit to {{vm.currentLocalBranch}}</h5>
126126
</div>
127127
<div class="row staging-action-buttons-container">
128128
<div class="col-sm-12 staging-actions">
129-
<button class="btn btn-sm btn-outline-primary float-left" ng-class="{'disabled': !vm.stagedFiles || vm.stagedFiles.length == 0}" ng-disabled="!vm.stagedFiles || vm.stagedFiles.length == 0" ng-click="vm.unstageAllFiles()">Unstage All</button>
130-
<button class="btn btn-sm btn-outline-primary float-left" ng-class="{'disabled': vm.diffOnCommitModal.file.tags.indexOf('staged') == -1}" ng-disabled="vm.diffOnCommitModal.file.tags.indexOf('staged') == -1" ng-click="vm.unstageFile()">Unstage</button>
131-
<button class="btn btn-sm btn-outline-primary float-right" ng-class="{'disabled': vm.diffOnCommitModal.file.tags.indexOf('unstaged') == -1}" ng-disabled="vm.diffOnCommitModal.file.tags.indexOf('unstaged') == -1" ng-click="vm.stageFile()">Stage</button>
132-
<button class="btn btn-sm btn-outline-primary float-right" ng-class="{'disabled': !vm.unstagedFiles || vm.unstagedFiles.length == 0}" ng-disabled="!vm.unstagedFiles || vm.unstagedFiles.length == 0" ng-click="vm.stageAllFiles()">Stage All</button>
129+
<button class="btn btn-sm btn-outline-primary float-left btn-unstage-all-files" ng-class="{'disabled': !vm.stagedFiles || vm.stagedFiles.length == 0}" ng-disabled="!vm.stagedFiles || vm.stagedFiles.length == 0" ng-click="vm.unstageAllFiles()">Unstage All</button>
130+
<button class="btn btn-sm btn-outline-primary float-left btn-unstage-files" ng-class="{'disabled': vm.diffOnCommitModal.file.tags.indexOf('staged') == -1}" ng-disabled="vm.diffOnCommitModal.file.tags.indexOf('staged') == -1" ng-click="vm.unstageFile()">Unstage</button>
131+
<button class="btn btn-sm btn-outline-primary float-right btn-stage-files" ng-class="{'disabled': vm.diffOnCommitModal.file.tags.indexOf('unstaged') == -1}" ng-disabled="vm.diffOnCommitModal.file.tags.indexOf('unstaged') == -1" ng-click="vm.stageFile()">Stage</button>
132+
<button class="btn btn-sm btn-outline-primary float-right btn-stage-all-files" ng-class="{'disabled': !vm.unstagedFiles || vm.unstagedFiles.length == 0}" ng-disabled="!vm.unstagedFiles || vm.unstagedFiles.length == 0" ng-click="vm.stageAllFiles()">Stage All</button>
133133
</div>
134134
</div>
135135
<div class="row">

0 commit comments

Comments
 (0)