Skip to content

Commit e07a809

Browse files
authored
merge for release v1.1.6
PR for v1.1.6 release # Features - Compare feature to compare the changes between branches and difference commits # Improvements and Bug Fixes - Final package size has been reduced by removing unwanted CSS selectors - UI layout change to make the platform more tablet and small desktop friendly - Removed critical initial startup bug which crashes the application during the first start
2 parents 99a4fec + adc4a92 commit e07a809

File tree

1,856 files changed

+4492
-4174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,856 files changed

+4492
-4174
lines changed

API/branchCompareApi.js

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
const { gitBranchCompare } = require("../git/gitBranchCompare");
2+
const { getRepoPath } = require("../global/fetchGitRepoPath");
3+
4+
async function branchCompareApi(repoId, baseBranch, compareBranch) {
5+
const repoPath = getRepoPath(repoId);
6+
7+
if (baseBranch !== compareBranch) {
8+
return await gitBranchCompare(repoPath, baseBranch, compareBranch);
9+
} else {
10+
return {
11+
message: "Nothing to compare as the branches are the same",
12+
};
13+
}
14+
}
15+
16+
module.exports.branchCompareApi = branchCompareApi;

API/commitCompareApi.js

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
const { gitCommitCompare } = require("../git/gitCommitCompareApi");
2+
const { getRepoPath } = require("../global/fetchGitRepoPath");
3+
4+
async function commitCompareApi(repoId, baseCommit, compareCommit) {
5+
const repoPath = getRepoPath(repoId);
6+
7+
if (baseCommit !== compareCommit) {
8+
return await gitCommitCompare(repoPath, baseCommit, compareCommit);
9+
} else {
10+
return {
11+
message: "Nothing to compare as the commits are the same",
12+
};
13+
}
14+
}
15+
16+
module.exports.commitCompareApi = commitCompareApi;

API/commitLogSearchApi.js

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
const sqlite = require("sqlite3").verbose();
22
const path = require("path");
3-
const db = new sqlite.Database(
4-
path.join(__dirname, "..", "/database/commitLogs.sqlite")
5-
);
63
const { gitCommitLogSearchHandler } = require("../git/gitCommitLogSearchApi");
74

85
async function gitCommitLogDbSerchApi(repoId, searchCategory, searchKey) {
96
let searchQuery = "";
7+
const db = new sqlite.Database(
8+
path.join(__dirname, "..", "/database/commitLogs.sqlite"),
9+
(err) => {
10+
if (err) {
11+
console.log("ERROR: Unable to open commit log SQLITE DB", err);
12+
}
13+
}
14+
);
1015

1116
switch (searchCategory) {
1217
case "hash":

DOCUMENTATION.md

+13-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ or use `pm2` by downloading it from npm - `npm i -g pm2` and start the module by
6666
### Left Pane Menu
6767

6868
- **Repositories** - To check tracked files changes, line-based changes with syntax highlighting and git operations (staging, un-staging, committing changes and pushing changed to remote)
69+
- **Compare** - To compare the branches and commits for the selected repository.
6970
- **Settings** - To check and edit internal data file, to remove a repo from GitConvex and to update the active port.
7071
- **Help** - Includes documentation link and various options to report an issue or to submit feedback.
7172

@@ -143,6 +144,17 @@ In "Git Difference" click on the modified file to see the difference. The platfo
143144

144145
![git-difference](https://user-images.githubusercontent.com/65342122/89559704-ab793300-d833-11ea-88a8-28afea4b461b.png)
145146

147+
## Compare
148+
- The **Compare** menu has two sections: **Branch compare** and **Commit compare**.
149+
150+
- **Branch compare** - Compares any two branches based on the selected base branch and compare branch. It displays difference between the selected branches.
151+
152+
![branch-compare](https://user-images.githubusercontent.com/65342122/94800651-83a4e680-0402-11eb-9e34-1c7b53e66add.png)
153+
154+
- **Commit compare** - Compares any two commits based on the selected base commit and compare commit. It shows file difference between the selected commits.
155+
156+
![commit-compare](https://user-images.githubusercontent.com/65342122/94800717-9d462e00-0402-11eb-84aa-9890bfea1f78.png)
157+
146158
## Settings
147159
- Settings in the left pane has three sections (Server data file, saved repos, Active GitConvex port number).
148160
![settings](https://user-images.githubusercontent.com/65342122/87243003-a4871c80-c44f-11ea-9d1a-8350bdfb0da8.png)
@@ -157,4 +169,4 @@ In "Git Difference" click on the modified file to see the difference. The platfo
157169
## Help and Support
158170

159171
- Visit help section if you're facing an issue or need any help. If you have any queries or feedback, then discuss it in "Discord" or report an issue in GitHub.
160-
![help-and-support](https://user-images.githubusercontent.com/65342122/87242999-8f11f280-c44f-11ea-9a81-f6cde7b4b419.png)
172+
![help-and-support](https://user-images.githubusercontent.com/65342122/94940199-d2c94500-04f0-11eb-9212-16c57d642c61.png)

README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
> Use any of the below options to get gitconvex for your system
2020
21-
[![gitconvex npm package](https://img.shields.io/static/v1?label=gitconvex&message=v1.1.5&color=red&style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@itassistors/gitconvex)
22-
[![github release](https://img.shields.io/static/v1?label=gitconvex&message=v1.1.5&color=green&style=for-the-badge&logo=github)](https://github.com/neel1996/gitconvex-package/releases)
23-
[![docker image](https://img.shields.io/static/v1?label=gitconvex&message=v1.1.5&color=blue&style=for-the-badge&logo=docker)](https://hub.docker.com/repository/docker/itassistors/gitconvex)
21+
[![gitconvex npm package](https://img.shields.io/static/v1?label=gitconvex&message=v1.1.6&color=red&style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@itassistors/gitconvex)
22+
[![github release](https://img.shields.io/static/v1?label=gitconvex&message=v1.1.6&color=green&style=for-the-badge&logo=github)](https://github.com/neel1996/gitconvex-package/releases)
23+
[![docker image](https://img.shields.io/static/v1?label=gitconvex&message=v1.1.6&color=blue&style=for-the-badge&logo=docker)](https://hub.docker.com/repository/docker/itassistors/gitconvex)
2424
[![License](https://img.shields.io/static/v1?label=LICENSE&message=Apache-2.0&color=yellow&style=for-the-badge)](LICENSE)
2525

2626
- **Option - 1** Cloning repo from **github**
@@ -122,3 +122,4 @@ Refer the detailed [Documentation](DOCUMENTATION.md) for how to setup and use th
122122
See [LICENSE ](LICENSE) info for more
123123

124124

125+

0 commit comments

Comments
 (0)