Skip to content

Commit

Permalink
merge for release v1.1.6
Browse files Browse the repository at this point in the history
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
  • Loading branch information
neel1996 authored Oct 3, 2020
2 parents 99a4fec + adc4a92 commit e07a809
Show file tree
Hide file tree
Showing 1,856 changed files with 4,492 additions and 4,174 deletions.
16 changes: 16 additions & 0 deletions API/branchCompareApi.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
const { gitBranchCompare } = require("../git/gitBranchCompare");
const { getRepoPath } = require("../global/fetchGitRepoPath");

async function branchCompareApi(repoId, baseBranch, compareBranch) {
const repoPath = getRepoPath(repoId);

if (baseBranch !== compareBranch) {
return await gitBranchCompare(repoPath, baseBranch, compareBranch);
} else {
return {
message: "Nothing to compare as the branches are the same",
};
}
}

module.exports.branchCompareApi = branchCompareApi;
16 changes: 16 additions & 0 deletions API/commitCompareApi.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
const { gitCommitCompare } = require("../git/gitCommitCompareApi");
const { getRepoPath } = require("../global/fetchGitRepoPath");

async function commitCompareApi(repoId, baseCommit, compareCommit) {
const repoPath = getRepoPath(repoId);

if (baseCommit !== compareCommit) {
return await gitCommitCompare(repoPath, baseCommit, compareCommit);
} else {
return {
message: "Nothing to compare as the commits are the same",
};
}
}

module.exports.commitCompareApi = commitCompareApi;
11 changes: 8 additions & 3 deletions API/commitLogSearchApi.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
const sqlite = require("sqlite3").verbose();
const path = require("path");
const db = new sqlite.Database(
path.join(__dirname, "..", "/database/commitLogs.sqlite")
);
const { gitCommitLogSearchHandler } = require("../git/gitCommitLogSearchApi");

async function gitCommitLogDbSerchApi(repoId, searchCategory, searchKey) {
let searchQuery = "";
const db = new sqlite.Database(
path.join(__dirname, "..", "/database/commitLogs.sqlite"),
(err) => {
if (err) {
console.log("ERROR: Unable to open commit log SQLITE DB", err);
}
}
);

switch (searchCategory) {
case "hash":
Expand Down
14 changes: 13 additions & 1 deletion DOCUMENTATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ or use `pm2` by downloading it from npm - `npm i -g pm2` and start the module by
### Left Pane Menu

- **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)
- **Compare** - To compare the branches and commits for the selected repository.
- **Settings** - To check and edit internal data file, to remove a repo from GitConvex and to update the active port.
- **Help** - Includes documentation link and various options to report an issue or to submit feedback.

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

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

## Compare
- The **Compare** menu has two sections: **Branch compare** and **Commit compare**.

- **Branch compare** - Compares any two branches based on the selected base branch and compare branch. It displays difference between the selected branches.

![branch-compare](https://user-images.githubusercontent.com/65342122/94800651-83a4e680-0402-11eb-9e34-1c7b53e66add.png)

- **Commit compare** - Compares any two commits based on the selected base commit and compare commit. It shows file difference between the selected commits.

![commit-compare](https://user-images.githubusercontent.com/65342122/94800717-9d462e00-0402-11eb-84aa-9890bfea1f78.png)

## Settings
- Settings in the left pane has three sections (Server data file, saved repos, Active GitConvex port number).
![settings](https://user-images.githubusercontent.com/65342122/87243003-a4871c80-c44f-11ea-9d1a-8350bdfb0da8.png)
Expand All @@ -157,4 +169,4 @@ In "Git Difference" click on the modified file to see the difference. The platfo
## Help and Support

- 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.
![help-and-support](https://user-images.githubusercontent.com/65342122/87242999-8f11f280-c44f-11ea-9a81-f6cde7b4b419.png)
![help-and-support](https://user-images.githubusercontent.com/65342122/94940199-d2c94500-04f0-11eb-9212-16c57d642c61.png)
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

> Use any of the below options to get gitconvex for your system
[![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)
[![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)
[![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)
[![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)
[![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)
[![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)
[![License](https://img.shields.io/static/v1?label=LICENSE&message=Apache-2.0&color=yellow&style=for-the-badge)](LICENSE)

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



Loading

0 comments on commit e07a809

Please sign in to comment.