fix(Next): Separate api from library source

danactive · May 15, 2021 · 50968b8 · 50968b8
1 parent ea240f8
commit 50968b8
Show file tree

Hide file tree

Showing 21 changed files with 19 additions and 20 deletions.
diff --git a/__mocks__/react-mapbox-gl.js b/__mocks__/react-mapbox-gl.js
diff --git a/api/server/plugins/editAlbum/lib/index.js b/api/server/plugins/editAlbum/lib/index.js
@@ -1,4 +1,4 @@
-const gallery = require('../../../../../app/pages/api/galleries/local');
+const gallery = require('../../../../../app/src/galleries');
 const routes = require('../../../lib/routes');
 const validation = require('../../../lib/validation');
 

diff --git a/api/server/plugins/gallery/lib/index.js b/api/server/plugins/gallery/lib/index.js
@@ -1,4 +1,4 @@
-const gallery = require('../../../../../app/pages/api/galleries/local');
+const gallery = require('../../../../../app/src/galleries');
 
 async function register(server) {
   server.route({

diff --git a/api/server/plugins/generatePreview/lib/resize.js b/api/server/plugins/generatePreview/lib/resize.js
@@ -3,7 +3,7 @@ const fs = require('fs');
 const sharp = require('sharp');
 
 const { previewFolderName } = require('../../../../../config.json');
-const existsMod = require('../../../../../app/pages/api/src/exists');
+const existsMod = require('../../../../../app/src/exists');
 const utils = require('../../utils');
 
 async function transformImages(originalPath) {

diff --git a/api/server/plugins/home/lib/index.js b/api/server/plugins/home/lib/index.js
@@ -1,4 +1,4 @@
-const gallery = require('../../../../../app/pages/api/galleries/local');
+const gallery = require('../../../../../app/src/galleries');
 
 async function handler(request, reply) {
   const isRaw = request.query.raw;

diff --git a/api/server/plugins/rename/lib/index.js b/api/server/plugins/rename/lib/index.js
@@ -1,4 +1,4 @@
-const existsChecker = require('../../../../../app/pages/api/src/exists');
+const existsChecker = require('../../../../../app/src/exists');
 const filenamer = require('./filenames');
 const renamer = require('./rename');
 const routes = require('../../../lib/routes');

diff --git a/api/server/plugins/rename/lib/rename.js b/api/server/plugins/rename/lib/rename.js
@@ -3,7 +3,7 @@ const Boom = require('boom');
 const fs = require('fs');
 const path = require('path');
 
-const exists = require('../../../../../app/pages/api/src/exists');
+const exists = require('../../../../../app/src/exists');
 const utils = require('../../utils');
 
 /*

diff --git a/api/server/plugins/rename/test/rename.spec.js b/api/server/plugins/rename/test/rename.spec.js
@@ -4,7 +4,7 @@ tape('Verify rename library', { skip: false }, (describe) => {
   const appRoot = require('app-root-path');
   const path = require('path');
 
-  const exist = require('../../../../../app/pages/api/src/exists');
+  const exist = require('../../../../../app/src/exists');
   const plugin = require('../lib/rename');
   const utils = require('../../utils');
 

diff --git a/api/server/plugins/resize/lib/resize.js b/api/server/plugins/resize/lib/resize.js
@@ -1,7 +1,7 @@
 const boom = require('boom');
 const gm = require('gm');
 
-const existsMod = require('../../../../../app/pages/api/src/exists');
+const existsMod = require('../../../../../app/src/exists');
 const utils = require('../../utils');
 
 /*

diff --git a/api/server/plugins/resize/test/index.spec.js b/api/server/plugins/resize/test/index.spec.js
@@ -1,6 +1,6 @@
 const tape = require('tape-catch');
 
-const existsChecker = require('../../../../../app/pages/api/src/exists');
+const existsChecker = require('../../../../../app/src/exists');
 
 tape('Verify /resize route', { skip: false }, (describe) => {
   const calipers = require('calipers')('jpeg');

diff --git a/api/server/plugins/resize/test/resize.spec.js b/api/server/plugins/resize/test/resize.spec.js
@@ -1,5 +1,5 @@
 const tape = require('tape-catch');
-const existsChecker = require('../../../../../app/pages/api/src/exists');
+const existsChecker = require('../../../../../app/src/exists');
 
 tape('Verify resize library', { skip: false }, (describe) => {
   const calipers = require('calipers')('jpeg');

diff --git a/api/server/plugins/utils/lib/utils.js b/api/server/plugins/utils/lib/utils.js
@@ -5,7 +5,7 @@ const glob = require('glob');
 const path = require('path');
 
 const configFile = require('../../../../../config.json');
-const utilsFactory = require('../../../../../app/pages/api/admin/filesystem/utils');
+const utilsFactory = require('../../../../../app/src/utils');
 
 const config = {
   get: (dotpath) => dotProp.get(configFile, dotpath),

diff --git a/api/server/plugins/walk/lib/index.js b/api/server/plugins/walk/lib/index.js
@@ -1,5 +1,5 @@
 const routes = require('../../../lib/routes');
-const files = require('../../../../../app/pages/api/admin/filesystem/local');
+const files = require('../../../../../app/src/filesystem');
 const validation = require('../../../lib/validation');
 
 const routeWalkPath = {

diff --git a/app/pages/api/admin/filesystem/__tests__/index.test.js b/app/pages/api/admin/filesystem/__tests__/index.test.js
@@ -4,7 +4,7 @@ import path from 'path'
 import { promisify } from 'util'
 
 import handler from '..'
-import utilsFactory from '../utils'
+import utilsFactory from '../../../../../src/utils'
 
 describe('Filesystem API', () => {
   describe('Expect result', () => {

diff --git a/app/pages/api/admin/filesystem/index.js b/app/pages/api/admin/filesystem/index.js
@@ -1,4 +1,4 @@
-import local from './local'
+import local from '../../../../src/filesystem'
 
 const errorSchema = (message) => ({ files: [], error: { message } })
 

diff --git a/app/pages/api/galleries/index.js b/app/pages/api/galleries/index.js
@@ -1,4 +1,4 @@
-import local from './local'
+import local from '../../../src/galleries'
 
 const errorSchema = (message) => ({ galleries: [], error: { message } })
 

diff --git a/app/pages/api/src/__tests__/exists.test.js → app/src/__tests__/exists.test.js b/app/pages/api/src/__tests__/exists.test.js → app/src/__tests__/exists.test.js
@@ -39,12 +39,12 @@ describe('Exists library', () => {
     })
 
     test('* Real root absolute file exists', async () => {
-      const testPath = path.join(__dirname, '../../../../../public/test/fixtures/exists.txt')
+      const testPath = path.join(__dirname, '../../../public/test/fixtures/exists.txt')
       await successTest(expect, testPath)
     })
 
     test('* Real root absolute folder exists', async () => {
-      const testPath = path.join(__dirname, '../../../../../public/test/fixtures')
+      const testPath = path.join(__dirname, '../../../public/test/fixtures')
       await successTest(expect, testPath)
     })
   })

diff --git a/app/pages/api/src/exists.js → app/src/exists.js b/app/pages/api/src/exists.js → app/src/exists.js
@@ -4,7 +4,7 @@ const path = require('path')
 const { promisify } = require('util')
 
 const getStat = promisify(fs.stat)
-const utilsFactory = require('../admin/filesystem/utils')
+const utilsFactory = require('./utils')
 
 const MODULE_NAME = 'pathExists'
 

diff --git a/app/pages/api/admin/filesystem/local.js → app/src/filesystem.js b/app/pages/api/admin/filesystem/local.js → app/src/filesystem.js
diff --git a/app/pages/api/galleries/local.js → app/src/galleries.js b/app/pages/api/galleries/local.js → app/src/galleries.js
diff --git a/app/pages/api/admin/filesystem/utils.js → app/src/utils.js b/app/pages/api/admin/filesystem/utils.js → app/src/utils.js
@@ -2,7 +2,7 @@ const appRoot = require('app-root-path')
 const mime = require('mime-types')
 const path = require('path')
 
-const configFile = require('../../../../../config.json')
+const configFile = require('../../config.json')
 
 function customMime(rawExtension) {
   const extension = (rawExtension) ? rawExtension.toLowerCase() : null