unsakini 0.0.4.2 → 0.0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54053e7e5b61b8cfbf49bdeb46789a0aa05bf63c
-  data.tar.gz: 6ed74baa24a16312b7767f27d5f7d831c6e24dea
+  metadata.gz: a0d780cebdb7dd795bdcb575419e297c3b930e5b
+  data.tar.gz: c6ce2373bf39b51a6b94a6481665b4395e3cbe63
 SHA512:
-  metadata.gz: 424a75de3e27bebb05b989694cd7569702bb5a275aa3cb39fd1d554809dce1fe9368a001e70eddf74db298162f889f28bd8a7b48eec02f3301eb541531e85d6a
-  data.tar.gz: 087b2e3fd72a467c7f0dce94e845e78124e912c00de5de262b5b3ba5b174f1d4b0261e827df5ffb867d979b9f4e1de10767cde789a4f72e486c3db51151dc868
+  metadata.gz: daf67dd36409c1c044064d2771ee780299b0e4231c404d9c6bfa05b0311ac5ca81cc3898a2c6948011a21a52376796301ac57f6be03bd94666d82fe53c9f7fc7
+  data.tar.gz: 6646d882f54f409179ead7f8b240697b42d45a781b23b6edac7ab31079f127f7d5e7661929b3d178d8b3b5c8d2436752a89b0aed2ca67fde6a8d160cd06931d1

data/README.md

@@ -48,6 +48,32 @@ Bundle install and initialize the application
 $ bundle install
 $ rake unsakini:install
 ```
+The `rake unsakini:install` command is just a super set of the following commands:
+```
+$ rails generate unsakini:config              # generates config/initializers/unsakini.rb
+$ rails generate unsakini:dependencies        # add dependencies to Gemfile
+$ rake unsakini_engine:install:migrations     # copy the engine migrations to db/migrations directory
+$ rake db:migrate                             # runs the migration files
+```
+
+These dependencies will be added to your Gemfile
+```bash
+gem "active_model_serializers"
+gem "rack-cors"
+gem "kaminari"
+gem "api-pagination"
+# As of Nov 28, 2016: waiting for my PR to be merged
+# https://github.com/nsarno/knock/pull/126
+gem 'knock', git: 'https://github.com/adonespitogo/knock'
+
+```
+
+Install the newly added dependencies
+
+**Note:** You might want to review your Gemfile first
+```
+$ bundle install
+```
 
 Run local rails server
 ```

data/angular/angular-cli.json

