Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[api, frontend] Endpoints modelization (#268) #269

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[api, frontend] Endpoints modelization (#268)
  • Loading branch information
RomuDeuxfois committed Dec 5, 2023
commit d4c7f5249aebb4300fdd778f11072da1b2ea2ef0
2 changes: 1 addition & 1 deletion openex-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>io.openex</groupId>
<artifactId>openex-collector-users</artifactId>
<artifactId>openex-injector-ssh</artifactId>
<version>3.4.2-SNAPSHOT</version>
</dependency>
</dependencies>
Expand Down
6 changes: 5 additions & 1 deletion openex-api/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -170,5 +170,9 @@ lade.password=<password>
# Injector Http config
http.enable=true


# Injector SSH config
ssh.enabled=true

# Collectors
collector.users.enable=false
collector.users.enable=false
23 changes: 14 additions & 9 deletions openex-front/src/admin/components/exercises/injects/InjectIcon.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
import React, { Component } from 'react';
import * as PropTypes from 'prop-types';
import {
ApiOutlined,
EmailOutlined,
SmsOutlined,
NotificationsActiveOutlined,
EmojiEventsOutlined,
HelpOutlined,
LastPage,
NotificationsActiveOutlined,
SmsOutlined,
SpeakerNotesOutlined,
ApiOutlined,
EmojiEventsOutlined,
} from '@mui/icons-material';
import {
Mastodon,
NewspaperVariantMultipleOutline,
Twitter,
} from 'mdi-material-ui';
import { Mastodon, NewspaperVariantMultipleOutline, Twitter, } from 'mdi-material-ui';
import Airbus from '../../../../resources/images/contracts/airbus.png';
import CustomTooltip from '../../../../components/CustomTooltip';

Expand Down Expand Up @@ -123,6 +120,14 @@ const iconSelector = (type, variant, fontSize, done, disabled) => {
sx={{ color: done ? '#4caf50' : '#e91e63' }}
/>
);
case 'openex_ssh':
return (
<LastPage
style={style}
fontSize={fontSize}
sx={{ color: color || '#6300d4' }}
/>
);
default:
return <HelpOutlined style={style} fontSize={fontSize} />;
}
Expand Down