Compare commits
3 Commits
f753684abe
...
8545a492ba
Author | SHA1 | Date |
---|---|---|
Alie | 8545a492ba | |
Alie | 42ca60c026 | |
Alie | 0c1de423ef |
|
@ -2,17 +2,17 @@ module.exports = {
|
|||
root: true,
|
||||
env: { browser: true, es2020: true },
|
||||
extends: [
|
||||
'eslint:recommended',
|
||||
'plugin:@typescript-eslint/recommended',
|
||||
'plugin:react-hooks/recommended',
|
||||
"eslint:recommended",
|
||||
"plugin:@typescript-eslint/recommended",
|
||||
"plugin:react-hooks/recommended",
|
||||
],
|
||||
ignorePatterns: ['dist', '.eslintrc.cjs'],
|
||||
parser: '@typescript-eslint/parser',
|
||||
plugins: ['react-refresh'],
|
||||
ignorePatterns: ["dist", ".eslintrc.cjs"],
|
||||
parser: "@typescript-eslint/parser",
|
||||
plugins: ["react-refresh"],
|
||||
rules: {
|
||||
'react-refresh/only-export-components': [
|
||||
'warn',
|
||||
"react-refresh/only-export-components": [
|
||||
"warn",
|
||||
{ allowConstantExport: true },
|
||||
],
|
||||
},
|
||||
}
|
||||
};
|
||||
|
|
|
@ -0,0 +1,52 @@
|
|||
name: Build image
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- build
|
||||
tags:
|
||||
- v*
|
||||
|
||||
jobs:
|
||||
build:
|
||||
container:
|
||||
image: docker:dind
|
||||
volumes:
|
||||
- /data/.cache/act:/data/.cache/act
|
||||
- /var/lib/docker/image:/var/lib/docker/image
|
||||
- /var/lib/docker/overlay2:/var/lib/docker/overlay2
|
||||
steps:
|
||||
- name: Starting docker daemon
|
||||
run: docker-init -- dockerd --host=unix:///var/run/docker.sock &
|
||||
- name: Installing necessary packages
|
||||
run: apk add nodejs git curl bash
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Docker meta
|
||||
id: meta
|
||||
uses: https://github.com/docker/metadata-action@v4
|
||||
with:
|
||||
# list of Docker images to use as base name for tags
|
||||
images: |
|
||||
git.fai.st/fedi-image-bot/moderation-fe
|
||||
# generate Docker tags based on the following events/attributes
|
||||
tags: |
|
||||
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
|
||||
type=ref,event=branch
|
||||
type=semver,pattern={{raw}}
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v2
|
||||
- name: Login to fai.st docker registry
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
registry: git.fai.st
|
||||
username: ${{ secrets.DOCKER_USER }}
|
||||
password: ${{ secrets.DOCKER_PASS }}
|
||||
- name: Build and push
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
platforms: linux/amd64,linux/arm64
|
||||
context: .
|
||||
push: true
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
15
index.html
15
index.html
|
@ -1,13 +1,20 @@
|
|||
<!doctype html>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<link
|
||||
rel="icon"
|
||||
type="image/svg+xml"
|
||||
href="/vite.svg" />
|
||||
<meta
|
||||
name="viewport"
|
||||
content="width=device-width, initial-scale=1.0" />
|
||||
<title>Vite + React + TS</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
<script
|
||||
type="module"
|
||||
src="/src/main.tsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
db = new Mongo().getDB("bot");
|
||||
|
||||
db.createCollection('authorizations');
|
||||
db.createCollection("authorizations");
|
||||
|
||||
db.authorizations.insert([
|
||||
{
|
||||
app: "tester",
|
||||
secret: "test"
|
||||
}
|
||||
])
|
||||
secret: "test",
|
||||
},
|
||||
]);
|
||||
|
|
22
src/App.tsx
22
src/App.tsx
|
@ -1,12 +1,32 @@
|
|||
import { useState } from "react";
|
||||
import "./App.css";
|
||||
import ImageModerator from "./components/ImageModerator/ImageModerator";
|
||||
import Login from "./components/Login/Login";
|
||||
|
||||
function App() {
|
||||
const [{ apiUrl, middlewareUrl, token }, setRemote] = useState({
|
||||
apiUrl: "",
|
||||
middlewareUrl: "",
|
||||
token: "",
|
||||
});
|
||||
|
||||
if (token) {
|
||||
return (
|
||||
<>
|
||||
<ImageModerator />
|
||||
<ImageModerator
|
||||
token={token}
|
||||
apiUrl={apiUrl}
|
||||
middlewareUrl={middlewareUrl}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
} else {
|
||||
return (
|
||||
<>
|
||||
<Login setRemote={setRemote} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default App;
|
||||
|
|
|
@ -4,5 +4,5 @@ export interface ButtonProps {
|
|||
}
|
||||
|
||||
export default function ImageViewer(props: ButtonProps) {
|
||||
return <button onClick={props.action}>{props.label}</button>
|
||||
return <button onClick={props.action}>{props.label}</button>;
|
||||
}
|
|
@ -1,43 +1,32 @@
|
|||
import Button from "../Button/Button";
|
||||
import { useEffect, useState } from "react";
|
||||
|
||||
// Let the user input the middleware URL, API url and app + secret
|
||||
const MWURL = "http://localhost:8081";
|
||||
const APIURL = "http://localhost:8080";
|
||||
const app = "tester";
|
||||
const secret = "test";
|
||||
interface ImageModeratorProps {
|
||||
token: string;
|
||||
apiUrl: string;
|
||||
middlewareUrl: string;
|
||||
}
|
||||
|
||||
export default function ImageModerator() {
|
||||
export default function ImageModerator({
|
||||
token,
|
||||
apiUrl,
|
||||
middlewareUrl,
|
||||
}: ImageModeratorProps) {
|
||||
const acceptLabel = "Accept";
|
||||
const discardLabel = "Discard";
|
||||
|
||||
const endpoint = `${MWURL}/image`;
|
||||
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [imageSrc, setImageSrc] = useState("");
|
||||
const [imageData, setImageData] = useState({ url: "", tags: [] });
|
||||
const [imageAlt, setImageAlt] = useState("No image");
|
||||
const [token, setToken] = useState("");
|
||||
|
||||
useEffect(() => {
|
||||
fetch(`${APIURL}/login`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify({ app, secret }),
|
||||
headers: { "Content-type": "application/json" },
|
||||
})
|
||||
.then((response) => {
|
||||
return response.json();
|
||||
})
|
||||
.then((body) => {
|
||||
setToken(body.token);
|
||||
});
|
||||
}, []);
|
||||
|
||||
console.log(token);
|
||||
|
||||
function acceptAction() {
|
||||
fetch(`${APIURL}/images`, {
|
||||
fetch(`${apiUrl}/images`, {
|
||||
method: "POST",
|
||||
body: `{ "url": "${imageSrc}", "status": "available", "tags": [] }`,
|
||||
body: JSON.stringify({
|
||||
url: imageData.url,
|
||||
status: "available",
|
||||
tags: imageData.tags,
|
||||
}),
|
||||
headers: {
|
||||
"Content-type": "application/json",
|
||||
Authorization: `Bearer ${token}`,
|
||||
|
@ -47,9 +36,13 @@ export default function ImageModerator() {
|
|||
}
|
||||
|
||||
function discardAction() {
|
||||
fetch(`${APIURL}/images`, {
|
||||
fetch(`${apiUrl}/images`, {
|
||||
method: "POST",
|
||||
body: `{ "url": "${imageSrc}", "status": "unavailable", "tags": [] }`,
|
||||
body: JSON.stringify({
|
||||
url: imageData.url,
|
||||
status: "unavailable",
|
||||
tags: imageData.tags,
|
||||
}),
|
||||
headers: {
|
||||
"Content-type": "application/json",
|
||||
Authorization: `Bearer ${token}`,
|
||||
|
@ -59,8 +52,8 @@ export default function ImageModerator() {
|
|||
}
|
||||
|
||||
const getNewImage = () => {
|
||||
setImageSrc("");
|
||||
fetch(endpoint, {
|
||||
setImageData({ url: "", tags: [] });
|
||||
fetch(`${middlewareUrl}/image`, {
|
||||
method: "GET",
|
||||
})
|
||||
.then((response) => {
|
||||
|
@ -68,8 +61,9 @@ export default function ImageModerator() {
|
|||
return response.json();
|
||||
})
|
||||
.then((data) => {
|
||||
const imageUrl = data.url;
|
||||
setImageSrc(imageUrl);
|
||||
const url = data.url;
|
||||
const tags = data.tags;
|
||||
setImageData({ url, tags });
|
||||
})
|
||||
.catch((error) => {
|
||||
setImageAlt("Error");
|
||||
|
@ -96,7 +90,7 @@ export default function ImageModerator() {
|
|||
<span>Loading...</span>
|
||||
) : (
|
||||
<img
|
||||
src={imageSrc}
|
||||
src={imageData.url}
|
||||
alt={imageAlt}
|
||||
style={{
|
||||
width: "100%",
|
||||
|
|
|
@ -0,0 +1,111 @@
|
|||
import { useEffect, useState } from "react";
|
||||
|
||||
export default function Login({ setRemote }: { setRemote: Function }) {
|
||||
const sendLabel = "Login";
|
||||
const [middlewareUrl, setMiddlewareUrl] = useState("");
|
||||
const [apiUrl, setApiUrl] = useState("");
|
||||
const [app, setApp] = useState("");
|
||||
const [secret, setSecret] = useState("");
|
||||
|
||||
function sendAction() {
|
||||
event?.preventDefault();
|
||||
try {
|
||||
if (apiUrl && middlewareUrl && app && secret) {
|
||||
localStorage.setItem(
|
||||
"credentials",
|
||||
JSON.stringify({ apiUrl, middlewareUrl, app, secret })
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
fetch(`${apiUrl}/login`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify({ app, secret }),
|
||||
headers: { "Content-type": "application/json" },
|
||||
})
|
||||
.then((response) => {
|
||||
return response.json();
|
||||
})
|
||||
.then((body) => {
|
||||
setRemote({ apiUrl, middlewareUrl, token: body.token });
|
||||
});
|
||||
}
|
||||
|
||||
function handleChange(
|
||||
e: {
|
||||
target: { value: React.SetStateAction<string> };
|
||||
},
|
||||
setter: React.Dispatch<React.SetStateAction<string>>
|
||||
): void {
|
||||
setter(e.target.value);
|
||||
}
|
||||
useEffect(() => {
|
||||
const savedRemote = localStorage.getItem("credentials");
|
||||
|
||||
if (savedRemote) {
|
||||
const savedData = JSON.parse(savedRemote);
|
||||
setApiUrl(savedData.apiUrl);
|
||||
setMiddlewareUrl(savedData.middlewareUrl);
|
||||
setApp(savedData.app);
|
||||
setSecret(savedData.secret);
|
||||
}
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (secret) {
|
||||
sendAction();
|
||||
}
|
||||
}, [secret]);
|
||||
|
||||
return (
|
||||
<div
|
||||
style={{
|
||||
height: "100vh",
|
||||
width: "100vw",
|
||||
}}>
|
||||
<form
|
||||
style={{
|
||||
height: "100%",
|
||||
width: "100%",
|
||||
display: "flex",
|
||||
flexDirection: "column",
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
}}
|
||||
onSubmit={sendAction}>
|
||||
<label>API URL: </label>
|
||||
<input
|
||||
type="url"
|
||||
id="api"
|
||||
name="api"
|
||||
value={apiUrl}
|
||||
onChange={(e) => handleChange(e, setApiUrl)}
|
||||
/>
|
||||
<label>Source URL: </label>
|
||||
<input
|
||||
type="url"
|
||||
id="middleware"
|
||||
name="middleware"
|
||||
value={middlewareUrl}
|
||||
onChange={(e) => handleChange(e, setMiddlewareUrl)}
|
||||
/>
|
||||
<label>App name: </label>
|
||||
<input
|
||||
type="text"
|
||||
id="username"
|
||||
name="username"
|
||||
value={app}
|
||||
onChange={(e) => handleChange(e, setApp)}
|
||||
/>
|
||||
<label>Secret: </label>
|
||||
<input
|
||||
type="password"
|
||||
value={secret}
|
||||
onChange={(e) => handleChange(e, setSecret)}
|
||||
/>
|
||||
<button type="submit">{sendLabel}</button>
|
||||
</form>
|
||||
</div>
|
||||
);
|
||||
}
|
10
src/main.tsx
10
src/main.tsx
|
@ -1,7 +1,5 @@
|
|||
import ReactDOM from 'react-dom/client'
|
||||
import App from './App.tsx'
|
||||
import './index.css'
|
||||
import ReactDOM from "react-dom/client";
|
||||
import App from "./App.tsx";
|
||||
import "./index.css";
|
||||
|
||||
ReactDOM.createRoot(document.getElementById('root')!).render(
|
||||
<App />
|
||||
)
|
||||
ReactDOM.createRoot(document.getElementById("root")!).render(<App />);
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
import React from "react";
|
||||
import { render, screen } from "@testing-library/react";
|
||||
import { describe, expect, it } from "bun:test";
|
||||
import ImageModerator, { ImageModeratorProps } from '../../src/components/ImageModerator/ImageModerator';
|
||||
import ImageModerator, {
|
||||
ImageModeratorProps,
|
||||
} from "../../src/components/ImageModerator/ImageModerator";
|
||||
|
||||
const properties: ImageModeratorProps = {
|
||||
acceptLabel: "Accept",
|
||||
discardLabel: "Discard"
|
||||
}
|
||||
discardLabel: "Discard",
|
||||
};
|
||||
|
||||
it("should render into the document", () => {
|
||||
render(<ImageModerator {...properties} />);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { defineConfig } from 'vite'
|
||||
import react from '@vitejs/plugin-react-swc'
|
||||
import { defineConfig } from "vite";
|
||||
import react from "@vitejs/plugin-react-swc";
|
||||
|
||||
// https://vitejs.dev/config/
|
||||
export default defineConfig({
|
||||
plugins: [react()]
|
||||
})
|
||||
plugins: [react()],
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue