diff --git a/.gitignore b/.gitignore index 5964d03..ceb01d9 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ npm-debug.log testem.log /typings package-lock.json +/units # e2e /e2e/*.js diff --git a/.travis.yml b/.travis.yml index 7127315..56e5ad3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ install: - npm install - npm run electron:linux script: + - npm run test:unit:coverage - npm run test:e2e notifications: email: false diff --git a/README.md b/README.md index e1dd2fb..7d8120d 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ Cette application a été réalisée par des étudiants de Master 1 Génie de l' Pour cela, nous avons utilisé : - Angular v7.1.4 -- Electron v2.0.7 -- Electron Builder v20.28.1 +- Electron v4.0.0 +- Electron Builder v20.36.1 - Bootstrap 4 - le [kit de démarrage](https://github.com/maximegris/angular-electron) de maximegris @@ -28,6 +28,14 @@ Pour assurer le fonctionnement de cette application depuis n'importe quel OS, il Nous utiliserons aussi yarn. +Pour la gestion des mots de passes, il est nécessaire d'avoir installé le package `libsecret` sur Linux. +Selon la distribution, il faut lancer les commandes suivantes : + +- Debian/Ubuntu: `sudo apt-get install libsecret-1-dev` +- Red Hat-based: `sudo yum install libsecret-devel` +- Arch Linux: `sudo pacman -S libsecret` + + ### Installation de Node.js **Windows et macOS** @@ -83,6 +91,8 @@ Installer les dépendances |`node_modules/`| Dossier contenant les modules natifs et installés. | |`release/`| Dossier contenant la release après génération. | |`tests/`| Dossier contenant les fichiers de test. | +|`coverage/`| Dossier contenant le résultat de la couverture de code. | +|`units/units.html`| Fichier de rapport des tests unitaires. | |`src/styles.scss`| Feuille de style globale. | |`src/variables.scss`| Feuille des variables de style. | |`src/assets/`| Dossier contenant les fichiers de traduction. | @@ -106,11 +116,18 @@ Comme expliqué plus haut, nous avons utilisé le kit de démarrage. Le fichier |`yarn electron:linux`| Sous Linux, build l'application et crée un `.AppImage`. | |`yarn electron:windows`| Sous Windows, build l'application et crée un `.exe`, exécutable pour les systèmes en 32 et 64 bits. | |`yarn electron:mac`| Sous macOS, build l'application et crée un `.dmg` contenant le `.app`. | +|`yarn test:unit`| Lance les tests unitaires | +|`yarn test:unit:coverage`| Lance les tests unitaires et le couvrage de code | |`yarn test:e2e`| Lance les tests end-to-end (e2e) | ⚠️ Il faut supprimer le dossier release avant d'en regénérer un autre ⚠️ -## Lancer les tests +## Lancer les tests unitaires + +Il est nécessaire d'avoir installé chrome auparavant sur son ordinateur pour lancer les tests unitaires. +Une fois cette condition réalisée, il suffit de lancé `yarn test:unit`. Le rapport est alors disponible dans `units/units.html`. + +## Lancer les tests end-to-end Comme expliqué ci-dessus, la commande `yarn test:e2e` lance les tests end-to-end. Cependant, il est nécessaire de créer une release avant de lancer cette commande. diff --git a/angular.json b/angular.json index 2344834..5bf0e75 100644 --- a/angular.json +++ b/angular.json @@ -97,6 +97,13 @@ "polyfills": "src/polyfills-test.ts", "tsConfig": "src/tsconfig.spec.json", "karmaConfig": "src/karma.conf.js", + "codeCoverageExclude": [ + "src/app/providers/*", + "src/app/components/**", + "src/app/screens/toolbox/**", + "src/app/models/**", + "src/environments/**" + ], "scripts": [], "styles": [ "src/styles.scss" diff --git a/e2e/app.e2e-spec.ts b/e2e/app.e2e-spec.ts deleted file mode 100644 index a481968..0000000 --- a/e2e/app.e2e-spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { GitHarponPage } from './app.po'; -import { browser, element, by } from 'protractor'; - -describe('git-harpon App', () => { - let page: AngularElectronPage; - - beforeEach(() => { - page = new AngularElectronPage(); - }); - - it('should display message saying App works !', () => { - page.navigateTo('/'); - expect(element(by.css('app-home h1')).getText()).toMatch('App works !'); - }); -}); diff --git a/e2e/app.po.ts b/e2e/app.po.ts deleted file mode 100644 index a4151f3..0000000 --- a/e2e/app.po.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { browser, element, by } from 'protractor'; - -/* tslint:disable */ -export class GitHarponPage { - navigateTo(route: string) { - return browser.get(route); - } -} diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js deleted file mode 100644 index e46f106..0000000 --- a/e2e/protractor.conf.js +++ /dev/null @@ -1,37 +0,0 @@ -// Protractor configuration file, see link for more information -// https://github.com/angular/protractor/blob/master/lib/config.ts - -const { SpecReporter } = require('jasmine-spec-reporter'); - -exports.config = { - allScriptsTimeout: 25000, - delayBrowserTimeInSeconds: 0, - specs: [ - './**/*.e2e-spec.ts' - ], - capabilities: { - 'browserName': 'chrome', - chromeOptions: { - args: ["--no-sandbox", "--headless", "--disable-gpu"] - } - }, - chromeOnly: true, - directConnect: true, - baseUrl: 'http://localhost:4200/', - framework: 'jasmine2', - jasmineNodeOpts: { - showColors: true, - defaultTimeoutInterval: 30000, - print: function () { }, - realtimeFailure: true - }, - useAllAngular2AppRoots: true, - beforeLaunch: function () { - require('ts-node').register({ - project: 'e2e/tsconfig.e2e.json' - }); - }, - onPrepare() { - jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); - } -}; diff --git a/e2e/tsconfig.e2e.json b/e2e/tsconfig.e2e.json deleted file mode 100644 index ac7a373..0000000 --- a/e2e/tsconfig.e2e.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/e2e", - "module": "commonjs", - "target": "es5", - "types":[ - "jasmine", - "node" - ] - } -} diff --git a/package.json b/package.json index 5c6b926..f4c5e15 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,13 @@ { "name": "git-harpon", - "version": "1.0.0", + "version": "1.1.0", + "description": "Open-source GUI for git", + "author": { + "name": "GitHarpon", + "email": "githarpon@gmail.com", + "url": "https://github.com/GitHarpon" + }, + "license": "SEE LICENSE IN LICENSE.md", "keywords": [ "angular", "angular 7", @@ -28,9 +35,10 @@ "electron:linux": "npm run build:prod && npx electron-builder build --linux", "electron:windows": "npm run build:prod && npx electron-builder build --windows", "electron:mac": "npm run build:prod && npx electron-builder build --mac", - "test": "npm run postinstall:web && ng test", "e2e": "npm run postinstall:web && ng e2e", - "test:e2e": "mocha --timeout 15000 tests/test.js" + "test:unit": "npm run postinstall:web && ng test", + "test:unit:coverage": "npm run postinstall:web && ng test --watch=false --code-coverage", + "test:e2e": "mocha --timeout 15000 tests/*.js" }, "dependencies": { "@angular/animations": "^7.2.4", @@ -38,22 +46,28 @@ "@angular/material": "^7.3.1", "@angular/platform-server": "^7.1.4", "@ng-bootstrap/ng-bootstrap": "^4.0.2", + "angular-resizable-element": "^3.2.3", "bootstrap": "4.1.3", "chai": "^4.2.0", "chai-as-promised": "^7.1.1", + "git-url-parse": "^11.1.2", "jquery": "^3.3.1", + "karma-htmlfile-reporter": "^0.3.8", "mocha": "^5.2.0", "mocha-sinon": "^2.1.0", "monaco-editor": "^0.14.3", "ngx-clipboard": "^11.1.9", "ngx-contextmenu": "^5.1.1", "ngx-scrollbar": "^4.1.1", + "ngx-store": "^2.1.0", "ngx-toastr": "^9.1.1", "popper.js": "^1.14.7", "rxjs-compat": "^6.3.3", "rxjs-tslint": "^0.1.6", + "simple-git": "^1.107.0", "sinon": "^7.2.3", - "spectron": "^5.0.0" + "spectron": "^5.0.0", + "valid-url": "^1.0.9" }, "devDependencies": { "@angular-devkit/build-angular": "^0.11.4", @@ -76,7 +90,7 @@ "@types/node": "^10.12.18", "codelyzer": "^4.5.0", "core-js": "^2.6.1", - "electron": "^4.0.0", + "electron": "4.0.0", "electron-builder": "20.36.1", "electron-reload": "1.3.0", "jasmine-core": "^3.3.0", @@ -97,5 +111,9 @@ "wait-on": "2.1.0", "webdriver-manager": "12.0.6", "zone.js": "^0.8.26" + }, + "browser": { + "fs": false, + "child_process": false } } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 4bae517..c5a27d6 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,8 +1,9 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { ToolboxComponent } from './components/toolbox/toolbox.component'; -import { HomeComponent } from './components/home/home.component'; +import { ToolboxComponent } from './screens/toolbox/toolbox.component'; +import { HomeComponent } from './screens/home/home.component'; +import { PreferencesComponent } from './screens/preferences/preferences.component'; const ROUTES: Routes = [ { @@ -17,6 +18,10 @@ const ROUTES: Routes = [ { path: 'toolbox', component: ToolboxComponent + }, + { + path: 'preferences', + component: PreferencesComponent } ]; diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts deleted file mode 100644 index e8f25b5..0000000 --- a/src/app/app.component.spec.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { TestBed, async } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; -import { AppComponent } from './app.component'; -import { TranslateModule } from '@ngx-translate/core'; -import { ElectronService } from './providers/electron.service'; - -describe('AppComponent', () => { - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ - AppComponent - ], - providers: [ - ElectronService - ], - imports: [ - RouterTestingModule, - TranslateModule.forRoot() - ] - }).compileComponents(); - })); - - it('should create the app', async(() => { - const fixture = TestBed.createComponent(AppComponent); - const app = fixture.debugElement.componentInstance; - expect(app).toBeTruthy(); - })); -}); - -class TranslateServiceStub { - setDefaultLang(lang: string): void { - } -} diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 780e174..c0c858c 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -13,15 +13,11 @@ export class AppComponent { private translate: TranslateService) { this.translate.addLangs(['fr', 'en']); - this.translate.setDefaultLang(this.translate.getLangs()[0]); - console.log('AppConfig', AppConfig); - if (electronService.isElectron()) { - console.log('Mode electron'); - console.log('Electron ipcRenderer', electronService.ipcRenderer); - console.log('NodeJS childProcess', electronService.childProcess); + if (localStorage.getItem('lang') === null || localStorage.getItem('lang') === 'fr') { + this.translate.setDefaultLang('fr'); } else { - console.log('Mode web'); + this.translate.setDefaultLang('en'); } } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 926dda2..df1cf07 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -10,16 +10,20 @@ import { HttpClientModule, HttpClient } from '@angular/common/http'; import { AppRoutingModule } from './app-routing.module'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { NgScrollbarModule } from 'ngx-scrollbar'; -import {MatTabsModule, MatIconModule } from '@angular/material'; +import { MatTabsModule, MatIconModule, MatExpansionModule, MatSortModule, MatFormFieldModule } from '@angular/material'; import { ContextMenuModule } from 'ngx-contextmenu'; import { ClipboardModule } from 'ngx-clipboard'; - +import { ResizableModule } from 'angular-resizable-element'; // NG Translate import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; import { ElectronService } from './providers/electron.service'; +import { GitService } from './providers/git.service'; +import { LanguagePreferencesService } from './providers/language-preferences.service'; +import { TerminalManagerService } from './providers/terminal-manager.service'; +import { ThemePreferencesService } from './providers/theme-preferences.service'; import { WebviewDirective } from './directives/webview.directive'; @@ -27,12 +31,13 @@ import { AppComponent } from './app.component'; import { MonacoEditorWrapperComponent } from './components/monaco-wrapper/monaco-editor-wrapper.component'; import { CommonModule } from '@angular/common'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { WebStorageModule } from 'ngx-store'; import { ToastrModule } from 'ngx-toastr'; import { EditorPreferencesService } from './providers/editor-preferences.service'; import { FooterComponent } from './components/footer/footer.component'; -import { HomeComponent } from './components/home/home.component'; -import { ToolboxComponent } from './components/toolbox/toolbox.component'; +import { HomeComponent } from './screens/home/home.component'; +import { ToolboxComponent } from './screens/toolbox/toolbox.component'; import { ContainerComponent } from './components/container/container.component'; import { CheckboxComponent } from './components/checkbox/checkbox.component'; import { ButtonComponent } from './components/button/button.component'; @@ -43,6 +48,9 @@ import { LoaderComponent } from './components/loader/loader.component'; import { ModalComponent } from './components/modal/modal.component'; import { InputNumberComponent } from './components/input-number/input-number.component'; import { CopyButtonComponent } from './components/copy-button/copy-button.component'; +import { PreferencesComponent } from './screens/preferences/preferences.component'; +import { AccordionComponent } from './components/accordion/accordion.component'; +import { InfoBarComponent } from './components/info-bar/info-bar.component'; // AoT requires an exported function for factories @@ -67,12 +75,18 @@ export function HttpLoaderFactory(http: HttpClient) { LoaderComponent, ModalComponent, InputNumberComponent, - CopyButtonComponent + CopyButtonComponent, + PreferencesComponent, + AccordionComponent, + InfoBarComponent ], imports: [ ReactiveFormsModule, MatIconModule, MatTabsModule, + MatSortModule, + MatExpansionModule, + MatFormFieldModule, NgScrollbarModule, NgbModule, ClipboardModule, @@ -81,6 +95,8 @@ export function HttpLoaderFactory(http: HttpClient) { FormsModule, HttpClientModule, AppRoutingModule, + ResizableModule, + WebStorageModule, TranslateModule.forRoot({ loader: { provide: TranslateLoader, @@ -94,7 +110,14 @@ export function HttpLoaderFactory(http: HttpClient) { useBootstrap4: true }) ], - providers: [ElectronService, EditorPreferencesService], + providers: [ + ElectronService, + GitService, + EditorPreferencesService, + LanguagePreferencesService, + ThemePreferencesService, + TerminalManagerService + ], bootstrap: [AppComponent] }) export class AppModule { } diff --git a/src/app/components/accordion/accordion.component.html b/src/app/components/accordion/accordion.component.html new file mode 100644 index 0000000..cbf6f35 --- /dev/null +++ b/src/app/components/accordion/accordion.component.html @@ -0,0 +1,12 @@ + + + + {{ title }} + + +
    +
  • branche test
    • +
