Merge branch 'master' of https://github.com/lokesh-coder/ink-bucket

Author: lokesh-coder

.gitignore

@@ -4,6 +4,7 @@
 /dist
 /tmp
 /out-tsc
+src/environments/secrets.ts
 
 # dependencies
 /node_modules
@@ -34,6 +35,7 @@ npm-debug.log
 yarn-error.log
 testem.log
 /typings
+.env
 
 # System Files
 .DS_Store

.grenrc

@@ -0,0 +1,18 @@
+{
+  "dataSource": "commits",
+    "template": {
+        "commit": "- {{message}} ([→]({{url}}))",
+        "issue": "- {{labels}} {{name}} [{{text}}]({{url}})",
+        "label": "[**{{label}}**]",
+        "noLabel": "closed",
+        "group": "\n#### {{heading}}\n",
+        "changelogTitle": "# Changelog\n\n",
+        "release": "## {{release}} ({{date}})\n{{body}}",
+        "releaseSeparator": "\n---\n\n"
+    },
+    "groupBy": {
+        "Enhancements:": ["enhancement", "internal"],
+        "Bug Fixes:": ["bug"],
+        "Build Improvements":["view"]
+    }
+}

CHANGELOG.md

@@ -1,21 +1,29 @@
-<a name="1.0.0-beta.0"></a>
-# 1.0.0-beta.0 (2018-05-27)
-
-
-### Features
-
-* added material CDK for color picker popup ([d02fd13](https://github.com/lokesh-coder/ink-bucket/commit/d02fd13))
-* added nedb for client side storage ([7929f75](https://github.com/lokesh-coder/ink-bucket/commit/7929f75))
-* added settings state and actions for test ([8152f65](https://github.com/lokesh-coder/ink-bucket/commit/8152f65))
-* Initial commit ([16e54d1](https://github.com/lokesh-coder/ink-bucket/commit/16e54d1))
-* store actions added ([8e50805](https://github.com/lokesh-coder/ink-bucket/commit/8e50805))
-* **delete:** added delete option in settings ([26fccd7](https://github.com/lokesh-coder/ink-bucket/commit/26fccd7))
-* updated store and added color picker ([df3ae6b](https://github.com/lokesh-coder/ink-bucket/commit/df3ae6b))
-* **electron:** basic electron setup ([c4e566e](https://github.com/lokesh-coder/ink-bucket/commit/c4e566e))
-* **export:** added database export option in settings ([78a27c0](https://github.com/lokesh-coder/ink-bucket/commit/78a27c0))
-* **pwa:** basic pwa setup ([32379e7](https://github.com/lokesh-coder/ink-bucket/commit/32379e7))
-* **wip:** design changes ([6fd994c](https://github.com/lokesh-coder/ink-bucket/commit/6fd994c))
-* **wip:** updated ink colors service ([41936ac](https://github.com/lokesh-coder/ink-bucket/commit/41936ac))
+# Changelog
 
+## v1.0.0-beta.1 (29/05/2018)
+- style(view): home page layout width ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/cae9800855d7f566154c0502a10e224a0c698a38))
+- fix(view): duplicate of colors and buckets on page revisits ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/2fe92cad531f638f730bae0c359dc12362be0c48))
+- style(view): add new thin color view ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/d90ca9f96c5e587d9dfc3b81f513fb03573da93d))
+- feat(view): add ink color view basic settings and state ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/ab39f30b2155b3075253a7122de616c4e57c9e0b))
+- build: add github release module ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/50093fc82316735fa0bbceaf0d3f09852994b2e7))
+- chore(changelog): added changelog ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/c6eeb8a6e24bd80e77911804fb1c23873ddf0da9))
 
+---
 
+## v1.0.0-beta.0 (28/05/2018)
+- feat(pwa): basic pwa setup ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/32379e79b8f497ee81e6430c20960f17c64e9e8b))
+- feat(electron): basic electron setup ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/c4e566eba0ff3c0346ca5d8a4bcb100ce2711508))
+- feat(wip): updated ink colors service ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/41936ac9d0bcd1b0b2a452936c23d036fa680b7b))
+- style(font): changed to default system font ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/d5b6d28f719bc5dae05a7a40f90f2d6de5e4f9b4))
+- feat(delete): added delete option in settings ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/26fccd794fd05d6a2f1e4131a8bc242d5b18d759))
+- feat(export): added database export option in settings ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/78a27c03763852f99aa023eb92c387b87c77b53f))
+- feat(wip): design changes ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/6fd994c74e5d868b5be0632164a095d38923bb3b))
+- refactor(wip): updated board and bucket data layer ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/339ba42e6e2f3e430a999711f6edd28539eb2540))
+- refactor(wip): change nedb to rxdb ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/dbbc7f7e921ba48e0c121a6f217e69d57b523df0))
+- style: app design update ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/56ac2b3c126d71b9a91954d070b40ad7bd5c0875))
+- feat: store actions added ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/8e5080513e1e178320c1396f052a45d6e5a8272f))
+- feat: added material CDK for color picker popup ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/d02fd13659b024b277b8e7b21a0a83373833f1c1))
+- feat: updated store and added color picker ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/df3ae6b7923b7dfd052dcdf7cf480fbc47c7b367))
+- feat: added settings state and actions for test ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/8152f65ecb15f2d79c2958e7b8e437bce8d5fae7))
+- feat: added nedb for client side storage ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/7929f750481be69664400175ccbb219d2b676b13))
+- feat: Initial commit ([→](https://api.github.com/repos/lokesh-coder/ink-bucket/git/commits/16e54d15e82ef12da4dcf9621295b477ab7c910b))

config/env.secrets.ts

@@ -0,0 +1,17 @@
+import { writeFile } from 'fs';
+import { argv } from 'yargs';
+
+require('dotenv').config();
+
+const targetPath = `./src/environments/secrets.ts`;
+const envConfigFile = `
+export const githubClientSecret= '${process.env.GITHUB_CLIENT_SECRET}';
+export const githubClientID= '${process.env.GITHUB_CLIENT_ID}';
+`;
+writeFile(targetPath, envConfigFile, function(err) {
+  if (err) {
+    console.log(err);
+  }
+
+  console.log(`secrets file generated at ${targetPath}`);
+});

config/proxy.conf.json

@@ -0,0 +1,9 @@
+{
+  "/ghtoken/*": {
+    "target": "https://github.com/login/oauth/access_token",
+    "secure": false,
+    "logLevel": "debug",
+    "changeOrigin": true,
+    "pathRewrite": { "^/ghtoken": "" }
+  }
+}

package-lock.json

@@ -4,7 +4,9 @@
   "main": "main.js",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve",
+    "config:secrets": "ts-node ./config/env.secrets.ts",
+    "start":
+      "npm run config:secrets && ng serve --proxy-config config/proxy.conf.json -o --host=0.0.0.0 --disable-host-check",
     "build": "ng build",
     "test": "ng test",
     "lint": "ng lint",
@@ -14,8 +16,8 @@
     "electron": "electron .",
     "electron-build": "ng build --prod && electron .",
     "server:prod": "http-server -p 1234 -s -o --cors",
-    "generate:changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
-    "release": "gren release --token=TOKEN --override"
+    "release": "gren release --token=TOKEN --data-source=commits --override",
+    "generate:changelog": "gren changelog --token=TOKEN --data-source=commits --override"
   },
   "private": true,
   "dependencies": {
@@ -31,6 +33,8 @@
     "@angular/platform-browser-dynamic": "^6.0.0",
     "@angular/pwa": "^0.6.5",
     "@angular/router": "^6.0.0",
+    "@angular/service-worker": "^6.0.0",
+    "@auth0/angular-jwt": "^2.0.0",
     "@ctrl/tinycolor": "^2.0.0",
     "@ngxs/devtools-plugin": "^3.0.1",
     "@ngxs/store": "^3.0.1",
@@ -41,6 +45,7 @@
     "babel-polyfill": "^6.26.0",
     "bootstrap": "^4.1.1",
     "core-js": "^2.5.4",
+    "deepmerge": "^2.1.1",
     "fuse.js": "^3.2.0",
     "gun": "^0.9.996",
     "keypress.js": "^2.1.5",
@@ -56,8 +61,7 @@
     "relational-pouch": "^3.0.1",
     "rxdb": "^7.6.0",
     "rxjs": "^6.0.0",
-    "zone.js": "^0.8.26",
-    "@angular/service-worker": "^6.0.0"
+    "zone.js": "^0.8.26"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.6.0",
@@ -72,6 +76,7 @@
     "@types/node": "~8.9.4",
     "@types/pouchdb": "^6.3.2",
     "codelyzer": "~4.2.1",
+    "dotenv": "^5.0.1",
     "electron": "^2.0.2",
     "github-release-notes": "^0.15.0",
     "husky": "^0.14.3",

package.json

@@ -1,5 +1,4 @@
-<inkapp-magic-title [title]="bucketData.name" (changed)="onTitleChange($event)">
-  #{{index}}
+<inkapp-magic-title [title]="bucketData.name" (changed)="onTitleChange($event)" [index]="index" (delete)="deleteBucket()">
 </inkapp-magic-title>
 <div class="d-flex flex-wrap">
   <ng-container *ngFor="let color of ink|async">

src/app/components/bucket/bucket.component.html

@@ -5,7 +5,7 @@ import { Observable } from 'rxjs';
 import { filter, tap, map } from 'rxjs/operators';
 import { AddInkColor, LoadInkColorsInBucket } from '../../store/actions/ink.action';
 import { BucketService } from '../../services/bucket.service';
-import { RenameBucket } from '../../store/actions/bucket.action';
+import { RenameBucket, DeleteBucket } from '../../store/actions/bucket.action';
 import { InkColorService } from '../../services/ink.service';
 
 @Component({
@@ -43,4 +43,10 @@ export class BucketComponent implements OnInit {
       this._store.dispatch(new RenameBucket(this.bucketData._id, bucket.name));
     });
   }
+
+  deleteBucket() {
+    this._bucketService.deleteBucket(this.bucketData._id).then(bucket => {
+      this._store.dispatch(new DeleteBucket(this.bucketData._id));
+    });
+  }
 }

src/app/components/bucket/bucket.component.ts

@@ -1,9 +1,13 @@
-<ng-container *ngIf="!editable else editableTpl">
-  <h5>
-    <span>
-      <ng-content></ng-content>
-    </span> {{title}}</h5>
-</ng-container>
-<ng-template #editableTpl>
-  <input type="text" class="form-control" [(ngModel)]="newTitle" (keyup.enter)="done()" (keyup.esc)="cancel()">
-</ng-template>
+<div class="inkapp--titlebar" [ngClass]="{'-has-prompt':editable}">
+  <div class="title" (dblclick)="allowEditing()">
+    <i class="prefix">#{{index}}</i> {{title}}
+  </div>
+  <div class="action">
+    <button class="btn -is-plain -is-compact --only-on-parent-hover" (click)="delete.emit()">
+      <i class="ink-icon icon-trash text-danger"></i>
+    </button>
+  </div>
+  <div class="prompt">
+    <input type="text" class="form-control -is-inline" [(ngModel)]="newTitle" (keyup.enter)="done()" (keyup.esc)="cancel()">
+  </div>
+</div>

src/app/components/magic-title/magic-title.component.html

@@ -7,6 +7,8 @@ import { Component, OnInit, EventEmitter, Output, Input, HostListener } from '@a
 export class MagicTitleComponent implements OnInit {
   @Output() changed: EventEmitter<string> = new EventEmitter<string>();
   @Input() title: string;
+  @Input() index: number;
+  @Output() delete: EventEmitter<string> = new EventEmitter();
   editable = false;
   newTitle: string;
   constructor() {}
@@ -15,8 +17,7 @@ export class MagicTitleComponent implements OnInit {
     this.newTitle = this.title;
   }
 
-  @HostListener('dblclick', ['$event.target'])
-  onDblClick(e) {
+  allowEditing(e) {
     this.editable = true;
   }
 

src/app/components/magic-title/magic-title.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, NgZone } from '@angular/core';
 import { Store } from '@ngxs/store';
-import { ChangeView, LoadSettings } from './store/actions/settings.action';
+import { LoadSettings } from './store/actions/settings.action';
 import { InkAppView, InkDb } from './models';
 import { DBService } from './services/db.service';
 import { tap } from 'rxjs/operators';
@@ -21,7 +21,9 @@ export class InkApp implements OnInit {
   }
   ngOnInit() {
     this._settingsService.setDefaultSettings().then((doc: any) => {
-      if (doc) { this._store.dispatch(new LoadSettings(doc)); }
+      if (doc) {
+        this._store.dispatch(new LoadSettings(doc));
+      }
     });
   }
 }