Commit 217953af authored by Grant's avatar Grant
Browse files

Merge branch 'main' of ssh://git.sc07.company:2424/sc07/canvas

parents fe5abb18 3337d82a

Dockerfile

+4 −0
Original line number Diff line number Diff line
@@ -107,9 +107,13 @@ ENV PORT 3000 
ENV NODE_ENV production

ENV SERVE_CLIENT /home/node/app/packages/client

ENV SERVE_ADMIN /home/node/app/packages/admin

ENV PIXEL_LOG_PATH /home/node/app/pixel.log



VOLUME /home/node/app/pixel.log



EXPOSE 3000

# profiler port, only used if profiler is explicity running

EXPOSE 9229



ENTRYPOINT [ "/bin/sh" ]

CMD [ "./docker-start.sh" ]
 
 No newline at end of file

package-lock.json

+7 −0
Original line number Diff line number Diff line
@@ -6332,6 +6332,12 @@ 
        "@types/express": "*"

      }

    },

    "node_modules/@types/grecaptcha": {

      "version": "3.0.9",

      "resolved": "https://registry.npmjs.org/@types/grecaptcha/-/grecaptcha-3.0.9.tgz",

      "integrity": "sha512-fFxMtjAvXXMYTzDFK5NpcVB7WHnrHVLl00QzEGpuFxSAC789io6M+vjcn+g5FTEamIJtJr/IHkCDsqvJxeWDyw==",

      "dev": true

    },

    "node_modules/@types/http-errors": {

      "version": "2.0.4",

      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
@@ -16104,6 +16110,7 @@ 
      },

      "devDependencies": {

        "@tsconfig/vite-react": "^3.0.0",

        "@types/grecaptcha": "^3.0.9",

        "@types/lodash.throttle": "^4.1.9",

        "@types/react": "^18.2.48",

        "@types/react-dom": "^18.2.18",

packages/client/package.json

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
  },

  "devDependencies": {

    "@tsconfig/vite-react": "^3.0.0",

    "@types/grecaptcha": "^3.0.9",

    "@types/lodash.throttle": "^4.1.9",

    "@types/react": "^18.2.48",

    "@types/react-dom": "^18.2.18",

packages/client/src/components/Info/InfoSidebar.tsx

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ export const InfoSidebar = () => { 
          </div>

        </Button>

        <b>Build {__COMMIT_HASH__}</b>

        <div id="grecaptcha-badge"></div>

      </section>

    </div>

  );

packages/client/src/lib/network.ts

+9 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import { 
} from "@sc07-canvas/lib/src/net";

import { toast } from "react-toastify";

import { handleAlert, handleDismiss } from "./alerts";

import { Recaptcha } from "./recaptcha";



export interface INetworkEvents {

  connected: () => void;
@@ -91,6 +92,14 @@ class Network extends EventEmitter<INetworkEvents> { 
      console.log("Reconnect failed");

    });



    this.socket.on("recaptcha", (site_key) => {

      Recaptcha.load(site_key);

    });



    this.socket.on("recaptcha_challenge", (ack) => {

      Recaptcha.executeChallenge(ack);

    });



    this.socket.on("user", (user) => {

      this.emit("user", user);

    });