From 6d1ad2f9abdbd891727a09d419b7205dd8c38867 Mon Sep 17 00:00:00 2001 From: theeditor Date: Wed, 31 Jan 2018 16:30:38 -0500 Subject: [PATCH 1/9] delete service unit test --- client/src/app/service/activity.service.spec.ts | 15 --------------- client/src/app/service/auth.service.spec.ts | 15 --------------- client/src/app/service/funding.service.spec.ts | 15 --------------- client/src/app/service/version.service.spec.ts | 15 --------------- client/src/app/service/work.service.spec.ts | 15 --------------- 5 files changed, 75 deletions(-) delete mode 100644 client/src/app/service/activity.service.spec.ts delete mode 100644 client/src/app/service/auth.service.spec.ts delete mode 100644 client/src/app/service/funding.service.spec.ts delete mode 100644 client/src/app/service/version.service.spec.ts delete mode 100644 client/src/app/service/work.service.spec.ts diff --git a/client/src/app/service/activity.service.spec.ts b/client/src/app/service/activity.service.spec.ts deleted file mode 100644 index edd0076..0000000 --- a/client/src/app/service/activity.service.spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { TestBed, inject } from '@angular/core/testing'; - -import { ActivityService } from './activity.service'; - -describe('ActivityService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ActivityService] - }); - }); - - it('should be created', inject([ActivityService], (service: ActivityService) => { - expect(service).toBeTruthy(); - })); -}); diff --git a/client/src/app/service/auth.service.spec.ts b/client/src/app/service/auth.service.spec.ts deleted file mode 100644 index bd98634..0000000 --- a/client/src/app/service/auth.service.spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { TestBed, inject } from '@angular/core/testing'; - -import { AuthService } from './auth.service'; - -describe('AuthService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [AuthService] - }); - }); - - it('should be created', inject([AuthService], (service: AuthService) => { - expect(service).toBeTruthy(); - })); -}); diff --git a/client/src/app/service/funding.service.spec.ts b/client/src/app/service/funding.service.spec.ts deleted file mode 100644 index 5f9fd98..0000000 --- a/client/src/app/service/funding.service.spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { TestBed, inject } from '@angular/core/testing'; - -import { FundingService } from './funding.service'; - -describe('FundingService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [FundingService] - }); - }); - - it('should be created', inject([FundingService], (service: FundingService) => { - expect(service).toBeTruthy(); - })); -}); diff --git a/client/src/app/service/version.service.spec.ts b/client/src/app/service/version.service.spec.ts deleted file mode 100644 index 757f1a3..0000000 --- a/client/src/app/service/version.service.spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { TestBed, inject } from '@angular/core/testing'; - -import { VersionService } from './version.service'; - -describe('VersionService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [VersionService] - }); - }); - - it('should be created', inject([VersionService], (service: VersionService) => { - expect(service).toBeTruthy(); - })); -}); diff --git a/client/src/app/service/work.service.spec.ts b/client/src/app/service/work.service.spec.ts deleted file mode 100644 index 921a4b9..0000000 --- a/client/src/app/service/work.service.spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { TestBed, inject } from '@angular/core/testing'; - -import { WorkService } from './work.service'; - -describe('WorkService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [WorkService] - }); - }); - - it('should be created', inject([WorkService], (service: WorkService) => { - expect(service).toBeTruthy(); - })); -}); From 71fe122d2820d4ec81cc69900b1206d6b8171aa5 Mon Sep 17 00:00:00 2001 From: theeditor Date: Wed, 31 Jan 2018 17:01:23 -0500 Subject: [PATCH 2/9] create version service --- server/actions/version.js | 12 ++++++++++++ server/app.js | 3 ++- server/package-lock.json | 32 +++++++++++++++++++++++++++++--- server/package.json | 1 + server/routes/version.js | 9 +++++++++ 5 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 server/actions/version.js create mode 100644 server/routes/version.js diff --git a/server/actions/version.js b/server/actions/version.js new file mode 100644 index 0000000..b890ce2 --- /dev/null +++ b/server/actions/version.js @@ -0,0 +1,12 @@ +const axios = require('axios'); + +getLatestCommit = (req,res)=>{ + +}; + +getLatestVersion = (req,res)=>{ + +}; + +module.exports.getLatestCommit = getLatestCommit; +module.exports.getLatestVersion = getLatestVersion; \ No newline at end of file diff --git a/server/app.js b/server/app.js index 1f00901..30d9726 100644 --- a/server/app.js +++ b/server/app.js @@ -10,6 +10,7 @@ var users = require('./routes/users'); var activity = require('./routes/activity'); var works = require('./routes/works'); var funding = require('./routes/funding'); +var version = require('./routes/version'); var app = express(); @@ -34,7 +35,7 @@ app.use('/activity',activity); app.use('/users', users); app.use('/work',works); app.use('/funding',funding); - +app.use('/version',version); // catch 404 and forward to error handler app.use(function(req, res, next) { diff --git a/server/package-lock.json b/server/package-lock.json index d3c9eb4..cb80bf6 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,6 +1,6 @@ { "name": "server", - "version": "1.0.1", + "version": "1.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -112,6 +112,15 @@ "resolved": "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz", "integrity": "sha1-GcenYEc3dEaPILLS0DNyrX1Mv10=" }, + "axios": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.17.1.tgz", + "integrity": "sha1-LY4+XQvb1zJ/kbyBT1xXZg+Bgk0=", + "requires": { + "follow-redirects": "1.4.1", + "is-buffer": "1.1.6" + } + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -873,6 +882,24 @@ } } }, + "follow-redirects": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz", + "integrity": "sha512-uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg==", + "requires": { + "debug": "3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + } + } + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -1991,8 +2018,7 @@ "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "is-data-descriptor": { "version": "1.0.0", diff --git a/server/package.json b/server/package.json index 387f036..ba3c99b 100644 --- a/server/package.json +++ b/server/package.json @@ -7,6 +7,7 @@ }, "dependencies": { "atob": "^2.0.3", + "axios": "^0.17.1", "bcrypt-nodejs": "0.0.3", "body-parser": "~1.18.2", "btoa": "^1.1.2", diff --git a/server/routes/version.js b/server/routes/version.js new file mode 100644 index 0000000..44260c5 --- /dev/null +++ b/server/routes/version.js @@ -0,0 +1,9 @@ +const express = require('express'); +const router = express.Router(); +const {getLatestCommit,getLatestVersion} = require('../actions/version'); + +router.get('/latest/commit',getLatestCommit); + +router.get('/latest/version',getLatestVersion); + +module.exports = router; \ No newline at end of file From 781711fe7e2bd5ccf4a0636d9b7e29d6d558ccbb Mon Sep 17 00:00:00 2001 From: theeditor Date: Wed, 31 Jan 2018 17:44:51 -0500 Subject: [PATCH 3/9] update manifest.json --- client/src/app/app.component.ts | 14 +++++++++++--- client/src/index.html | 4 ---- client/src/manifest.json | 2 ++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index 7b0f672..acf1efc 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts @@ -1,10 +1,18 @@ -import { Component } from '@angular/core'; +import {Component, OnInit} from '@angular/core'; @Component({ selector: 'app-root', templateUrl: './app.component.html', styleUrls: ['./app.component.css'] }) -export class AppComponent { - title = 'app'; +export class AppComponent implements OnInit{ + + loaded:Boolean = false; + constructor(){ + + } + + ngOnInit(){ + this.loaded = true; + } } diff --git a/client/src/index.html b/client/src/index.html index 96a9074..098037e 100644 --- a/client/src/index.html +++ b/client/src/index.html @@ -14,10 +14,6 @@ -
- Angular5 PWA logo -

Starry Sea International

-