@@ -6,7 +6,7 @@
   "apps": [
     {
       "root": "src",
-      "outDir": "dist",
+      "outDir": "../public/unsakini/app/",
       "assets": [
         "assets",
         "favicon.ico"
@@ -18,13 +18,15 @@
       "prefix": "app",
       "mobile": false,
       "styles": [
-        "styles.css"
+        "../node_modules/bootstrap/dist/css/bootstrap.css",
+        "assets/global.scss"
       ],
       "scripts": [],
       "environments": {
         "source": "environments/environment.ts",
         "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
+        "prod": "environments/environment.prod.ts",
+        "custom": "environments/custom.ts"
       }
     }
   ],

data/angular/npm-debug.log

@@ -0,0 +1,54 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/usr/bin/node',
+1 verbose cli   '/usr/bin/npm',
+1 verbose cli   'run',
+1 verbose cli   'e2e',
+1 verbose cli   '--',
+1 verbose cli   './protractor.conf.js' ]
+2 info using npm@4.0.2
+3 info using node@v6.9.1
+4 verbose run-script [ 'pree2e', 'e2e', 'poste2e' ]
+5 info lifecycle angular@0.0.0~pree2e: angular@0.0.0
+6 verbose lifecycle angular@0.0.0~pree2e: unsafe-perm in lifecycle true
+7 verbose lifecycle angular@0.0.0~pree2e: PATH: /usr/lib/node_modules/npm/bin/node-gyp-bin:/home/adones/Projects/UNSAKINI/unsakini/angular/node_modules/.bin:/home/adones/.rbenv/shims:/usr/local/bin:/usr/local/sbin:/usr/bin:/home/adones/.config/composer/vendor/bin
+8 verbose lifecycle angular@0.0.0~pree2e: CWD: /home/adones/Projects/UNSAKINI/unsakini/angular
+9 silly lifecycle angular@0.0.0~pree2e: Args: [ '-c', 'webdriver-manager update' ]
+10 silly lifecycle angular@0.0.0~pree2e: Returned: code: 0  signal: null
+11 info lifecycle angular@0.0.0~e2e: angular@0.0.0
+12 verbose lifecycle angular@0.0.0~e2e: unsafe-perm in lifecycle true
+13 verbose lifecycle angular@0.0.0~e2e: PATH: /usr/lib/node_modules/npm/bin/node-gyp-bin:/home/adones/Projects/UNSAKINI/unsakini/angular/node_modules/.bin:/home/adones/.rbenv/shims:/usr/local/bin:/usr/local/sbin:/usr/bin:/home/adones/.config/composer/vendor/bin
+14 verbose lifecycle angular@0.0.0~e2e: CWD: /home/adones/Projects/UNSAKINI/unsakini/angular
+15 silly lifecycle angular@0.0.0~e2e: Args: [ '-c', 'protractor "./protractor.conf.js"' ]
+16 silly lifecycle angular@0.0.0~e2e: Returned: code: 1  signal: null
+17 info lifecycle angular@0.0.0~e2e: Failed to exec e2e script
+18 verbose stack Error: angular@0.0.0 e2e: `protractor "./protractor.conf.js"`
+18 verbose stack Exit status 1
+18 verbose stack     at EventEmitter.<anonymous> (/usr/lib/node_modules/npm/lib/utils/lifecycle.js:279:16)
+18 verbose stack     at emitTwo (events.js:106:13)
+18 verbose stack     at EventEmitter.emit (events.js:191:7)
+18 verbose stack     at ChildProcess.<anonymous> (/usr/lib/node_modules/npm/lib/utils/spawn.js:40:14)
+18 verbose stack     at emitTwo (events.js:106:13)
+18 verbose stack     at ChildProcess.emit (events.js:191:7)
+18 verbose stack     at maybeClose (internal/child_process.js:877:16)
+18 verbose stack     at Process.ChildProcess._handle.onexit (internal/child_process.js:226:5)
+19 verbose pkgid angular@0.0.0
+20 verbose cwd /home/adones/Projects/UNSAKINI/unsakini/angular
+21 error Linux 4.8.8-2-ARCH
+22 error argv "/usr/bin/node" "/usr/bin/npm" "run" "e2e" "--" "./protractor.conf.js"
+23 error node v6.9.1
+24 error npm  v4.0.2
+25 error code ELIFECYCLE
+26 error angular@0.0.0 e2e: `protractor "./protractor.conf.js"`
+26 error Exit status 1
+27 error Failed at the angular@0.0.0 e2e script 'protractor "./protractor.conf.js"'.
+27 error Make sure you have the latest version of node.js and npm installed.
+27 error If you do, this is most likely a problem with the angular package,
+27 error not with npm itself.
+27 error Tell the author that this fails on your system:
+27 error     protractor "./protractor.conf.js"
+27 error You can get information on how to open an issue for this project with:
+27 error     npm bugs angular
+27 error Or if that isn't available, you can get their info via:
+27 error     npm owner ls angular
+27 error There is likely additional logging output above.
+28 verbose exit [ 1, true ]

data/angular/package.json

@@ -21,8 +21,11 @@
     "@angular/platform-browser": "^2.1.0",
     "@angular/platform-browser-dynamic": "^2.1.0",
     "@angular/router": "^3.1.0",
