|
1 | | - |
2 | 1 | # Introduction |
3 | | - |
4 | | - |
5 | 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. |
6 | 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?) |
7 | 4 | ## Requirements |
8 | | -1. Node JS (Version 12.0+) |
9 | | - |
10 | | -2. Git (Version 2.20+) |
11 | | - |
12 | | - |
13 | | - |
| 5 | +1. [Node JS](https://nodejs.org/en/) (Version 12.0+) |
| 6 | +2. [Git](https://git-scm.com/) (Version 2.20+) |
14 | 7 | ## Download Options |
15 | | - |
16 | | - |
17 | 8 | - **Option-1:** Directly clone the repo from github |
18 | | - |
19 | 9 | `git clone https://github.com/neel1996/gitconvex-package` |
20 | 10 |
|
21 | | - |
22 | | - |
23 | 11 | - **Option-2** Downloading the zip file from the [releases](https://github.com/neel1996/gitconvex-package/releases). |
24 | 12 |
|
25 | | - |
26 | | - |
27 | | -- **Option-3** GitConvex is also available on `npm`. Install the package globally to run it directly from the command line, |
28 | | - |
29 | | - |
30 | | - |
| 13 | +- **Option-3** GitConvex is also available on `npm`. Install the package globally to run it directly from the command line |
31 | 14 | `npm i -g @itassistors/gitconvex` |
32 | 15 |
|
33 | | - |
34 | | - |
35 | 16 | This will install **gitconvex** as a global module and it can be started straight away from the command line with `gitconvex` command |
36 | | - |
37 | | - |
38 | | - |
39 | 17 | ``` |
40 | | -
|
41 | 18 | $ gitconvex |
42 | | -
|
43 | 19 | |
44 | | -
|
45 | 20 | INFO: Checking for config file |
46 | | -
|
47 | 21 | INFO: Config file is present |
48 | | -
|
49 | 22 | INFO: Reading from config file /usr/lib/node_modules/@itassistors/gitconvex/env_config.json |
50 | | -
|
51 | 23 | GitConvex API connected! |
52 | | -
|
53 | 24 | |
54 | | -
|
55 | 25 | Checking data file availability... |
56 | | -
|
57 | 26 | 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! |
58 | | -
|
59 | | - |
60 | | -
|
61 | 27 | You can change this under the settings menu |
62 | | -
|
63 | | - |
64 | | -
|
65 | 28 | Gitconvex is running on port 9001 |
66 | | -
|
67 | | - |
68 | | -
|
69 | 29 | Open http://localhost:9001/ to access gitconvex |
70 | | -
|
71 | 30 | ``` |
72 | | - |
73 | | - |
74 | | - |
75 | | - |
76 | 31 | ## Setup |
77 | 32 |
|
78 | | -If either download **Option-1** or **Option-2** is followed, then the following steps need to be followed to setup GitConvex |
79 | | - |
80 | | - |
81 | | - |
| 33 | +If either download **Option-1** or **Option-2** is opted, then the following steps need to be followed to setup GitConvex |
82 | 34 | 1. For installing all dependencies, |
83 | | - |
84 | 35 | `` $npm install `` |
85 | 36 |
|
86 | | - |
87 | | - |
88 | | -2. To start a server, either use normal node command |
89 | | - |
| 37 | +2. To start the server, either use normal node command |
90 | 38 | `` $node server.js `` |
91 | | - |
92 | | - |
93 | | - |
94 | 39 | or use `pm2` by downloading it from npm - `npm i -g pm2` and start the module by executing the following command, |
95 | | - |
96 | 40 | `pm2 start ecosystem.config.js` |
97 | 41 |
|
98 | | - |
99 | | - |
100 | 42 | ## Features available |
101 | | - |
102 | 43 | - Visualizing basic repo stats such as active branch, active remotes, number of files tracked etc |
103 | | - |
104 | 44 | - Tracking modified files |
105 | | - |
106 | 45 | - Creating new branches (provided there are no diverging changes) |
107 | | - |
108 | 46 | - Initializing git inside a new repo and adding it to the platform tracker on the go |
109 | | - |
110 | 47 | - File difference tracker with syntax highlighting for the [supported languages](language). |
111 | | - |
112 | 48 | - Commit log viewer |
113 | | - |
114 | 49 | - Basic git operations such as staging, un-staging, committing and pushing to remote repo. |
115 | 50 |
|
116 | | - |
117 | | - |
118 | 51 | ## How to use |
119 | 52 |
|
120 | | - |
121 | | - |
122 | 53 | ### Left Pane Menu |
123 | 54 |
|
124 | | - |
125 | | - |
126 | 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) |
127 | | - |
128 | | -- **Settings** - To check and edit internal data file, to remove a repo from gitconvex and to update the active port |
129 | | - |
130 | | -- **Help** - Includes documentation link and various options to report an issue or to submit feedback |
131 | | - |
132 | | - |
| 56 | +- **Settings** - To check and edit internal data file, to remove a repo from gitconvex and to update the active port. |
| 57 | +- **Help** - Includes documentation link and various options to report an issue or to submit feedback. |
133 | 58 |
|
134 | 59 | ### Adding a new repo |
135 | | - |
136 | 60 | - Use "+" at the bottom right corner to add a repo. |
137 | | - |
138 | 61 |  |
139 | 62 |
|
140 | | -<br> |
141 | | - |
142 | 63 | - 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. |
143 | | - |
144 | 64 |  |
145 | 65 |
|
146 | | - |
147 | | - |
148 | 66 | - The newly added repo will be displayed as a card in the dashboard |
149 | | - |
150 | | - |
| 67 | + |
151 | 68 |
|
152 | 69 | ### Repo Details |
153 | | - |
154 | 70 | - Click on the repo card to get the following details about the repo |
155 | | - |
156 | 71 | ``` |
157 | | -
|
158 | 72 | - The list of branches |
159 | | -
|
160 | 73 | - Commit logs |
161 | | -
|
162 | 74 | - Latest commit |
163 | | -
|
164 | 75 | - Active branch and available local branches |
165 | | -
|
166 | 76 | - Remote repo URL and host |
167 | | -
|
168 | 77 | - Files and folders tracked by git |
169 | | -
|
170 | 78 | ``` |
171 | | - |
172 | 79 | The repo detail view also provides features for performing the following git operations, |
173 | | - |
174 | 80 | ``` |
175 | | -
|
176 | 81 | - Adding a new branch |
177 | | -
|
178 | 82 | - Pulling changes from remote |
179 | | -
|
180 | 83 | - Fetching changes from remote |
181 | | -
|
182 | 84 | - Adding a new remote repo |
183 | | -
|
184 | 85 | ``` |
185 | | - |
186 | | - |
187 | | - |
188 | 86 |  |
189 | 87 |
|
190 | 88 |  |
191 | 89 |
|
192 | | - |
193 | | - |
194 | 90 | #### Add new branch |
195 | | - |
196 | | - |
197 | | - |
198 | 91 |  |
199 | 92 |
|
200 | 93 | Note: In a newly initialized git repo, the newly added branch will be considered by git only after a initial commit |
201 | 94 |
|
202 | | - |
203 | | - |
204 | | -- Next, left pane consists of repositories, settings and help. In "repositories" choose a saved repo. This module has three sections : File view, Git difference and Git operation. The header portion shows chosen repo name, active branch, number of tracked files and commits. |
205 | | - |
206 | | -- File view shows the new/Untracked/Modified/deleted files. |
| 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. |
207 | 97 |
|
| 98 | +### File View |
| 99 | +- File view shows the New/Untracked/Modified/Deleted files. |
208 | 100 |  |
209 | 101 |
|
210 | | -- 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 untracked files from the chosen repo. |
211 | | - |
212 | | - |
213 | | - |
| 102 | +### 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. |
214 | 104 |  |
215 | 105 |
|
216 | | -- After add operation all staged files can be removed immediately if you wish to, else ignore it. Reload the page to see the difference in "File View". |
217 | | - |
| 106 | +- The staged files can be removed individually or it can be removed all at once. |
218 | 107 |  |
219 | 108 |
|
220 | | -- All staged files can be committed using "Commit changes" module. After commit changes reload the page to see active branch name, number of tracked files and number of commits. |
221 | | - |
222 | | - |
223 | | - |
| 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 |
224 | 110 |  |
225 | 111 |
|
226 | | -- After **commit changes** operation, |
227 | | - |
228 | | - |
229 | | - |
230 | | - |
231 | | - |
232 | | - |
233 | | - |
234 | | -- "Push to remote" module pushes all commits to the remote host. If there is no remote in the chosen repo then ignore this module. After the push to remote is completed, check the remote host to see the pushed folder/file. |
235 | | - |
236 | | -with Remote(Git Hub) |
237 | | - |
| 112 | +- **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 |
238 | 113 |  |
239 | 114 |
|
240 | | -If you try to "push to remote" without having a remote host, "push failed" error message will be displayed. |
241 | | - |
242 | | - |
243 | | - |
| 115 | +This section will let you know if the selected remote is not valid or if the push operation fails |
244 | 116 |  |
245 | | - |
246 | 117 |
|
247 | | -In "Git Difference" click on the modified file(s) to see the difference. |
| 118 | +### Git Difference |
248 | 119 |
|
249 | | - |
250 | | - |
251 | | -- "Stage all changes" and "commit changes" for applying a change. |
252 | | - |
253 | | - |
| 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 | + |
254 | 122 |
|
| 123 | +## Settings |
255 | 124 | - Settings in the left pane has three sections( Server data file, saved repos, Active GitConvex port number ). |
| 125 | + |
256 | 126 |
|
257 | | - |
258 | | - |
259 | | - |
260 | | - |
261 | | - |
262 | | - |
263 | | -- Server data file stores repo details. The data file can be updated. 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 |
| 127 | +- 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 |
| 128 | +- In the saved repos section, added repo(s) can be deleted permanently from GitConvex. |
264 | 129 |
|
265 | | -- In the saved repos section, added repo(s) can be deleted permanently from GitConvex. |
| 130 | +>Note that, this will only remove the repo from gitconvex records andit will not perform an actual folder delete operation |
266 | 131 |
|
267 | | -- The port number can be updated but make sure to restart the app and to change the port in the URL after updating it. |
| 132 | +- 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. |
268 | 133 |
|
269 | | -- Visit help section if you're facing an issue or need any help. If you have any queries discuss it in "Discord" or report an issue in GitHub. |
| 134 | +## Help |
270 | 135 |
|
271 | | - |
| 136 | +- 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 | + |
0 commit comments