k-space/log-viewer
11
0
Fork 0
Code Issues 6 Pull Requests Projects Activity

Add iteration through screenshot array in frontend/src/component/Event.js
All checks were successful
continuous-integration/drone Build is passing
Details

Browse Source
This commit is contained in:
Léo Carpentier
2022-02-16 11:48:18 +02:00
parent 705b57f3a0
commit a951f16494
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/server.js
View File

@@ -11,7 +11,7 @@ const mongoUri = process.env.MONGO_URI || 'mongodb://127.0.0.1:27017/default?rep
const minioURI = new URL(process.env.MINIO_URI || 'http://kspace-mugshot:2mSI6HdbJ8@127.0.0.1:9000/kspace-mugshot'); const minioURI = new URL(process.env.MINIO_URI || 'http://kspace-mugshot:2mSI6HdbJ8@127.0.0.1:9000/kspace-mugshot');
const minioBucket = minioURI.pathname.substring(1); const minioBucket = minioURI.pathname.substring(1);
console.info("Using bucket:", minioBucket); console.info("Using bucket:", minioBucket);
const historyNumber = parseInt(process.env.HISTORY_AMOUNT) || 1000; const historyNumber = parseInt(process.env.HISTORY_AMOUNT) || 10;
// Stream set-up variables // Stream set-up variables
let changeStream; let changeStream;
@@ -39,7 +39,7 @@ async function run() {
app.get('/events', async function (request, response) { app.get('/events', async function (request, response) {
let minioClient = new minio.Client({ let minioClient = new minio.Client({
endPoint: minioURI.hostname, endPoint: minioURI.hostname,
port: parseInt(minioURI.port) || (minioURI.protocol == 'https' ? 443 : 80), port: parseInt(minioURI.port) || (minioURI.protocol == 'https:' ? 443 : 80),
useSSL: minioURI.protocol == 'https:', useSSL: minioURI.protocol == 'https:',
accessKey: minioURI.username, accessKey: minioURI.username,
secretKey: minioURI.password secretKey: minioURI.password

2
docker-compose.yml
View File

@@ -12,7 +12,7 @@ x-common: &common
MINIO_ACCESS_KEY: kspace-mugshot MINIO_ACCESS_KEY: kspace-mugshot
MINIO_SECRET_KEY: 2mSI6HdbJ8 MINIO_SECRET_KEY: 2mSI6HdbJ8
MINIO_DEFAULT_BUCKETS: kspace-mugshot:download MINIO_DEFAULT_BUCKETS: kspace-mugshot:download
MINIO_URI: 'https://kspace-mugshot:2mSI6HdbJ8@127.0.0.1:9000/kspace-mugshot' MINIO_URI: 'http://kspace-mugshot:2mSI6HdbJ8@127.0.0.1:9000/kspace-mugshot'
services: services:

12
frontend/src/components/event/Event.js
View File

@@ -3,9 +3,19 @@ import "./Event.css";
function Event(props) { function Event(props) {
let imgArray = [];
if (props.data.hasOwnProperty('screenshots')) {
props.data.screenshots.forEach(element => {
imgArray = [(<img src={element.url} className="eventPic"></img>), ...imgArray]
});
}
return ( return (
<div className="eventDiv"> <div className="eventDiv">
{props.screenshots ? <img className="eventPic" src={props.screenshots[0].url}></img> : JSON.stringify(props)} {JSON.stringify(props.data)}
<br></br>
{[...imgArray]}
</div> </div>
); );
} }