Merge pull request #24 from Commandos-app/develop

Release 0.7.5

CHANGELOG.md

@@ -0,0 +1,28 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+### 0.7.5 (2021-08-26)
+
+
+### Features
+
+* added loading more history entries ([91d8c46](https://github.com/Commandos-app/Commandos/commit/91d8c46b24a8666969765112d68a11060281d4d1)), closes [#16](https://github.com/Commandos-app/Commandos/issues/16)
+* collapsible tree view ([a2f4ee7](https://github.com/Commandos-app/Commandos/commit/a2f4ee73b7175cf6587124c7c64058fd888ca39b))
+
+
+### Bug Fixes
+
+* angular size ([27fe850](https://github.com/Commandos-app/Commandos/commit/27fe850b0731e7be9f5f3971a1d06f72f246fc4e))
+* button remains disabled ([f6c22ba](https://github.com/Commandos-app/Commandos/commit/f6c22ba29ce6a090b363fef72b02fa0acebe1129)), closes [#19](https://github.com/Commandos-app/Commandos/issues/19)
+* check fields for null ([2ceb87d](https://github.com/Commandos-app/Commandos/commit/2ceb87d7e382005d3938edac6315996d2d16acc9))
+* cursor ([39d2444](https://github.com/Commandos-app/Commandos/commit/39d2444b0078df6c3ed3f462f224a0c32ad7a40b))
+* loadingStates for buttons ([ef20fd6](https://github.com/Commandos-app/Commandos/commit/ef20fd618708e706e7c2f8357c52cfa88b5dbcb3))
+* order ([7a7d6b1](https://github.com/Commandos-app/Commandos/commit/7a7d6b1bdb28e861ee23eb6b95ad67c235748480))
+* publios,ymal ([ec12954](https://github.com/Commandos-app/Commandos/commit/ec12954a876a4523297831a415c5ca16cef689bf))
+* refresh ahead/behind indicator ([943cd8c](https://github.com/Commandos-app/Commandos/commit/943cd8c865809e2ac6b3068eef663088712e1c95)), closes [#9](https://github.com/Commandos-app/Commandos/issues/9)
+* reload Ahead/Behind when pushing ([89bd12b](https://github.com/Commandos-app/Commandos/commit/89bd12bf1de1eab42c9adc9d9b62ec9bdd642af0)), closes [#9](https://github.com/Commandos-app/Commandos/issues/9)
+* startup heck of file ([0d7d6c1](https://github.com/Commandos-app/Commandos/commit/0d7d6c14943520ea9503c7a7b82c12a1930de763))
+* swap back to tauri commands ([ae278f7](https://github.com/Commandos-app/Commandos/commit/ae278f72b1e53fb549d66fdfd9753f7a98005d49))
+* typo ([5aa8143](https://github.com/Commandos-app/Commandos/commit/5aa8143ec057c733012f022a5e213e5daf811648))
+* workflow, wrong attributes ([57bbb9b](https://github.com/Commandos-app/Commandos/commit/57bbb9b23967f2b0acc69cb6dfe8db57f327d7fc))

CODE_OF_CONDUCT.md

@@ -1,3 +1,4 @@
+
 # Contributor Covenant Code of Conduct
 
 ## Our Pledge
@@ -6,12 +7,14 @@ We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
 size, visible or invisible disability, ethnicity, sex characteristics, gender
 identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
+nationality, personal appearance, race, caste, color, religion, or sexual identity
 and orientation.
 
 We pledge to act and interact in ways that contribute to an open, welcoming,
 diverse, inclusive, and healthy community.
 
+
+
 ## Our Standards
 
 Examples of behavior that contributes to a positive environment for our
@@ -36,6 +39,8 @@ Examples of unacceptable behavior include:
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
+
+
 ## Enforcement Responsibilities
 
 Community leaders are responsible for clarifying and enforcing our standards of
@@ -48,6 +53,8 @@ comments, commits, code, wiki edits, issues, and other contributions that are
 not aligned to this Code of Conduct, and will communicate reasons for moderation
 decisions when appropriate.
 
+
+
 ## Scope
 
 This Code of Conduct applies within all community spaces, and also applies when
@@ -56,16 +63,19 @@ Examples of representing our community include using an official e-mail address,
 posting via an official social media account, or acting as an appointed
 representative at an online or offline event.
 
+
+
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-.
+reported to the community leaders responsible for enforcement.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the
 reporter of any incident.
 
+
+
 ## Enforcement Guidelines
 
 Community leaders will follow these Community Impact Guidelines in determining
@@ -112,17 +122,23 @@ individual, or aggression toward or disparagement of classes of individuals.
 **Consequence**: A permanent ban from any sort of public interaction within
 the community.
 
+
+
 ## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
 
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
 For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
+at [https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

CONTRIBUTING.md

@@ -0,0 +1,55 @@
+# Contributing
+
+When contributing to this repository, please first discuss the change you wish to make via issue,
+email, or any other method with the owners of this repository before making a change. 
+
+Please note we have a [code of conduct](CODE_OFCONDUCT.md), please follow it in all your interactions with the project.
+
+
+
+## Commit guidelines
+We use [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) to ensure that our commits are in a consistent format.
+
+The commit message should be structured as follows:
+
+---
+
+```
+<type>[optional scope]: <description>
+
+[optional body]
+
+[optional footer(s)]
+```
+---
+
+
+The commit contains the following structural elements, to communicate intent to the
+consumers of your library:
+
+1. **fix:** a commit of the _type_ `fix` patches a bug in your codebase (this correlates with [`PATCH`](http://semver.org/#summary) in Semantic Versioning).
+1. **feat:** a commit of the _type_ `feat` introduces a new feature to the codebase (this correlates with [`MINOR`](http://semver.org/#summary) in Semantic Versioning).
+1. **BREAKING CHANGE:** a commit that has a footer `BREAKING CHANGE:`, or appends a `!` after the type/scope, introduces a breaking API change (correlating with [`MAJOR`](http://semver.org/#summary) in Semantic Versioning).
+A BREAKING CHANGE can be part of commits of any _type_.
+1. _types_ other than `fix:` and `feat:` are allowed, for example [@commitlint/config-conventional](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional) (based on the [the Angular convention](https://github.com/angular/angular/blob/22b96b9/CONTRIBUTING.md#-commit-message-guidelines)) recommends `build:`, `chore:`,
+  `ci:`, `docs:`, `style:`, `refactor:`, `perf:`, `test:`, and others.
+1. _footers_ other than `BREAKING CHANGE: <description>` may be provided and follow a convention similar to
+  [git trailer format](https://git-scm.com/docs/git-interpret-trailers).
+
+Additional types are not mandated by the Conventional Commits specification, and have no implicit effect in Semantic Versioning (unless they include a BREAKING CHANGE).
+
+A scope may be provided to a commit's type, to provide additional contextual information and is contained within parenthesis, e.g., `feat(parser): add ability to parse arrays`.
+
+
+
+
+## Pull Request Process
+
+1. Ensure any install or build dependencies are removed before the end of the layer when doing a 
+   build.
+2. Update the README.md with details of changes to the interface, this includes new environment 
+   variables, exposed ports, useful file locations and container parameters.
+3. Increase the version numbers in any examples files and the README.md to the new version that this
+   Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
+4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you 
+   do not have permission to do that, you may request the second reviewer to merge it for you.

README.md

@@ -1,10 +1,48 @@
 # Commandos
-Commandos is a new GIT client with a lot of nice features.   
-One of the main features is to execute a git command in multiple repositories.
+Commandos is a GIT Client specialty for multi repositories. But works fine too with just one repository.
+It can execute a command on multiple repositories like creating a branch, merge a branch, or other commands.
 
-  
+Commandos is currently only available on Windows, we plan to add macOS and Linux support when we release version 1.0.
 
-Commandos is currently in __Alpha__ version!
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
+[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-blue.svg)](https://conventionalcommits.org)
 
 
-> more comming soon
+## Table of Contents
+
+- [Installation](#installation)
+- [Contributing](#contributing)
+- [Support + Feedback](#support--feedback)
+- [License](#license)
+
+
+## Installation
+
+Use the prebuild binaries, or if you like to build it yourself:
+Follow the instruction to install rust: https://tauri.studio/en/docs/getting-started/intro
+
+After this, you can install all dependencies:
+```bash
+npm install
+```
+To run the app, run these commands:
+```bash
+npm run tauri dev
+npm ng serve
+```
+
+## Contributing
+
+We appreciate feedback and contribution to this repo! Before you get started, please see the following:
+
+- [Contribution guide](CONTRIBUTING.md)
+
+
+## Support + Feedback
+
+Use Github issues to report bugs, or to ask questions.
+
+
+## License
+
+Link to [MIT LICENSE](LICENSE) doc.

angular.json

@@ -2,7 +2,7 @@
     "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
     "version": 1,
     "cli": {
-        "packageManager": "pnpm"
+        "packageManager": "yarn"
     },
     "newProjectRoot": "projects",
     "projects": {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "commandos",
-    "version": "0.7.3",
+    "version": "0.7.5",
     "description": "Commandos is a multi git repo client",
     "scripts": {
         "preinstall": "npx only-allow yarn",
@@ -16,28 +16,29 @@
         "build:prod:sme": "ng build --configuration production --sourceMap=true",
         "build:release": "yarn run build:prod && yarn tauri build",
         "build:release:debug": "yarn run build:prod && yarn tauri build --debug",
-        "postinstall": "patch-package"
+        "postinstall": "patch-package",
+        "release": "standard-version"
     },
     "private": true,
     "dependencies": {
-        "@angular/animations": "^12.1.0",
-        "@angular/cdk": "^12.1.0",
-        "@angular/common": "~12.1.0",
-        "@angular/compiler": "~12.1.0",
-        "@angular/core": "~12.1.0",
-        "@angular/forms": "~12.1.0",
-        "@angular/platform-browser": "~12.1.0",
-        "@angular/platform-browser-dynamic": "~12.1.0",
-        "@angular/router": "~12.1.0",
-        "@cds/angular": "^5.4.1",
+        "@angular/animations": "^12.2.3",
+        "@angular/cdk": "^12.2.2",
+        "@angular/common": "~12.2.3",
+        "@angular/compiler": "~12.2.3",
+        "@angular/core": "~12.2.3",
+        "@angular/forms": "~12.2.3",
+        "@angular/platform-browser": "~12.2.3",
+        "@angular/platform-browser-dynamic": "~12.2.3",
+        "@angular/router": "~12.2.3",
+        "@cds/angular": "^5.5.2",
         "@cds/city": "^1.1.0",
-        "@cds/core": "^5.4.1",
+        "@cds/core": "^5.5.2",
         "@josee9988/filter-pipe-ngx": "^1.1.0",
         "@ng-select/ng-select": "^7.2.0",
         "@ngneat/until-destroy": "^8.0.4",
         "@ngx-translate/core": "^13.0.0",
         "@ngx-translate/http-loader": "^6.0.0",
-        "@tauri-apps/api": "^1.0.0-beta.8",
+        "@tauri-apps/api": "^1.0.0-beta.6",
         "angular-split": "^5.0.0",
         "dayjs": "^1.10.4",
         "diff2html": "^3.4.0",
@@ -54,10 +55,10 @@
         "zone.js": "~0.11.4"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "~12.1.0",
-        "@angular/cli": "~12.1.0",
-        "@angular/compiler-cli": "~12.1.0",
-        "@tauri-apps/cli": "^1.0.0-beta.10",
+        "@angular-devkit/build-angular": "~12.2.2",
+        "@angular/cli": "~12.2.2",
+        "@angular/compiler-cli": "~12.2.3",
+        "@tauri-apps/cli": "^1.0.0-beta.9",
         "@types/hogan.js": "^3.0.0",
         "@types/jasmine": "~3.6.0",
         "@types/node": "^12.11.1",
@@ -70,6 +71,7 @@
         "karma-jasmine": "~4.0.0",
         "karma-jasmine-html-reporter": "^1.5.0",
         "protractor": "~7.0.0",
+        "standard-version": "^9.3.1",
         "ts-node": "~8.3.0",
         "tslint": "~6.1.0",
         "typescript": "~4.2.4"

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "0.7.3"
+version = "0.7.5"
 description = "Commandos is a multi git repo client"
 authors = [ "Dominik Schenk" ]
 license = ""

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
     "package": {
         "productName": "Commandos",
-        "version": "0.7.3"
+        "version": "0.7.5"
     },
     "build": {
         "distDir": "../dist/commandos",

src/app/git/commands/log.ts

@@ -1,14 +1,15 @@
 import { logFormaterObject } from "../model";
 import { GitResult, runGit } from "./base";
 
-export async function getLogMeta(repository: string, branch = 'HEAD', limit = 100): Promise<GitResult> {
+export async function getLogMeta(repository: string, branch = 'HEAD', limit = 100, skip: number = 0): Promise<GitResult> {
 
     const format = Object.values(logFormaterObject).join('%x00');
 
     const args = [
         'log',
         branch,
         '--date=iso-local',
+        `--skip=${skip}`,
         `--max-count=${limit}`,
         '-z',
         `--format=${format}`,

src/app/git/parsers/log.ts

@@ -3,9 +3,7 @@ import { logFormaterObject, LogItem } from "../model";
 
 export function parseLog<T extends Record<string, string>>(stdout: string): Array<LogItem> {
 
-
     if (stdout) {
-
         const keys: Array<keyof T> = Object.keys(logFormaterObject);
         const records = stdout.split('\0');
         const entries: Array<LogItem> = [];
@@ -17,10 +15,9 @@ export function parseLog<T extends Record<string, string>>(stdout: string): Arra
         }
 
         return entries;
-
     }
     else {
-        throw new Error(`Failed to parse log`);
+        return [];
     }
 }
 

src/app/routes/repository/repository-commit/repository-commit.component.html

@@ -3,7 +3,7 @@
     <commander-split-layout>
         <div class="commander-commit-area" sidebar>
             <div class="commander-commit-message-box" cds-layout="m-b:sm">
-                <form #form="ngForm">
+                <form #myForm="ngForm">
                     <cds-form-group layout="vertical">
                         <cds-textarea cds-layout="vertical p-l:xs p-r:xs">
                             <label></label>
@@ -18,8 +18,8 @@
                             Commit
                         </cds-button>
                         <cds-icon-button (click)="load()" size="sm" action="flat" cds-layout="m-r:sm"
-                            aria-label="refresh">
-                            <cds-icon shape="refresh" size="14" [class.spin]="isLoading"></cds-icon>
+                            aria-label="refresh" [loadingState]="isLoading">
+                            <cds-icon shape="refresh" size="14"></cds-icon>
                         </cds-icon-button>
                     </div>
                 </form>