merge experiment into master

admin/lib/withAuth.tsx

@@ -33,11 +33,11 @@ export default function withAuth(
       let asUrl = '/login';
       if (user) {
         if (!user.defaultTeamSlug) {
-          redirectUrl = '/settings/create-team';
-          asUrl = '/settings/create-team';
+          redirectUrl = '/create-team';
+          asUrl = '/create-team';
         } else {
-          redirectUrl = `/topics/detail?teamSlug=${user.defaultTeamSlug}&topicSlug=projects`;
-          asUrl = `/team/${user.defaultTeamSlug}/t/projects`;
+          redirectUrl = `/discussion?teamSlug=${user.defaultTeamSlug}`;
+          asUrl = `/team/${user.defaultTeamSlug}/d`;
         }
       }
 

admin/lib/withStore.tsx

@@ -2,7 +2,8 @@ import React from 'react';
 import { Provider, inject } from 'mobx-react';
 
 import { initStore, Store, getStore } from './store';
-import { getInitialData, getUser } from './api/admin';
+import { getInitialData } from './api/team-member';
+import { getUser } from './api/public';
 
 export default function withStore(BaseComponent) {
   BaseComponent = inject('store')(BaseComponent);
@@ -33,22 +34,22 @@ export default function withStore(BaseComponent) {
         Object.assign(props, (await BaseComponent.getInitialProps(ctx)) || {});
       }
 
-      const { teamSlug, topicSlug, discussionSlug } = props;
+      const { teamSlug, discussionSlug } = props;
       let initialData = {};
 
       if (user) {
         try {
           initialData = await getInitialData({
             request: ctx.req,
-            data: { teamSlug, topicSlug, discussionSlug },
+            data: { teamSlug, discussionSlug },
           });
         } catch (error) {
           console.log(error);
         }
       }
 
       Object.assign(props, {
-        initialState: { user, teamSlug, ...initialData },
+        initialState: { user, teamSlug, currentUrl: ctx.asPath, ...initialData },
       });
 
       return props;

admin/server/models/Discussion.ts

@@ -33,11 +33,6 @@ const mongoSchema = new mongoose.Schema({
     required: true,
     default: Date.now,
   },
-  lastActivityDate: {
-    type: Date,
-    required: true,
-    default: Date.now,
-  },
 });
 
 mongoSchema.index({ name: 'text' });
@@ -51,7 +46,6 @@ interface IDiscussionDocument extends mongoose.Document {
   memberIds: string[];
   isPrivate: boolean;
   createdAt: Date;
-  lastActivityDate: Date;
 }
 
 interface IDiscussionModel extends mongoose.Model<IDiscussionDocument> {
@@ -132,7 +126,6 @@ class DiscussionClass extends mongoose.Model {
     const filter: any = { topicId, $or: [{ isPrivate: false }, { memberIds: userId }] };
 
     const discussions: any[] = await this.find(filter)
-      .sort({ lastActivityDate: -1 })
       .lean();
 
     return { discussions };

admin/server/models/Team.ts

@@ -1,7 +1,5 @@
 import * as mongoose from 'mongoose';
 
-import Topic from './Topic';
-
 import generateSlug from '../utils/slugify';
 import User from './User';
 
@@ -105,15 +103,6 @@ class TeamClass extends mongoose.Model {
       defaultTeam,
     });
 
-    await Topic.create({
-      createdUserId: userId,
-      teamId: team._id,
-      name: 'Projects',
-      slug: 'projects',
-      isProjects: true,
-      createdAt: new Date(),
-    });
-
     return team;
   }
 

admin/server/models/User.ts

@@ -37,8 +37,6 @@ const mongoSchema = new mongoose.Schema({
     default: '',
   },
 
-  projectIds: [String],
-
   isAdmin: {
     type: Boolean,
     default: false,

api/package.json

@@ -7,10 +7,16 @@
     "build": "tsc --project tsconfig.json",
     "start": "NODE_ENV=production node production-server/app.js",
     "now": "now && now alias && now rm saas-api --safe --yes",
-    "lint": "tslint components pages lib server",
+    "lint": "tslint -p tsconfig.json",
     "test": "jest --coverage",
     "processes-8000": "ss -lptn 'sport = :8000'",
-    "processes-node": "ps -e|grep node"
+    "processes-node": "ps -e|grep node",
+    "kill-processes-at-port": "lsof -i tcp:8000 | awk 'NR!=1 {print $2}' | xargs kill"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "yarn lint && yarn build && cd ../app && yarn lint"
+    }
   },
   "jest": {
     "coverageDirectory": "./.coverage"
@@ -55,6 +61,7 @@
     "eslint-plugin-import": "^2.12.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-react": "^7.8.2",
+    "husky": "^1.0.0-rc.13",
     "jest": "^22.4.4",
     "nodemon": "^1.17.4",
     "ts-node": "^6.0.3",

api/server/api/index.ts

@@ -1,6 +1,6 @@
+import publicApi from './public';
 import teamLeaderApi from './team-leader';
 import teamMemberApi from './team-member';
-import publicApi from './public';
 
 export default function api(server) {
   server.use('/api/v1/public', publicApi);

api/server/api/public.ts

@@ -1,7 +1,7 @@
 import * as express from 'express';
 
-import Invitation from '../models/Invitation';
 import logger from '../logs';
+import Invitation from '../models/Invitation';
 
 const router = express.Router();