@veritree/services 1.0.0-2 → 1.0.0-3

package/index.js

@@ -1,45 +1,37 @@
-import { createCountriesApiService } from './src/services/countries.js';
-import { Countries } from './src/services/countries2.js';
-import { createFieldUpdatesApiService } from './src/services/field-updates.js';
-import { createFieldUpdateVerificationsApiService } from './src/services/field-udpate-verifications.js';
-import { createFormSubmissionsApiService } from './src/services/form-submissions.js';
-import { createForestTypeSpeciesApiService } from './src/services/forest-type-species.js';
-import { ForestTypeSpecies } from './src/services/forest-type-species2.js';
-import { createForestTypesApiService } from './src/services/forest-types.js';
-import { ForestTypes } from './src/services/forest-types2.js';
-import { createImagesApiService } from './src/services/images.js';
-import { Images } from './src/services/images2.js';
-import { createMeApiService } from './src/services/me.js';
-import { createOrgsApiService } from './src/services/orgs.js';
-import { createRegionsApiService } from './src/services/regions.js';
-import { Regions } from './src/services/regions2.js';
-import { createSponsorsApiService } from './src/services/sponsors.js';
-import { createSubdomainsApiService } from './src/services/subdomains.js';
-import { createSubsitesApiService } from './src/services/subsites.js';
-import { Subsites } from './src/services/subsites2.js';
-import { createSubsiteTypesApiService } from './src/services/subsite-types.js';
-import { createTreeOrdersApiService } from './src/services/trees-orders.js';
+import { Countries } from './src/services/countries';
+import { FieldUpdates } from './src/services/field-updates';
+import { FieldUpdateVerifications } from './src/services/field-udpate-verifications';
+import { FormSubmissions } from './src/services/form-submissions';
+import { ForestTypeSpecies } from './src/services/forest-type-species';
+import { ForestTypes } from './src/services/forest-types';
+import { ForestTypeProfiles } from './src/services/forest-types-profiles';
+import { Images } from './src/services/images';
+import { User } from './src/services/user';
+import { Orgs } from './src/services/orgs';
+import { Regions } from './src/services/regions';
+import { Sponsors } from './src/services/sponsors';
+import { Stats } from './src/services/stats';
+import { Subdomains } from './src/services/subdomains';
+import { Subsites } from './src/services/subsites';
+import { SubsiteTypes } from './src/services/subsite-types';
+import { TreeOrders } from './src/services/trees-orders';
 
 export {
-  createCountriesApiService,
   Countries,
-  createFieldUpdatesApiService,
-  createFieldUpdateVerificationsApiService,
-  createForestTypeSpeciesApiService,
+  FieldUpdates,
+  FieldUpdateVerifications,
   ForestTypeSpecies,
-  createForestTypesApiService,
   ForestTypes,
-  createFormSubmissionsApiService,
-  createOrgsApiService,
-  createImagesApiService,
+  ForestTypeProfiles,
+  FormSubmissions,
+  Orgs,
   Images,
-  createMeApiService,
-  createRegionsApiService,
+  User,
   Regions,
-  createSponsorsApiService,
-  createSubdomainsApiService,
-  createSubsitesApiService,
+  Sponsors,
+  Stats,
+  Subdomains,
   Subsites,
-  createSubsiteTypesApiService,
-  createTreeOrdersApiService,
+  SubsiteTypes,
+  TreeOrders
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veritree/services",
-  "version": "1.0.0-2",
+  "version": "1.0.0-3",
   "description": "A collection of javascript functions/services to talk to veritree API",
   "type": "module",
   "main": "index.js",

package/src/helpers/api-v2.js

@@ -2,37 +2,41 @@ import { getCookie } from "./cookies";
 import { createParamsStringFromArgs } from "../utils/args";
 import { getSession } from "./session";
 
-export default function Api(resource, session) {
-  const baseUrl = `${process.env.API_VERITREE_URL}/api`;
+export default class Api {
+  constructor(resource) {
+    this.baseUrl = `${process.env.API_VERITREE_URL}/api`;
+    this.resource = resource;
+    this.orgId = null;
+    this.orgType = null;
+  }
 
   /**
    *
    * @returns {promise}
    */
-  this.all = async function () {
-    const url = `${this.getUrl()}?${this.getUrlParams(arguments)}`;
+  async all() {
+    const url = `${this.getUrl()}${this.getUrlParams(arguments)}`;
     return await this.get(url);
-  };
+  }
 
   /**
    *
    * @param {string, number} id
    * @returns {promise}
    */
-  this.single = async function (id) {
-    const url = `${this.getUrl()}/${id}?${this.getUrlParams()}`;
+  async single(id) {
+    const url = `${this.getUrl()}/${id}${this.getUrlParams()}`;
     return await this.get(url);
-  };
+  }
 
   /**
    *
    * @param {object} data
    * @returns {promise}
    */
-  this.create = async function (data) {
-    const url = `${this.getUrl()}?${this.getUrlParams()}`;
-    return await this.post(url, data);
-  };
+  async create(data) {
+    return await this.post(null, data);
+  }
 
   /**
    *
@@ -41,31 +45,17 @@ export default function Api(resource, session) {
    * @param {string} as - 'put' // necessary for updates because of how Laravel handles PUT requests
    * @returns {promise}
    */
-  this.update = async function (id, data, as = "put") {
-    const url = `${this.getUrl()}/${id}?${this.getUrlParams()}`;
+  async update(id, data, as = "put") {
+    const url = `${this.getUrl()}/${id}${this.getUrlParams()}`;
     return await this.post(url, data, as);
-  };
-
-  // ----------
-  // --
-  this.getUrl = () => {
-    return `${baseUrl}/${resource}`;
-  };
-
-  this.getUrlParams = (args) => {
-    const { orgId, orgType } = getSession();
-
-    return `org_id=${orgId}&org_type=${orgType}${createParamsStringFromArgs(
-      args
-    )}`;
-  };
+  }
 
   /**
    *
    * @param {string} url
    * @returns {promise}
    */
-  this.get = async function (url) {
+  get = async function (url) {
     return await this.unWrap(url);
   };
 
@@ -75,10 +65,28 @@ export default function Api(resource, session) {
    * @param {object} data
    * @returns {promise}
    */
-  this.post = async function (url, data, as) {
+  post = async function (url, data, as) {
+    if (!url) url = `${this.getUrl()}${this.getUrlParams()}`;
     return await this.unWrap(url, "post", data, as);
   };
 
+  // ----------
+  // --
+  getUrl = () => {
+    return `${this.baseUrl}/${this.resource}`;
+  };
+
+  getUrlParams = (args) => {
+    this.setOrg();
+
+    const orgIdParam = this.orgId ? `org_id=${this.orgId}` : "";
+    const orgTypeParam = this.orgType ? `org_type=${this.orgType}` : "";
+
+    return `?${orgIdParam}&${orgTypeParam}${createParamsStringFromArgs(
+      args
+    )}`;
+  };
+
   /**
    * Deals with all fetch requests
    *
@@ -87,7 +95,7 @@ export default function Api(resource, session) {
    * @param {object} data
    * @returns {object} envelope
    */
-  this.unWrap = async function (url, method = "get", data, as) {
+  unWrap = async function (url, method = "get", data, as) {
     url = this.handleEnvelopParam(url, data); // TODO: remove when API is fully migrated to envelopes
     const config = this.getConfig(method, data, as);
 
@@ -108,7 +116,7 @@ export default function Api(resource, session) {
    * @param {object} body
    * @returns {object} data
    */
-  this.getConfig = function (method, data, as) {
+  getConfig = function (method, data, as) {
     const isGet = method === "get";
     const isPut = as === "put";
     const isFormData = this.isFormData(data);
@@ -139,13 +147,21 @@ export default function Api(resource, session) {
     return config;
   };
 
+  setOrg = () => {
+    const session = getSession();
+    if(!session) return;
+    const { orgId, orgType } = session;
+    this.orgId = orgId;
+    this.orgType = orgType;
+  }
+
   /**
    * Adds the envelope argument to the url
    *
    * @param {string} url
    * @returns {string} url
    */
-  this.handleEnvelopParam = function (url) {
+  handleEnvelopParam = function (url) {
     if (!url || url.includes("_result=1")) return url;
 
     const urlHasArgs = url.includes("?");
@@ -154,5 +170,5 @@ export default function Api(resource, session) {
     return `${url}${urlEvenlopeArg}`;
   };
 
-  this.isFormData = (data) => data instanceof FormData;
+  isFormData = (data) => data instanceof FormData;
 }

package/src/services/countries.js

@@ -1,35 +1,5 @@
-import Api from '../helpers/api';
+import Api from "../helpers/api-v2";
 
-export const createCountriesApiService = () => {
-  const resource = 'countries';
+const resource = "countries";
 
-  const get = {
-    async all() {
-      const url = _getUrl();
-      return await Api.get(url);
-    },
-
-    async specific(countriId) {
-      const url = `${_getUrl()}/${countriId}`;
-      return await Api.get(url);
-    }
-  }
-
-  const stats = {
-    async get(countryId) {
-      const type = countryId ? `${countryId}` : 'global';
-      const url = `${_getUrl()}/${type}/stats`;
-
-      return await Api.get(url);
-    }
-  }
-
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
-
-  return {
-    get,
-    stats
-  };
-};
+export const Countries = new Api(resource);

package/src/services/field-udpate-verifications.js

@@ -1,34 +1,5 @@
-import Api from "../helpers/api";
-import { getSession } from "../helpers/session";
+import Api from "../helpers/api-v2";
 
-export const createFieldUpdateVerificationsApiService = () => {
-  const resource = `field-update-verifications`;
-  const { orgId, orgType } = getSession();
+const resource = "field-update-verifications";
 
-  if (!orgId && !orgType) {
-    throw new Error('Organization id and type are required');
-  }
-
-  /**
-   *
-   * @param {object} data
-   * @returns
-   */
-   const post = (data) => {
-    const url = `${_getUrl()}?${_getParams()}`;
-
-    return Api.post(url, data);
-  };
-
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
-
-  const _getParams = () => {
-    return `org_id=${orgId}&org_type=${orgType}`;
-  };
-
-  return {
-    post,
-  };
-};
+export const FieldUpdateVerifications = new Api(resource);

package/src/services/field-updates.js

@@ -1,77 +1,5 @@
-import Api from "../helpers/api";
-import { getSession } from "../helpers/session";
-import { createParamsStringFromArgs } from "../utils/args";
+import Api from "../helpers/api-v2";
 
-export const createFieldUpdatesApiService = () => {
-  const resource = `field-updates`;
-  const { orgId, orgType } = getSession();
+const resource = "field-updates";
 
-  if (!orgId && !orgType) {
-    throw new Error('Organization id and type are required');
-  }
-
-  const get = {
-    async all() {
-      const url = `${_getUrl()}?${_getParams(arguments)}`;
-
-      return await Api.get(url);
-    },
-
-    async specific(id) {
-      const url = `${_getUrl()}/${id}?${_getParams()}`;
-
-      return await Api.get(url);
-    }
-  };
-
-  /**
-   *
-   * @param {object} data
-   * @returns
-   */
-   const post = (data) => {
-    const url = `${_getUrl()}?${_getParams()}`;
-
-    return Api.post(url, data);
-  };
-
-  /**
-   *
-   * @param {string} fieldUpdateId
-   * @param {object} data
-   * @returns
-   */
-  const update = (fieldUpdateId, data) => {
-    const url = `${_getUrl()}/${fieldUpdateId}?${_getParams()}`;
-
-    return Api.post(url, data);
-  };
-
-  /**
-   * 
-   */
-  const remove = {
-    async img(fieldUpdateId, data) {
-      const url = `${_getUrl()}/${fieldUpdateId}/images/detach?${_getParams()}`;
-
-      return await Api.post(url, data);
-    }
-  }
-
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
-
-  const _getParams = (args) => {
-    const paramsString = createParamsStringFromArgs(args);
-
-    return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
-  };
-
-  return {
-    get,
-    post,
-    update,
-    remove
-  };
-};
+export const FieldUpdates = new Api(resource);

package/src/services/forest-type-species.js

@@ -1,63 +1,5 @@
-import Api from "../helpers/api";
-import { createParamsStringFromArgs } from "../utils/args";
-import { getSession } from "../helpers/session";
-// import { all, getUrl, getUrlParams } from "../utils/methods";
+import Api from "../helpers/api-v2";
 
-export const createForestTypeSpeciesApiService = () => {
-  const resource = "forest-type-species";
-  const { orgId, orgType } = getSession();
+const resource = "forest-type-species";
 
-  if (!orgId && !orgType) {
-    throw new Error("Organization id and type are required");
-  }
-
-  const get = {
-    /**
-     * @param {object} arguments
-     * @returns {object} envelope
-     */
-    async all() {
-      const url = `${_getUrl()}?${_getUrlParams(arguments)}`;
-
-      return await Api.get(url);
-    },
-
-    /**
-     * @param {number/string} id
-     * @returns {object} envelope
-     */
-    async specific(id) {
-      const url = `${_getUrl()}/${id}?${_getUrlParams()}`;
-
-      return await Api.get(url);
-    },
-  };
-
-  const post = (data) => {
-    const url = `${_getUrl()}?${_getUrlParams()}`;
-
-    return Api.post(url, data);
-  };
-
-  const update = (id, data) => {
-    const url = `${_getUrl()}/${id}?${_getUrlParams()}`;
-
-    return Api.update(url, data);
-  };
-
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
-
-  const _getUrlParams = (args) => {
-    const paramsString = createParamsStringFromArgs(args);
-
-    return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
-  };
-
-  return {
-    get,
-    post,
-    update,
-  };
-};
+export const ForestTypeSpecies = new Api(resource);

package/src/services/forest-types-profiles.js

@@ -0,0 +1,5 @@
+import Api from '../helpers/api-v2';
+
+const resource = 'forest-type-profiles';
+
+export const ForestTypeProfiles = new Api(resource);

package/src/services/forest-types.js

@@ -1,62 +1,5 @@
-import Api from "../helpers/api";
-import { createParamsStringFromArgs } from "../utils/args";
-import { getSession } from "../helpers/session";
+import Api from "../helpers/api-v2";
 
-export const createForestTypesApiService = () => {
-  const resource = "forest-types";
-  const { orgId, orgType } = getSession();
+const resource = "forest-types";
 
-  if (!orgId && !orgType) {
-    throw new Error("Organization id and type are required");
-  }
-
-  const get = {
-    /**
-     * @param {object} arguments
-     * @returns {object} envelope
-     */
-    async all() {
-      const url = `${_getUrl()}?${_getUrlParams(arguments)}`;
-
-      return await Api.get(url);
-    },
-
-    /**
-     * @param {number/string} id
-     * @returns {object} envelope
-     */
-    async specific(id) {
-      const url = `${_getUrl()}/${id}?${_getUrlParams()}`;
-
-      return await Api.get(url);
-    },
-  };
-
-  const post = (data) => {
-    const url = `${_getUrl()}?${_getUrlParams()}`;
-
-    return Api.post(url, data);
-  };
-
-  const update = (id, data) => {
-    const url = `${_getUrl()}/${id}?${_getUrlParams()}`;
-
-    return Api.update(url, data);
-  };
-
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
-
-  const _getUrlParams = (args) => {
-    const paramsString = createParamsStringFromArgs(args);
-
-    return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
-  };
-
-  return {
-    get,
-    post,
-    update,
-  };
-};
+export const ForestTypes = new Api(resource);

package/src/services/form-submissions.js

@@ -1,33 +1,5 @@
-import Api from '../helpers/api';
-import { getSession } from "../helpers/session";
-import { createParamsStringFromArgs } from '../utils/args';
+import Api from "../helpers/api-v2";
 
-export const createFormSubmissionsApiService = () => {
-  const resource = 'form-submissions';
-  const { orgId, orgType } = getSession();
+const resource = "form-submissions";
 
-  if (!orgId && !orgType) {
-    throw new Error('Organization id and type are required');
-  }
-
-  const get = {
-    async all() {
-      const url = `${_getUrl()}?${_getParams(arguments)}`;
-      return await Api.get(url);
-    },
-  };
-
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
-
-  const _getParams = (args) => {
-    const paramsString = createParamsStringFromArgs(args);
-
-    return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
-  };
-
-  return {
-    get,
-  };
-};
+export const FormSubmissions = new Api(resource);

package/src/services/images.js

@@ -1,39 +1,5 @@
-import Api from "../helpers/api";
-import { getSession } from "../helpers/session";
-import { createParamsStringFromArgs } from "../utils/args";
+import Api from "../helpers/api-v2";
 
-export const createImagesApiService = () => {
-  const resource = "images";
-  const { orgId, orgType } = getSession();
+const resource = "images";
 
-  if (!orgId && !orgType) {
-    throw new Error("Organization id and type are required");
-  }
-
-  const get = {
-    async all() {
-      const url = `${_getUrl()}?${_getParams(arguments)}`;
-      return await Api.get(url);
-    },
-
-    async specific(id) {
-      const url = `${_getUrl()}/${id}?${_getParams()}`;
-
-      return await Api.get(url);
-    },
-  };
-
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
-
-  const _getParams = (args) => {
-    const paramsString = createParamsStringFromArgs(args);
-
-    return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
-  };
-
-  return {
-    get,
-  };
-};
+export const Images = new Api(resource);

package/src/services/orgs.js

@@ -1,31 +1,25 @@
-import Api from '../helpers/api';
+import Api from '../helpers/api-v2';
 
-export const createOrgsApiService = (orgId, orgType) => {
-  if (!orgId && !orgType) throw new Error('No org id and/or type provided');
-  const resource = 'orgs';
-  
-  // filter for stats data
-  const stats = {
-    async get(isPublic) {
-      const endpoint = _getStatsEndpoint(isPublic);
-      const url = `${_getUrl()}/${endpoint}?${_getUrlParams()}`;
-      return await Api.get(url);
-    },
-  };
+class OrgsApi extends Api {
+  constructor(resource) {
+    super(resource);
+    this.resource = 'orgs';
+  }
 
-  const _getStatsEndpoint = (isPublic) => {
-    return isPublic ? 'pstats' : 'stats';
+  async stats() {
+    const url = `${this._geStatstUrl()}`;
+    return await this.get(url);
   }
 
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
+  async publicStats() {
+    const url = `${this._geStatstUrl(true)}`;
+    return await this.get(url);
+  }
 
-  const _getUrlParams = () => {
-    return `org_id=${orgId}&org_type=${orgType}`
+  _geStatstUrl = (isPublic) => {
+    const endpoint = isPublic ? 'pstats' : 'stats';
+    return `${this.getUrl()}/${endpoint}${this.getUrlParams()}`;
   }
+}
 
-  return {
-    stats,
-  };
-};
+export const Orgs = new OrgsApi();

package/src/services/regions.js

@@ -1,41 +1,5 @@
-import Api from "../helpers/api";
-import { getSession } from "../helpers/session";
-import { createParamsStringFromArgs } from "../utils/args";
+import Api from "../helpers/api-v2";
 
-export const createRegionsApiService = () => {
-  const resource = "regions";
-  const { orgId, orgType } = getSession();
+const resource = "regions";
 
-  if (!orgId && !orgType) {
-    throw new Error("Organization id and type are required");
-  }
-
-  const get = {
-    async all() {
-      const url = `${_getUrl()}?${_getParams(arguments)}`;
-
-      return await Api.get(url);
-    },
-  };
-
-  const post = (data) => {
-    const url = `${_getUrl()}?${_getParams()}`;
-
-    return Api.post(url, data);
-  };
-
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
-
-  const _getParams = (args) => {
-    const paramsString = createParamsStringFromArgs(args)
-
-    return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
-  };
-
-  return {
-    get,
-    post,
-  };
-};
+export const Regions = new Api(resource);

package/src/services/sponsors.js

@@ -1,31 +1,28 @@
-import Api from '../helpers/api';
-
-export const createSponsorsApiService = (orgId) => {
-  if (!orgId) throw new Error('No org id provided');
-  const resource = 'sponsors';
-
-  // filter for map data
-  const map = {
-    async get() {
-      const url = `${_getUrl()}/${orgId}/map-data`;
-      return await Api.get(url);
-    },
-  };
-
-  // filter for profile
-  const profile = {
-    async get() {
-      const url = `${_getUrl()}/${orgId}/profile`;
-      return await Api.get(url);
-    },
-  };
-
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
-
-  return {
-    map,
-    profile,
-  };
-};
+import Api from '../helpers/api-v2';
+
+class SponsorsApi extends Api {
+  constructor(resource) {
+    super(resource);
+    this.resource = 'sponsors';
+  }
+
+  async map() {
+    this.setOrg();
+
+    if(!this.orgId) throw new Error('No org id provided');
+
+    const url = `${this.getUrl()}/${this.orgId}/map-data`;
+    return await this.get(url);
+  }
+
+  async profile() {
+    this.setOrg();
+
+    if(!this.orgId) throw new Error('No org id provided');
+
+    const url = `${this.getUrl()}/${this.orgId}/profile`;
+    return await this.get(url);
+  }
+}
+
+export const Sponsors = new SponsorsApi();

package/src/services/stats.js

@@ -0,0 +1,17 @@
+import Api from '../helpers/api-v2';
+
+class StatsApi extends Api {
+  constructor(resource) {
+    super(resource);
+  }
+
+  async crumb(id) {
+    this.resource = 'pstats';
+    const url = `${this.getUrl()}/${id}${this.getUrlParams()}`;
+
+    return await this.get(url);
+  }
+}
+
+export const Stats = new StatsApi();
+

package/src/services/subdomains.js

@@ -1,26 +1,5 @@
-import Api from '../helpers/api';
+import Api from '../helpers/api-v2';
 
-export const createSubdomainsApiService = () => {
-  const resource = 'subdomains';
+const resource = 'subdomains';
 
-  const get = {
-    /**
-     * Gets org data related to subdomain
-     * 
-     * @param {string} id (name or id)
-     * @returns {object} evenlop
-     */
-    async specific(id) {
-      const url = `${_getUrl()}/${id}`;
-      return await Api.get(url);
-    },
-  };
-
-  function _getUrl() {
-    return `${Api.baseUrl}/${resource}`;
-  }
-
-  return {
-    get,
-  };
-};
+export const Subdomains = new Api(resource);

package/src/services/subsite-types.js

@@ -1,70 +1,5 @@
-import Api from "../helpers/api";
-import { getSession } from "../helpers/session";
-import { createParamsStringFromArgs } from "../utils/args";
+import Api from "../helpers/api-v2";
 
-export const createSubsiteTypesApiService = () => {
-  const resource = "subsite-types";
-  const { orgId, orgType } = getSession();
+const resource = "subsite-types";
 
-  if (!orgId && !orgType) {
-    throw new Error("Organization id and type are required");
-  }
-
-  const get = {
-    /**
-     * @returns {obj} envelope
-     */
-    async all() {
-      const url = `${_getUrl()}?${_getUrlParams(arguments)}`;
-
-      return await Api.get(url);
-    },
-
-    /**
-     * Gets a speficific subsite of an organization
-     *
-     * @param {number/string} id
-     * @param {number/string} page
-     * @returns {object} envelope
-     */
-    async specific(id) {
-      const url = `${_getUrl()}/${id}?${_getUrlParams()}`;
-
-      return await Api.get(url);
-    },
-
-    async stats(id) {
-      const url = `${_getUrl()}/${id}/stats`;
-
-      return await Api.get(url);
-    }
-  };
-
-  const post = (data) => {
-    const url = `${_getUrl()}?${_getUrlParams()}`;
-
-    return Api.post(url, data);
-  }
-
-  const update = (id, data) => {
-    const url = `${_getUrl()}/${id}?${_getUrlParams()}`;
-
-    return Api.update(url, data);
-  }
-
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
-
-  const _getUrlParams = (args) => {
-    const paramsString = createParamsStringFromArgs(args);
-
-    return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
-  };
-
-  return {
-    get,
-    post,
-    update
-  };
-};
+export const SubsiteTypes = new Api(resource);

package/src/services/subsites.js

@@ -1,70 +1,5 @@
-import Api from "../helpers/api";
-import { getSession } from "../helpers/session";
-import { createParamsStringFromArgs } from "../utils/args";
+import Api from "../helpers/api-v2";
 
-export const createSubsitesApiService = () => {
-  const resource = "subsites";
-  const { orgId, orgType } = getSession();
+const resource = "subsites";
 
-  if (!orgId && !orgType) {
-    throw new Error("Organization id and type are required");
-  }
-
-  const get = {
-    /**
-     * @returns {obj} envelope
-     */
-    async all() {
-      const url = `${_getUrl()}?${_getUrlParams(arguments)}`;
-
-      return await Api.get(url);
-    },
-
-    /**
-     * Gets a speficific subsite of an organization
-     *
-     * @param {number/string} id
-     * @param {number/string} page
-     * @returns {object} envelope
-     */
-    async specific(id) {
-      const url = `${_getUrl()}/${id}?${_getUrlParams()}`;
-
-      return await Api.get(url);
-    },
-
-    async stats(id) {
-      const url = `${_getUrl()}/${id}/stats`;
-
-      return await Api.get(url);
-    },
-  };
-
-  const post = (data) => {
-    const url = `${_getUrl()}?${_getUrlParams()}`;
-
-    return Api.post(url, data);
-  };
-
-  const update = (id, data) => {
-    const url = `${_getUrl()}/${id}?${_getUrlParams()}`;
-
-    return Api.update(url, data);
-  };
-
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
-
-  const _getUrlParams = (args) => {
-    const paramsString = createParamsStringFromArgs(args);
-
-    return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
-  };
-
-  return {
-    get,
-    post,
-    update,
-  };
-};
+export const Subsites = new Api(resource);

package/src/services/trees-orders.js

@@ -1,42 +1,5 @@
-import Api from '../helpers/api';
+import Api from '../helpers/api-v2';
 
-export const createTreeOrdersApiService = (orgId, orgType) => {
-  const resource = 'tree-orders';
+const resource = 'tree-orders';
+export const TreeOrders = new Api(resource);
 
-  const get = {
-    /**
-     * 
-     * @param {number/string} page
-     * @param {number/string} pageSize
-     * @returns {object} envelope
-     */
-    async all(page = 1, pageSize = 10) {
-      const url = `${_getUrl()}?${_getUrlParams(page, pageSize)}`;
-      return await Api.get(url);
-    },
-
-    /**
-     * 
-     * @param {number/string} id
-     * @param {number/string} page
-     * @param {number/string} pageSize
-     * @returns {object} envelope
-     */
-    async specific(id, page = 1, pageSize = 10) {
-      const url = `${_getUrl()}/${id}?${_getUrlParams(page, pageSize)}`;
-      return await Api.get(url);
-    },
-  };
-
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
-
-  const _getUrlParams = (page, pageSize) => {
-    return `org_id=${orgId}&org_type=${orgType}&page=${page}&page_size=${pageSize}&include=tree_allocations`;
-  };
-
-  return {
-    get,
-  };
-};

package/src/services/user.js

@@ -0,0 +1,15 @@
+import Api from '../helpers/api-v2';
+
+class UserApi extends Api {
+  constructor(resource) {
+    super(resource);
+    this.resource = 'me';
+  }
+
+  async me() {
+    const url = `${this.getUrl()}${this.getUrlParams()}`;
+    return await this.get(url);
+  }
+}
+
+export const User = new UserApi();

package/src/services/countries2.js

@@ -1,5 +0,0 @@
-import Api from "../helpers/api-v2";
-
-const resource = "countries";
-
-export const Countries = new Api(resource);

package/src/services/forest-type-species2.js

@@ -1,5 +0,0 @@
-import Api from "../helpers/api-v2";
-
-const resource = "forest-type-species";
-
-export const ForestTypeSpecies = new Api(resource);

package/src/services/forest-types2.js

@@ -1,5 +0,0 @@
-import Api from "../helpers/api-v2";
-
-const resource = "forest-types";
-
-export const ForestTypes = new Api(resource);

package/src/services/forms.js

@@ -1,33 +0,0 @@
-import Api from '../helpers/api';
-
-export const createFormApiService = (orgId, orgType) => {
-  if (!orgId && !orgType) throw new Error('orgId and orgType are required');
-  const resource = 'orgs';
-
-  const get = {
-    async all(page = 1, pageSize = 10) {
-      const url = `${_getUrl()}/${orgId}/forms?${_getParams(page, pageSize)}`;
-      return await Api.get(url);
-    },
-
-    async specific(formId) {
-      const url = `${_getUrl()}/${orgId}/forms/${formId}?${_getParams()}`;
-      return await Api.get(url);
-    },
-  };
-
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
-
-  const _getParams = (page, pageSize) => {
-    const paramPageSize = pageSize ? `&page_size=${pageSize}` : '';
-    const paramPage = page ? `&page=${page}` : '';
-
-    return `org_type=${orgType}${paramPageSize}${paramPage}`;
-  };
-
-  return {
-    get,
-  };
-};

package/src/services/images2.js

@@ -1,5 +0,0 @@
-import Api from "../helpers/api-v2";
-
-const resource = "images";
-
-export const Images = new Api(resource);

package/src/services/me.js

@@ -1,20 +0,0 @@
-import Api from '../helpers/api';
-
-export const createMeApiService = () => {
-  const resource = 'me';
-
-  const get = {
-    async me() {
-      const url = _getUrl();
-      return await Api.get(url);
-    },
-  };
-
-  const _getUrl = () => {
-    return `${Api.baseUrl}/${resource}`;
-  };
-
-  return {
-    get,
-  };
-};

package/src/services/regions2.js

@@ -1,5 +0,0 @@
-import Api from "../helpers/api-v2";
-
-const resource = "regions";
-
-export const Regions = new Api(resource);

package/src/services/subsites2.js

@@ -1,5 +0,0 @@
-import Api from "../helpers/api-v2";
-
-const resource = "subsites";
-
-export const Subsites = new Api(resource);

package/src/utils/methods.js

@@ -1,16 +0,0 @@
-import Api from "../helpers/api";
-import { createParamsStringFromArgs } from "../utils/args";
-
-export const all = async (url) => {
-  return await Api.get(url);
-};
-
-export const getUrl = (resource) => {
-  return `${Api.baseUrl}/${resource}`;
-};
-
-export const getUrlParams = (args) => {
-  const paramsString = createParamsStringFromArgs(args);
-
-  return `org_id=${orgId}&org_type=${orgType}${paramsString}`;
-};