-    "angular2-token": "^0.2.0-beta.3",
+    "angular2-jwt": "^0.1.25",
+    "bootstrap": "^3.3.7",
+    "bootstrap-sass": "^3.3.7",
     "core-js": "^2.4.1",
+    "ng2-bootstrap": "^1.1.16",
     "rxjs": "5.0.0-beta.12",
     "ts-helpers": "^1.1.1",
     "zone.js": "^0.6.23"

data/angular/src/app/app.component.html

@@ -1,4 +1 @@
-<h1>
-  {{title}}
-  <router-outlet></router-outlet>
-</h1>
+<router-outlet></router-outlet>

data/angular/src/app/app.module.ts

@@ -2,27 +2,28 @@ import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { HttpModule } from '@angular/http';
-import { Angular2TokenService, A2tUiModule } from 'angular2-token';
 
 import { AppRoutesModule } from './app.routes.module';
-
 import { AppComponent } from './app.component';
-import { RegistrationComponent } from './registration/registration.component';
+import { RegistrationModule } from './registration/'
+import { LoginModule } from './login'
+import { ConfirmAccountModule } from './confirm-account'
 
 @NgModule({
   imports: [
     BrowserModule,
     FormsModule,
     HttpModule,
+
     AppRoutesModule,
-    A2tUiModule,
+    RegistrationModule,
+    ConfirmAccountModule,
+    LoginModule,
   ],
   declarations: [
-    AppComponent,
-    RegistrationComponent
+    AppComponent
   ],
   providers: [
-    Angular2TokenService,
   ],
   bootstrap: [AppComponent]
 })

data/angular/src/app/app.routes.module.ts

@@ -2,17 +2,27 @@ import { NgModule }     from '@angular/core';
 import { RouterModule } from '@angular/router';
 
 import { RegistrationComponent } from './registration/registration.component'
+import { LoginComponent } from './login/login.component'
+import { ConfirmAccountComponent } from './confirm-account/confirm-account.component'
 
 
 const routes = [
   {
     path: '',
-    redirectTo: 'registration',
+    redirectTo: 'login',
     pathMatch: 'full'
   },
   {
-    path: 'registration',
+    path: 'signup',
     component: RegistrationComponent
+  },
+  {
+    path: 'login',
+    component: LoginComponent
+  },
+  {
+    path: 'account/confirm/:token',
+    component: ConfirmAccountComponent
   }
 ];
 

data/angular/src/app/confirm-account/confirm-account.component.ts

@@ -0,0 +1,27 @@
+import {Component} from '@angular/core';
+import {Router, Params, ActivatedRoute} from '@angular/router';
+import {ConfirmAccountService} from './confirm-account.service';
+import 'rxjs/add/operator/catch';
+
+@Component({
+  templateUrl: './confirm-account.html',
+  styleUrls: ['./confirm-account.scss']
+})
+
+export class ConfirmAccountComponent {
+  confirming = true;
+  confirmed: boolean;
+  constructor(
+    private confirmAccountService: ConfirmAccountService,
+    private router: Router,
+    private route: ActivatedRoute
+  ) {
+    this.route.params.forEach((params: Params) => {
+      let token = params['token'];
+      confirmAccountService.confirm(token).subscribe((json) => {
+        this.confirming = false;
+        this.confirmed = json.confirmed;
+      });
+    });
+  }
+}

data/angular/src/app/confirm-account/confirm-account.html

