feature(*) extensions, refactoring, data

HackMerced/2017F/src/server/src/handlers/hacker.js

@@ -71,6 +71,8 @@ export const hackerHandlers = {
       });
   },
   postLogin: (req, reply) => {
+
+
     const email = req.payload.email ? req.payload.email.toLowerCase() : 'bad'
 
     axios

HackMerced/2017F/src/server/src/validators/hacker.js

@@ -6,10 +6,8 @@ import { notMercedOptions } from '../../../app/src/constants'
 
 export const hackerValidators = {
   postLogin: {
-    // tomoe handles this
   },
   postSignup: {
-    // tomoe handles this
   },
   getMe:{
     payload:{

Tomoe/Cloud/README.md

@@ -0,0 +1 @@
+# Tomoe cloud handler/website and directives

Tomoe/package.json → Tomoe/Core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Tomoe",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Centralized API user platform for Hackathons",
   "main": "production.js",
   "scripts": {
@@ -10,7 +10,7 @@
     "generate": "node ./build/core",
     "build": "npm run clean && cross-env NODE_ENV=production npm run compile",
     "start": "node ./build/imports && cross-env NODE_ENV=development node ./src/app/build/scripts/start",
-    "api": "nodemon -e js -w ./src/server ./src/server/index.js",
+    "api": "nodemon -e js --watch './src/server' --watch './src/extensions/**/server/**/*' ./src/server/index.js",
     "test_server": "cross-env NODE_ENV=test nyc node ./build/tests",
     "test_app": "cross-env NODE_ENV=test karma start ./src/app/build/karma.config",
     "test": "npm run test_server",

Tomoe/Core/src/extensions/admissions/config.json

@@ -0,0 +1,8 @@
+{
+  "name": "admissions",
+  "displayName": "Admissions",
+  "injectables": {
+    "routes": "server/routes/index.js"
+  },
+  "interface": "sidebar"
+}

Tomoe/Core/src/extensions/admissions/importable.js

@@ -0,0 +1 @@
+export * from '../'

Tomoe/Core/src/extensions/admissions/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "Tomoe-Admissions",
+  "version": "1.0.0",
+  "description": "Admissions utility for Tomoe",
+  "main": " ",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "HackMerced",
+  "license": "MIT"
+}

Tomoe/src/server/src/collections/Hacker.js → Tomoe/Core/src/extensions/admissions/src/server/classes/Hacker.js

@@ -1,4 +1,4 @@
-import { User } from './';
+import { User } from '../../../importable';
 
 export class Hacker extends User{
   constructor(data = {}){

Tomoe/Core/src/extensions/admissions/src/server/classes/index.js

@@ -0,0 +1 @@
+export * from './Hacker'

Tomoe/src/server/src/handlers/hacker.js → Tomoe/Core/src/extensions/admissions/src/server/handlers/hacker.js

@@ -1,5 +1,5 @@
-import { Hacker } from '../collections'
-import { operatorSearch, respond, transformData, setSearchParam } from '../util';
+import { Hacker } from '../classes'
+import { operatorSearch, respond, transformData, setSearchParam } from '../../../importable';
 import Joi from 'joi';
 import Boom from 'boom';
 

Tomoe/Core/src/extensions/admissions/src/server/handlers/index.js

@@ -0,0 +1 @@
+export * from './hacker'

Tomoe/Core/src/extensions/admissions/src/server/routes/index.js

@@ -0,0 +1,7 @@
+import hackerRoutes from './hacker';
+
+const routes = [
+  ...hackerRoutes,
+];
+
+export default routes;

Tomoe/Core/src/extensions/admissions/src/server/validators/index.js

@@ -0,0 +1 @@
+export * from './hacker'

Tomoe/Core/src/extensions/index.js

@@ -0,0 +1 @@
+export * from '../server/exportable';

Tomoe/Core/src/extensions/template/README.md

@@ -0,0 +1 @@
+#

Tomoe/Core/src/extensions/template/config.json

@@ -0,0 +1,7 @@
+{
+  "name": "template",
+  "displayName": "template",
+  "injectables": {
+  },
+  "interface": "sidebar"
+}

Tomoe/Core/src/extensions/template/importable.js

@@ -0,0 +1 @@
+export * from '../'

Tomoe/Core/src/extensions/template/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "template",
+  "version": "1.0.0",
+  "description": "A template for Tomoe Extensions",
+  "main": " ",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "HackMerced",
+  "license": "MIT"
+}

Tomoe/Core/src/extensions/volunteers/README.md

@@ -0,0 +1 @@
+#

Tomoe/Core/src/extensions/volunteers/config.json

@@ -0,0 +1,7 @@
+{
+  "name": "template",
+  "displayName": "template",
+  "injectables": {
+  },
+  "interface": "sidebar"
+}

Tomoe/Core/src/extensions/volunteers/importable.js

@@ -0,0 +1 @@
+export * from '../'

Tomoe/Core/src/extensions/volunteers/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "template",
+  "version": "1.0.0",
+  "description": "A template for Tomoe Extensions",
+  "main": " ",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "HackMerced",
+  "license": "MIT"
+}

Tomoe/src/server/src/collections/Volunteer.js → Tomoe/Core/src/extensions/volunteers/server/classes/Volunteer.js

@@ -1,4 +1,4 @@
-import { User } from './';
+import { User } from '../../../importable';
 
 export class Volunteer extends User{
   constructor(data = {}){

Tomoe/Core/src/extensions/volunteers/server/classes/index.js

@@ -0,0 +1 @@
+export * from './Volunteer'

Tomoe/Core/src/extensions/volunteers/server/handlers/index.js

@@ -0,0 +1 @@
+export * from './volunteer'

Tomoe/src/server/src/handlers/volunteer.js → Tomoe/Core/src/extensions/volunteers/server/handlers/volunteer.js

@@ -1,5 +1,5 @@
-import { Volunteer } from '../collections'
-import { operatorSearch, respond, transformData, setSearchParam } from '../util';
+import { Volunteer } from '../classes'
+import { operatorSearch, respond, transformData, setSearchParam } from '../../../importable';
 import Joi from 'joi';
 import Boom from 'boom';
 

Tomoe/src/server/src/routes/index.js → Tomoe/Core/src/extensions/volunteers/server/routes/index.js

@@ -1,10 +1,6 @@
-import hackerRoutes from './hacker';
-import adminRoutes from './admin';
 import volunteerRoutes from './volunteer';
 
 const routes = [
-  ...hackerRoutes,
-  ...adminRoutes,
   ...volunteerRoutes,
 ];
 

Tomoe/Core/src/extensions/volunteers/server/validators/index.js

@@ -0,0 +1 @@
+export * from './volunteer'

Tomoe/Core/src/server/exportable.js

@@ -0,0 +1,4 @@
+// content that can be utilized by extensions
+
+export * from './src/classes';
+export * from './src/util';

Tomoe/src/server/src/collections/Email.js → Tomoe/Core/src/server/src/classes/generic/Email.js

@@ -13,7 +13,6 @@ const transporter = nodemailer.createTransport({
 
 export class Email {
   constructor(data = {}){
-    super(data);
 
   }
 

Tomoe/Core/src/server/src/classes/generic/Event.js

@@ -0,0 +1,19 @@
+import uuidv4 from 'uuid/v4'
+
+export class Event {
+  constructor({ id = uuidv4(), date = null }){
+    this.id = id;
+    this.date = date;
+  }
+
+  static getCollection(){
+    return db.collection('event');
+  }
+
+  _get(){
+    return {
+      id: this.id,
+      date: this.date,
+    }
+  }
+}

Tomoe/src/server/src/collections/User.js → Tomoe/Core/src/server/src/classes/generic/User.js

@@ -1,9 +1,10 @@
 import { aql } from 'arangojs';
+import { Tomoe } from './';
 import uuidv4 from 'uuid/v4'
 import sha256 from 'sha256';
 import Boom from 'boom';
 
-export class User{
+export class User {
   constructor(data = {}){
     // user information
     this.id = data.id || uuidv4();

Tomoe/Core/src/server/src/classes/generic/index.js

@@ -0,0 +1,2 @@
+export * from './User';
+export * from './Event';

Tomoe/Core/src/server/src/classes/index.js

@@ -0,0 +1,2 @@
+export * from './generic';
+export * from './strict';

Tomoe/src/server/src/collections/Admin.js → Tomoe/Core/src/server/src/classes/strict/Admin.js

@@ -1,4 +1,4 @@
-import { User } from './';
+import { User } from '../';
 
 export class Admin extends User{
   constructor(data = {}){

Tomoe/Core/src/server/src/classes/strict/index.js

@@ -0,0 +1 @@
+export * from './Admin';

Tomoe/src/server/src/handlers/admin.js → Tomoe/Core/src/server/src/handlers/admin.js

@@ -1,4 +1,4 @@
-import { Admin } from '../collections'
+import { Admin } from '../classes'
 import { operatorSearch, respond, transformData, setSearchParam } from '../util';
 import Joi from 'joi';
 import Boom from 'boom';

Tomoe/Core/src/server/src/handlers/index.js

@@ -0,0 +1 @@
+export * from './admin'

Tomoe/Core/src/server/src/routes/index.js

@@ -0,0 +1,10 @@
+import adminRoutes from './admin';
+
+import { getExtensionContent } from '../util';
+
+const routes = [
+  ...adminRoutes,
+  ...getExtensionContent('routes'),
+];
+
+export default routes;

Tomoe/Core/src/server/src/util/extension-handler.js

@@ -0,0 +1,14 @@
+const { extensions } = TOMOE_CONFIG;
+const EXTENSION_ROOT = '../../../extensions';
+
+export function getExtensionContent(extensionType){
+  return extensions.map((extName) => {
+      const extRoute = require(`${EXTENSION_ROOT}/${extName}/config.json`).injectables[extensionType];
+
+      if(extRoute) {
+        return require(`${EXTENSION_ROOT}/${extName}/src/${extRoute}`).default;
+      }
+
+      return null;
+  });
+};

Tomoe/src/server/src/util/index.js → Tomoe/Core/src/server/src/util/index.js

@@ -2,3 +2,4 @@ export * from './operator-search';
 export * from './respond';
 export * from './transform-data'
 export * from './set-search-param'
+export * from './extension-handler'

Tomoe/Core/src/server/src/validators/index.js

@@ -0,0 +1 @@
+export * from './admin'