Skip to content

Commit 6323f60

Browse files
Revised documentation
1 parent 9f2c4c2 commit 6323f60

File tree

1 file changed

+45
-35
lines changed

1 file changed

+45
-35
lines changed

DOCUMENTATION.md

Lines changed: 45 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,29 @@
11
# Introduction
2-
GitConvex is a web app for managing your git repositories. It is supported by Linux, Mac OS and Windows. The [latest version](https://github.com/neel1996/gitconvex-package/releases) of GitConvex supports git features such as initializing and tracking a git repo, staging and unstaging changes, committing changes, pushing changes to selected remote and so on.
3-
The main goal of this platform is to act as a web based alternative for Github desktop, but we are still in the starting stages, so we are not completely there yet (baby steps, right?)
2+
GitConvex is a web app for managing your git repositories. It is supported by Linux, Mac OS and Windows. The [latest version] (https://github.com/neel1996/gitconvex-package/releases) of GitConvex supports git features such as initializing and tracking a git repo, staging and unstaging changes, committing changes, pushing changes to the selected remote and so on.
3+
The main goal of this platform is to act as a web-based alternative for Github desktop, but we are still in the starting stages, so we are not completely there yet (baby steps, right?)
4+
## Table of Contents
5+
[Requirements](#requirements)<br>
6+
[Download Options](#download-options)<br>
7+
[Setup](#setup)<br>
8+
[Features available](#features-available)<br>
9+
[How to use](#how-to-use)
10+
- [Adding a new repo](#adding-a-new-repo)
11+
- [Repo Details](#repo-details)
12+
- [Add a new branch](#add-new-branch)
13+
414
## Requirements
515
1. [Node JS](https://nodejs.org/en/) (Version 12.0+)
616
2. [Git](https://git-scm.com/) (Version 2.20+)
717
## Download Options
8-
- **Option-1:** Directly clone the repo from github
18+
- **Option-1:** Directly clone the repo from GitHub
919
`git clone https://github.com/neel1996/gitconvex-package`
1020

11-
- **Option-2** Downloading the zip file from the [releases](https://github.com/neel1996/gitconvex-package/releases).
21+
- **Option-2:** Downloading the zip file from the [releases](https://github.com/neel1996/gitconvex-package/releases).
1222

13-
- **Option-3** GitConvex is also available on `npm`. Install the package globally to run it directly from the command line
23+
- **Option-3:** GitConvex is also available on `npm`. Install the package globally to run it directly from the command line
1424
`npm i -g @itassistors/gitconvex`
1525

16-
This will install **gitconvex** as a global module and it can be started straight away from the command line with `gitconvex` command
26+
This will install **GitConvex** as a global module and it can be started straight away from the command line with `gitconvex` command
1727
```
1828
$ gitconvex
1929
@@ -25,8 +35,8 @@ GitConvex API connected!
2535
Checking data file availability...
2636
INFO: Data file /usr/lib/node_modules/@itassistors/gitconvex/database/repo-datastore.json is present and it will be used as the active data file!
2737
You can change this under the settings menu
28-
Gitconvex is running on port 9001
29-
Open http://localhost:9001/ to access gitconvex
38+
GitConvex is running on port 9001
39+
Open http://localhost:9001/ to access GitConvex
3040
```
3141
## Setup
3242

@@ -44,27 +54,27 @@ or use `pm2` by downloading it from npm - `npm i -g pm2` and start the module by
4454
- Tracking modified files
4555
- Creating new branches (provided there are no diverging changes)
4656
- Initializing git inside a new repo and adding it to the platform tracker on the go
47-
- File difference tracker with syntax highlighting for the [supported languages](LANGUAGES.md).
57+
- File difference tracker with syntax highlighting for the [supported languages] (LANGUAGES.md).
4858
- Commit log viewer
4959
- Basic git operations such as staging, un-staging, committing and pushing to remote repo.
5060

5161
## How to use
5262

5363
### Left Pane Menu
5464

55-
- **Repositories** - To check tracked files changes, line based changes with syntax highlighting and git operations (staging, unstaging, commiting changes and pushing changed to remote)
56-
- **Settings** - To check and edit internal data file, to remove a repo from gitconvex and to update the active port.
65+
- **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)
66+
- **Settings** - To check and edit internal data file, to remove a repo from GitConvex and to update the active port.
5767
- **Help** - Includes documentation link and various options to report an issue or to submit feedback.
5868

5969
### Adding a new repo
6070
- Use "+" at the bottom right corner to add a repo.
61-
![Picture1](https://user-images.githubusercontent.com/65342122/87232632-0eff7480-c3de-11ea-8a9f-f0a6cf9cd6ee.png)
71+
![add-a-repo](https://user-images.githubusercontent.com/65342122/87232632-0eff7480-c3de-11ea-8a9f-f0a6cf9cd6ee.png)<!-- .element style="height:10%; width:10%" -->
6272

6373
- Enter repo name and paste the repo path. If the folder is not a git repo then check the "*Check this if the folder is not a git repo*" checkbox to initialize git.
64-
![Picture2](https://user-images.githubusercontent.com/65342122/87232637-16268280-c3de-11ea-9f9d-708c5a3eb668.png)
74+
![repo-details](https://user-images.githubusercontent.com/65342122/87232637-16268280-c3de-11ea-9f9d-708c5a3eb668.png)
6575

6676
- The newly added repo will be displayed as a card in the dashboard
67-
![Picture17](https://user-images.githubusercontent.com/65342122/87243016-d13b3400-c44f-11ea-88ec-c4d14cbfbf97.png)
77+
![repo-card](https://user-images.githubusercontent.com/65342122/87243016-d13b3400-c44f-11ea-88ec-c4d14cbfbf97.png)
6878

6979
### Repo Details
7080
- Click on the repo card to get the following details about the repo
@@ -83,55 +93,55 @@ The repo detail view also provides features for performing the following git ope
8393
- Fetching changes from remote
8494
- Adding a new remote repo
8595
```
86-
![Picture4](https://user-images.githubusercontent.com/65342122/87232642-1f175400-c3de-11ea-8ead-80cd5ab4c37c.png)
96+
![repo-card-details](https://user-images.githubusercontent.com/65342122/87232642-1f175400-c3de-11ea-8ead-80cd5ab4c37c.png)
8797

88-
![enter image description here](https://user-images.githubusercontent.com/65342122/87232671-71587500-c3de-11ea-8ff5-25fb95b08553.png)
98+
![commit-logs](https://user-images.githubusercontent.com/65342122/87232671-71587500-c3de-11ea-8ff5-25fb95b08553.png)
8999

90100
#### Add new branch
91-
![Picture5](https://user-images.githubusercontent.com/65342122/87232643-23437180-c3de-11ea-9d9e-7e3c3789c32e.png)
101+
![new-branch](https://user-images.githubusercontent.com/65342122/87232643-23437180-c3de-11ea-9d9e-7e3c3789c32e.png)
92102

93-
Note: In a newly initialized git repo, the newly added branch will be considered by git only after a initial commit
103+
Note: In a newly initialized git repo, the newly added branch will be considered by git only after an initial commit
94104

95-
## Repositoru Menu
96-
- The **Repository** menu has three sections : File view, Git difference and Git operation, which will be displayed based on the selected repo.
105+
## Repository Menu
106+
- The **Repository** menu has three sections: **File view, Git difference and Git operations**, which will be displayed based on the selected repo.
97107

98108
### File View
99109
- File view shows the New/Untracked/Modified/Deleted files.
100-
![Picture6](https://user-images.githubusercontent.com/65342122/87232644-29d1e900-c3de-11ea-9adc-03fb4e690882.png)
110+
![file-view](https://user-images.githubusercontent.com/65342122/87232644-29d1e900-c3de-11ea-9adc-03fb4e690882.png)
101111

102112
### Git Operations
103-
- Git operations module consists of three basic git operations( Stage all changes, commit changes, push to remote ). Below this file status is display and the files can be staged with add action or click on "stage all changes" to stage all the files from the chosen repo.
104-
![Picture7](https://user-images.githubusercontent.com/65342122/87232645-30f8f700-c3de-11ea-8ddb-52f4d5ec7140.png)
113+
- Git operations module lets you handle three basic git operations (**Stage all changes, commit changes, push to remote**). Below this option, the files will be displayed and the files can be staged individually using the "Add" button or as a whole using the "stage all changes".
114+
![git-operations](https://user-images.githubusercontent.com/65342122/87232645-30f8f700-c3de-11ea-8ddb-52f4d5ec7140.png)
105115

106116
- The staged files can be removed individually or it can be removed all at once.
107-
![Picture8](https://user-images.githubusercontent.com/65342122/87232658-51c14c80-c3de-11ea-95e1-b9bbeeac82bb.png)
117+
![staged-files](https://user-images.githubusercontent.com/65342122/87232658-51c14c80-c3de-11ea-95e1-b9bbeeac82bb.png)
108118

109-
- The staged changes can be comitted using the **Commit changes** option. This will display a pop-up with all the staged files and it requires a commit message to successfully commit the changes.THe commit messages can either be a single line message or a multi-line message
110-
![Picture9](https://user-images.githubusercontent.com/65342122/87232659-56860080-c3de-11ea-9bc4-a19ad727b101.png)
119+
- The staged changes can be committed using the **Commit changes** option. This will display a pop-up with all the staged files and it requires a commit message to successfully commit the changes. The commit messages can either be a single line message or a multi-line message
120+
![commit-changes](https://user-images.githubusercontent.com/65342122/87232659-56860080-c3de-11ea-9bc4-a19ad727b101.png)
111121

112122
- **Push to remote** option pushes all commits to the selected remote host. The pop-up displayed will display the commits which are in queue to be pushed to the remote repository
113-
![Picture11](https://user-images.githubusercontent.com/65342122/87232662-61409580-c3de-11ea-8ad7-61c3871f0a4d.png)
123+
![push-operation-with-remote](https://user-images.githubusercontent.com/65342122/87232662-61409580-c3de-11ea-8ad7-61c3871f0a4d.png)
114124

115125
This section will let you know if the selected remote is not valid or if the push operation fails
116-
![Picture12](https://user-images.githubusercontent.com/65342122/87232666-6867a380-c3de-11ea-9903-5ea12200e994.png)
126+
![push-opeartion-without-remote](https://user-images.githubusercontent.com/65342122/87232666-6867a380-c3de-11ea-9903-5ea12200e994.png)
117127

118128
### Git Difference
119129

120-
In "Git Difference" click on the modified file(s) to see the difference. The platform has syntax highlighting available for a limited set of [languages](LANGUAGES.md)
121-
![Picture21](https://user-images.githubusercontent.com/65342122/87243040-11021b80-c450-11ea-8775-d52dcc7f57e1.png)
130+
In "Git Difference" click on the modified file to see the difference. The platform has syntax highlighting available for a limited set of [languages](LANGUAGES.md)
131+
![git-difference](https://user-images.githubusercontent.com/65342122/87243040-11021b80-c450-11ea-8775-d52dcc7f57e1.png)
122132

123133
## Settings
124-
- Settings in the left pane has three sections( Server data file, saved repos, Active GitConvex port number ).
125-
![Picture19](https://user-images.githubusercontent.com/65342122/87243003-a4871c80-c44f-11ea-9d1a-8350bdfb0da8.png)
134+
- Settings in the left pane has three sections (Server data file, saved repos, Active GitConvex port number).
135+
![settings](https://user-images.githubusercontent.com/65342122/87243003-a4871c80-c44f-11ea-9d1a-8350bdfb0da8.png)
126136

127137
- Server data file stores repo details such as the repo path, timestamp and the unique ID assigned to each repo. The data file must be an accessible JSON file with read / write permissions set to it. Also make sure you enter the full path for the file. E.g: /opt/my_data/data-file.json
128138
- In the saved repos section, added repo(s) can be deleted permanently from GitConvex.
129139

130-
>Note that, this will only remove the repo from gitconvex records andit will not perform an actual folder delete operation
140+
>Note that, this will only remove the repo from GitConvex records and it will not perform an actual folder delete operation
131141
132142
- The port number can be updated to an available alternate port. Make sure that the port is not in use. The app needs to be restarted for the port change to take effect.
133143

134-
## Help
144+
## Help and Support
135145

136146
- 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.
137-
![Picture20](https://user-images.githubusercontent.com/65342122/87242999-8f11f280-c44f-11ea-9a81-f6cde7b4b419.png)
147+
![help-and-support](https://user-images.githubusercontent.com/65342122/87242999-8f11f280-c44f-11ea-9a81-f6cde7b4b419.png)

0 commit comments

Comments
 (0)