@@ -0,0 +1,41 @@
+<div class="container">
+  <div class="row">
+    <div class="col-md-4 col-md-offset-4">
+      <h1 class="text-center">
+        <a href="/">
+          <img src="/images/unsakini.svg" width="300px" height="130px">
+        </a>
+      </h1>
+    </div>
+  </div>
+  <div class="jumbotron" *ngIf="confirming">
+    <h1>
+      Confirming your account. Please wait...
+    </h1>
+  </div>
+  <div class="jumbotron" *ngIf="confirmed && !confirming">
+    <div>
+      <h1>Success!</h1>
+      <hr>
+      <h3>Account activation succedded.</h3>
+      <p>
+        You can now sign in to the <a [routerLink]="['/login']">dashboard</a>.
+      </p>
+    </div>
+  </div>
+  <div class="jumbotron" *ngIf="!confirmed && !confirming">
+    <div>
+      <h1>Ouch!</h1>
+      <hr>
+      <h3>
+        Account confirmation failed.
+      </h3>
+      <p>
+        That token is already expired or non-existent.
+      </p>
+      <p>
+        No account yet? <a [routerLink]="['/signup']"><b>Sign up</b></a>.
+      </p>
+    </div>
+  </div>
+</div>

data/angular/src/app/confirm-account/confirm-account.module.ts

@@ -0,0 +1,24 @@
+import {NgModule} from '@angular/core';
+import {RouterModule} from '@angular/router';
+import {HttpModule} from '@angular/http';
+import {CommonModule} from '@angular/common';
+import {ServicesModule} from '../services';
+import {ConfirmAccountComponent} from './confirm-account.component';
+import {ConfirmAccountService} from './confirm-account.service';
+
+@NgModule({
+  imports: [
+    HttpModule,
+    RouterModule,
+    CommonModule,
+    ServicesModule,
+  ],
+  declarations: [
+    ConfirmAccountComponent
+  ],
+  providers: [
+    ConfirmAccountService
+  ]
+})
+
+export class ConfirmAccountModule {}

data/angular/src/app/confirm-account/confirm-account.scss

@@ -0,0 +1,3 @@
+.confirm-account {
+  padding-top: 120px;
+}

data/angular/src/app/confirm-account/confirm-account.service.ts

@@ -0,0 +1,27 @@
+import {Injectable} from '@angular/core';
+import {Observable} from 'rxjs/Observable';
+import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/catch';
+import {HttpService} from '../services';
+
+@Injectable()
+
+export class ConfirmAccountService {
+  constructor(private http: HttpService) { }
+
+  confirm (token: string): Observable<any> {
+    return this.http.get(`/user/confirm/${token}`).map((res) => {
+      console.log(res)
+      if (res.ok) {
+        return {confirmed: true}
+      } else {
+        return {confirmed: false}
+      }
+    }).catch(this.catchError);
+  }
+
+  private catchError(res) {
+    return Observable.of({confirmed: false});
+  }
+
+}

data/angular/src/app/confirm-account/index.ts

@@ -0,0 +1,3 @@
+export * from './confirm-account.component';
+export * from './confirm-account.service';
+export * from './confirm-account.module';

data/angular/src/app/index.ts

@@ -1,2 +1,4 @@
 export * from './app.component';
 export * from './app.module';
+export * from './services';
+export * from './registration';

data/angular/src/app/login/index.ts

@@ -0,0 +1,3 @@
+export * from './login.service'
+export * from './login.component'
+export * from './login.module'

data/angular/src/app/login/login.component.ts

@@ -0,0 +1,40 @@
+
+import {Component} from '@angular/core';
+import {Router} from '@angular/router';
+import {ICredentials, LoginService} from './login.service';
+
+
+@Component({
+  templateUrl: './login.html'
+})
+export class LoginComponent {
+
+  creds: ICredentials;
+  error: string;
+  success: string;
+
+  constructor(
+    private loginService: LoginService,
+    private router: Router
+  ) {
+    this.creds = {email: '', password: ''};
+  }
+
+  doLogin (e) {
+     e.stopPropagation();
+    this.error = null;
+    this.loginService.login(this.creds)
+    .subscribe(
+      (json) => {
+        this.success = 'Login successful. Redirecting...';
+        window.localStorage.setItem('auth_token', json.token);
+        // this.router.navigate(['/dashboard']);
+        // window.location.assign('/dashboard');
+      },
+      (e) => {
+        this.error = e;
+      }
+    );
+    return false;
+  }
+}

