From ee651c9ee4d4fc50e012468fc2934907683fde4f Mon Sep 17 00:00:00 2001 From: Douglas Barone Date: Mon, 21 Dec 2020 09:02:47 -0400 Subject: [PATCH] Organize Mutations and Subscriptions in folders --- .../{Mutation.js => Mutation/index.js} | 12 +++++----- .../index.js} | 4 ++-- server/src/resolvers/index.js | 23 ++++++++++--------- 3 files changed, 20 insertions(+), 19 deletions(-) rename server/src/resolvers/{Mutation.js => Mutation/index.js} (75%) mode change 100755 => 100644 rename server/src/resolvers/{Subscriptions.js => Subscriptions/index.js} (89%) diff --git a/server/src/resolvers/Mutation.js b/server/src/resolvers/Mutation/index.js old mode 100755 new mode 100644 similarity index 75% rename from server/src/resolvers/Mutation.js rename to server/src/resolvers/Mutation/index.js index c9313ff..9bc61af --- a/server/src/resolvers/Mutation.js +++ b/server/src/resolvers/Mutation/index.js @@ -1,10 +1,10 @@ -import { replacePassword } from '../lib/activeDirectory/passwordUtils' -import { User } from '../classes/User' -import { ResetToken } from '../classes/ResetToken' +import { replacePassword } from '../../lib/activeDirectory/passwordUtils' +import { User } from '../../classes/User' +import { ResetToken } from '../../classes/ResetToken' -import { updateDevicesInfo } from '../lib/wifiDevices' -import { updateUserIdMappings } from '../lib/paloalto' -import { logInfo } from '../lib/logger' +import { updateDevicesInfo } from '../../lib/wifiDevices' +import { updateUserIdMappings } from '../../lib/paloalto' +import { logInfo } from '../../lib/logger' const Mutation = { async login(_, { data }) { diff --git a/server/src/resolvers/Subscriptions.js b/server/src/resolvers/Subscriptions/index.js similarity index 89% rename from server/src/resolvers/Subscriptions.js rename to server/src/resolvers/Subscriptions/index.js index af6de76..7341d57 100644 --- a/server/src/resolvers/Subscriptions.js +++ b/server/src/resolvers/Subscriptions/index.js @@ -1,6 +1,6 @@ -import { pubsub, USER_PRESENCE_UPDATED, AUTH_UPDATED } from '../pubsub' +import { pubsub, USER_PRESENCE_UPDATED, AUTH_UPDATED } from '../../pubsub' import { withFilter } from 'apollo-server' -import { validateToken } from '../utils/validateToken' +import { validateToken } from '../../utils/validateToken' const Subscription = { userPresenceUpdated: { diff --git a/server/src/resolvers/index.js b/server/src/resolvers/index.js index bb90c3a..840b0c0 100755 --- a/server/src/resolvers/index.js +++ b/server/src/resolvers/index.js @@ -1,26 +1,27 @@ -import { Query } from './Query' import { Mutation } from './Mutation' +import { Query } from './Query' import { Subscription } from './Subscriptions' +import { Group } from './Group' +import { Log } from './Log' +import { ResetToken } from './ResetToken' +import { Stats } from './Stats' import { User } from './User' import { UserPresence } from './UserPresence' -import { Group } from './Group' -import { ResetToken } from './ResetToken' import { WifiDevice } from './WifiDevice' -import { Stats } from './Stats' -import { Log } from './Log' const resolvers = { - Query, Mutation, + Query, Subscription, + + Group, + Log, + ResetToken, + Stats, User, UserPresence, - Group, - ResetToken, - WifiDevice, - Stats, - Log + WifiDevice } export { resolvers }