+ + + \ No newline at end of file diff --git a/src/app/components/accordion/accordion.component.scss b/src/app/components/accordion/accordion.component.scss new file mode 100644 index 0000000..039cd2b --- /dev/null +++ b/src/app/components/accordion/accordion.component.scss @@ -0,0 +1,95 @@ +@import '../../../variables.scss'; + +.gh-accordion { + & i { + float: left; + padding: 5px; + font-size: 12px; + } + + & /deep/ .card { + @include wX(340px); + margin-bottom: 76px; + border: 0; + } + + & /deep/ .card-block { + @include wX(340px); + } + + & /deep/ .card-header { + @include wX(340px); + padding: 0; + border-radius: 0 !important; + } + + & /deep/ .card-body { + @include wX(340px); + font-size: 12px; + } + + & /deep/ .btn-link { + font-size: 12px; + @include wX(100%); + text-decoration: none; + text-align: left; + + &:hover, &:focus { + text-decoration: none; + } + } + +} + +.gh-accordion.dark { + & /deep/ .card { + border: 1px solid $light-grey; + background: $light-grey; + } + + & /deep/ .card-header { + background: $light-grey; + border: 1px solid $dark-grey; + + & .icon-dark { + color: $muted-white; + } + } + + & /deep/ .card-body { + background: $dark-grey; + color: $white; + border: 1px solid $dark-grey; + } + + & /deep/ .btn-link { + color: $white; + &:hover, &:focus { + color: $white; + } + } +} + + +.gh-accordion.light { + & /deep/ .card-header { + background: $dark-grey-light; + border: 1px solid $border-dark-grey-light; + & .icon-light { + color: rgb(141, 141, 141); + } + } + + & /deep/ .card-body { + background: $light-grey-light; + color: $dark; + border: 1px solid $border-dark-grey-light; + } + + & /deep/ .btn-link { + color: $dark; + &:hover, &:focus { + color: $dark; + } + } +} \ No newline at end of file diff --git a/src/app/components/accordion/accordion.component.ts b/src/app/components/accordion/accordion.component.ts new file mode 100644 index 0000000..0426842 --- /dev/null +++ b/src/app/components/accordion/accordion.component.ts @@ -0,0 +1,33 @@ +import { Component, OnInit, Input } from '@angular/core'; +import { Subscription } from 'rxjs'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; + +@Component({ + selector: 'app-accordion', + templateUrl: './accordion.component.html', + styleUrls: ['./accordion.component.scss'] +}) +export class AccordionComponent implements OnInit { + + @Input() title: String; + @Input() disabled: Boolean = false; + @Input() icon: { + name: String, + isFab: Boolean + }; + themePrefSubscription: Subscription; + currentTheme: string; + + constructor(private themePrefService: ThemePreferencesService) { + this.themePrefSubscription = this.themePrefService.themePreferenceSubject.subscribe( + (newTheme: string) => { + this.currentTheme = newTheme; + } + ); + this.themePrefService.emitThemePreferencesSubject(); + } + + ngOnInit() { + } + +} diff --git a/src/app/components/button/button.component.html b/src/app/components/button/button.component.html index cd6ddc7..09dbe46 100644 --- a/src/app/components/button/button.component.html +++ b/src/app/components/button/button.component.html @@ -1,2 +1,2 @@ \ No newline at end of file + [ngClass]="[type + '-' + currentTheme, (disabled ? 'disabled' : ''), (large ? 'large' : '')]" /> \ No newline at end of file diff --git a/src/app/components/button/button.component.scss b/src/app/components/button/button.component.scss index 890072b..73bfa9e 100644 --- a/src/app/components/button/button.component.scss +++ b/src/app/components/button/button.component.scss @@ -3,12 +3,11 @@ .gh-button { border-style: solid; border-radius: 2px; - color: $white; outline: none; - - &.primary { + &.primary-dark { @include bg-color($dark-blue); border-color: $light-blue; + color: $white; cursor: pointer; &:hover { @@ -27,10 +26,33 @@ } } - &.success { + &.primary-light { + @include bg-color($light-blue-light); + border-color: $dark-blue-light; + cursor: pointer; + color: $dark; + + &:hover { + @include bg-color($dark-blue-light); + } + + &.disabled { + @include bg-color($disabled-blue-light); + border-color: $dark-blue-light; + color: $dark; + + &:hover { + cursor: not-allowed; + color: $white; + } + } + } + + &.success-dark { @include bg-color($dark-green); border-color: $light-green; cursor: pointer; + color: $white; &:hover { @include bg-color($light-green); @@ -49,10 +71,34 @@ } } - &.danger { + &.success-light { + @include bg-color($light-green-light); + border-color: $dark-green-light; + cursor: pointer; + color: $dark; + + &:hover { + @include bg-color($dark-green-light); + } + + &.disabled { + @include bg-color($disabled-green-light); + border-color: $dark-green-light; + color: $dark; + + + &:hover { + cursor: not-allowed; + color: $white; + } + } + } + + &.danger-dark { @include bg-color($dark-red); border-color: $light-red; cursor: pointer; + color: $white; &:hover { @include bg-color($light-red); @@ -69,6 +115,28 @@ } } } + + &.danger-light { + @include bg-color($light-red-light); + border-color: $dark-red-light; + cursor: pointer; + color: $dark; + + &:hover { + @include bg-color($dark-red-light); + } + + &.disabled { + @include bg-color($disabled-red-light); + border-color: $dark-red-light; + color: $dark; + + &:hover { + cursor: not-allowed; + color: $white; + } + } + } } .large { diff --git a/src/app/components/button/button.component.spec.ts b/src/app/components/button/button.component.spec.ts deleted file mode 100644 index 794fc67..0000000 --- a/src/app/components/button/button.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ButtonComponent } from './button.component'; - -describe('ButtonComponent', () => { - let component: ButtonComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ButtonComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ButtonComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/button/button.component.ts b/src/app/components/button/button.component.ts index a911cd3..e5ba507 100644 --- a/src/app/components/button/button.component.ts +++ b/src/app/components/button/button.component.ts @@ -1,5 +1,7 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; +import { Subscription } from 'rxjs'; @Component({ selector: 'app-button', @@ -14,8 +16,16 @@ export class ButtonComponent implements OnInit { @Input() large: Boolean = false; @Input() type: String = 'primary'; @Output() buttonClicked: EventEmitter = new EventEmitter(); + themePrefSubscription: Subscription; + currentTheme: string; - constructor(private translateService: TranslateService) { + constructor(private translateService: TranslateService, private themePrefService: ThemePreferencesService) { + this.themePrefSubscription = this.themePrefService.themePreferenceSubject.subscribe( + (newTheme: string) => { + this.currentTheme = newTheme; + } + ); + this.themePrefService.emitThemePreferencesSubject(); } ngOnInit() { diff --git a/src/app/components/checkbox/checkbox.component.spec.ts b/src/app/components/checkbox/checkbox.component.spec.ts deleted file mode 100644 index be613b0..0000000 --- a/src/app/components/checkbox/checkbox.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { CheckboxComponent } from './checkbox.component'; - -describe('CheckboxComponent', () => { - let component: CheckboxComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ CheckboxComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(CheckboxComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/checkbox/checkbox.component.ts b/src/app/components/checkbox/checkbox.component.ts index ffcb214..3247bf2 100644 --- a/src/app/components/checkbox/checkbox.component.ts +++ b/src/app/components/checkbox/checkbox.component.ts @@ -24,8 +24,7 @@ export class CheckboxComponent implements OnInit { this.valueChange.emit(this.currentValue); } - constructor(private electronService: ElectronService, - private toastr: ToastrService, private translateService: TranslateService) { } + constructor() { } ngOnInit() { } diff --git a/src/app/components/container/container.component.html b/src/app/components/container/container.component.html index f72a7f8..5863e19 100644 --- a/src/app/components/container/container.component.html +++ b/src/app/components/container/container.component.html @@ -1,3 +1,3 @@ -
+
\ No newline at end of file diff --git a/src/app/components/container/container.component.scss b/src/app/components/container/container.component.scss index 4e25cb3..cbd9fa0 100644 --- a/src/app/components/container/container.component.scss +++ b/src/app/components/container/container.component.scss @@ -15,12 +15,19 @@ @include wX-hX(100%, calc(100% - #{$footer-height})); overflow: auto; - &.white { + &.light { background-color: $white; + &.gh-border { + border: 1px solid $border-dark-grey-light; + } } &.dark-grey { background-color: $dark-grey; + &.gh-border { + border: 1px solid $dark; + } + } &.light-grey { @@ -35,10 +42,6 @@ background-color: $dark; } - &.dark-border { - border: 1px solid $dark; - } - &.loader-dark { background-color: $dark; opacity: 0.8; diff --git a/src/app/components/container/container.component.spec.ts b/src/app/components/container/container.component.spec.ts deleted file mode 100644 index f71eaab..0000000 --- a/src/app/components/container/container.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ContainerComponent } from './container.component'; - -describe('ContainerComponent', () => { - let component: ContainerComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ContainerComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ContainerComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/copy-button/copy-button.component.html b/src/app/components/copy-button/copy-button.component.html index 6aa4f38..5c836fb 100644 --- a/src/app/components/copy-button/copy-button.component.html +++ b/src/app/components/copy-button/copy-button.component.html @@ -1,8 +1,8 @@ -
-
+
+
-
+
diff --git a/src/app/components/copy-button/copy-button.component.scss b/src/app/components/copy-button/copy-button.component.scss index b27286e..1cdc9b1 100644 --- a/src/app/components/copy-button/copy-button.component.scss +++ b/src/app/components/copy-button/copy-button.component.scss @@ -18,7 +18,6 @@ font-size: $fs-medium; &__button { - background: $light-grey; width: 40px; height: 40px; border-radius: 50%; @@ -27,6 +26,13 @@ display: flex; align-items: center; justify-content: center; + &.dark { + background-color: $light-grey; + } + + &.light { + background-color: $button-bar-light; + } } &__copy { diff --git a/src/app/components/copy-button/copy-button.component.spec.ts b/src/app/components/copy-button/copy-button.component.spec.ts deleted file mode 100644 index 115d714..0000000 --- a/src/app/components/copy-button/copy-button.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { CopyButtonComponent } from './copy-button.component'; - -describe('CopyButtonComponent', () => { - let component: CopyButtonComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ CopyButtonComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(CopyButtonComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/copy-button/copy-button.component.ts b/src/app/components/copy-button/copy-button.component.ts index 4db0b74..14766a0 100644 --- a/src/app/components/copy-button/copy-button.component.ts +++ b/src/app/components/copy-button/copy-button.component.ts @@ -1,5 +1,7 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { ClipboardService } from 'ngx-clipboard'; +import { Subscription } from 'rxjs'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; @Component({ selector: 'app-copy-button', @@ -10,9 +12,18 @@ export class CopyButtonComponent implements OnInit { @Input() template: string; copy: Boolean; + themePrefSubscription: Subscription; + currentTheme: string; - constructor(private clipboardService: ClipboardService) {} + constructor(private clipboardService: ClipboardService, private themePrefService: ThemePreferencesService) { + this.themePrefSubscription = this.themePrefService.themePreferenceSubject.subscribe( + (newTheme: string) => { + this.currentTheme = newTheme; + } + ); + this.themePrefService.emitThemePreferencesSubject(); + } ngOnInit() { diff --git a/src/app/components/dropdown/dropdown.component.html b/src/app/components/dropdown/dropdown.component.html index d741cfe..d613e45 100644 --- a/src/app/components/dropdown/dropdown.component.html +++ b/src/app/components/dropdown/dropdown.component.html @@ -1,4 +1,4 @@ - - + diff --git a/src/app/components/dropdown/dropdown.component.scss b/src/app/components/dropdown/dropdown.component.scss index dacc1ff..1fa750e 100644 --- a/src/app/components/dropdown/dropdown.component.scss +++ b/src/app/components/dropdown/dropdown.component.scss @@ -10,9 +10,6 @@ } outline: none; - background-color: $dark; - color: $white; - border : 1px solid $dark-grey; border-radius: 3px; font-size: $fs-medium; padding: $gap-md; @@ -25,12 +22,33 @@ outline: 0; } - &.disabled { + &.dark { + background-color: $dark; + color: $white; + border : 1px solid $dark-grey; + &.disabled { color: $muted-white; &:hover { cursor: not-allowed; color: $white; } + } } + + &.light { + background-color: $white; + color: $dark; + border : 1px solid $border-light-grey-light; + + &.disabled { + color: $muted-dark; + + &:hover { + cursor: not-allowed; + color: $dark; + } + } + } + } \ No newline at end of file diff --git a/src/app/components/dropdown/dropdown.component.spec.ts b/src/app/components/dropdown/dropdown.component.spec.ts deleted file mode 100644 index e0edf7a..0000000 --- a/src/app/components/dropdown/dropdown.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { DropdownComponent } from './dropdown.component'; - -describe('DropdownComponent', () => { - let component: DropdownComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ DropdownComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DropdownComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/dropdown/dropdown.component.ts b/src/app/components/dropdown/dropdown.component.ts index 797c7bf..05134de 100644 --- a/src/app/components/dropdown/dropdown.component.ts +++ b/src/app/components/dropdown/dropdown.component.ts @@ -1,4 +1,6 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; +import { Subscription } from 'rxjs'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; @Component({ selector: 'app-dropdown', @@ -9,6 +11,8 @@ export class DropdownComponent implements OnInit { @Input() disabled: Boolean = false; @Input() required: Boolean = false; + themePrefSubscription: Subscription; + currentTheme: string; currentValue: string; @Input() idKey: String; @@ -29,7 +33,14 @@ export class DropdownComponent implements OnInit { } } - constructor() { } + constructor(private themePrefService: ThemePreferencesService) { + this.themePrefSubscription = this.themePrefService.themePreferenceSubject.subscribe( + (newTheme: string) => { + this.currentTheme = newTheme; + } + ); + this.themePrefService.emitThemePreferencesSubject(); + } getOptKey(option: any) { if (this.idKey) { @@ -38,11 +49,13 @@ export class DropdownComponent implements OnInit { } isSelected(opt) { - var valeur = this.getOptKey(opt); - if (valeur === this.currentValue) { - return 'selected'; + const Value = this.getOptKey(opt); + const Selected = 'selected'; + const Empty = ''; + if (Value === this.currentValue) { + return Selected; } - return ''; + return Empty; } getOptValue(option: any) { diff --git a/src/app/components/footer/footer.component.html b/src/app/components/footer/footer.component.html index e67f77e..c30f20e 100644 --- a/src/app/components/footer/footer.component.html +++ b/src/app/components/footer/footer.component.html @@ -1,6 +1,6 @@ -
+
-
+
@@ -8,7 +8,7 @@
-
+
{{ version }}
diff --git a/src/app/components/footer/footer.component.scss b/src/app/components/footer/footer.component.scss index bfcdffa..24413c2 100644 --- a/src/app/components/footer/footer.component.scss +++ b/src/app/components/footer/footer.component.scss @@ -4,26 +4,43 @@ position: fixed; bottom: 0; width: 100%; - border-top: 1px solid $dark; - background: $light-grey; - color: $white; text-align:center; padding: $gap-sm; height: $footer-height; + &.dark { + color: $white; + background: $light-grey; + border-top: 1px solid $dark; + } + + &.light { + color: $button-bar-light; + background: $light-grey-light; + border-top: 1px solid $border-dark-grey-light; + } + &__content { text-align: right; &__version { font-weight: bold; - background-color: #3E4453; display: inline-block; padding: 0 $gap-sm; + + &.dark { + background-color: #3E4453; + } + + &.light { + background-color: $button-bar-light; + color: $white; + } } &__toolbox { display: inline-block; margin-right: $gap-md; - & > a { + &.dark > a { color: $white; text-decoration: none; &:hover, &:visited, &:active, &:focus { @@ -31,7 +48,17 @@ color: $white; outline: none; } - } + } + + &.light > a { + color: $button-bar-light; + text-decoration: none; + &:hover, &:visited, &:active, &:focus { + text-decoration: none; + color: $button-bar-light; + outline: none; + } + } } &__github { diff --git a/src/app/components/footer/footer.component.spec.ts b/src/app/components/footer/footer.component.spec.ts deleted file mode 100644 index 2ca6c45..0000000 --- a/src/app/components/footer/footer.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { FooterComponent } from './footer.component'; - -describe('FooterComponent', () => { - let component: FooterComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ FooterComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(FooterComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/footer/footer.component.ts b/src/app/components/footer/footer.component.ts index c3b382e..00e5190 100644 --- a/src/app/components/footer/footer.component.ts +++ b/src/app/components/footer/footer.component.ts @@ -2,6 +2,8 @@ import { Component, OnInit, Input } from '@angular/core'; import { AppConfig } from '../../../environments/environment'; import { ElectronService } from '../../providers/electron.service'; import { TranslateService } from '@ngx-translate/core'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; +import { Subscription } from 'rxjs'; @Component({ @@ -13,9 +15,17 @@ export class FooterComponent implements OnInit { @Input() devRedirect: any; version: String; production: Boolean; + themePrefSubscription: Subscription; + currentTheme: string; constructor(private electronService: ElectronService, - private translateService: TranslateService) { + private translateService: TranslateService, private themePrefService: ThemePreferencesService) { + this.themePrefSubscription = this.themePrefService.themePreferenceSubject.subscribe( + (newTheme: string) => { + this.currentTheme = newTheme; + } + ); + this.themePrefService.emitThemePreferencesSubject(); } ngOnInit() { diff --git a/src/app/components/home/home.component.html b/src/app/components/home/home.component.html deleted file mode 100644 index 2d08a6a..0000000 --- a/src/app/components/home/home.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/app/components/home/home.component.scss b/src/app/components/home/home.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/components/home/home.component.spec.ts b/src/app/components/home/home.component.spec.ts deleted file mode 100644 index 490e81b..0000000 --- a/src/app/components/home/home.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { HomeComponent } from './home.component'; - -describe('HomeComponent', () => { - let component: HomeComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ HomeComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(HomeComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/home/home.component.ts b/src/app/components/home/home.component.ts deleted file mode 100644 index f56c8c1..0000000 --- a/src/app/components/home/home.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-home', - templateUrl: './home.component.html', - styleUrls: ['./home.component.scss'] -}) -export class HomeComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/components/icon-button/icon-button.component.html b/src/app/components/icon-button/icon-button.component.html index 81a4849..94305f6 100644 --- a/src/app/components/icon-button/icon-button.component.html +++ b/src/app/components/icon-button/icon-button.component.html @@ -1,8 +1,8 @@ -
+
-
+
{{ getValueTranslation() }}
\ No newline at end of file diff --git a/src/app/components/icon-button/icon-button.component.scss b/src/app/components/icon-button/icon-button.component.scss index 748c8e6..8eec8ef 100644 --- a/src/app/components/icon-button/icon-button.component.scss +++ b/src/app/components/icon-button/icon-button.component.scss @@ -11,14 +11,39 @@ white-space: nowrap; text-overflow: clip; - @include bg-color($light-grey); + cursor: pointer; - &:hover { - @include bg-color($dark-grey); + &.dark { + @include bg-color($light-grey); + &.disabled { + color: $muted-white; + cursor: not-allowed; + } + + &:hover { + @include bg-color($dark-grey); + } } + &.light { + @include bg-color($button-bar-light); + &.disabled { + color: $muted-white; + cursor: not-allowed; + } + + &:hover { + @include bg-color($button-bar-hover-light); + } + } + + .gh-button-div { padding-bottom: 5px; } + + h6 { + color: $white; + } } \ No newline at end of file diff --git a/src/app/components/icon-button/icon-button.component.spec.ts b/src/app/components/icon-button/icon-button.component.spec.ts deleted file mode 100644 index ccbd621..0000000 --- a/src/app/components/icon-button/icon-button.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { IconButtonComponent } from './icon-button.component'; - -describe('IconButtonComponent', () => { - let component: IconButtonComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ IconButtonComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(IconButtonComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/icon-button/icon-button.component.ts b/src/app/components/icon-button/icon-button.component.ts index e2576f7..0d7b5c2 100644 --- a/src/app/components/icon-button/icon-button.component.ts +++ b/src/app/components/icon-button/icon-button.component.ts @@ -1,5 +1,7 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { Subscription } from 'rxjs'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; @Component({ selector: 'app-icon-button', @@ -11,20 +13,32 @@ export class IconButtonComponent implements OnInit { @Input() value: String; @Input() tooltipValue: String; @Input() placement: String; + @Input() disabled: Boolean = false; @Input() icon: { name: String, isFab: Boolean }; @Output() buttonClicked: EventEmitter = new EventEmitter(); + themePrefSubscription: Subscription; + currentTheme: string; - constructor(private translateService: TranslateService) { } + constructor(private translateService: TranslateService, private themePrefService: ThemePreferencesService) { + this.themePrefSubscription = this.themePrefService.themePreferenceSubject.subscribe( + (newTheme: string) => { + this.currentTheme = newTheme; + } + ); + this.themePrefService.emitThemePreferencesSubject(); + } ngOnInit() { } execClick(evt) { - this.buttonClicked.emit(evt); + if (!this.disabled) { + this.buttonClicked.emit(evt); + } } getValueTranslation() { diff --git a/src/app/components/info-bar/info-bar.component.html b/src/app/components/info-bar/info-bar.component.html new file mode 100644 index 0000000..9bd0913 --- /dev/null +++ b/src/app/components/info-bar/info-bar.component.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/src/app/components/info-bar/info-bar.component.scss b/src/app/components/info-bar/info-bar.component.scss new file mode 100644 index 0000000..6a63b61 --- /dev/null +++ b/src/app/components/info-bar/info-bar.component.scss @@ -0,0 +1,14 @@ +@import '../../../variables.scss'; + +.gh-info-bar { + position: fixed; + z-index: 4; + color: $white; + @include fs($fs-medium); + @include bg-color($dark-blue); + @include wX(100%); + min-height: 50px; + align-items: center; + justify-content: center; + display: flex; +} \ No newline at end of file diff --git a/src/app/components/info-bar/info-bar.component.ts b/src/app/components/info-bar/info-bar.component.ts new file mode 100644 index 0000000..7813a3d --- /dev/null +++ b/src/app/components/info-bar/info-bar.component.ts @@ -0,0 +1,28 @@ +import { Component, OnInit, Input } from '@angular/core'; +import { trigger, style, transition, animate } from '@angular/animations'; + +@Component({ + selector: 'app-info-bar', + animations: [ + trigger('slideInOut', [ + transition(':enter', [ + style({transform: 'translateX(-100%)'}), + animate('300ms ease-in', style({transform: 'translateX(0%)'})) + ]), + transition(':leave', [ + animate('300ms ease-in', style({transform: 'translateX(-100%)'})) + ]) + ]) + ], + templateUrl: './info-bar.component.html', + styleUrls: ['./info-bar.component.scss'], +}) +export class InfoBarComponent implements OnInit { + @Input() visible: Boolean = false; + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/components/input-number/input-number.component.html b/src/app/components/input-number/input-number.component.html index aea3e3f..6079d8b 100644 --- a/src/app/components/input-number/input-number.component.html +++ b/src/app/components/input-number/input-number.component.html @@ -1,2 +1,2 @@ \ No newline at end of file + [readonly]="readonly" [disabled]="disabled" [ngClass]="[currentTheme, disabled ? 'disabled' : '']" [formControl]="form" [(ngModel)]="value" /> \ No newline at end of file diff --git a/src/app/components/input-number/input-number.component.spec.ts b/src/app/components/input-number/input-number.component.spec.ts deleted file mode 100644 index 31b9eff..0000000 --- a/src/app/components/input-number/input-number.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { InputNumberComponent } from './input-number.component'; - -describe('InputNumberComponent', () => { - let component: InputNumberComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ InputNumberComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(InputNumberComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/input-number/input-number.component.ts b/src/app/components/input-number/input-number.component.ts index 23aa1c1..b3a22fc 100644 --- a/src/app/components/input-number/input-number.component.ts +++ b/src/app/components/input-number/input-number.component.ts @@ -1,6 +1,8 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { FormControl } from '@angular/forms'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; +import { Subscription } from 'rxjs'; @Component({ selector: 'app-input-number', @@ -17,6 +19,8 @@ export class InputNumberComponent implements OnInit { @Input() min: number; currentValue: number; form: FormControl; + themePrefSubscription: Subscription; + currentTheme: string; @Output() valueChange = new EventEmitter(); @@ -39,7 +43,14 @@ export class InputNumberComponent implements OnInit { this.valueChange.emit(this.currentValue); } - constructor(private translateService: TranslateService) { } + constructor(private translateService: TranslateService, private themePrefService: ThemePreferencesService) { + this.themePrefSubscription = this.themePrefService.themePreferenceSubject.subscribe( + (newTheme: string) => { + this.currentTheme = newTheme; + } + ); + this.themePrefService.emitThemePreferencesSubject(); + } ngOnInit() { this.form = new FormControl(''); diff --git a/src/app/components/input/input.component.html b/src/app/components/input/input.component.html index 34445ee..c6bf40d 100644 --- a/src/app/components/input/input.component.html +++ b/src/app/components/input/input.component.html @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/components/input/input.component.scss b/src/app/components/input/input.component.scss index 6864a66..1dc2f5a 100644 --- a/src/app/components/input/input.component.scss +++ b/src/app/components/input/input.component.scss @@ -2,27 +2,43 @@ .gh-input { outline: none; - background-color: $dark; - color: $white; - border : 1px solid $dark-grey; border-radius: 3px; font-size: $fs-medium; padding: $gap-md; line-height: 1; @include wX(100%); + &.dark { + color: $white; + border : 1px solid $dark-grey; + background-color: $dark; + &.disabled { + color: $muted-white; + + &:hover { + cursor: not-allowed; + color: $white; + } + } + } + + &.light { + color: $dark; + border : 1px solid $border-light-grey-light; + background-color: $white; + &.disabled { + color: $dark; + + &:hover { + cursor: not-allowed; + color: $muted-dark; + } + } + } + &:focus { border-color: $light-blue-hover; box-shadow: 0 0 0 1px $light-blue-hover; outline: 0; } - - &.disabled { - color: $muted-white; - - &:hover { - cursor: not-allowed; - color: $white; - } - } } \ No newline at end of file diff --git a/src/app/components/input/input.component.spec.ts b/src/app/components/input/input.component.spec.ts deleted file mode 100644 index 0895fab..0000000 --- a/src/app/components/input/input.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { InputComponent } from './input.component'; - -describe('InputComponent', () => { - let component: InputComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ InputComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(InputComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/input/input.component.ts b/src/app/components/input/input.component.ts index d144f29..74fca29 100644 --- a/src/app/components/input/input.component.ts +++ b/src/app/components/input/input.component.ts @@ -1,5 +1,7 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; +import { Subscription } from 'rxjs'; @Component({ selector: 'app-input', @@ -12,7 +14,10 @@ export class InputComponent implements OnInit { @Input() placeholder: String; @Input() readonly: Boolean; @Input() disabled: Boolean; + @Input() type: String = 'text'; currentValue: String; + themePrefSubscription: Subscription; + currentTheme: string; @Output() valueChange = new EventEmitter(); @@ -27,7 +32,14 @@ export class InputComponent implements OnInit { this.valueChange.emit(this.currentValue); } - constructor(private translateService: TranslateService) { } + constructor(private translateService: TranslateService, private themePrefService: ThemePreferencesService) { + this.themePrefSubscription = this.themePrefService.themePreferenceSubject.subscribe( + (newTheme: string) => { + this.currentTheme = newTheme; + } + ); + this.themePrefService.emitThemePreferencesSubject(); + } ngOnInit() { } diff --git a/src/app/components/loader/loader.component.html b/src/app/components/loader/loader.component.html index 214a300..3038b00 100644 --- a/src/app/components/loader/loader.component.html +++ b/src/app/components/loader/loader.component.html @@ -1,5 +1,5 @@
-
+
@@ -14,7 +14,7 @@
-

{{ 'LOADER.INFO' | translate }}

+

{{ 'LOADER.INFO' | translate }}

diff --git a/src/app/components/loader/loader.component.scss b/src/app/components/loader/loader.component.scss index 1512b92..51f1d2f 100644 --- a/src/app/components/loader/loader.component.scss +++ b/src/app/components/loader/loader.component.scss @@ -50,7 +50,12 @@ body { h2 { text-align: center; - color: $muted-white; + &.dark { + color: $muted-white; + } + &.dark { + color: $muted-dark; + } } &_overlay { @@ -61,10 +66,18 @@ body { right: 0; height: 100%; width: 100%; - background-color: $light-grey; display: block; z-index: 2; - opacity: 0.8; + + &.dark { + background-color: $light-grey; + opacity: 0.8; + } + &.light { + background-color: $white; + opacity: 0.6; + + } } &_content { diff --git a/src/app/components/loader/loader.component.spec.ts b/src/app/components/loader/loader.component.spec.ts deleted file mode 100644 index 35adf49..0000000 --- a/src/app/components/loader/loader.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { LoaderComponent } from './loader.component'; - -describe('LoaderComponent', () => { - let component: LoaderComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ LoaderComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(LoaderComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/loader/loader.component.ts b/src/app/components/loader/loader.component.ts index bd87173..addfbc6 100644 --- a/src/app/components/loader/loader.component.ts +++ b/src/app/components/loader/loader.component.ts @@ -1,4 +1,6 @@ import { Component, OnInit, Input } from '@angular/core'; +import { Subscription } from 'rxjs'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; @Component({ selector: 'app-loader', @@ -7,8 +9,17 @@ import { Component, OnInit, Input } from '@angular/core'; }) export class LoaderComponent implements OnInit { @Input() loading: Boolean = false; + themePrefSubscription: Subscription; + currentTheme: string; - constructor() { } + constructor(private themePrefService: ThemePreferencesService) { + this.themePrefSubscription = this.themePrefService.themePreferenceSubject.subscribe( + (newTheme: string) => { + this.currentTheme = newTheme; + } + ); + this.themePrefService.emitThemePreferencesSubject(); + } ngOnInit() { } diff --git a/src/app/components/modal/modal.component.html b/src/app/components/modal/modal.component.html index c08fac0..7202491 100644 --- a/src/app/components/modal/modal.component.html +++ b/src/app/components/modal/modal.component.html @@ -1,12 +1,14 @@
-
-
- {{ title | translate }} -
+
+ +
+ {{ title | translate }} +
+
+
+ +
+
-
- -
-
\ No newline at end of file diff --git a/src/app/components/modal/modal.component.scss b/src/app/components/modal/modal.component.scss index fbdef13..761b3a3 100644 --- a/src/app/components/modal/modal.component.scss +++ b/src/app/components/modal/modal.component.scss @@ -19,27 +19,42 @@ } &__content { - color: $white; position: absolute; top: 50px; bottom: 0; @include wX(100%); overflow: auto; + + .dark { + color: $white; + } + &.light { + color: $dark; + } } &__title { - background: $blue-grey; font-weight: bold; @include hX(50px); line-height: 50px; vertical-align: middle; padding-left: $gap-xl; - border-bottom: 1px solid $dark; + + + &.dark { + border-bottom: 1px solid $dark; + background: $light-grey; + } + + &.light { + background: $dark-grey-light; + border-bottom: 1px solid $border-dark-grey-light; + } + } &__close { position: absolute; - color: $white; top: 15px; right: $gap-xl; @include wX-hX(20px, 20px); @@ -50,10 +65,20 @@ -webkit-transition: background-color 0.25s ease-out, color 0.25s ease-out; transition: background-color 0.25s ease-out, color 0.25s ease-out; - &:hover { - background: rgba(76, 93, 170, 0.2); - + &.dark { + color: $white; + &:hover { + background: rgba(76, 93, 170, 0.2); + } + } + &.light { + color: $dark; + &:hover { + background: $modal-tab-hover-light; + } } + + } &__window @@ -62,12 +87,18 @@ @include wX-hX(30%, 80%); top: 5%; left: 35%; - border: 1px solid $light-grey; z-index: 2; + &.dark { + border: 1px solid $light-grey; + } + &.light { + border: 1px solid $border-dark-grey-light; + } + &.medium { - @include wX(50%); - left: 25%; + @include wX(60%); + left: 20%; } &.large { diff --git a/src/app/components/modal/modal.component.spec.ts b/src/app/components/modal/modal.component.spec.ts deleted file mode 100644 index fc32a90..0000000 --- a/src/app/components/modal/modal.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ModalComponent } from './modal.component'; - -describe('ModalComponent', () => { - let component: ModalComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ModalComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/modal/modal.component.ts b/src/app/components/modal/modal.component.ts index 6e406a9..cbfdcfb 100644 --- a/src/app/components/modal/modal.component.ts +++ b/src/app/components/modal/modal.component.ts @@ -1,4 +1,7 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; +import { TranslateModule } from '@ngx-translate/core'; +import { Subscription } from 'rxjs'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; @Component({ selector: 'app-modal', @@ -11,10 +14,13 @@ export class ModalComponent implements OnInit { @Input() medium: Boolean; @Input() fullscreen: Boolean; @Input() title: String; + @Input() loading: Boolean = false; currentVisible: Boolean; @Output() visibleChange = new EventEmitter(); + themePrefSubscription: Subscription; + currentTheme: string; @Input() get visible() { @@ -26,13 +32,22 @@ export class ModalComponent implements OnInit { this.visibleChange.emit(this.currentVisible); } - constructor() { } + constructor(private themePrefService: ThemePreferencesService) { + this.themePrefSubscription = this.themePrefService.themePreferenceSubject.subscribe( + (newTheme: string) => { + this.currentTheme = newTheme; + } + ); + this.themePrefService.emitThemePreferencesSubject(); + } ngOnInit() { } closeModal() { - this.visible = false; + if (!this.loading) { + this.visible = false; + } } } diff --git a/src/app/components/toolbox/toolbox.component.scss b/src/app/components/toolbox/toolbox.component.scss deleted file mode 100644 index 31f178a..0000000 --- a/src/app/components/toolbox/toolbox.component.scss +++ /dev/null @@ -1,101 +0,0 @@ -@import '../../../variables.scss'; - -.big-heading { - @include wX(100%); - color: $white; - font-size: 36px; -} - -.color-item { - @include hX(50px); - border: 1px solid $muted-white; -} - -.bb-white { - border-bottom: 1px solid $white; -} - -.gh-div-loader { - width: 500px; - height: 500px; -} - -a.link-white { - - color: $white; - text-decoration: underline; - &:hover, &:focus, &:active, &:visited { - color: $white; - cursor: pointer; - } -} - -// Background colors -.dark-blue { - @include bg-color($dark-blue); -} -.light-blue { - @include bg-color($light-blue); -} -.light-blue-hover { - @include bg-color($light-blue-hover); -} -.disabled-blue { - @include bg-color($disabled-blue); -} -.gh-green { - @include bg-color($gh-green); -} -.dark-green { - @include bg-color($dark-green); -} -.light-green { - @include bg-color($light-green); -} -.disabled-green { - @include bg-color($disabled-green); -} -.dark-red { - @include bg-color($dark-red); -} -.light-red { - @include bg-color($light-red); -} -.disabled-red { - @include bg-color($disabled-red); -} -.dark-grey { - @include bg-color($dark-grey); -} -.light-grey { - @include bg-color($light-grey); -} -.blue-grey { - @include bg-color($blue-grey); -} -.white { - @include bg-color($white); -} -.muted-white { - @include bg-color($muted-white); -} -.dark { - @include bg-color($dark); -} - -// Font sizes -.fs-xsmall { - @include fs($fs-xsmall); -} -.fs-small { - @include fs($fs-small); -} -.fs-medium { - @include fs($fs-medium); -} -.fs-large { - @include fs($fs-large); -} -.fs-xlarge { - @include fs($fs-xlarge); -} \ No newline at end of file diff --git a/src/app/components/toolbox/toolbox.component.spec.ts b/src/app/components/toolbox/toolbox.component.spec.ts deleted file mode 100644 index b249024..0000000 --- a/src/app/components/toolbox/toolbox.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ToolboxComponent } from './toolbox.component'; - -describe('ToolboxComponent', () => { - let component: ToolboxComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ToolboxComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ToolboxComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/models/MockElectronService.ts b/src/app/models/MockElectronService.ts new file mode 100644 index 0000000..0f1eeee --- /dev/null +++ b/src/app/models/MockElectronService.ts @@ -0,0 +1,20 @@ +import { Injectable } from '@angular/core'; + +@Injectable() +export class MockElectronService { + + constructor() { } + + browse() { + const CHEMIN = '/new'; + return CHEMIN; + } + + pathJoin(...paths: string[]): string { + return paths.join('').toString(); + } + + fsExistsSync(pathToCheck: string): boolean { + return pathToCheck === 'path'; + } +} diff --git a/src/app/models/MockGitService.ts b/src/app/models/MockGitService.ts new file mode 100644 index 0000000..efac7ce --- /dev/null +++ b/src/app/models/MockGitService.ts @@ -0,0 +1,77 @@ +import * as gitPromise from 'simple-git/promise'; +import * as simpleGit from 'simple-git'; +import { Subject } from 'rxjs'; +import { ElectronService } from '../providers/electron.service'; +import * as GitUrlParse from 'git-url-parse'; +import { ServiceResult } from '../models/ServiceResult'; +import { Injectable } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; + +@Injectable() +export class MockGitService { + pathSubject: Subject; + repoNameSubject: Subject; + recentProjectSubject: Subject; + + constructor(private translate: TranslateService) { + this.pathSubject = new Subject(); + this.repoNameSubject = new Subject(); + this.recentProjectSubject = new Subject(); + } + + emitPathSubject(path) { + this.pathSubject.next(path); + } + + emitRecentProjectSubject(newProject) { + this.recentProjectSubject.next(newProject); + } + + emitRepoNameSubject(repo) { + this.repoNameSubject.next(repo); + } + + async setPath(newPath) { + return new Promise((resolve, reject) => { + if (newPath === '/new') { + this.emitPathSubject(newPath); + resolve(new ServiceResult(true, this.translate.instant('SUCCESS'), + this.translate.instant('OPEN.OPENED_REPO'))); + } else { + reject(new ServiceResult(false, this.translate.instant('ERROR'), + this.translate.instant('OPEN.NOT_GIT_REPO'))); + } + }); + } + + init(initLocation: string, initName: string) { + if (initLocation && initName) { + return new Promise((resolve, reject) => { + if (initLocation === '/new' && initName === '/repo') { + this.setPath(initLocation); + resolve(new ServiceResult(true, 'SUCCESS', 'INIT.SUCCESS')); + } else { + reject(new ServiceResult(false, 'ERROR', 'PATH_NOT_FOUND')); + } + }); + } + } + + async cloneHttps(url: GitUrlParse, folder: string, username: string, password: string) { + return new Promise((resolve, reject) => { + if (url && folder === 'path') { + if (username === 'username' && password === 'password') { + const REPOPATH = '/path'; + resolve(new ServiceResult(true, this.translate.instant('SUCCESS'), + this.translate.instant('CLONE.DONE'), REPOPATH)); + } else { + reject(new ServiceResult(false, this.translate.instant('ERROR'), + this.translate.instant('CLONE.ERROR'))); + } + } else { + reject(new ServiceResult(false, this.translate.instant('ERROR'), + this.translate.instant('CLONE.ERROR'))); + } + }); + } +} diff --git a/src/app/models/MockLanguagePreferenceService.ts b/src/app/models/MockLanguagePreferenceService.ts new file mode 100644 index 0000000..bae2f65 --- /dev/null +++ b/src/app/models/MockLanguagePreferenceService.ts @@ -0,0 +1,25 @@ +import { Injectable, OnInit } from '@angular/core'; +import { Subject } from 'rxjs'; +import { TranslateService } from '@ngx-translate/core'; + +export class MockLanguagePreferencesService { + languages: any[]; + preferences: string; + preferencesSubject = new Subject(); + + constructor() { + this.preferences = 'fr'; + + this.emitPreferencesSubject(); + } + + emitPreferencesSubject() { + this.preferencesSubject.next(this.preferences); + } + + setLanguage(newLanguage) { + this.preferences = newLanguage; + this.emitPreferencesSubject(); + return this.preferences; + } +} diff --git a/src/app/models/MockRouter.ts b/src/app/models/MockRouter.ts new file mode 100644 index 0000000..d3c4044 --- /dev/null +++ b/src/app/models/MockRouter.ts @@ -0,0 +1,7 @@ +export class MockRouter { + navigate(commands: any[], extras?: string) { + return new Promise((resolve, reject) => { + resolve(true); + }); + } +} diff --git a/src/app/models/MockTerminalManagerService.ts b/src/app/models/MockTerminalManagerService.ts new file mode 100644 index 0000000..5ccd6dc --- /dev/null +++ b/src/app/models/MockTerminalManagerService.ts @@ -0,0 +1,38 @@ +import { Subject } from 'rxjs'; +import { ServiceResult } from './ServiceResult'; + +export class MockTerminalManagerService { + languages: any[]; + preferencesSubject = new Subject(); + terminalCmd: string; + terminalName: string; + + constructor() { + this.terminalCmd = ''; + this.terminalName = ''; + } + + emitPreferencesSubject() { + this.preferencesSubject.next(this.terminalCmd); + } + + setCurrentTerminal(newCmd) { + this.terminalCmd = newCmd; + this.terminalName = 'terminator'; + this.emitPreferencesSubject(); + } + + getTerminals() { + return [{key: 'toto', value: 'titi'}]; + } + + openTerminal() { + return new Promise((resolve, reject) => { + if (this.terminalName === 'terminator') { + resolve(new ServiceResult(true, '', '')); + } else { + reject(new ServiceResult(false, '', '')); + } + }); + } +} diff --git a/src/app/models/MockThemePreferencesService.ts b/src/app/models/MockThemePreferencesService.ts new file mode 100644 index 0000000..23f1e4b --- /dev/null +++ b/src/app/models/MockThemePreferencesService.ts @@ -0,0 +1,20 @@ +import { Subject } from 'rxjs'; + +export class MockThemePreferencesService { + themePreference = ''; + themePreferenceSubject: Subject; + + constructor() { + this.themePreferenceSubject = new Subject(); + this.themePreference = 'dark'; + } + + emitThemePreferencesSubject() { + this.themePreferenceSubject.next(this.themePreference); + } + + setThemePreference(newTheme: string) { + this.themePreference = newTheme; + this.emitThemePreferencesSubject(); + } +} diff --git a/src/app/models/MockTranslateLoader.ts b/src/app/models/MockTranslateLoader.ts new file mode 100644 index 0000000..e8e8f0f --- /dev/null +++ b/src/app/models/MockTranslateLoader.ts @@ -0,0 +1,10 @@ +import { Observable } from 'rxjs/Observable'; +import { TranslateLoader } from '@ngx-translate/core'; + +export class MockTranslateLoader implements TranslateLoader { + translations: any = { 'CARDS_TITLE': 'This is a test' }; + + getTranslation(lang: string): Observable { + return this.translations; + } +} diff --git a/src/app/models/MockTranslateService.ts b/src/app/models/MockTranslateService.ts new file mode 100644 index 0000000..6460223 --- /dev/null +++ b/src/app/models/MockTranslateService.ts @@ -0,0 +1,10 @@ +export class MockTranslateService { + instant(text: string) { + return text; + } + + getDefaultLang() { + const DefaultLang = 'fr'; + return DefaultLang; + } +} diff --git a/src/app/models/ServiceResult.ts b/src/app/models/ServiceResult.ts new file mode 100644 index 0000000..93c2f2e --- /dev/null +++ b/src/app/models/ServiceResult.ts @@ -0,0 +1,13 @@ +export class ServiceResult { + success: Boolean; + title: string; + message: string; + newData?: string; + + constructor(success: Boolean, title: string, message: string, newData?: string) { + this.success = success; + this.title = title; + this.message = message; + this.newData = newData; + } +} diff --git a/src/app/providers/electron.service.ts b/src/app/providers/electron.service.ts index b61de28..91f38a7 100644 --- a/src/app/providers/electron.service.ts +++ b/src/app/providers/electron.service.ts @@ -6,6 +6,9 @@ import { ipcRenderer, webFrame, remote, shell } from 'electron'; import * as childProcess from 'child_process'; import * as fs from 'fs'; import * as path from 'path'; +import * as os from 'os'; +import * as process from 'process'; +import * as url from 'url'; @Injectable() export class ElectronService { @@ -14,9 +17,12 @@ export class ElectronService { webFrame: typeof webFrame; remote: typeof remote; childProcess: typeof childProcess; + process: typeof process; fs: typeof fs; path: typeof path; + os: typeof os; shell: typeof shell; + url: typeof url; constructor() { // Conditional imports @@ -29,6 +35,9 @@ export class ElectronService { this.childProcess = window.require('child_process'); this.fs = window.require('fs'); this.path = window.require('path'); + this.process = window.require('process'); + this.url = window.require('url'); + this.os = window.require('os'); } } @@ -36,4 +45,21 @@ export class ElectronService { return window && window.process && window.process.type; } + browse() { + const PATH = this.remote.dialog.showOpenDialog({ + properties: ['openDirectory'] + }); + if (PATH !== undefined) { + return PATH[0]; + } + return null; + } + + pathJoin(...paths: string[]): string { + return this.path.join(...paths).toString(); + } + + fsExistsSync(pathToCheck: fs.PathLike): boolean { + return this.fs.existsSync(pathToCheck); + } } diff --git a/src/app/providers/git.service.ts b/src/app/providers/git.service.ts new file mode 100644 index 0000000..28d2ae9 --- /dev/null +++ b/src/app/providers/git.service.ts @@ -0,0 +1,184 @@ +import { Injectable } from '@angular/core'; +import * as gitPromise from 'simple-git/promise'; +import * as simpleGit from 'simple-git'; +import { Subject } from 'rxjs'; +import { ElectronService } from './electron.service'; +import * as GitUrlParse from 'git-url-parse'; +import { ServiceResult } from '../models/ServiceResult'; +import { TranslateService } from '@ngx-translate/core'; +import { LocalStorage } from 'ngx-store'; + +@Injectable() +export class GitService { + @LocalStorage({ key: 'recentProject' }) recentProject = []; + recentProjectSubject: Subject; + path: any; + pathSubject: Subject; + repoName: any; + repoNameSubject: Subject; + gitP: any; + git: any; + + constructor(private electronService: ElectronService, private translate: TranslateService) { + this.gitP = gitPromise(); + this.git = simpleGit(); + this.pathSubject = new Subject(); + this.repoNameSubject = new Subject(); + this.recentProjectSubject = new Subject(); + if (this.recentProject[0]) { + if (this.recentProject[0].path) { + this.setPath(this.recentProject[0].path); + } else { + this.path = this.electronService.process.cwd(); + } + } else { + this.path = this.electronService.process.cwd(); + } + } + + emitPathSubject() { + this.pathSubject.next(this.path); + } + + emitRepoNameSubject() { + this.repoNameSubject.next(this.repoName); + } + + emitRecentProjectSubject() { + this.recentProjectSubject.next(this.recentProject.slice()); + } + + init(initLocation: string, initName: string) { + if (initLocation && initName) { + const PATHTOREPO = this.electronService.path.join(initLocation, initName); + return new Promise((resolve, reject) => { + if (this.electronService.fs.existsSync(initLocation)) { + if (!this.electronService.fs.existsSync(PATHTOREPO)) { + this.electronService.fs.mkdirSync(PATHTOREPO); + } + + gitPromise(PATHTOREPO).init() + .then(() => { + this.setPath(PATHTOREPO); + resolve(new ServiceResult(true, this.translate.instant('SUCCESS'), + this.translate.instant('INIT.SUCCESS'))); + }) + .catch(() => { + reject(new ServiceResult(false, this.translate.instant('ERROR'), + this.translate.instant('INIT.FAILED'))); + }); + } else { + reject(new ServiceResult(false, this.translate.instant('ERROR'), + this.translate.instant('PATH_NOT_FOUND'))); + } + }); + } + } + + async setPath(newPath) { + return new Promise((resolve, reject) => { + if (this.electronService.fs.existsSync(newPath)) { + gitPromise(newPath).checkIsRepo() + .then(isRepo => { + if (isRepo) { + this.path = newPath; + this.repoName = this.electronService.path.basename(this.path); + this.emitRepoNameSubject(); + this.electronService.process.chdir(this.path); + this.git.cwd(this.path); + this.gitP.cwd(this.path); + this.emitPathSubject(); + this.registerProject(this.repoName, this.path); + resolve(new ServiceResult(true, this.translate.instant('SUCCESS'), + this.translate.instant('OPEN.OPENED_REPO'))); + } else { + reject(new ServiceResult(false, this.translate.instant('ERROR'), + this.translate.instant('OPEN.NOT_GIT_REPO'))); + } + }) + .catch(() => { + reject(new ServiceResult(false, this.translate.instant('ERROR'), + this.translate.instant('OPEN.NOT_GIT_REPO'))); + }); + } else { + this.deleteProjetWithPath(newPath); + reject(new ServiceResult(false, this.translate.instant('ERROR'), + this.translate.instant('OPEN.REPO_NOT_EXIST'))); + } + }); + } + + registerProject(repo: any, path: any) { + const PROJECT = { + repo: repo, + path: path + }; + for (let INDEX = 0; INDEX < this.recentProject.length; INDEX++) { + if (this.recentProject[INDEX].repo === PROJECT.repo + && this.recentProject[INDEX].path === PROJECT.path) { + this.recentProject.splice(INDEX, 1); + INDEX--; + } + } + this.recentProject.splice(0, 0, PROJECT); + if (this.recentProject.length >= 5) { + this.recentProject.splice(5, 1); + } + this.emitRecentProjectSubject(); + } + + deleteProject(id: number) { + this.recentProject.splice(id, 1); + this.emitRecentProjectSubject(); + } + + deleteProjetWithPath(path: any) { + for (let INDEX = 0; INDEX < this.recentProject.length; INDEX++) { + if (this.recentProject[INDEX].path === path) { + this.recentProject.splice(INDEX, 1); + INDEX--; + } + } + this.emitRecentProjectSubject(); + } + + async cloneHttps(url: GitUrlParse, folder: string, username: string, password: string) { + return new Promise((resolve, reject) => { + const REMOTE = `https://${username}:${password}@${url.resource}${url.pathname}`; + gitPromise(folder) + .clone(REMOTE, null) + .then(() => { + const REPOPATH = this.electronService.path.join(folder, url.name); + gitPromise(REPOPATH) + .raw(['remote', 'set-url', 'origin', url]) + .then(() => { + resolve(new ServiceResult(true, this.translate.instant('SUCCESS'), + this.translate.instant('CLONE.DONE'), REPOPATH)); + }) + .catch((err) => { + console.log(err); + reject(new ServiceResult(false, this.translate.instant('ERROR'), + this.translate.instant('CLONE.ERROR'))); + }); + }) + .catch((err) => { + var ERRMSG = 'CLONE.ERROR'; + if (err.toString().includes('unable to update url base from redirection')) { + ERRMSG = 'CLONE.UNABLE_TO_UPDATE'; + } else if (err.toString().includes('HTTP Basic: Access denied')) { + ERRMSG = 'CLONE.HTTP_ACCESS_DENIED'; + } else if (err.toString().includes('could not create work tree')) { + ERRMSG = 'CLONE.NOT_WORK_TREE'; + } else if (err.toString().includes('Repository not found')) { + ERRMSG = 'CLONE.REPO_NOT_FOUND'; + } else if (err.toString().includes('already exists and is not an empty directory')) { + ERRMSG = 'CLONE.ALREADY_EXISTS'; + } else if (err.toString().includes('Invalid username or password')) { + ERRMSG = 'CLONE.INVALID_CRED'; + } + reject(new ServiceResult(false, this.translate.instant('ERROR'), + this.translate.instant(ERRMSG))); + }); + }); + } +} diff --git a/src/app/providers/language-preferences.service.ts b/src/app/providers/language-preferences.service.ts new file mode 100644 index 0000000..08212ca --- /dev/null +++ b/src/app/providers/language-preferences.service.ts @@ -0,0 +1,26 @@ +import { Injectable, OnInit } from '@angular/core'; +import { Subject } from 'rxjs'; +import { TranslateService } from '@ngx-translate/core'; + +@Injectable() +export class LanguagePreferencesService { + languages: any[]; + preferences: string; + preferencesSubject = new Subject(); + + constructor(private translate: TranslateService) { + this.preferences = this.translate.getDefaultLang(); + this.emitPreferencesSubject(); + } + + emitPreferencesSubject() { + this.preferencesSubject.next(this.preferences); + } + + setLanguage(newLanguage) { + localStorage.setItem('lang', newLanguage); + this.translate.setDefaultLang(newLanguage); + this.preferences = newLanguage; + this.emitPreferencesSubject(); + } +} diff --git a/src/app/providers/terminal-manager.service.ts b/src/app/providers/terminal-manager.service.ts new file mode 100644 index 0000000..dbad458 --- /dev/null +++ b/src/app/providers/terminal-manager.service.ts @@ -0,0 +1,75 @@ +import { Injectable } from '@angular/core'; +import { Subject } from 'rxjs'; +import { ElectronService } from './electron.service'; +import { ServiceResult } from '../models/ServiceResult'; +import { TranslateService } from '@ngx-translate/core'; +import { LocalStorage } from 'ngx-store'; + +@Injectable() +export class TerminalManagerService { + @LocalStorage({key: 'terminalName'}) terminalName = ''; + @LocalStorage({key: 'terminalCmd'}) terminalCmd = ''; + currentOs: any; + preferencesSubject = new Subject(); + + constructor(private electronService: ElectronService, + private translateService: TranslateService) { + this.preferencesSubject = new Subject(); + this.currentOs = this.electronService.os.type(); + if (this.terminalName == '' || this.terminalCmd == '') { + this.terminalName = this.getTerminals()[0].value; + this.terminalCmd = this.getTerminals()[0].key; + } + } + + openTerminal(): Promise { + return new Promise((resolve, reject) => { + this.electronService.childProcess.exec(this.terminalCmd, (err) => { + if (err) { + reject(new ServiceResult(false, + this.translateService.instant('TERMINAL.UNKNOWN'), + this.translateService.instant('TERMINAL.MESSAGE'))); + } else { + resolve(new ServiceResult(true, '', '')); + } + }); + }); + } + + getTerminals() { + switch (this.currentOs) { + case 'Linux': + return [ + { key: 'terminator', value: 'terminator' }, + { key: 'gnome-terminal', value: 'gnome-terminal' }, + { key: 'xterm', value: 'xterm' } + ]; + case 'Darwin': + return [ + { key: 'open -a Terminal', value: 'Terminal' }, + { key: 'open -a iTerm', value: 'iTerm' }, + { key: 'open -a terminator', value: 'terminator' } + ]; + case 'Windows_NT': + return [ + { key: 'start cmd.exe', value: 'cmd' }, + { key: 'start PowerShell.exe', value: 'PowerShell' }, + { key: 'start "" "%ProgramFiles%\\Git\\git-bash.exe"', value: 'git-bash' } + ]; + default: + return []; + } + } + + emitPreferencesSubject() { + this.preferencesSubject.next(this.terminalCmd); + } + + setCurrentTerminal(newCmd) { + this.terminalCmd = newCmd; + this.terminalName = this.getTerminals().filter(o => { + return o.key === this.terminalCmd; + })[0].value; + this.emitPreferencesSubject(); + } +} diff --git a/src/app/providers/theme-preferences.service.ts b/src/app/providers/theme-preferences.service.ts new file mode 100644 index 0000000..ed3da7b --- /dev/null +++ b/src/app/providers/theme-preferences.service.ts @@ -0,0 +1,31 @@ +import { Injectable, OnInit, Inject } from '@angular/core'; +import { Subject } from 'rxjs'; +import { LocalStorage } from 'ngx-store'; +import { DOCUMENT } from '@angular/common'; + +@Injectable() +export class ThemePreferencesService { + @LocalStorage({ key: 'themePreference' }) themePreference = ''; + themePreferenceSubject: Subject; + + constructor(@Inject(DOCUMENT) private document: Document) { + this.themePreferenceSubject = new Subject(); + if (this.themePreference.length === 0) { + this.setThemePreference('dark'); + } else { + this.document.body.classList.add((this.themePreference === 'light' ? 'light' : 'dark') + '-body'); + this.document.body.classList.remove((this.themePreference === 'light' ? 'dark' : 'light') + '-body'); + } + } + + emitThemePreferencesSubject() { + this.themePreferenceSubject.next(this.themePreference); + } + + setThemePreference(newTheme: string) { + this.themePreference = newTheme; + this.document.body.classList.add((newTheme === 'light' ? 'light' : 'dark') + '-body'); + this.document.body.classList.remove((newTheme === 'light' ? 'dark' : 'light' + '-body')); + this.emitThemePreferencesSubject(); + } +} diff --git a/src/app/screens/home/home.component.html b/src/app/screens/home/home.component.html new file mode 100644 index 0000000..1731d7b --- /dev/null +++ b/src/app/screens/home/home.component.html @@ -0,0 +1,204 @@ + + + +
+ +
+ +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+ +
+ + + + +
+
+
+ + +
+
+
+
{{ 'OPEN.REPO' | translate }}
+
+
+
+
{{ 'INIT.TAB_TITLE' | translate }}
+
+
+
+
{{ 'CLONE.TAB_TITLE' | translate }}
+
+
+
+
+ + + +
+ DIV TEST +
+ + + + + + + {{ 'OPEN.REPO' | translate }} + +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+ + + {{ 'OPEN.OPENED' | translate }} + +
+
+ {{project.value.repo}} +
+
+
+ {{project.value.path}} +
+
+
+ + + + + {{ 'CLONE.TAB_TITLE' | translate }} + +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+ + + + + {{ 'INIT.TAB_TITLE' | translate }} + +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ {{ fullPath }} +
+
+
+
+ +
+
+
+ + + + + + + + + {{ 'LOG_TO_CONTINUE' | translate }} + + + + + + + + + + + + diff --git a/src/app/screens/home/home.component.scss b/src/app/screens/home/home.component.scss new file mode 100644 index 0000000..48adc2a --- /dev/null +++ b/src/app/screens/home/home.component.scss @@ -0,0 +1,288 @@ +@import '../../../variables.scss'; + +.gh-button-bar { + @include wX-hX(100%, 50px); + + color: $white; + + &.dark { + @include bg-color($light-grey); + } + + &.light { + @include bg-color($button-bar-light); + } + + &-project { + @include hX(50px); + line-height: 50px; + float: left; + text-align: left; + padding-left: 0; + } + + &-actions { + @include hX(50px); + margin: 0 auto; + display: inline-block; + text-align: center; + } + + &-more { + @include hX(50px); + line-height: 50px; + float: right; + text-align: right; + + & .searchInput { + width: 175px; + display: inline-block; + } + } +} + +.gh-main-panel { + @include wX-hX(100%, 100%); + position: fixed; + + font-size: $fs-large; + + .dark { + color: $muted-white; + } + .light { + color: $dark; + } + + &-not-opened { + top: 40%; + position: relative; + + &-button { + padding: 10px 20px; + &.dark { + border: 1px solid $light-grey; + &:hover { + @include bg-color($light-grey); + cursor: pointer; + } + } + &.light { + border: 1px solid $border-light-grey-light; + &:hover { + @include bg-color($modal-tab-hover-light); + cursor: pointer; + } + } + } + } + +} + +.gh-breadcrumbs { + list-style: none; + overflow: hidden; + font-size: 16px; + + &.dark ul { + padding-left: 0; + + & li { + float: left; + + & a { + color: $white; + text-decoration: none; + padding-left: 45px; + background: $blue-grey; + position: relative; + display: block; + float: left; + cursor: pointer; + + &::after { + content: " "; + display: block; + @include wX-hX(0, 0); + border-top: 50px solid transparent; + border-bottom: 50px solid transparent; + border-left: 30px solid $blue-grey; + position: absolute; + top: 50%; + margin-top: -50px; + left: 100%; + z-index: 1; + } + + &::before { + content: " "; + display: block; + @include wX-hX(0, 0); + border-top: 50px solid transparent; + border-bottom: 50px solid transparent; + border-left: 30px solid $light-grey; + position: absolute; + top: 50%; + margin-top: -50px; + margin-left: 2px; + left: 100%; + z-index: 1; + } + } + + &:first-child { + a { + padding-left: 10px; + @include bg-color($light-grey); + + &::before, &::after { + border-left: 16px solid $light-grey; + } + } + } + } + } + + &.light ul { + padding-left: 0; + & li { + float: left; + & a { + color: $white; + text-decoration: none; + padding-left: 45px; + background: $arrow-light; + position: relative; + display: block; + float: left; + cursor: pointer; + + &::after { + content: " "; + display: block; + @include wX-hX(0, 0); + border-top: 50px solid transparent; + border-bottom: 50px solid transparent; + border-left: 30px solid $arrow-light; + position: absolute; + top: 50%; + margin-top: -50px; + left: 100%; + z-index: 1; + } + + &::before { + content: " "; + display: block; + @include wX-hX(0, 0); + border-top: 50px solid transparent; + border-bottom: 50px solid transparent; + border-left: 30px solid $button-bar-light; + position: absolute; + top: 50%; + margin-top: -50px; + margin-left: 2px; + left: 100%; + z-index: 1; + } + } + + &:first-child { + a { + padding-left: 10px; + @include bg-color($button-bar-light); + + &::before, &::after { + border-left: 16px solid $button-bar-light; + } + } + } + } + } +} + +.cursor-pointer { + cursor: pointer; +} + +.left-panel { + position: fixed; + top: 50px; + height: 88%; + min-width: 20%; + max-width: 50%; + text-align:center; + padding: $gap-sm; + + &.dark { + background: $light-grey; + color: $white; + border: 1px solid $dark; + } + + &.light { + background: $light-grey-light; + color: $dark; + border: 1px solid $border-dark-grey-light; + } + + mwlResizable { + box-sizing: border-box; + } +} +.gh-open-recentProject.dark { + &:hover { + @include bg-color($disabled-blue); + cursor: pointer; + } +} +.gh-open-recentProject.light { + &:hover { + @include bg-color($modal-tab-hover-light); + cursor: pointer; + } +} + +.gh-open-first.dark { + @include bg-color($light-green-hover); + + &:hover { + @include bg-color($light-green-hover); + } +} + +.gh-open-first.light { + @include bg-color($light-green-hover-light); + &:hover { + @include bg-color($light-green-hover-light); + cursor: default; + } +} + +.gh-open-recentPath { + font-size: $fs-small; + + &.dark { + color: $muted-white; + } + &.light { + color: $muted-dark; + } +} + +.gh-project-not-opened { + visibility: hidden; +} + +.icon-times { + color: $muted-white; + + &:hover { + color: $white; + } +} + +.disabled-search { + cursor: not-allowed; + color: $muted-white +} \ No newline at end of file diff --git a/src/app/screens/home/home.component.spec.ts b/src/app/screens/home/home.component.spec.ts new file mode 100644 index 0000000..b438fa7 --- /dev/null +++ b/src/app/screens/home/home.component.spec.ts @@ -0,0 +1,469 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeComponent } from './home.component'; +import { FormsModule } from '@angular/forms'; +import { TranslateService, TranslateModule, TranslateLoader } from '@ngx-translate/core'; +import { MockTranslateService } from '../../models/MockTranslateService'; +import { ElectronService } from '../../providers/electron.service'; +import { MockElectronService } from '../../models/MockElectronService'; +import { GitService } from '../../providers/git.service'; +import { MockGitService } from '../../models/MockGitService'; +import { ContainerComponent } from '../../components/container/container.component'; +import { InputComponent } from '../../components/input/input.component'; +import { ButtonComponent } from '../../components/button/button.component'; +import { ModalComponent } from '../../components/modal/modal.component'; +import { FooterComponent } from '../../components/footer/footer.component'; +import { IconButtonComponent } from '../../components/icon-button/icon-button.component'; +import { MatTabsModule, TooltipComponent } from '@angular/material'; +import { ResizableModule, ResizeEvent } from 'angular-resizable-element'; +import { LoaderComponent } from '../../components/loader/loader.component'; +import { RouterModule, Router } from '@angular/router'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { RouterTestingModule } from '@angular/router/testing'; +import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { ToastrService, ToastrModule } from 'ngx-toastr'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; +import { MockThemePreferencesService } from '../../models/MockThemePreferencesService'; +import { MockTranslateLoader } from '../../models/MockTranslateLoader'; +import { InfoBarComponent } from '../../components/info-bar/info-bar.component'; +import { MockRouter } from '../../models/MockRouter'; +import { MockTerminalManagerService } from '../../models/MockTerminalManagerService'; +import { TerminalManagerService } from '../../providers/terminal-manager.service'; + +describe('HomeComponent', () => { + let component: HomeComponent; + let fixture: ComponentFixture; + let terminalService: TerminalManagerService; + let originalTimeout; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ + HomeComponent, + ContainerComponent, + InputComponent, + ButtonComponent, + ModalComponent, + FooterComponent, + IconButtonComponent, + LoaderComponent, + InfoBarComponent + ], + imports: [ + FormsModule, + TranslateModule.forRoot({ + loader: {provide: TranslateLoader, useClass: MockTranslateLoader} + }), + MatTabsModule, + ResizableModule, + NgbModule, + RouterTestingModule, + BrowserAnimationsModule, + ToastrModule.forRoot() + ], + providers: [ + { + provide: Router, + useClass: MockRouter + }, + { + provide: TranslateService, + useClass: MockTranslateService + }, + { + provide: ThemePreferencesService, + useClass: MockThemePreferencesService + }, + { + provide: ElectronService, + useClass: MockElectronService + }, + { + provide: GitService, + useClass: MockGitService + }, + { + provide: TerminalManagerService, + useClass: MockTerminalManagerService + }, + ToastrService + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(HomeComponent); + component = fixture.componentInstance; + terminalService = TestBed.get(TerminalManagerService); + }); + + it('tests the component creation', () => { + expect(component).toBeTruthy(); + }); + + it('tests the pullButtonClicked function', () => { + expect(component.pullButtonClicked()).toBeTruthy(); + }); + + it('tests the pushButtonClicked function', () => { + expect(component.pushButtonClicked()).toBeTruthy(); + }); + + it('tests the branchButtonClicked function', () => { + expect(component.branchButtonClicked()).toBeTruthy(); + }); + + it('tests the openTerminal function with success', (done) => { + const TerminalName = 'terminator'; + terminalService.terminalName = TerminalName; + component.openTerminal().then((result) => { + expect(result).toBeTruthy(); + done(); + }); + }); + + it('tests the openTerminal function with success', (done) => { + const TerminalName = 'not-a-terminal'; + terminalService.terminalName = TerminalName; + component.openTerminal().then((result) => { + expect(result).toBeFalsy(); + done(); + }); + }); + + it('tests the openPreferences function', (done) => { + component.openPreferences().then((result) => { + expect(result).toBeTruthy(); + done(); + }); + }); + + it('tests the openProjectModal function', () => { + const TabSelectedIndex = 0; + component.openProjectModal(TabSelectedIndex); + expect(component.projectModalTabSelectedIndex).toBe(TabSelectedIndex); + expect(component.projectModalVisible).toBeTruthy(); + }); + + it('tests the displaySearchInputValue function', () => { + const RepoName = '/repo'; + component.repoName = RepoName; + expect(component.displaySearchInputValue()).toBeTruthy(); + }); + + it('tests the validate function with bad status', () => { + const TestEvent: ResizeEvent = + { + edges: + { + right: 2 + }, + rectangle: + { + top: 50, + bottom: 750, + left: 0, + right: 220, + height: 700, + width: 5 + } + }; + component.dimensions = 20; + expect(component.validate(TestEvent)).toBeFalsy(); + }); + + it('tests the validate function with good status', () => { + const TestEvent: ResizeEvent = + { + edges: + { + right: 2 + }, + rectangle: + { + top: 50, + bottom: 750, + left: 0, + right: 220, + height: 700, + width: 220 + } + }; + component.dimensions = 20; + expect(component.validate(TestEvent)).toBeTruthy(); + }); + + it('tests the onResizeEnd function', () => { + const TestEvent: ResizeEvent = + { + edges: + { + right: 2 + }, + rectangle: + { + top: 50, + bottom: 800, + left: 0, + right: 300, + height: 500, + width: 220 + } + }; + component.onResizeEnd(TestEvent); + expect(component.style).not.toBeUndefined(); + }); + + it('tests the updateFullPath function for init with all fields', () => { + const Path = '/new'; + const RepoName = '/repo'; + component.initLocation = Path; + component.initName = RepoName; + component.updateFullPath(); + expect(component.fullPath).toBe('/new/repo'); + }); + + it('tests the updateFullPath for init without location', () => { + const Path = ''; + const RepoName = '/repo'; + component.initLocation = Path; + component.initName = RepoName; + component.updateFullPath(); + expect(component.fullPath).toBe(''); + }); + + it('tests the initBrowse function', () => { + component.initBrowse(); + expect(component.initLocation).toBe('/new'); + }); + + it('tests the initSubmit function with valid path', (done) => { + const OldPath = '/old'; + const NewPath = '/new'; + const RepoName = '/repo'; + const BoolModal = true; + component.initLocation = NewPath; + component.initName = RepoName; + component.projectModalVisible = BoolModal; + component.projectModalLoading = BoolModal; + component.path = OldPath; + component.initSubmit().then(() => { + expect(component.projectModalVisible).toBeFalsy(); + expect(component.projectModalLoading).toBeFalsy(); + expect(component.initLocation).toBe(''); + expect(component.initName).toBe(''); + expect(component.fullPath).toBe(''); + expect(component.path).toBe(NewPath); + done(); + }); + }); + + it('tests the openBrowse function', () => { + const Path = '/new'; + component.openBrowse(); + expect(component.openFolder).toBe(Path); + }); + + it('tests the openRepo function with changed and valid path', (done) => { + const OldPath = '/old'; + const NewPath = '/new'; + const ProjectModalBoolean = true; + component.path = OldPath; + component.openFolder = NewPath; + component.projectModalLoading = ProjectModalBoolean; + component.projectModalVisible = ProjectModalBoolean; + component.openRepo().then(() => { + expect(component.openFolder).toBe(''); + expect(component.projectModalLoading).toBeFalsy(); + expect(component.projectModalVisible).toBeFalsy(); + done(); + }); + }); + + it('tests the openRepo function with changed and invalid path', (done) => { + const OldPath = '/old'; + const NewPath = '/invalid'; + const ProjectModalBoolean = true; + component.path = OldPath; + component.openFolder = NewPath; + component.projectModalLoading = ProjectModalBoolean; + component.projectModalVisible = ProjectModalBoolean; + component.openRepo().then(() => { + expect(component.openFolder).toBe(''); + expect(component.projectModalLoading).toBeFalsy(); + expect(component.projectModalVisible).toBeTruthy(); + done(); + }); + }); + + it('tests the initSubmit function with invalid path', (done) => { + const OldPath = '/old'; + const NewPath = '/invalidpath'; + const RepoName = '/repo'; + const BoolModal = true; + component.initLocation = NewPath; + component.initName = RepoName; + const FullPath = component.fullPath; + component.projectModalVisible = BoolModal; + component.projectModalLoading = BoolModal; + component.path = OldPath; + component.initSubmit().then(() => { + expect(component.projectModalVisible).toBeTruthy(); + expect(component.projectModalLoading).toBeFalsy(); + expect(component.initLocation).toBe(NewPath); + expect(component.initName).toBe(RepoName); + expect(component.fullPath).toBe(FullPath); + expect(component.path).toBe(OldPath); + done(); + }); + }); + + it('tests the openRepo function with unchanged path', (done) => { + const OldPath = '/old'; + const ProjectModalBoolean = true; + component.path = OldPath; + component.openFolder = OldPath; + component.projectModalVisible = ProjectModalBoolean; + component.openRepo().then((result) => { + expect(component.projectModalVisible).toBeTruthy(); + expect(result).toBeFalsy(); + done(); + }); + }); + + it('tests the openRecentRepo function', (done) => { + const OldPath = '/old'; + const NewPath = '/new'; + component.path = OldPath; + component.openRecentRepo(NewPath).then(() => { + expect(component.openFolder).toBe(''); + expect(component.projectModalLoading).toBeFalsy(); + expect(component.projectModalVisible).toBeFalsy(); + done(); + }); + }); + + it('tests the closeRepo function', () => { + const Path = '/new'; + const Repo = 'new'; + component.path = Path; + component.repoName = Repo; + component.closeRepo(); + expect(component.path).toBeUndefined(); + expect(component.repoName).toBeUndefined(); + }); + + it('tests the cloneBrowse function', () => { + component.cloneBrowse(); + expect(component.cloneFolder).toBe('/new'); + }); + + it('tests the cloneSubmit function with https', () => { + const CloneFolder = 'path'; + const CloneUrl = 'https://github.com/GitHarpon/git-harpon'; + component.cloneFolder = CloneFolder; + component.cloneUrl = CloneUrl; + component.cloneSubmit(); + expect(component.projectModalVisible).toBeFalsy(); + expect(component.credInfoBarVisible).toBeTruthy(); + }); + + it('tests the cloneSubmit function with ssh', () => { + const CloneFolder = 'path'; + const CloneUrl = 'git@github.com:GitHarpon/git-harpon.git'; + component.cloneFolder = CloneFolder; + component.cloneUrl = CloneUrl; + component.cloneSubmit(); + }); + + it('tests the cloneSubmit function with invalid url', () => { + const CloneFolder = 'path'; + const CloneUrl = 'NotAnUrl'; + component.cloneFolder = CloneFolder; + component.cloneUrl = CloneUrl; + component.cloneSubmit(); + }); + + it('tests the cloneSubmit function with invalid folder', () => { + const CloneFolder = 'invalid'; + const CloneUrl = 'https://github.com/GitHarpon/git-harpon'; + component.cloneFolder = CloneFolder; + component.cloneUrl = CloneUrl; + component.cloneSubmit(); + }); + + it('tests the cloneHttps function with valid arguments', (done) => { + const CloneUrl = 'https://github.com/GitHarpon/git-harpon'; + const CloneFolder = 'path'; + const Username = 'username'; + const Password = 'password'; + component.cloneUrl = CloneUrl; + component.cloneFolder = CloneFolder; + component.username = Username; + component.password = Password; + component.openClonedInfoBarVisible = false; + component.cloneHttps().then(() => { + expect(component.homeLoading).toBeFalsy(); + expect(component.openClonedInfoBarVisible).toBeTruthy(); + done(); + }); + }); + + it('tests the cloneHttps function with invalid url or folder', (done) => { + const CloneUrl = 'invalidurl'; + const CloneFolder = 'invalidfolder'; + const Username = 'username'; + const Password = 'password'; + component.cloneUrl = CloneUrl; + component.cloneFolder = CloneFolder; + component.username = Username; + component.password = Password; + component.cloneHttps().then(() => { + expect(component.homeLoading).toBeFalsy(); + done(); + }); + }); + + it('tests the cloneHttps function with invalid username or password', (done) => { + const CloneUrl = 'https://github.com/GitHarpon/git-harpon'; + const CloneFolder = 'path'; + const Username = 'badusername'; + const Password = 'badpassword'; + component.cloneUrl = CloneUrl; + component.cloneFolder = CloneFolder; + component.username = Username; + component.password = Password; + component.cloneHttps().then(() => { + expect(component.homeLoading).toBeFalsy(); + done(); + }); + }); + + it('tests the closeCredInfoBar function', () => { + component.closeCredInfoBar(); + expect(component.credInfoBarVisible).toBeFalsy(); + }); + + it('tests the openClonedRepo function', () => { + const NewRepo = '/new'; + component.newClonedRepoPath = NewRepo; + component.openClonedRepo(); + expect(component.path).toBe(NewRepo); + expect(component.openClonedInfoBarVisible).toBeFalsy(); + }); + + it('tests the closeClonedInfoBar function', () => { + component.closeClonedInfoBar(); + expect(component.openClonedInfoBarVisible).toBeFalsy(); + }); + + it('tests the resetCloneInputs function', () => { + component.resetCloneInputs(); + expect(component.username).toBe(''); + expect(component.password).toBe(''); + expect(component.cloneUrl).toBe(''); + expect(component.cloneFolder).toBe(''); + expect(component.newClonedRepoPath).toBe(''); + }); +}); diff --git a/src/app/screens/home/home.component.ts b/src/app/screens/home/home.component.ts new file mode 100644 index 0000000..16847b1 --- /dev/null +++ b/src/app/screens/home/home.component.ts @@ -0,0 +1,289 @@ +import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Router } from '@angular/router'; +import { ToastrService } from 'ngx-toastr'; +import { ResizeEvent } from 'angular-resizable-element'; +import { GitService } from '../../providers/git.service'; +import { ElectronService } from '../../providers/electron.service'; +import { initNgModule } from '@angular/core/src/view/ng_module'; +import { Subscription } from 'rxjs'; +import { ServiceResult } from '../../models/ServiceResult'; +import { TranslateService } from '@ngx-translate/core'; +import * as GitUrlParse from 'git-url-parse'; +import { TerminalManagerService } from '../../providers/terminal-manager.service'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; + +@Component({ + selector: 'app-home', + templateUrl: './home.component.html', + styleUrls: ['./home.component.scss'] +}) +export class HomeComponent implements OnDestroy { + projectModalTabSelectedIndex: any; + projectModalVisible: Boolean; + cloneUrl: String; + cloneFolder: string; + searchInputValue: String; + dimensions: number; + style: Object; + initName: string; + initLocation: string; + projectModalLoading: Boolean; + fullPath: string; + path: any; + pathSubscription: Subscription; + repoName: any; + repoNameSubscription: Subscription; + recentProject: any[]; + recentProjectSubscription: Subscription; + credInfoBarVisible: boolean; + openClonedInfoBarVisible: boolean; + newClonedRepoPath: string; + username: string; + password: string; + homeLoading: boolean; + openFolder: string; + themePrefSubscription: Subscription; + currentTheme: string; + + constructor(public router: Router, private toastr: ToastrService, + private electronService: ElectronService, private gitService: GitService, + private translateService: TranslateService, private terminalService: TerminalManagerService, + private themePrefService: ThemePreferencesService) { + this.pathSubscription = this.gitService.pathSubject.subscribe( + (path: any) => { + this.path = path; + }); + this.gitService.emitPathSubject(); + + this.repoNameSubscription = this.gitService.repoNameSubject.subscribe( + (repoName: any) => { + this.repoName = repoName; + }); + this.gitService.emitRepoNameSubject(); + + this.recentProjectSubscription = this.gitService.recentProjectSubject.subscribe( + (recentProject: any) => { + this.recentProject = recentProject; + }); + this.gitService.emitRecentProjectSubject(); + + this.themePrefSubscription = this.themePrefService.themePreferenceSubject.subscribe( + (newTheme: string) => { + this.currentTheme = newTheme; + } + ); + this.themePrefService.emitThemePreferencesSubject(); + + this.dimensions = 20; + } + + pullButtonClicked() { + return true; + } + + pushButtonClicked() { + return true; + } + + branchButtonClicked() { + return true; + } + + async openTerminal() { + return this.terminalService.openTerminal() + .then(() => { + return true; + }) + .catch((data) => { + this.toastr.error(data.message, data.title, { + onActivateTick: true + }); + return false; + }); + } + + async openPreferences() { + return this.router.navigate(['preferences']); + } + + openProjectModal(tabSelected: any) { + this.projectModalTabSelectedIndex = tabSelected; + this.projectModalVisible = true; + } + + displaySearchInputValue() { + if (this.repoName) { + return true; + } + } + + validate(event: ResizeEvent): boolean { + if ( + event.rectangle.width && + (event.rectangle.width < this.dimensions) + ) { + return false; + } + return true; + } + + onResizeEnd(event: ResizeEvent): void { + this.style = { + width: `${event.rectangle.width}px` + }; + } + + cloneBrowse() { + const BrowsePath = this.electronService.browse(); + if (BrowsePath !== null) { + this.cloneFolder = BrowsePath; + } + } + + cloneSubmit() { + if (this.electronService.fsExistsSync(this.cloneFolder.toString())) { + var Url = GitUrlParse(this.cloneUrl); + if (Url.protocol === 'https') { + this.projectModalVisible = false; + this.credInfoBarVisible = true; + } else if (Url.protocol === 'ssh') { + this.toastr.error('Pas de ssh pour le moment', 'Erreur'); + } else { + this.toastr.error(this.translateService.instant('INVALID_URL'), + this.translateService.instant('ERROR')); + } + } else { + this.toastr.error(this.translateService.instant('PATH_NOT_FOUND'), + this.translateService.instant('ERROR')); + } + } + + cloneHttps() { + this.credInfoBarVisible = false; + this.homeLoading = true; + return this.gitService.cloneHttps(GitUrlParse(this.cloneUrl), this.cloneFolder, this.username, this.password) + .then((data) => { + this.homeLoading = false; + this.openClonedInfoBarVisible = true; + this.newClonedRepoPath = data.newData; + this.toastr.info(data.message, data.title); + }) + .catch((data) => { + this.homeLoading = false; + this.resetCloneInputs(); + this.toastr.error(data.message, data.title); + }); + } + + initBrowse() { + const InitPath = this.electronService.browse(); + if (InitPath !== null) { + this.initLocation = InitPath; + } + this.updateFullPath(); + } + + updateFullPath() { + if (this.initLocation) { + this.fullPath = this.initLocation; + + if (this.initName) { + this.fullPath = this.electronService.pathJoin(this.initLocation, this.initName); + } + } else { + this.fullPath = ''; + } + } + + async initSubmit() { + this.projectModalLoading = true; + + return await this.gitService.init(this.initLocation, this.initName) + .then((result) => { + this.toastr.info(result.message, result.title, { + onActivateTick: true + }); + this.projectModalLoading = false; + this.projectModalVisible = false; + this.initName = ''; + this.initLocation = ''; + this.fullPath = ''; + }) + .catch((result) => { + this.toastr.error(result.message, result.title, { + onActivateTick: true + }); + this.projectModalLoading = false; + }); + } + + openBrowse() { + const NewPath = this.electronService.browse(); + if (NewPath !== null) { + this.openFolder = NewPath; + } + } + + async openRepo() { + if (this.path !== this.openFolder) { + this.projectModalLoading = true; + if (this.openFolder !== null) { + return this.gitService.setPath(this.openFolder) + .then((data) => { + this.projectModalLoading = false; + this.projectModalVisible = false; + this.openFolder = ''; + this.toastr.info(data.message, data.title); + }) + .catch((data) => { + this.projectModalLoading = false; + this.openFolder = ''; + this.toastr.error(data.message, data.title); + }); + } + } else { + this.toastr.error(this.translateService.instant('OPEN.ALREADY'), + this.translateService.instant('ERROR')); + return false; + } + } + + closeCredInfoBar() { + this.credInfoBarVisible = false; + this.resetCloneInputs(); + } + + openClonedRepo() { + this.gitService.setPath(this.newClonedRepoPath); + this.closeClonedInfoBar(); + } + + closeClonedInfoBar() { + this.openClonedInfoBarVisible = false; + this.resetCloneInputs(); + } + + resetCloneInputs() { + this.username = ''; + this.password = ''; + this.cloneUrl = ''; + this.cloneFolder = ''; + this.newClonedRepoPath = ''; + } + + async openRecentRepo(recentPath: string) { + this.openFolder = recentPath; + return this.openRepo(); + } + + closeRepo() { + this.path = undefined; + this.repoName = undefined; + } + + ngOnDestroy() { + this.pathSubscription.unsubscribe(); + this.repoNameSubscription.unsubscribe(); + this.recentProjectSubscription.unsubscribe(); + } +} diff --git a/src/app/screens/preferences/preferences.component.html b/src/app/screens/preferences/preferences.component.html new file mode 100644 index 0000000..56e9b01 --- /dev/null +++ b/src/app/screens/preferences/preferences.component.html @@ -0,0 +1,61 @@ + + + + + +
+ + {{ 'EXIT_PREFERENCES' | translate }} +
+ + + + + {{ 'GENERAL' | translate }} + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + + + {{ 'EDITOR' | translate }} + + + + + {{ 'UI' | translate }} + +
+
+ +
+
+ +
+
+ +
+
+ + + \ No newline at end of file diff --git a/src/app/screens/preferences/preferences.component.scss b/src/app/screens/preferences/preferences.component.scss new file mode 100644 index 0000000..9404d21 --- /dev/null +++ b/src/app/screens/preferences/preferences.component.scss @@ -0,0 +1 @@ +@import '../../../variables.scss'; \ No newline at end of file diff --git a/src/app/screens/preferences/preferences.component.spec.ts b/src/app/screens/preferences/preferences.component.spec.ts new file mode 100644 index 0000000..6695d87 --- /dev/null +++ b/src/app/screens/preferences/preferences.component.spec.ts @@ -0,0 +1,210 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { PreferencesComponent } from './preferences.component'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { TranslateService } from '@ngx-translate/core'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { MockTranslateLoader } from '../../models/MockTranslateLoader'; +import { ModalComponent } from '../../components/modal/modal.component'; +import { MockTranslateService } from '../../models/MockTranslateService'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; +import { MockThemePreferencesService } from '../../models/MockThemePreferencesService'; +import { MockLanguagePreferencesService } from '../../models/MockLanguagePreferenceService'; +import { MatTabsModule, MatIconModule } from '@angular/material'; +import { DropdownComponent } from '../../components/dropdown/dropdown.component'; +import { ButtonComponent } from '../../components/button/button.component'; +import { LoaderComponent } from '../../components/loader/loader.component'; +import { AppRoutingModule } from '../../app-routing.module'; +import { HomeComponent } from '../home/home.component'; +import { ToolboxComponent } from '../toolbox/toolbox.component'; +import { IconButtonComponent } from '../../components/icon-button/icon-button.component'; +import { ContainerComponent } from '../../components/container/container.component'; +import { FooterComponent } from '../../components/footer/footer.component'; +import { CheckboxComponent } from '../../components/checkbox/checkbox.component'; +import { AccordionComponent } from '../../components/accordion/accordion.component'; +import { InfoBarComponent } from '../../components/info-bar/info-bar.component'; +import { InputComponent } from '../../components/input/input.component'; +import { CopyButtonComponent } from '../../components/copy-button/copy-button.component'; +import { InputNumberComponent } from '../../components/input-number/input-number.component'; +import { ResizableModule } from 'angular-resizable-element'; +import { ContextMenuComponent, ContextMenuModule } from 'ngx-contextmenu'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { RouterTestingModule } from '@angular/router/testing'; +import { ToastrService, ToastrModule } from 'ngx-toastr'; +import { LanguagePreferencesService } from '../../providers/language-preferences.service'; +import { CommonModule } from '@angular/common'; +import { NgScrollbarModule } from 'ngx-scrollbar'; +import { Router } from '@angular/router'; +import { MockRouter } from '../../models/MockRouter'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { ElectronService } from '../../providers/electron.service'; +import { MockElectronService } from '../../models/MockElectronService'; +import { TerminalManagerService } from '../../providers/terminal-manager.service'; +import { MockTerminalManagerService } from '../../models/MockTerminalManagerService'; + +describe('PreferencesComponent', () => { + let component: PreferencesComponent; + let fixture: ComponentFixture; + let langPrefService: LanguagePreferencesService; + let terminalService: TerminalManagerService; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ + PreferencesComponent, + ModalComponent, + DropdownComponent, + ButtonComponent, + LoaderComponent, + HomeComponent, + ToolboxComponent, + IconButtonComponent, + ContainerComponent, + FooterComponent, + CheckboxComponent, + AccordionComponent, + InfoBarComponent, + InputComponent, + CopyButtonComponent, + InputNumberComponent, + ], + imports: [ + FormsModule, + ContextMenuModule, + CommonModule, + MatTabsModule, + NgbModule, + RouterTestingModule, + ReactiveFormsModule, + ToastrModule.forRoot(), + MatIconModule, + AppRoutingModule, + ResizableModule, + BrowserAnimationsModule, + TranslateModule.forRoot({ + loader: {provide: TranslateLoader, useClass: MockTranslateLoader}, + }), + NgScrollbarModule + ], + providers: [ + { + provide: Router, + useClass: MockRouter + }, + { + provide: TranslateService, + useClass: MockTranslateService + }, + { + provide: ThemePreferencesService, + useClass: MockThemePreferencesService + }, + { + provide: LanguagePreferencesService, + useClass: MockLanguagePreferencesService, + }, + { + provide: ElectronService, + useClass: MockElectronService, + }, + { + provide: TerminalManagerService, + useClass: MockTerminalManagerService + }, + ToastrService + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PreferencesComponent); + component = fixture.componentInstance; + langPrefService = TestBed.get(LanguagePreferencesService); + terminalService = TestBed.get(TerminalManagerService); + }); + + it('tests the component creation', () => { + expect(component).toBeTruthy(); + }); + + it('tests the ngOnInit function', () => { + component.ngOnInit(); + expect(component.languageSubscription.closed).toBeFalsy(); + expect(component.themePrefSubscription.closed).toBeFalsy(); + expect(component.terminalSubscription.closed).toBeFalsy(); + }); + + it('tests the checkIfCloseModal function with index equals to 0', (done) => { + const Event = { index: 0 }; + component.checkIfCloseModal(Event).then((result) => { + expect(result).toBeTruthy(); + done(); + }); + }); + + it('tests the checkIfCloseModal function with index greater than 0', (done) => { + const Event = { index: 1 }; + component.checkIfCloseModal(Event).then((result) => { + expect(result).toBeFalsy(); + done(); + }); + }); + + it('tests the switchLanguage function', () => { + const Lang = 'fr'; + component.dropdownLanguageValue = Lang; + component.switchLanguage(); + expect(langPrefService.preferences).toEqual(Lang); + }); + + it('tests the switchTerminal function', () => { + const TerminalCmd = 'terminator'; + component.dropdownTerminalValue = TerminalCmd; + component.switchTerminal(); + expect(terminalService.terminalCmd).toBe(TerminalCmd); + }); + + it('tests the saveChangedPreferences function', (done) => { + const Lang = 'fr'; + const TerminalCmd = 'terminator'; + component.dropdownLanguageValue = Lang; + component.dropdownTerminalValue = TerminalCmd; + component.saveChangedPreferences().then((result) => { + expect(result).toBeTruthy(); + done(); + }); + expect(langPrefService.preferences).toEqual(Lang); + expect(terminalService.terminalName).toEqual(TerminalCmd); + expect(component.loading).toBeFalsy(); + }); + + it('tests the saveChangedUIPreferences function with light theme', (done) => { + const Theme = 'light'; + component.currentTheme = Theme; + component.saveChangedUIPreferences().then((result) => { + expect(result).toBeTruthy(); + done(); + }); + expect(component.currentTheme).toEqual(Theme); + }); + + it('tests the saveChangedUIPreferences function with dark theme', (done) => { + const Theme = 'dark'; + component.currentTheme = Theme; + component.saveChangedUIPreferences().then((result) => { + expect(result).toBeTruthy(); + done(); + }); + expect(component.currentTheme).toEqual(Theme); + }); + + + + it('tests the ngOnDestroy function', () => { + component.ngOnInit(); + component.ngOnDestroy(); + expect(component.languageSubscription.closed).toBeTruthy(); + expect(component.themePrefSubscription.closed).toBeTruthy(); + expect(component.terminalSubscription.closed).toBeTruthy(); + }); +}); diff --git a/src/app/screens/preferences/preferences.component.ts b/src/app/screens/preferences/preferences.component.ts new file mode 100644 index 0000000..fe6b6ed --- /dev/null +++ b/src/app/screens/preferences/preferences.component.ts @@ -0,0 +1,129 @@ +import { Component, OnInit, OnDestroy, Input } from '@angular/core'; +import { Router } from '@angular/router'; +import { TranslateService } from '@ngx-translate/core'; +import { Subscription } from 'rxjs'; +import { LanguagePreferencesService } from '../../providers/language-preferences.service'; +import { ToastrService } from 'ngx-toastr'; +import { ElectronService } from '../../providers/electron.service'; +import { TerminalManagerService } from '../../providers/terminal-manager.service'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; + +@Component({ + selector: 'app-preferences', + templateUrl: './preferences.component.html', + styleUrls: ['./preferences.component.scss'] +}) +export class PreferencesComponent implements OnInit, OnDestroy { + + loading: Boolean = false; + + preferencesVisible: Boolean; + preferencesTabSelectedIndex: any; + dropdownLanguageValue: string; + dataDropdownLanguage: Array; + dataDropdownTheme: Array; + currentTheme: string; + + languageSubscription: Subscription; + themePrefSubscription: Subscription; + + dataDropdownTerminal: Array; + dropdownTerminalValue: string; + + terminalSubscription: Subscription; + + constructor(public router: Router, private translate: TranslateService, + private langPrefService: LanguagePreferencesService, private toastr: ToastrService, + private electronService: ElectronService, private themePrefService: ThemePreferencesService, + public terminalPreferencesService: TerminalManagerService) { + } + + ngOnInit() { + this.preferencesVisible = true; + this.preferencesTabSelectedIndex = 1; + + this.dataDropdownLanguage = [ + { key: 'fr', value: this.translate.instant('FRENCH') }, + { key: 'en', value: this.translate.instant('ENGLISH') }, + ]; + + this.dataDropdownTheme = [ + { key: 'dark', value: this.translate.instant('DARK') }, + { key: 'light', value: this.translate.instant('LIGHT') } + ]; + + this.dropdownLanguageValue = this.translate.getDefaultLang(); // renvoie 'fr' ou 'en' + + this.languageSubscription = this.langPrefService.preferencesSubject.subscribe( + (preference) => { + this.dropdownLanguageValue = preference; + } + ); + this.langPrefService.emitPreferencesSubject(); + + this.dataDropdownTerminal = this.terminalPreferencesService.getTerminals(); + + this.dropdownTerminalValue = this.terminalPreferencesService.terminalCmd; + + this.terminalSubscription = this.terminalPreferencesService.preferencesSubject.subscribe( + (preference) => { + this.dropdownTerminalValue = preference; + } + ); + this.terminalPreferencesService.emitPreferencesSubject(); + + this.themePrefSubscription = this.themePrefService.themePreferenceSubject.subscribe( + (newTheme: string) => { + this.currentTheme = newTheme; + } + ); + this.themePrefService.emitThemePreferencesSubject(); + } + + async checkIfCloseModal(event) { + if (event.index === 0) { + return this.router.navigate(['home']); + } + return false; + } + + switchLanguage() { + this.langPrefService.setLanguage(this.dropdownLanguageValue); + } + + switchTerminal() { + this.terminalPreferencesService.setCurrentTerminal(this.dropdownTerminalValue); + } + + // Fonction qui regroupe toutes les fonctions applicables aux préférences + async saveChangedPreferences() { + this.loading = true; + this.switchLanguage(); + this.switchTerminal(); + this.loading = false; + this.toastr.info(this.translate.instant('CHANGE_PREF_DONE'), + this.translate.instant('SUCCESS')); + return this.router.navigate(['home']); + } + + async saveChangedUIPreferences() { + this.loading = true; + this.themePrefService.setThemePreference(this.currentTheme); + this.loading = false; + this.toastr.info(this.translate.instant('CHANGE_PREF_DONE'), + this.translate.instant('SUCCESS')); + return this.router.navigate(['home']); + } + + ngOnDestroy() { + if (this.languageSubscription) { + this.languageSubscription.unsubscribe(); + } + if (this.terminalSubscription) { + this.terminalSubscription.unsubscribe(); + } + if (this.themePrefSubscription) { + this.themePrefSubscription.unsubscribe(); + } + } +} diff --git a/src/app/components/toolbox/toolbox.component.html b/src/app/screens/toolbox/toolbox.component.html similarity index 75% rename from src/app/components/toolbox/toolbox.component.html rename to src/app/screens/toolbox/toolbox.component.html index 0c8e922..3fa9a73 100644 --- a/src/app/components/toolbox/toolbox.component.html +++ b/src/app/screens/toolbox/toolbox.component.html @@ -1,91 +1,119 @@ - - + +
- Toolbox + Toolbox
-
-

{{ 'COLORS' | translate }}

+
+

{{ 'DARK_THEME' | translate }}

-
-
+
+
-
+
${{ color }}
-
+
+

{{ 'LIGHT_THEME' | translate }}

+
+
+
+
+
+
+ ${{ color }} +
+
+
+
+
+
+

{{ 'INDEPENDENT_THEME' | translate }}

+
+
+
+
+
+
+ ${{ color }} +
+
+
+
+
+

{{ 'FONT_SIZES' | translate }}

-
+
${{ fs }}
-
+

{{ 'TAGS' | translate }}

-
+

{{ 'TAG' | translate }} h1

-
+

{{ 'TAG' | translate }} h2

-
+

{{ 'TAG' | translate }} h3

-
+

{{ 'TAG' | translate }} h4

-
+
{{ 'TAG' | translate }} h5
-
+
{{ 'TAG' | translate }} h6
-
+

Font Awesome

-
+
-
+
{{ fa.icon }}
- Font Awesome 5 Free + Font Awesome 5 Free
-
+

Loader

@@ -106,7 +134,7 @@

Loader

-
+

{{ 'CHECKBOX' | translate }}

@@ -129,7 +157,7 @@

{{ 'CHECKBOX' | translate }}

-
+

Boutons

@@ -190,13 +218,13 @@

Boutons

-
+

Input

-
+
@@ -205,7 +233,7 @@

Input

@@ -225,7 +253,7 @@

Input

@@ -245,7 +273,7 @@

Input

-
+
-
+
-
+
+
+ +
+ +
+
+ +
+
+
+ +
@@ -280,7 +328,7 @@

Input

-
+

{{ 'MODAL.WINDOW' | translate }}

@@ -294,7 +342,7 @@

{{ 'MODAL.WINDOW' | translate }}

-
+
@@ -337,9 +385,39 @@

{{ 'MODAL.WINDOW' | translate }}

'>
+
+
+ +
+
+ +
+
-
+
+

{{ 'INFOBAR.TITLE' | translate }}

+
+
+
+ +
+
+ +
+
+
+
+

IconButtons

@@ -358,23 +436,25 @@

IconButtons

-
+

Input-Number

-
+
@@ -384,8 +464,7 @@

Input-Number

@@ -405,7 +484,7 @@

Input-Number

{{ 'CONTEXT_MENU' | translate }}

-
    +
    • {{ 'CLICK.RIGHT' | translate }}: {{ user?.sexe === 'F' ? 'Mme.' : 'M.' }} {{ user?.lastname }}
      • @@ -468,7 +547,7 @@

      {{ 'CONTEXT_MENU' | translate }}

      '>
-
    +
    • {{ 'CLICK.RIGHT' | translate }}: {{ subject?.name }}
    @@ -531,7 +610,7 @@

    {{ 'CONTEXT_MENU' | translate }}

-
+

Dropdowns

@@ -578,6 +657,29 @@

Dropdowns

+
+
+
+

Accordion

+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
@@ -587,7 +689,7 @@

Dropdowns

-
+
@@ -606,6 +708,15 @@

Dropdowns

+ + + + {{ 'MODAL.FIRST_CONTENT' | translate }} + {{ 'MODAL.SECOND_CONTENT' | translate }} + {{ 'MODAL.THIRD_CONTENT' | translate }} + + + @@ -623,5 +734,9 @@

Dropdowns

 + + {{ 'INFOBAR.TITLE' | translate }} + + \ No newline at end of file diff --git a/src/app/screens/toolbox/toolbox.component.scss b/src/app/screens/toolbox/toolbox.component.scss new file mode 100644 index 0000000..ce402f8 --- /dev/null +++ b/src/app/screens/toolbox/toolbox.component.scss @@ -0,0 +1,194 @@ +@import '../../../variables.scss'; + +.big-heading { + @include wX(100%); + font-size: 36px; + &.dark { + color: $white; + } + &.light { + color: $dark; + } +} + +.bb-white { + border-bottom: 2px solid $white; +} + +.bb-dark { + border-bottom: 1px solid $dark; +} + +.gh-div-loader { + width: 500px; + height: 500px; +} + +a.link-white { + + color: $white; + text-decoration: underline; + &:hover, &:focus, &:active, &:visited { + color: $white; + cursor: pointer; + } +} + +a.link-dark { + + color: $dark; + text-decoration: underline; + &:hover, &:focus, &:active, &:visited { + color: $dark; + cursor: pointer; + } +} + +// Background colors +.color-item { + @include hX(50px); + &.border-dark { + border: 1px solid $muted-white !important; + } + &.border-light { + border: 1px solid $dark !important; + } + // DARK THEME + &.dark-blue { + @include bg-color($dark-blue); + } + &.light-blue { + @include bg-color($light-blue); + } + &.disabled-blue { + @include bg-color($disabled-blue); + } + &.dark-green { + @include bg-color($dark-green); + } + &.light-green { + @include bg-color($light-green); + } + &.disabled-green { + @include bg-color($disabled-green); + } + &.light-green-hover { + @include bg-color($light-green-hover); + } + &.dark-red { + @include bg-color($dark-red); + } + &.light-red { + @include bg-color($light-red); + } + &.disabled-red { + @include bg-color($disabled-red); + } + &.dark-grey { + @include bg-color($dark-grey); + } + &.light-grey { + @include bg-color($light-grey); + } + &.blue-grey { + @include bg-color($blue-grey); + } + + // LIGHT THEME + &.dark-blue-light { + @include bg-color($dark-blue-light); + } + &.light-blue-light { + @include bg-color($light-blue-light); + } + &.disabled-blue-light { + @include bg-color($disabled-blue-light); + } + &.dark-green-light { + @include bg-color($dark-green-light); + } + &.light-green-light { + @include bg-color($light-green-light); + } + &.disabled-green-light { + @include bg-color($disabled-green-light); + } + &.light-green-hover-light { + @include bg-color($light-green-hover-light); + } + &.dark-red-light { + @include bg-color($dark-red-light); + } + &.light-red-light { + @include bg-color($light-red-light); + } + &.disabled-red-light { + @include bg-color($disabled-red-light); + } + &.button-bar-light { + @include bg-color($button-bar-light); + } + &.button-bar-hover-light { + @include bg-color($button-bar-hover-light); + } + &.arrow-light { + @include bg-color($arrow-light); + } + &.border-light-grey-light { + @include bg-color($border-light-grey-light); + } + &.border-dark-grey-light { + @include bg-color($border-dark-grey-light); + } + &.dark-grey-light { + @include bg-color($dark-grey-light); + } + &.light-grey-light { + @include bg-color($light-grey-light); + } + &.grey-variant-light { + @include bg-color($grey-variant-light); + } + &.modal-tab-selected-light { + @include bg-color($modal-tab-selected-light); + } + &.modal-tab-hover-light { + @include bg-color($modal-tab-hover-light); + } + + // INDEPENDANT OF THEME + &.light-blue-hover { + @include bg-color($light-blue-hover); + } + &.muted-white { + @include bg-color($muted-white); + } + &.white { + @include bg-color($white); + } + &.muted-dark { + @include bg-color($muted-dark); + } + &.dark { + @include bg-color($dark); + } + &.gh-green { + @include bg-color($gh-green); + } +} +// Font sizes +.fs-xsmall { + @include fs($fs-xsmall); +} +.fs-small { + @include fs($fs-small); +} +.fs-medium { + @include fs($fs-medium); +} +.fs-large { + @include fs($fs-large); +} +.fs-xlarge { + @include fs($fs-xlarge); +} \ No newline at end of file diff --git a/src/app/components/toolbox/toolbox.component.ts b/src/app/screens/toolbox/toolbox.component.ts similarity index 70% rename from src/app/components/toolbox/toolbox.component.ts rename to src/app/screens/toolbox/toolbox.component.ts index d3e916a..87bbe8d 100644 --- a/src/app/components/toolbox/toolbox.component.ts +++ b/src/app/screens/toolbox/toolbox.component.ts @@ -3,6 +3,8 @@ import { ElectronService } from '../../providers/electron.service'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; import { ContextMenuComponent } from 'ngx-contextmenu'; +import { Subscription } from 'rxjs'; +import { ThemePreferencesService } from '../../providers/theme-preferences.service'; @Component({ selector: 'app-toolbox', @@ -12,17 +14,22 @@ import { ContextMenuComponent } from 'ngx-contextmenu'; export class ToolboxComponent implements OnInit { @ViewChild('userCM') userCM: ContextMenuComponent; @ViewChild('subjectCM') subjectCM: ContextMenuComponent; - colorList: Array; + darkColorList: Array; + lightColorList: Array; + independentColorList: Array; fsList: Array; faList: Array; cbValue: Boolean; inputValue: String; inputEmptyValue: String; loading: Boolean; + modalLoading: Boolean; modalRegularVisible: Boolean; modalFullscreenVisible: Boolean; + modalLoadingVisible: Boolean; modalInputValue: String; modalTabSelectedIndex: any; + infoBarVisible: Boolean; inputValueNumber: number; inputMinMaxValueNumber: number; max: number; @@ -36,10 +43,22 @@ export class ToolboxComponent implements OnInit { value: String = 'value'; dropdownValue: String; dropdownValueTwo: String; + passwordInput: string; + + themePrefSubscription: Subscription; + currentTheme: string; constructor(private electronService: ElectronService, - private toastr: ToastrService, private translateService: TranslateService) { } + private toastr: ToastrService, private translateService: TranslateService, + private themePrefService: ThemePreferencesService) { + this.themePrefSubscription = this.themePrefService.themePreferenceSubject.subscribe( + (newTheme: string) => { + this.currentTheme = newTheme; + } + ); + this.themePrefService.emitThemePreferencesSubject(); + } ngOnInit() { this.cbValue = true; @@ -47,31 +66,61 @@ export class ToolboxComponent implements OnInit { this.inputEmptyValue = ''; this.modalTabSelectedIndex = 1; + this.passwordInput = 'toto'; this.inputValueNumber = 10; this.inputMinMaxValueNumber = 0; this.max = 10; this.min = 0; - this.dropdownValue = 'Orange'; + this.dropdownValue = 'banana'; - this.colorList = [ + this.darkColorList = [ 'dark-blue', 'light-blue', - 'light-blue-hover', 'disabled-blue', - 'gh-green', 'dark-green', 'light-green', 'disabled-green', + 'light-green-hover', 'dark-red', 'light-red', 'disabled-red', 'dark-grey', 'light-grey', 'blue-grey', - 'white', + 'version' + ]; + + this.lightColorList = [ + 'dark-blue-light', + 'light-blue-light', + 'disabled-blue-light', + 'dark-green-light', + 'light-green-light', + 'disabled-green-light', + 'light-green-hover-light', + 'dark-red-light', + 'light-red-light', + 'disabled-red-light', + 'button-bar-light', + 'button-bar-hover-light', + 'arrow-light', + 'border-light-grey-light', + 'border-dark-grey-light', + 'dark-grey-light', + 'light-grey-light', + 'grey-variant-light', + 'modal-tab-selected-light', + 'modal-tab-hover-light' + ]; + + this.independentColorList = [ + 'light-blue-hover', 'muted-white', - 'dark' + 'white', + 'muted-dark', + 'dark', + 'gh-green' ]; this.fsList = [ @@ -112,21 +161,29 @@ export class ToolboxComponent implements OnInit { { icon: 'fa-spinner', isFab: false }, { icon: 'fa-upload', isFab: false }, { icon: 'fa-download', isFab: false }, - { icon: 'fa-sign-out-alt', isFab: false} + { icon: 'fa-globe', isFab: false}, + { icon: 'fa-sign-out-alt', isFab: false }, + { icon: 'fa-code-branch', isFab: false }, + { icon: 'fa-laptop', isFab: false }, + { icon: 'fa-cloud', isFab: false }, + { icon: 'fa-cog', isFab: false }, + { icon: 'fa-laptop', isFab: false }, + { icon: 'fa-search', isFab: false }, + { icon: 'fa-times', isFab: false } ]; this.dataDropdownExample = [ - {key: 'Orange', value: 'Orange'}, - {key: 'Banane', value: 'Banane'}, - {key: 'Cerise', value: 'Cerise'}, - {key: 'Poire', value: 'Poire'}, + { key: 'orange', value: 'Orange' }, + { key: 'banana', value: 'Banane' }, + { key: 'cherry', value: 'Cerise' }, + { key: 'pear', value: 'Poire' }, ]; this.dataDropdownExampleTwo = [ - {key: 'Carotte', value: 'Carotte'}, - {key: 'Poireau', value: 'Poireau'}, - {key: 'Courge', value: 'Courge'}, - {key: 'Patate', value: 'Patate'}, + { key: 'carrot', value: 'Carotte' }, + { key: 'leek', value: 'Poireau' }, + { key: 'squash', value: 'Courge' }, + { key: 'potato', value: 'Patate' }, ]; this.contextMenuFirstObject = [ @@ -139,7 +196,7 @@ export class ToolboxComponent implements OnInit { ]; this.contextMenuSecondObject = [ - { name: 'Prog Objet', teacher: 'M. Andary', language: 'Java' }, + { name: 'Prog Objet', teacher: 'M. Andary', language: 'Java' }, { name: 'S&T', teacher: 'M. Patrou', language: 'Scala' }, { name: 'Langage Web', teacher: 'M. Nicart', language: 'JavaScript' }, ]; @@ -208,12 +265,30 @@ export class ToolboxComponent implements OnInit { this.modalFullscreenVisible = true; } + openLoadingModal() { + this.modalLoadingVisible = true; + this.modalLoading = true; + new Promise(resolve => setTimeout(resolve, 3000)) + .then(() => { + this.modalLoading = false; + } + ); + } + + openInfoBar() { + this.infoBarVisible = true; + } + + closeInfoBar() { + this.infoBarVisible = false; + } + displayModalInputValue() { this.toastr.info(this.modalInputValue.toString()); } - checkIfCloseModal($event) { - if ($event.index === 0) { + checkIfCloseModal(event) { + if (event.index === 0) { this.modalTabSelectedIndex = 1; this.modalFullscreenVisible = false; } @@ -236,7 +311,7 @@ export class ToolboxComponent implements OnInit { } testAleatDropdown() { - this.dropdownValue = this.dataDropdownExample[Math.floor(Math.random() * 4)].value; + this.dropdownValue = this.dataDropdownExample[Math.floor(Math.random() * 4)].key; } showMessage(message: string) { diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 7b174b3..d9e3e1b 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -4,6 +4,11 @@ "COLORS": "Colors", "TAGS": "Tags", "TAG": "Tag", + "CHANGE_PREFERENCE": "Change preferences", + "CHANGE_PREF_DONE": "The preferences were changed", + "LANGUE": "Language", + "FRENCH": "French", + "ENGLISH": "English", "FONT_SIZES": "Font sizes", "CHECKBOX": "CheckBox", "UN_CHECKBOX": "Unchecked checkbox", @@ -23,6 +28,20 @@ "DESACTIVATE": "Desactivate the loader", "INFO": "Loading..." }, + "CLONE": { + "WHERE": "Where to clone", + "URL": "URL", + "TITLE": "Clone", + "TAB_TITLE": "Clone a repository", + "DONE": "The repository was clone", + "ERROR": "Problem during the clone", + "UNABLE_TO_UPDATE": "Unable to update url base from redirection", + "HTTP_ACCESS_DENIED": "HTTP basic: Access denied", + "NOT_WORK_TREE": "Could not create work tree : permission denied", + "REPO_NOT_FOUND": "Repository not found", + "ALREADY_EXISTS": "This repository already exists and is not an empty directory", + "INVALID_CRED": "Invalid username or password" + }, "BUTTON": { "PRIMARY": "Primary button", "SUCCESS": "Success button", @@ -38,9 +57,13 @@ "GITLAB": "This is GitLab" } }, + "CLOSE": "Close", + "NAME": "Nom", "INFORMATION": "Information", "SUCCESS": "Success", "DANGER": "Danger", + "ERROR": "Error", + "PATH_NOT_FOUND": "This path doesn't exist", "UPDATE_VALUE": "Update value", "DISPLAY_VALUE": "Display value", "LABEL": "Label", @@ -48,7 +71,8 @@ "WINDOW": "Modal window", "OPEN": { "REGULAR": "Open the regular modal", - "FULLSCREEN": "Open the fullscreen modal" + "FULLSCREEN": "Open the fullscreen modal", + "LOADING": "Open the modal with loading" }, "EXIT": "Exit", "FIRST_SECTION": "First section", @@ -58,10 +82,62 @@ "SECOND_CONTENT": "Second content", "THIRD_CONTENT": "Third content" }, + "INFOBAR": { + "TITLE": "Information bar", + "OPEN": "Open the information bar" + }, "CONTEXT_MENU": "Menu contextuel", "CLICK": { "RIGHT": "Right click", "LEFT": "Left click" }, - "COPY": "Copy" + "COPY": "Copy", + "BRANCH": "Branch", + "PULL": "Pull", + "PUSH": "Push", + "EXIT_PREFERENCES": "Exit preferences", + "GENERAL": "General", + "EDITOR": "Editor", + "UI": "User Interface", + "REPOSITORY_MANAGEMENT": "Repository management", + "REMOTE": "REMOTE", + "OPEN": { + "TITLE": "Open", + "REPO": "Open a repository", + "OPENED": "Recently Opened", + "BROWSE": "Browse", + "OPENED_REPO": "The repository was successfully opened", + "NOT_GIT_REPO": "This is not a git repository", + "REPO_NOT_EXIST": "The repository no longer exist", + "WHERE": "Where to clone", + "ALREADY": "Already opened" + }, + "INIT": { + "TITLE": "Init", + "TAB_TITLE": "Initialize a repository", + "WHERE": "Initialize in", + "SUCCESS": "Init successed", + "FAILED": "Init failed" + }, + "FULL_PATH": "Full path", + "BROWSE": "Browse", + "CREATE_REPOSITORY": "Create Repository", + "LOG_IN": "Log in", + "CANCEL": "Cancel", + "OPEN_NOW": "Open now", + "USERNAME": "Username", + "PASSWORD": "Password", + "LOG_TO_CONTINUE": "Please log to continue:", + "INVALID_URL": "Invalid URL", + "TERMINAL": { + "UNKNOWN": "Unknown terminal", + "MESSAGE": "It seeems not installed on the device", + "NAME": "Terminal" + }, + "LIGHT": "Light", + "DARK": "Dark", + "THEME": "Theme", + "DARK_THEME": "Dark theme", + "LIGHT_THEME": "Light theme", + "INDEPENDENT_THEME": "Independent of the theme" } \ No newline at end of file diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index ab25922..9017203 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -4,6 +4,11 @@ "COLORS": "Couleurs", "TAGS": "Balises", "TAG": "Balise", + "CHANGE_PREFERENCE": "Changer les préférences", + "CHANGE_PREF_DONE": "Les préférences ont été changées", + "LANGUE": "Langage", + "FRENCH": "Français", + "ENGLISH": "Anglais", "FONT_SIZES": "Tailles de texte", "CHECKBOX": "Case à cocher", "UN_CHECKBOX": "Case décochée", @@ -23,12 +28,27 @@ "DESACTIVATE": "Désactiver le loader", "INFO": "Chargement..." }, + "CLONE": { + "WHERE": "Où cloner", + "URL": "URL", + "TITLE": "Cloner", + "TAB_TITLE": "Cloner un dépôt", + "DONE": "Le répertoire a été cloné", + "ERROR": "Problème lors du clone", + "UNABLE_TO_UPDATE": "Impossible de mettre à jour la base de l'URL à partir d'une redirection", + "HTTP_ACCESS_DENIED": "HTTP basic: Accès refusé", + "NOT_WORK_TREE": "Impossible de créer le repertoire de travail : permission refusé", + "REPO_NOT_FOUND": "Répertoire non trouvé", + "ALREADY_EXISTS": "Ce répertoire existe déjà et n'est pas un dossier vide", + "INVALID_CRED": "Nom d'utilisateur ou mot de passe invalide" + }, "BUTTON": { "PRIMARY": "Bouton primaire", "SUCCESS": "Bouton succès", "DANGER": "Bouton danger", "DISABLED": "Bouton désactivé", "LARGE": "Bouton allongé" + }, "ICONBUTTON": { "GITHUB": "GitHub", @@ -38,9 +58,12 @@ "GITLAB": "Ceci est GitLab" } }, + "CLOSE": "Fermer", + "NAME": "Nom", "INFORMATION": "Information", "SUCCESS": "Succès", "DANGER": "Danger", + "PATH_NOT_FOUND": "Ce chemin n'existe pas", "UPDATE_VALUE": "Changer la valeur", "DISPLAY_VALUE": "Afficher la valeur", "LABEL": "Label", @@ -48,7 +71,8 @@ "WINDOW": "Fenêtre modale", "OPEN": { "REGULAR": "Ouvrir la modale normale", - "FULLSCREEN": "Ouvrir la modale plein écran" + "FULLSCREEN": "Ouvrir la modale plein écran", + "LOADING": "Ouvrir la modale avec chargement" }, "EXIT": "Sortir", "FIRST_SECTION": "Première section", @@ -58,10 +82,62 @@ "SECOND_CONTENT": "Deuxième contenu", "THIRD_CONTENT": "Troisième contenu" }, + "INFOBAR": { + "TITLE": "Barre d'informations", + "OPEN": "Ouvrir la barre d'informations" + }, "CONTEXT_MENU": "Menu contextuel", "CLICK": { "RIGHT": "Clic droit", "LEFT": "Clic gauche" }, - "COPY": "Copier" + "COPY": "Copier", + "BRANCH": "Branche", + "PULL": "Tirer", + "PUSH": "Pousser", + "EXIT_PREFERENCES": "Sortir des préferences", + "GENERAL": "Général", + "EDITOR": "Editeur", + "UI": "Interface Utilisateur", + "REPOSITORY_MANAGEMENT": "Gestion du répertoire", + "REMOTE": "DISTANT", + "OPEN": { + "TITLE": "Ouvrir", + "REPO": "Ouvrir un dépôt", + "OPENED": "Ouvert récemment", + "BROWSE": "Parcourir", + "OPENED_REPO": "Le dépôt a été ouvert avec succès", + "NOT_GIT_REPO": "Ce répertoire n'est pas un répertoire git", + "REPO_NOT_EXIST": "Ce répertoire n'existe plus", + "WHERE": "Où ouvrir", + "ALREADY": "Déjà ouvert" + }, + "INIT": { + "TITLE": "Initialiser", + "TAB_TITLE": "Initialiser un dépôt", + "WHERE": "Initialiser dans", + "SUCCESS": "Initialisation réussie", + "FAILED": "Initialisation échouée" + }, + "FULL_PATH": "Chemin complet", + "BROWSE": "Parcourir", + "CREATE_REPOSITORY": "Créer le répertoire", + "TERMINAL": { + "UNKNOWN": "Terminal inconnu", + "MESSAGE": "Il ne semble pas installé sur la machine", + "NAME": "Terminal" + }, + "LOG_IN": "S'identifier", + "CANCEL": "Annuler", + "OPEN_NOW": "Ouvrir", + "USERNAME": "Nom d'utilisateur", + "PASSWORD": "Mot de passe", + "LOG_TO_CONTINUE": "Veuillez vous identifier pour continuer :", + "INVALID_URL": "URL invalide", + "LIGHT": "Clair", + "DARK": "Sombre", + "THEME": "Thème", + "DARK_THEME": "Thème sombre", + "LIGHT_THEME": "Thème clair", + "INDEPENDENT_THEME": "Indépendant du thème" } \ No newline at end of file diff --git a/src/karma.conf.js b/src/karma.conf.js index 886ca1b..b564350 100644 --- a/src/karma.conf.js +++ b/src/karma.conf.js @@ -10,7 +10,8 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), require('karma-coverage-istanbul-reporter'), - require('@angular-devkit/build-angular/plugins/karma') + require('karma-htmlfile-reporter'), + require('@angular-devkit/build-angular/plugins/karma'), ], client:{ clearContext: false // leave Jasmine Spec Runner output visible in browser @@ -20,7 +21,10 @@ module.exports = function (config) { reports: [ 'html', 'lcovonly' ], fixWebpackSourcePaths: true }, - reporters: ['progress', 'kjhtml'], + htmlReporter: { + outputFile: '../units/units.html' + }, + reporters: ['progress', 'html'], port: 9876, colors: true, logLevel: config.LOG_INFO, diff --git a/src/styles.scss b/src/styles.scss index 09a1bd8..f3886a5 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -11,8 +11,8 @@ body { position: relative; } -body { - color: $f-color; +.dark-body { + color: $white; font-family: $ff-default; margin: 0; background: $dark; @@ -48,17 +48,72 @@ body { } } +.light-body { + color: $dark; + font-family: $ff-default; + margin: 0; + background: $white; + h1 { + font-size: $fs-xlarge; + font-weight: bold; + color: $dark; + } + h2 { + font-size: $fs-large; + font-weight: bold; + color: $dark; + } + h3 { + font-size: $fs-large; + color: $dark; + } + h4 { + font-size: $fs-medium; + font-weight: bold; + color: $dark; + } + h5 { + font-size: $fs-medium; + color: $dark; + } + h6 { + font-size: $fs-small; + color: $dark; + } + p { + font-size: $fs-large; + } +} + .color-white { - color: $white; + color: $white; +} + +.color-dark { + color: $dark; +} + +.section-title { + font-size: 32px; } .gh-label-input { + color: $white; + padding: $gap-md $gap-md 0 $gap-md; + padding-right: 0; + &.dark { color: $white; - padding: $gap-md $gap-md 0 $gap-md; - padding-right: 0; + } + &.light { + color: $dark; + } +} + +.text-break-word { + word-wrap: break-word; } -.gh-scrollbar { +.gh-scrollbar-dark { --scrollbar-color: rgba(55, 56, 65, 0.3) !important; --scrollbar-thumb-color: #373841 !important; --scrollbar-thumb-hover-color: #373841 !important; @@ -66,12 +121,20 @@ body { --scrollbar-size: 7px !important; } +.gh-scrollbar-light { + --scrollbar-color: rgba(0, 0, 0, 0.1) !important; + --scrollbar-thumb-color: #C6C6C6 !important; + --scrollbar-thumb-hover-color: #C6C6C6 !important; + --scrollbar-border-radius: 4px !important; + --scrollbar-size: 7px !important; + } + /*** Tabs ***/ -.mat-tab { +.gh-modal__content.dark .mat-tab { &-header { - background: $blue-grey; + background: $light-grey; border-right: 1px solid $dark; &-pagination { @@ -120,6 +183,59 @@ body { } } +.gh-modal__content.light .mat-tab { + + &-header { + color: $dark; + background: $dark-grey-light; + border-right: 1px solid $border-dark-grey-light; + + &-pagination { + display:none !important; + } + } + + &-body-wrapper { + @include wX(100%); + background: $light-grey-light; + padding:10px; + } + + &-label { + font-size: 22px; + opacity: 1 !important; + justify-content: left !important; + + &:hover { + background: $modal-tab-hover-light; + } + + &-active { + background: $modal-tab-selected-light !important; /* light-grey plus clair */ + } + } + + &-group { + @include hX(100%); + display: flex; + flex-direction: row !important; + + } + + &-labels { + display: flex; + flex-direction: column !important; + } + + & md-tab-content { + transition:none; + } + + & md-ink-bar { + transition:none; + } +} + .ngx-contextmenu { & .dropdown-menu { diff --git a/src/variables.scss b/src/variables.scss index 1e140da..d17c250 100644 --- a/src/variables.scss +++ b/src/variables.scss @@ -1,26 +1,55 @@ // Couleurs +// DARK THEME $dark-blue: #353D5A; $light-blue: #4C5DAA; -$light-blue-hover: #4D88FF; $disabled-blue: #2A3345; -$gh-green: #1B958A; $dark-green: #314739; $light-green:#477F4B; $disabled-green: #2C3835; +$light-green-hover: #37553E; $dark-red:#54383E; $light-red: #963D3E; $disabled-red: #382C32; $dark-grey: #2C2E34; $light-grey: #373841; -$blue-grey: #373841; -$white: #fff; +$blue-grey: #3E4453; +$version: #3E4453; + + +// LIGHT THEME +$dark-blue-light: #4C88FC; +$light-blue-light: #DDE6F8; +$disabled-blue-light: #EAEFF8; +$dark-green-light: #5BB862; +$light-green-light: #E0EDE1; +$disabled-green-light: #ECF2EC; +$light-green-hover-light: #C7E4CA; +$dark-red-light: #DA413E; +$light-red-light: #ECD6D5; +$disabled-red-light: #E0D6D5; +$button-bar-light: #464E69; +$button-bar-hover-light: #3E465E; +$arrow-light: #525C7C; +$border-dark-grey-light: #C6C6C6; +$border-light-grey-light: #DADADA; +$dark-grey-light: #F0F0F0; +$light-grey-light: #F7F7F7; +$grey-variant-light: #E8E8E8; +$modal-tab-selected-light: #CDD6E9; +$modal-tab-hover-light: #DADEE8; + +// Independent of theme +$light-blue-hover: #4D88FF; $muted-white: #C9CACC; +$white: #fff;; +$muted-dark: #8A8A8B; $dark: #222328; +$gh-green: #1B958A; + // Font family $ff-default: 'Open Sans', sans-serif; -$f-color: $white; // Font size $fs-xsmall: 10px; diff --git a/tests/open-terminal.js b/tests/open-terminal.js new file mode 100644 index 0000000..f1452a6 --- /dev/null +++ b/tests/open-terminal.js @@ -0,0 +1,72 @@ +const Application = require('spectron').Application; +const path = require('path'); +const chai = require('chai'); +var expect = require('chai').expect; + +require('mocha-sinon'); +const chaiAsPromised = require('chai-as-promised'); +const name = require('../package.json').name; +const version = require('../package.json').version; + +if (process.platform === 'linux') { + electronPath = path.join(__dirname, '..', 'release', `${name}-${version}.AppImage`); +} else if (process.platform === 'darwin') { + electronPath = path.join(__dirname, '..', 'release', `${name}.app/Contents/MacOS/${name}`); +} else if (process.platform === 'win32') { + electronPath = path.join(__dirname, '..', 'release', `${name}-${version}.exe`); +} + +var appPath = path.join(__dirname, '..'); + +var app = new Application({ + path: electronPath, + args: [appPath] +}); + +global.before(function () { + chai.should(); + chai.use(chaiAsPromised); +}); + +describe('Test term-1', function () { + beforeEach(function () { + var log = console.log; + this.sinon.stub(console, 'log').callsFake( function() { + return log.apply(log, arguments); + }); + return app.start(); + }); + + afterEach(function () { + return app.stop(); + }); + + it('Ouverture terminal', function () { + var btn = app.client.element('#terminal-opener'); + btn.click(); + + const util = require('util'); + const exec = util.promisify(require('child_process').exec); + + async function lsExample() { + var command; + if (process.platform === 'linux') { + command = 'ps -aux | grep "[' + localStorage.getItem('terminalName').substr(0,1) + ']' + + localStorage.getItem('terminalName').substr(1) + '"'; + console.log('ps -aux | grep "[' + test.substr(0,1) + ']' + test.substr(1) + '"'); + + + } else if (process.platform === 'darwin') { + command = 'ps -A -ww | grep [^]]' + localStorage.getItem('terminalName'); + } else if (process.platform === 'win32') { + command = 'tasklist | findstr "' + localStorage.getItem('terminalName') + '"'; + } + + const { stdout, stderr } = await exec('command'); + + return stdout.length; + } + var length = lsExample(); + expect(length).to.be.not.equal(0); + }); +}); \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 71d5563..2bb8f80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -615,6 +615,13 @@ amdefine@>=0.0.4: resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= +angular-resizable-element@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/angular-resizable-element/-/angular-resizable-element-3.2.3.tgz#0080a61fdbe88634ea233596a6640ffa597130de" + integrity sha512-BRBYZOKcqKdMbCsmZxuc3SPwmrTXsM2eDQK4O/RiXul/3v0puTZ2r913uQiFg971SI4Tl9Udtzjpgg6MbU6tNw== + dependencies: + tslib "^1.9.0" + ansi-align@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" @@ -1476,7 +1483,7 @@ builder-util-runtime@8.0.2: debug "^4.1.0" fs-extra-p "^7.0.0" sax "^1.2.4" - + builder-util-runtime@^8.0.1: version "8.1.1" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.1.1.tgz#f2f6fc43e33d26892bd491667fc746ad69bccc50" @@ -2405,7 +2412,7 @@ date-now@^0.1.4: resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= -debug@*, debug@^4.1.0, debug@^4.1.1: +debug@*, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== @@ -2856,12 +2863,12 @@ electron-to-chromium@^1.3.92: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.96.tgz#25770ec99b8b07706dedf3a5f43fa50cb54c4f9a" integrity sha512-ZUXBUyGLeoJxp4Nt6G/GjBRLnyz8IKQGexZ2ndWaoegThgMGFO1tdDYID5gBV32/1S83osjJHyfzvanE/8HY4Q== -electron@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/electron/-/electron-4.0.4.tgz#638e32ccbe9ded1124c3e6dbbaa1e16d37c32019" - integrity sha512-zG5VtLrmPfmw1fXY/3BEtRZk7OZ7djQhweZ6rW+R5NeF6s8RTz/AwTGtLoBo4z8wmJ5QTy0Y941FZw4pe5YlpA== +electron@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-4.0.0.tgz#6ccb40cc8bf2d49954dcea73b97ae7ad12ee04b3" + integrity sha512-3XPG/3IXlvnT1oe1K6zEushoD0SKbP8xwdrL10EWGe6k2iOV4hSHqJ8vWnR8yZ7VbSXmBRfomEFDNAo/q/cwKw== dependencies: - "@types/node" "^10.12.18" + "@types/node" "^8.0.24" electron-download "^4.1.0" extract-zip "^1.0.3" @@ -3770,6 +3777,21 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" +git-up@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0" + integrity sha512-LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw== + dependencies: + is-ssh "^1.3.0" + parse-url "^5.0.0" + +git-url-parse@^11.1.2: + version "11.1.2" + resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.1.2.tgz#aff1a897c36cc93699270587bea3dbcbbb95de67" + integrity sha512-gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ== + dependencies: + git-up "^4.0.0" + glob-base@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" @@ -4704,6 +4726,13 @@ is-retry-allowed@^1.0.0: resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34" integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ= +is-ssh@^1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3" + integrity sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg== + dependencies: + protocols "^1.1.0" + is-stream@^1.0.0, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -5097,6 +5126,13 @@ karma-coverage-istanbul-reporter@2.0.0: istanbul-api "^1.3.1" minimatch "^3.0.4" +karma-htmlfile-reporter@^0.3.8: + version "0.3.8" + resolved "https://registry.yarnpkg.com/karma-htmlfile-reporter/-/karma-htmlfile-reporter-0.3.8.tgz#490f7f5f4fa7115404222f5d6cb72b04108354b4" + integrity sha512-Hd4c/vqPXYjdNYXeDJRMMq2DMMxPxqOR+TPeiLz2qbqO0qCCQMeXwFGhNDFr+GsvYhcOyn7maTbWusUFchS/4A== + dependencies: + xmlbuilder "^10.0.0" + karma-jasmine-html-reporter@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.0.tgz#1abbd30d4509a8c82b96707ae7d2fa4da459ca19" @@ -5393,11 +5429,26 @@ lodash.get@^4.4.2: resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= + +lodash.merge@^4.6.1: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54" + integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ== + lodash.mergewith@^4.6.0: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ== +lodash.set@^4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" + integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM= + lodash.tail@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664" @@ -5980,6 +6031,18 @@ ngx-scrollbar@^4.1.1: dependencies: tslib "^1.9.0" +ngx-store@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ngx-store/-/ngx-store-2.1.0.tgz#b0789406fd60102f8ea925f507376b87f91f9af2" + integrity sha512-NVFP/VUctQuzwGqmaSx6bbQwT1XmGmHe0ACTMyxoWq7gmpAFAt/LkGuei70aX4ukyH1tQNk9zuYzTQlQOIG7rg== + dependencies: + lodash.get "^4.4.2" + lodash.isequal "^4.5.0" + lodash.merge "^4.6.1" + lodash.set "^4.3.2" + ts-debug "^1.3.0" + tslib "^1.9.3" + ngx-toastr@^9.1.1: version "9.1.1" resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-9.1.1.tgz#c7ec0284d13951422ccf47439a387372ddccc768" @@ -6180,6 +6243,11 @@ normalize-range@^0.1.2: resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= +normalize-url@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" + integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== + npm-bundled@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979" @@ -6813,6 +6881,24 @@ parse-json@^4.0.0: error-ex "^1.3.1" json-parse-better-errors "^1.0.1" +parse-path@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.1.tgz#0ec769704949778cb3b8eda5e994c32073a1adff" + integrity sha512-d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA== + dependencies: + is-ssh "^1.3.0" + protocols "^1.4.0" + +parse-url@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.1.tgz#99c4084fc11be14141efa41b3d117a96fcb9527f" + integrity sha512-flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg== + dependencies: + is-ssh "^1.3.0" + normalize-url "^3.3.0" + parse-path "^4.0.0" + protocols "^1.4.0" + parse5@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" @@ -7164,6 +7250,11 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= +protocols@^1.1.0, protocols@^1.4.0: + version "1.4.7" + resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz#95f788a4f0e979b291ffefcf5636ad113d037d32" + integrity sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg== + protoduck@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-4.0.0.tgz#fe4874d8c7913366cfd9ead12453a22cd3657f8e" @@ -8157,6 +8248,13 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= +simple-git@^1.107.0: + version "1.107.0" + resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.107.0.tgz#12cffaf261c14d6f450f7fdb86c21ccee968b383" + integrity sha512-t4OK1JRlp4ayKRfcW6owrWcRVLyHRUlhGd0uN6ZZTqfDq8a5XpcUdOKiGRNobHEuMtNqzp0vcJNvhYWwh5PsQA== + dependencies: + debug "^4.0.1" + single-line-log@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/single-line-log/-/single-line-log-1.1.2.tgz#c2f83f273a3e1a16edb0995661da0ed5ef033364" @@ -9099,6 +9197,11 @@ truncate-utf8-bytes@^1.0.0: dependencies: utf8-byte-length "^1.0.1" +ts-debug@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/ts-debug/-/ts-debug-1.3.0.tgz#ecf9fb60f7be223a0ff9113ac48e93da139ad98f" + integrity sha512-sP9Q4Nfqu5ImWLH955PpxbjR2zgLWS3NIc2tCw/JZtZMFFxUZe3fvkhdA0vSIpjiGFKPwCg6v0drthjwnSQTGA== + ts-node@6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-6.0.3.tgz#28bf74bcad134fad17f7469dad04638ece03f0f4" @@ -9113,7 +9216,7 @@ ts-node@6.0.3: source-map-support "^0.5.3" yn "^2.0.0" -tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.9.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== @@ -9421,6 +9524,11 @@ uuid@~3.1.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" integrity sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g== +valid-url@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" + integrity sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA= + validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -9835,6 +9943,11 @@ xml2js@^0.4.17: sax ">=0.6.0" xmlbuilder "~9.0.1" +xmlbuilder@^10.0.0: + version "10.1.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-10.1.1.tgz#8cae6688cc9b38d850b7c8d3c0a4161dcaf475b0" + integrity sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg== + xmlbuilder@^9.0.7, xmlbuilder@~9.0.1: version "9.0.7" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"