data/angular/src/app/login/login.html

@@ -0,0 +1,43 @@
+<div class="container home-forms">
+  <div class="row">
+    <div class="col-md-4 col-md-offset-4">
+      <h1 class="text-center">
+        <a href="/">
+          <img src="/images/unsakini.svg" width="300px" height="130px">
+        </a>
+      </h1>
+      <hr>
+      <p class="lead text-center">
+        Sign In
+      </p>
+      <form #loginForm="ngForm">
+        <div *ngIf="error" class="alert alert-danger">
+          {{error}}
+        </div>
+        <div class="form-group">
+          <label for="email">Email</label>
+          <input type="email" class="form-control" id="email" placeholder="Email" required [(ngModel)]="creds.email" name="email" #email="ngModel">
+        </div>
+        <div [hidden]="email.valid || email.pristine" class="alert alert-danger">
+          Email is required
+        </div>
+        <label for="password">Password</label>
+        <input type="password" class="form-control" id="password" placeholder="Password" required [(ngModel)]="creds.password" name="password" #password="ngModel">
+        <div [hidden]="password.valid || password.pristine" class="alert alert-danger">
+          Password is required
+        </div>
+        <div class="form-group" style="margin-top: 20px;">
+          <button (click)="doLogin($event)" type="submit" class="btn btn-primary" [disabled]="!loginForm.form.valid || submitting">
+            <span *ngIf="!submitting">Sign In</span>
+            <span *ngIf="submitting">Signing in...</span>
+          </button>
+        </div>
+      </form>
+      <hr>
+      <p>
+        Don't have an account? <a [routerLink]="['/signup']">Create Account</a>
+      </p>
+    </div>
+  </div>
+
+</div>

data/angular/src/app/login/login.module.ts

@@ -0,0 +1,27 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { BrowserModule } from '@angular/platform-browser';
+import { HttpModule } from '@angular/http';
+import { FormsModule } from '@angular/forms';
+import { ServicesModule } from '../services'
+
+import {LoginComponent} from './login.component';
+import {LoginService} from './login.service';
+
+@NgModule({
+  imports: [
+    BrowserModule,
+    HttpModule,
+    FormsModule,
+    RouterModule,
+    ServicesModule,
+  ],
+  declarations: [
+    LoginComponent,
+  ],
+  providers: [
+    LoginService
+  ]
+})
+
+export class LoginModule {}

data/angular/src/app/login/login.service.ts

@@ -0,0 +1,48 @@
+import {Injectable} from '@angular/core';
+import {Response} from '@angular/http';
+import { HttpService } from '../services/http';
+import {Observable} from 'rxjs/Observable';
+import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/catch';
+
+export interface ICredentials {
+  email: string;
+  password: string;
+}
+
+export interface IAuthUser {
+  id: number;
+  name: string;
+  email: string;
+}
+
+@Injectable()
+export class LoginService {
+
+  constructor (
+    private http: HttpService
+  ) {}
+
+  login (creds: ICredentials) {
+    return this.http.post('/user_token', {auth: creds}).map(
+      (res) => {
+        return res.json();
+      }
+    )
+    .catch(this.loginFailedHandler(this));
+  }
+
+  private loginFailedHandler (self: LoginService) {
+    return (res: Response) => {
+      let error_message = res.toString();
+
+      if (res.status === 404 && res.text.length === 0)
+        error_message = `Invalid email and password combination.`
+      if (res.status === 401)
+        error_message = res.json().message;
+
+      return Observable.throw(error_message);
+
+    };
+  }
+}

data/angular/src/app/registration/index.ts

@@ -0,0 +1,3 @@
+export * from './registration.component'
+export * from './registration.service'
+export * from './registration.module'

data/angular/src/app/registration/registration.component.html

