Removed circular dependencies from project.
This commit is contained in:
Patrick Fic
27
client/src/utils/CleanAxios.js
Normal file
27
client/src/utils/CleanAxios.js
Normal file
@@ -0,0 +1,27 @@
|
||||
import axios from "axios";
|
||||
import { auth } from "../firebase/firebase.utils";
|
||||
|
||||
if (process.env.NODE_ENV === "prodution") {
|
||||
axios.defaults.baseURL =
|
||||
process.env.REACT_APP_AXIOS_BASE_API_URL || "https://api.imex.online/";
|
||||
}
|
||||
|
||||
export const axiosAuthInterceptorId = axios.interceptors.request.use(
|
||||
async (config) => {
|
||||
if (!config.headers.Authorization) {
|
||||
const token =
|
||||
auth.currentUser && (await auth.currentUser.getIdToken(true));
|
||||
if (token) {
|
||||
config.headers.Authorization = `Bearer ${token}`;
|
||||
}
|
||||
}
|
||||
|
||||
return config;
|
||||
},
|
||||
(error) => Promise.reject(error)
|
||||
);
|
||||
|
||||
const cleanAxios = axios.create();
|
||||
cleanAxios.interceptors.request.eject(axiosAuthInterceptorId);
|
||||
|
||||
export default cleanAxios;
|
||||
118
client/src/utils/GraphQLClient.js
Normal file
118
client/src/utils/GraphQLClient.js
Normal file
@@ -0,0 +1,118 @@
|
||||
import { setContext } from "@apollo/client/link/context";
|
||||
import { HttpLink } from "@apollo/client/link/http"; //"apollo-link-http";
|
||||
import { RetryLink } from "@apollo/client/link/retry";
|
||||
import { WebSocketLink } from "@apollo/client/link/ws";
|
||||
import { ApolloLink } from "apollo-boost";
|
||||
import { InMemoryCache } from "apollo-cache-inmemory";
|
||||
import ApolloClient from "apollo-client";
|
||||
import { split } from "apollo-link";
|
||||
import apolloLogger from "apollo-link-logger";
|
||||
import { getMainDefinition } from "apollo-utilities";
|
||||
import { auth } from "../firebase/firebase.utils";
|
||||
import errorLink from "../graphql/apollo-error-handling";
|
||||
|
||||
const httpLink = new HttpLink({
|
||||
uri: process.env.REACT_APP_GRAPHQL_ENDPOINT,
|
||||
});
|
||||
|
||||
const wsLink = new WebSocketLink({
|
||||
uri: process.env.REACT_APP_GRAPHQL_ENDPOINT_WS,
|
||||
options: {
|
||||
lazy: true,
|
||||
reconnect: true,
|
||||
connectionParams: async () => {
|
||||
const token =
|
||||
auth.currentUser && (await auth.currentUser.getIdToken(true));
|
||||
if (token) {
|
||||
return {
|
||||
headers: {
|
||||
authorization: token ? `Bearer ${token}` : "",
|
||||
},
|
||||
};
|
||||
}
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
const subscriptionMiddleware = {
|
||||
applyMiddleware: async (options, next) => {
|
||||
options.authToken =
|
||||
auth.currentUser && (await auth.currentUser.getIdToken(true));
|
||||
next();
|
||||
},
|
||||
};
|
||||
wsLink.subscriptionClient.use([subscriptionMiddleware]);
|
||||
|
||||
const link = split(
|
||||
// split based on operation type
|
||||
({ query }) => {
|
||||
const definition = getMainDefinition(query);
|
||||
// console.log(
|
||||
// "##Intercepted GQL Transaction : " +
|
||||
// definition.operation +
|
||||
// "|" +
|
||||
// definition.name.value +
|
||||
// "##",
|
||||
// query
|
||||
// );
|
||||
return (
|
||||
definition.kind === "OperationDefinition" &&
|
||||
definition.operation === "subscription"
|
||||
);
|
||||
},
|
||||
wsLink,
|
||||
httpLink
|
||||
);
|
||||
|
||||
const authLink = setContext((_, { headers }) => {
|
||||
return (
|
||||
auth.currentUser &&
|
||||
auth.currentUser.getIdToken().then((token) => {
|
||||
if (token) {
|
||||
return {
|
||||
headers: {
|
||||
...headers,
|
||||
authorization: token ? `Bearer ${token}` : "",
|
||||
},
|
||||
};
|
||||
} else {
|
||||
return { headers };
|
||||
}
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
const retryLink = new RetryLink({
|
||||
delay: {
|
||||
initial: 500,
|
||||
max: 5,
|
||||
jitter: true,
|
||||
},
|
||||
attempts: {
|
||||
max: 5,
|
||||
retryIf: (error, _operation) => !!error,
|
||||
},
|
||||
});
|
||||
|
||||
const middlewares = [];
|
||||
if (process.env.NODE_ENV === "development") {
|
||||
middlewares.push(apolloLogger);
|
||||
}
|
||||
|
||||
middlewares.push(retryLink.concat(errorLink.concat(authLink.concat(link))));
|
||||
|
||||
const cache = new InMemoryCache({});
|
||||
|
||||
export default new ApolloClient({
|
||||
link: ApolloLink.from(middlewares),
|
||||
cache,
|
||||
connectToDevTools: process.env.NODE_ENV !== "production",
|
||||
defaultOptions: {
|
||||
query: {
|
||||
fetchPolicy: "network-only",
|
||||
},
|
||||
watchQuery: {
|
||||
fetchPolicy: "network-only",
|
||||
},
|
||||
},
|
||||
});
|
||||
@@ -1,7 +1,7 @@
|
||||
import axios from "axios";
|
||||
import gql from "graphql-tag";
|
||||
import { QUERY_TEMPLATES_BY_NAME } from "../graphql/templates.queries";
|
||||
import axios from "axios";
|
||||
import { client } from "../App/App.container";
|
||||
import client from "../utils/GraphQLClient";
|
||||
|
||||
export default async function RenderTemplate(templateObject, bodyshop) {
|
||||
const { data: templateRecords } = await client.query({
|
||||
|
||||
@@ -1,170 +0,0 @@
|
||||
/* eslint no-fallthrough: off */
|
||||
import * as dates from "date-arithmetic";
|
||||
|
||||
export {
|
||||
milliseconds,
|
||||
seconds,
|
||||
minutes,
|
||||
hours,
|
||||
month,
|
||||
startOf,
|
||||
endOf,
|
||||
add,
|
||||
eq,
|
||||
gte,
|
||||
gt,
|
||||
lte,
|
||||
lt,
|
||||
inRange,
|
||||
min,
|
||||
max
|
||||
} from "date-arithmetic";
|
||||
|
||||
const MILLI = {
|
||||
seconds: 1000,
|
||||
minutes: 1000 * 60,
|
||||
hours: 1000 * 60 * 60,
|
||||
day: 1000 * 60 * 60 * 24
|
||||
};
|
||||
|
||||
const MONTHS = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
|
||||
|
||||
export function monthsInYear(year) {
|
||||
let date = new Date(year, 0, 1);
|
||||
|
||||
return MONTHS.map(i => dates.month(date, i));
|
||||
}
|
||||
|
||||
export function firstVisibleDay(date, localizer) {
|
||||
let firstOfMonth = dates.startOf(date, "month");
|
||||
|
||||
return dates.startOf(firstOfMonth, "week", localizer.startOfWeek());
|
||||
}
|
||||
|
||||
export function lastVisibleDay(date, localizer) {
|
||||
let endOfMonth = dates.endOf(date, "month");
|
||||
|
||||
return dates.endOf(endOfMonth, "week", localizer.startOfWeek());
|
||||
}
|
||||
|
||||
export function visibleDays(date, localizer) {
|
||||
let current = firstVisibleDay(date, localizer),
|
||||
last = lastVisibleDay(date, localizer),
|
||||
days = [];
|
||||
|
||||
while (dates.lte(current, last, "day")) {
|
||||
days.push(current);
|
||||
current = dates.add(current, 1, "day");
|
||||
}
|
||||
|
||||
return days;
|
||||
}
|
||||
|
||||
export function ceil(date, unit) {
|
||||
let floor = dates.startOf(date, unit);
|
||||
|
||||
return dates.eq(floor, date) ? floor : dates.add(floor, 1, unit);
|
||||
}
|
||||
|
||||
export function range(start, end, unit = "day") {
|
||||
let current = start,
|
||||
days = [];
|
||||
|
||||
while (dates.lte(current, end, unit)) {
|
||||
days.push(current);
|
||||
current = dates.add(current, 1, unit);
|
||||
}
|
||||
|
||||
return days;
|
||||
}
|
||||
|
||||
export function merge(date, time) {
|
||||
if (time == null && date == null) return null;
|
||||
|
||||
if (time == null) time = new Date();
|
||||
if (date == null) date = new Date();
|
||||
|
||||
date = dates.startOf(date, "day");
|
||||
date = dates.hours(date, dates.hours(time));
|
||||
date = dates.minutes(date, dates.minutes(time));
|
||||
date = dates.seconds(date, dates.seconds(time));
|
||||
return dates.milliseconds(date, dates.milliseconds(time));
|
||||
}
|
||||
|
||||
export function eqTime(dateA, dateB) {
|
||||
return (
|
||||
dates.hours(dateA) === dates.hours(dateB) &&
|
||||
dates.minutes(dateA) === dates.minutes(dateB) &&
|
||||
dates.seconds(dateA) === dates.seconds(dateB)
|
||||
);
|
||||
}
|
||||
|
||||
export function isJustDate(date) {
|
||||
return (
|
||||
dates.hours(date) === 0 &&
|
||||
dates.minutes(date) === 0 &&
|
||||
dates.seconds(date) === 0 &&
|
||||
dates.milliseconds(date) === 0
|
||||
);
|
||||
}
|
||||
|
||||
export function duration(start, end, unit, firstOfWeek) {
|
||||
if (unit === "day") unit = "date";
|
||||
return Math.abs(
|
||||
dates[unit](start, undefined, firstOfWeek) -
|
||||
dates[unit](end, undefined, firstOfWeek)
|
||||
);
|
||||
}
|
||||
|
||||
export function diff(dateA, dateB, unit) {
|
||||
if (!unit || unit === "milliseconds") return Math.abs(+dateA - +dateB);
|
||||
|
||||
// the .round() handles an edge case
|
||||
// with DST where the total won't be exact
|
||||
// since one day in the range may be shorter/longer by an hour
|
||||
return Math.round(
|
||||
Math.abs(
|
||||
+dates.startOf(dateA, unit) / MILLI[unit] -
|
||||
+dates.startOf(dateB, unit) / MILLI[unit]
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
export function total(date, unit) {
|
||||
let ms = date.getTime(),
|
||||
div = 1;
|
||||
|
||||
switch (unit) {
|
||||
case "week":
|
||||
div *= 7;
|
||||
case "day":
|
||||
div *= 24;
|
||||
case "hours":
|
||||
div *= 60;
|
||||
case "minutes":
|
||||
div *= 60;
|
||||
case "seconds":
|
||||
div *= 1000;
|
||||
}
|
||||
|
||||
return ms / div;
|
||||
}
|
||||
|
||||
export function week(date) {
|
||||
var d = new Date(date);
|
||||
d.setHours(0, 0, 0);
|
||||
d.setDate(d.getDate() + 4 - (d.getDay() || 7));
|
||||
return Math.ceil(((d - new Date(d.getFullYear(), 0, 1)) / 8.64e7 + 1) / 7);
|
||||
}
|
||||
|
||||
export function today() {
|
||||
return dates.startOf(new Date(), "day");
|
||||
}
|
||||
|
||||
export function yesterday() {
|
||||
return dates.add(dates.startOf(new Date(), "day"), -1, "day");
|
||||
}
|
||||
|
||||
export function tomorrow() {
|
||||
return dates.add(dates.startOf(new Date(), "day"), 1, "day");
|
||||
}
|
||||
Reference in New Issue
Block a user