Link and metamigo build fixes

This commit is contained in:
Darren Clarke 2023-03-13 22:14:52 +00:00
parent 4f2b7934e2
commit 785d0965e3
17 changed files with 26 additions and 16 deletions

View file

@ -10,14 +10,16 @@ export const ZammadWrapper: FC<ZammadWrapperProps> = ({
path, path,
hideSidebar = true, hideSidebar = true,
}) => { }) => {
const origin = typeof window !== 'undefined' && window.location.origin const origin =
typeof window !== "undefined" && window.location.origin
? window.location.origin ? window.location.origin
: ''; : "";
const [display, setDisplay] = useState("hidden"); const [display, setDisplay] = useState("hidden");
const url = `${origin}/zammad${path}`; const url = `${origin}/zammad${path}`;
console.log({ origin, path, url }); console.log({ origin, path, url });
return ( return (
// @ts-ignore
<Iframe <Iframe
id="link" id="link"
url={url} url={url}
@ -49,7 +51,6 @@ export const ZammadWrapper: FC<ZammadWrapperProps> = ({
setDisplay("inherit"); setDisplay("inherit");
} }
}} }}
/> />
); );

View file

@ -1,3 +1,4 @@
// @ts-nocheck
import Head from "next/head"; import Head from "next/head";
import { Grid } from "@mui/material"; import { Grid } from "@mui/material";
import { Layout } from "components/Layout"; import { Layout } from "components/Layout";

View file

@ -1,3 +1,4 @@
// @ts-nocheck
import Head from "next/head"; import Head from "next/head";
import { Grid } from "@mui/material"; import { Grid } from "@mui/material";
import { Layout } from "components/Layout"; import { Layout } from "components/Layout";
@ -17,7 +18,7 @@ const Metamigo = () => (
<Grid item sx={{ height: "100vh", width: "100%" }}> <Grid item sx={{ height: "100vh", width: "100%" }}>
<Iframe <Iframe
id="link" id="link"
url={"https://sigarillo.link.smex.org"} url={"http://metamigo-frontend:3000"}
width="100%" width="100%"
height="100%" height="100%"
frameBorder={0} frameBorder={0}

View file

@ -1,3 +1,4 @@
// @ts-nocheck
import { useState } from "react"; import { useState } from "react";
import Head from "next/head"; import Head from "next/head";
import { Grid, Button } from "@mui/material"; import { Grid, Button } from "@mui/material";

View file

@ -1,3 +1,4 @@
// @ts-nocheck
import { useState } from "react"; import { useState } from "react";
import Head from "next/head"; import Head from "next/head";
import { Grid, Button } from "@mui/material"; import { Grid, Button } from "@mui/material";

View file

@ -1,3 +1,4 @@
// @ts-nocheck
import { useState } from "react"; import { useState } from "react";
import Head from "next/head"; import Head from "next/head";
import { Grid, Button } from "@mui/material"; import { Grid, Button } from "@mui/material";

View file

@ -1,3 +1,4 @@
// @ts-nocheck
import { useState } from "react"; import { useState } from "react";
import Head from "next/head"; import Head from "next/head";
import { Grid, Button } from "@mui/material"; import { Grid, Button } from "@mui/material";

View file

@ -1,3 +1,4 @@
// @ts-nocheck
import { useState } from "react"; import { useState } from "react";
import Head from "next/head"; import Head from "next/head";
import { Grid, Button } from "@mui/material"; import { Grid, Button } from "@mui/material";

View file

@ -1,10 +1,12 @@
require("eslint-config-link/patch/modern-module-resolution"); require("eslint-config-link/patch/modern-module-resolution");
module.exports = { module.exports = {
extends: [ extends: [
"eslint-config-link/profile/node", "eslint-config-link/profile/node",
"eslint-config-link/profile/typescript", "eslint-config-link/profile/typescript",
"eslint-config-link/profile/jest", "eslint-config-link/profile/jest",
"next" "next",
"unicorn/filename-case",
], ],
parserOptions: { tsconfigRootDir: __dirname }, parserOptions: { tsconfigRootDir: __dirname },
}; };

View file

@ -69,7 +69,7 @@ export const AdminLogin: FC = () => {
spacing={5} spacing={5}
direction="column" direction="column"
alignItems="center" alignItems="center"
justify="center" justifyContent="center"
style={{ minHeight: "100vh" }} style={{ minHeight: "100vh" }}
> >
<Grid item xs={3}> <Grid item xs={3}>

View file

@ -1,7 +1,7 @@
import pgPromise from "pg-promise"; import pgPromise from "pg-promise";
import * as pgMonitor from "pg-monitor"; import * as pgMonitor from "pg-monitor";
import { dbInitOptions, IRepositories, AppDatabase } from "@digiresilience/metamigo-db"; import { dbInitOptions, IRepositories, AppDatabase } from "@digiresilience/metamigo-db";
import config from "config"; import config from "@digiresilience/metamigo-config";
import type { IInitOptions } from "pg-promise"; import type { IInitOptions } from "pg-promise";
export const initDiagnostics = ( export const initDiagnostics = (

View file

@ -1,7 +1,7 @@
import * as Worker from "graphile-worker"; import * as Worker from "graphile-worker";
import { parseCronItems } from "graphile-worker"; import { parseCronItems } from "graphile-worker";
import { defState } from "@digiresilience/montar"; import { defState } from "@digiresilience/montar";
import config from "config"; import config from "@digiresilience/metamigo-config";
import { initPgp } from "./db"; import { initPgp } from "./db";
import logger from "./logger"; import logger from "./logger";
import workerUtils from "./utils"; import workerUtils from "./utils";

View file

@ -1,6 +1,6 @@
import { defState } from "@digiresilience/montar"; import { defState } from "@digiresilience/montar";
import { configureLogger } from "@digiresilience/metamigo-common"; import { configureLogger } from "@digiresilience/metamigo-common";
import config from "config"; import config from "@digiresilience/metamigo-config";
export const logger = defState("workerLogger", { export const logger = defState("workerLogger", {
start: async () => configureLogger(config), start: async () => configureLogger(config),

View file

@ -1,5 +1,5 @@
import Twilio from "twilio"; import Twilio from "twilio";
import config from "config"; import config from "@digiresilience/metamigo-config";
import { withDb, AppDatabase } from "../db"; import { withDb, AppDatabase } from "../db";
interface VoiceLineDeleteTaskOptions { interface VoiceLineDeleteTaskOptions {

View file

@ -1,5 +1,5 @@
import Twilio from "twilio"; import Twilio from "twilio";
import config from "config"; import config from "@digiresilience/metamigo-config";
import { withDb, AppDatabase } from "../db"; import { withDb, AppDatabase } from "../db";
interface VoiceLineUpdateTaskOptions { interface VoiceLineUpdateTaskOptions {

View file

@ -1,5 +1,5 @@
{ {
"extends": "../tsconfig.json", "extends": "tsconfig-link",
"compilerOptions": { "compilerOptions": {
"outDir": "build/main", "outDir": "build/main",
"esModuleInterop": true "esModuleInterop": true

View file

@ -1,6 +1,6 @@
import * as Worker from "graphile-worker"; import * as Worker from "graphile-worker";
import { defState } from "@digiresilience/montar"; import { defState } from "@digiresilience/montar";
import config from "config"; import config from "@digiresilience/metamigo-config";
const startWorkerUtils = async (): Promise<Worker.WorkerUtils> => { const startWorkerUtils = async (): Promise<Worker.WorkerUtils> => {
const workerUtils = await Worker.makeWorkerUtils({ const workerUtils = await Worker.makeWorkerUtils({