@@ -1,14 +1,72 @@
-
-<form (ngSubmit)="doSubmit()">
-  <div class="alert alert-success" *ngIf="success">Registration successful. Please confirm your email sent to {{user.email}} to proceed.</div>
-  <div class="alert alert-danger" *ngIf="errors">
-    <p *ngFor="let e of errors">{{e}}</p>
+<div class="container home-forms">
+  <div class="row">
+    <div class="col-md-4 col-md-offset-4">
+      <h1 class="text-center">
+        <a href="/">
+          <img src="/images/unsakini.svg" width="300px" height="130px">
+        </a>
+      </h1>
+      <hr>
+      <p class="lead text-center">
+        Create Account
+      </p>
+      <form #regForm="ngForm" (ngSubmit)="doSubmit($event); false">
+        <div *ngIf="success" class="alert alert-success">
+          <p>Success! A confirmation link has been sent to {{user.email}}.</p>
+        </div>
+        <div class="form-group"  [ngClass]="(email.invalid && !email.pristine) || errors.email.length > 0  ? 'has-error' : ''">
+          <label for="email">Email</label>
+          <input type="email" class="form-control" id="email" placeholder="Email" required [(ngModel)]="user.email" name="email" #email="ngModel">
+          <span class="help-block" *ngFor="let e of errors.email">
+            Email {{e}}
+          </span>
+          <span [hidden]="email.valid || email.pristine" class=" help-block">
+            Email is required
+          </span>
+        </div>
+        <div class="form-group"  [ngClass]="(name.invalid && !name.pristine) || errors.name.length > 0  ? 'has-error' : ''">
+          <label for="name">name</label>
+          <input type="text" class="form-control" id="name" placeholder="name" required [(ngModel)]="user.name" name="name" #name="ngModel">
+          <span [hidden]="name.valid || name.pristine" class=" help-block">
+            <span class="text-danger">Name is required</span>
+          </span>
+          <span class="help-block" *ngFor="let e of errors.name">
+            Password {{e}}
+          </span>
+        </div>
+        <div class="form-group" [ngClass]="(password.invalid && !password.pristine) || errors.password.length > 0 ? 'has-error' : ''">
+          <label for="password">Password</label>
+          <input type="password" class="form-control" id="password" placeholder="Password" required [(ngModel)]="user.password" name="password" #password="ngModel">
+          <span [hidden]="password.valid || password.pristine" class="help-block">
+            Password is required
+          </span>
+          <span class="help-block" *ngFor="let e of errors.password">
+            Password {{e}}
+          </span>
+        </div>
+        <div class="form-group" [ngClass]="(password_confirmation.invalid && !password_confirmation.pristine) || errors.password_confirmation.length > 0 ? 'has-error' : ''">
+          <label for="password">Confirm Password</label>
+          <input type="password" class="form-control" id="password_confirmation" placeholder="Confirm Password" required [(ngModel)]="user.password_confirmation" name="password_confirmation" #password_confirmation="ngModel">
+          <span [hidden]="password_confirmation.valid || password_confirmation.pristine" class="help-block">
+            Password confirmation is required
+          </span>
+          <span class="help-block" *ngFor="let e of errors.password_confirmation">
+            Password Confirmation {{e}}
+          </span>
+        </div>
+        <div class="form-group" style="margin-top: 20px;">
+          <button type="submit" class="btn btn-primary" [disabled]="!regForm.form.valid || submitting">
+            <span *ngIf="!submitting">Create Account</span>
+            <span *ngIf="submitting">Submitting...</span>
+          </button>
+        </div>
+      </form>
+      <hr>
+      <p>
+        Already have an account? <a [routerLink]="['/login']">Login</a>
+      </p>
+    </div>
   </div>
-  <input type="text" name="name">
-  <input type="email" name="email">
-  <input type="password" name="password">
-  <input type="password" name="password_confirmation">
-  <button type="submit">Sign Up</button>
-</form>
+</div>
+
 
-<div (click)="doSubmit()">CLICK ME</div>