Skip to content

Commit

Permalink
Merge improvements-v2 into improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlistairMRoss
AlistairMRoss committed Oct 16, 2023
2 parents da71b76 + 40c4688 commit e2e396d
Show file tree
Hide file tree
Showing 43 changed files with 291 additions and 196 deletions.
48 changes: 42 additions & 6 deletions frontend/infosafe_frontend/src/components/About.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import '../styling/About.css';
import React from 'react';

Check warning on line 2 in frontend/infosafe_frontend/src/components/About.js

View workflow job for this annotation

GitHub Actions / Lint Code Base 

'React' is defined but never used
import {MdOutlineMailOutline} from 'react-icons/md';

Check warning on line 3 in frontend/infosafe_frontend/src/components/About.js

View workflow job for this annotation

GitHub Actions / Lint Code Base 

'MdOutlineMailOutline' is defined but never used
import termsDoc from "../images/Terms_of_Service_and_Use.pdf"
import privacyDoc from "../images/Privacy_Policy.pdf"

export const About = () => {
return (
Expand All @@ -14,14 +12,52 @@ export const About = () => {
The vision for this project is to create an easy-to-use application with a user-friendly interface where an organization can have access to all their users, data scopes, support related queries/issues, risk reports and tasks.
Users will be assigned certain roles when their profile has been created on the application. These roles are defined by a set of permissions within the application, this is to manage data access as well as to assign administrative rights to certain users.
</p>
<p className="aboutTitle">Terms of Service and Use</p>
<p className="aboutSubTitle">Terms of Service and Use</p>
<p className="aboutData">
Please find our Terms of Service and Use <a href={termsDoc} target="_blank" rel="noreferrer">here</a>.
To view the InfoSafe Terms of Service and User, please view them <a href="">here</a>.

Check warning on line 17 in frontend/infosafe_frontend/src/components/About.js

View workflow job for this annotation

GitHub Actions / Lint Code Base 

The href attribute requires a valid value to be accessible. Provide a valid, navigable address as the href value. If you cannot provide a valid href, but still need the element to resemble a link, use a button and change it with appropriate styles. Learn more: https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/HEAD/docs/rules/anchor-is-valid.md
</p>
<p className="aboutTitle">Privacy Policy</p>
<p className="aboutSubTitle">Privacy Policy</p>
<p className="aboutData">
Please find our Privacy Policy <a href={privacyDoc} target="_blank" rel="noreferrer">here</a>.
To learn more about the InfoSafe Privacy Policy, find it <a href="">here</a>.

Check warning on line 21 in frontend/infosafe_frontend/src/components/About.js

View workflow job for this annotation

GitHub Actions / Lint Code Base 

The href attribute requires a valid value to be accessible. Provide a valid, navigable address as the href value. If you cannot provide a valid href, but still need the element to resemble a link, use a button and change it with appropriate styles. Learn more: https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/HEAD/docs/rules/anchor-is-valid.md
</p>
{/*<p className="aboutTitle">Terms of Service and Use</p>*/}
{/*<p className="aboutData">*/}
{/* Welcome to the InfoSafe system. These Terms of Use govern your access to and use of our website. By accessing or using our website, you agree to comply with these Terms. Please read these Terms carefully before using our Website. If you do not agree to these Terms, you may not use our Website.*/}
{/*</p>*/}
{/*<p className="aboutSubTitle">Use of the Website</p>*/}
{/*<p className="aboutData">*/}
{/* Eligibility: By using our website, you affirm that you are at least 18 years and you consent to use the website. If you are using the website on behalf of an organization, you represent and warrant that you have the authority to bind that organization to these Terms.*/}
{/*</p>*/}
{/*<p className="aboutData">*/}
{/* Content: You agree not to use our website for any unlawful or prohibited purpose. You are responsible for all content you post or transmit on the website. We reserve the right to remove any content that violates these terms or is otherwise objectionable.*/}
{/*</p>*/}
{/*<p className="aboutData">*/}
{/* User Accounts: You will be required to obtain a user account to access certain features of our website. You are responsible for maintaining the confidentiality of your account credentials and for all activities that occur under your account. You agree to notify us immediately of any unauthorized use of your account.*/}

{/*</p>*/}
{/*<p className="aboutSubTitle">Intellectual Property</p>*/}
{/*<p className="aboutData">*/}
{/* All content and materials on our website, including text, graphics, logos, images, software, and any other intellectual property, are owned or licensed by us and protected by copyright and other intellectual property laws. You may not use, reproduce, distribute, or create derivative works from our content without our explicit written permission.*/}
{/*</p>*/}
{/*<p className="aboutSubTitle">Privacy</p>*/}
{/*<p className="aboutData">*/}
{/* Your use of our Website is also governed by our Privacy Policy, which is incorporated by reference into these Terms. Please review our Privacy Policy below to understand how we collect, use, and protect your personal information.*/}
{/*</p>*/}
{/*<p className="aboutSubTitle">Termination</p>*/}
{/*<p className="aboutData">*/}
{/* We reserve the right to terminate or suspend your access to our website, without notice, for any reason, including if we believe you have violated these Terms. Upon termination, your right to use the Website will cease immediately.*/}
{/*</p>*/}
{/*<p className="aboutSubTitle"></p>*/}
{/*<p className="aboutData">*/}
{/* We may update these Terms at any time for operational, legal, or regulatory reasons. We will notify you of any significant changes by prominently posting a notice on our Website. Your continued use of the Website after such changes constitute your acceptance of the revised Terms.*/}
{/*</p>*/}
{/*<p className="aboutTitle">Privacy Policy</p>*/}
{/*<p className="aboutData">This Privacy Policy outlines how the InfoSafe System collects, uses, maintains, and protects user information on our website. We are committed to safeguarding your privacy and ensuring the security of your personal data. By using our Website, you consent to the practices described in this policy.*/}
{/* Personal information that we collect include you name, surname and email address for system access.*/}
{/* We use the collected information to provide services, improve our website and to send periodic emails.*/}
{/* We are committed to protecting your personal information. We implement reasonable security measures to safeguard your data against unauthorized access, disclosure, alteration, or destruction. However, please be aware that no method of data transmission over the internet or electronic storage is entirely secure, and we cannot guarantee absolute security.*/}
{/* You have the right to access, update, correct, or delete your personal information at any time. You can exercise these rights by contacting us at at the details below. Please allow a reasonable amount of time for us to respond to your request.*/}
{/*</p>*/}
<div className="contactUsInfo">
<p className="contactUsTitle">Contact Us</p>
<p className="contactUsData"><MdOutlineMailOutline className="emailIcon"></MdOutlineMailOutline> [email protected]</p>
Expand Down
2 changes: 1 addition & 1 deletion frontend/infosafe_frontend/src/components/Charts/Dashboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export const Dashboard = () => {
<ul className="inUseDevicesList">
{myAssets.map((assets, index) => (
<li key={index}>
<p>{assets.asset_name}</p>
<p>{assets.asset_name} ({assets.device_type})</p>
</li>
))}
</ul>
Expand Down
87 changes: 29 additions & 58 deletions frontend/infosafe_frontend/src/components/Help.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import '../styling/Help.css';
import React from 'react';
import user_manual from "../images/user_manual.png";
import userDoc from "../images/Infosafe_User_Manual_V4.pdf";


export const Help = () => {
Expand All @@ -10,63 +9,35 @@ export const Help = () => {
<div className="display">
<div className="helpBackground">
<div className='helpInfo'>
<table>
<tr>
<td>
<div>
<p className="helpTitle">System Tips</p>
<p className="helpData">
Here are a few system tips that may help you in general throughout the system. If you require a deep understanding, please see the user manual below.
</p>
</div>
<div>
<p className="helpSubTitle">Entity Creation and Editing</p>
<p className="helpData">
When creating or editing entities (users, assets, datascopes etc.) ensure all relevant fields are filled in correctly.
</p>
</div>
<div>
<p className="helpSubTitle">Entity Deletion</p>
<p className="helpData">
When deleting entities from the system be very sure they will not be needed again as they cannot be restored.
Your system administrator will have access to the secondary "delete" database where deleted entities are stored in but this information is not made available to the system.
</p>
</div>
<div>
<p className="helpSubTitle">Manage your Risks</p>
<p className="helpData">
Make sure you keep an eye on your logged risks in the system. You don't want them to catch you off guard if their status is elevated and they can potentially lead to an incident or failure.
</p>
</div>
<div>
<p className="helpSubTitle">Requests</p>
<p className="helpData">
The requests tab is a very powerful tool within the system. You can use it to create and manage a variety of requests relating to the system, such as assets, access to datascopes or support for anything that may be giving you problems. Don't suffer alone when a colleague can suffer with you!
</p>
</div>
<div>
<p className="helpSubTitle">Patience</p>
<p className="helpData">
Patience is sometimes the best solution. If a page is taking long to load, chances are it is retrieving a lot of data from the database and it may take some time to render.
</p>
</div>
</td>
<td>
<div>
<p className="helpTitle">User Manual</p>
<p className="helpData">
If none of these tips are able to help you or you need a deeper understanding of the system you can find the
user manual <a href={userDoc} target="_blank" rel="noreferrer">here</a>.
This will provide you with an in-depth breakdown of all the subsystems and how to utilise them to increase your
productivity and efficiency within the InfoSafe system.
</p>
</div>
<a href={userDoc} target="_blank" rel="noreferrer">
<img src={user_manual} alt="user manual image" height={844} width={687}/>
</a>
</td>
</tr>
</table>
<div>
<p className="helpTitle">System Tips</p>
<p className="helpData">
Here are a few system tips that may help you in general throughout the system. If you require a deep understanding, please see the user manual below.
</p>
</div>
<div>
<p className="helpSubTitle">Entity Management</p>
<p className="helpData">
When creating or editing entities (users, assets, data scopes etc.) ensure all relevant fields are filled in correctly.
When deleting entities from the system be very sure they will not be needed again as they cannot be restored.
Your system administrator will have access to the secondary "delete" database where deleted entities are stored in but this information is not made available to the system.
</p>
</div>
<div>
<p className="helpSubTitle">Requests</p>
<p className="helpData">
The requests tab is a very powerful tool within the system. You can use it to create and manage a variety of requests relating to the system, such as assets, access to datascopes or support for anything that may be giving you problems. Don't suffer alone when a colleague can suffer with you!
</p>
</div>
<div>
<p className="helpTitle">User Manual</p>
<p className="helpData">
If none of the above tips are able to help you or you need a deeper understanding of the system you can find the
user manual <a href="https://drive.google.com/file/d/1I3YdViR5jbR4gqQQjGEcjIQmcQFEhaRv/view?usp=drive_link">here</a>.
This will provide you with an in-depth breakdown of all the subsystems and how to utilise them to increase your
productivity and efficiency within the InfoSafe system.
</p>
</div>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions frontend/infosafe_frontend/src/styling/About.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
left: 5%;
font-family: 'Roboto', sans-serif;
text-align: center;
overflow-y: scroll;
overflow-y: auto;
}
.aboutTitle{
font-size: 40px;
font-size: 45px;
}
.aboutSubTitle{
font-size: 24px;
font-size: 26px;
}
.aboutData{
font-size: 18px;
font-size: 20px;
}
.contactUsInfo{
width: 90%;
Expand Down
2 changes: 1 addition & 1 deletion frontend/infosafe_frontend/src/styling/AccessRequestApproval.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
top: 4%;
left: 0;
overflow-x: hidden;
overflow-y: scroll;
overflow-y: auto;
scrollbar-width: none;
}
.approveAccessRequestPopupBorder::-webkit-scrollbar{
Expand Down
16 changes: 13 additions & 3 deletions frontend/infosafe_frontend/src/styling/AccessRequests.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,19 @@
height: 60%;
position: relative;
top: 0;
overflow-y: scroll;
overflow-y: auto;
overflow-x: hidden;
box-sizing: content-box;
/*scrollbar-width: none;*/
scrollbar-width: auto;
scrollbar-color: #CECECE #CECECE;
padding-right: 1vw;
}
.accessRequests::-webkit-scrollbar {
width: 8px;
}
.accessRequests::-webkit-scrollbar-track{
background-color: #CECECE;
border-radius: 12px;
}
.accessrequestsList {
list-style: none;
Expand All @@ -76,7 +85,8 @@
color: #000000;
width: 100%;
text-transform: none;
background-color: #CECECE;
border: 3px solid #444040;
background-color: white;
padding: 5px;
border-radius: 4px;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.25) inset;
Expand Down
19 changes: 13 additions & 6 deletions frontend/infosafe_frontend/src/styling/AssetRequests.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,20 @@
height: 60%;
position: relative;
top: 0;
overflow-y: scroll;
overflow-y: auto;
overflow-x: hidden;
box-sizing: content-box;
/*scrollbar-width: none;*/
scrollbar-width: auto;
scrollbar-color: #CECECE #CECECE;
padding-right: 1vw;
}
.assetRequests::-webkit-scrollbar {
width: 8px;
}
.assetRequests::-webkit-scrollbar-track{
background-color: #CECECE;
border-radius: 12px;
}
/*.assetRequests::-webkit-scrollbar {*/
/* display: none;*/
/*}*/
.assetRequestsList {
list-style: none;
margin: 0;
Expand All @@ -81,7 +87,8 @@
color: #000000;
width: 100%;
text-transform: none;
background-color: #CECECE;
border: 3px solid #444040;
background-color: white;
padding: 5px;
border-radius: 4px;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.25) inset;
Expand Down
2 changes: 1 addition & 1 deletion frontend/infosafe_frontend/src/styling/ChangePassword.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
top: 4%;
left: 0;
overflow-x: hidden;
overflow-y: scroll;
overflow-y: auto;
scrollbar-width: none;
}
.borderChangePass::-webkit-scrollbar {
Expand Down
2 changes: 1 addition & 1 deletion frontend/infosafe_frontend/src/styling/ConfirmDelete.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
top: 4%;
left: 0;
overflow-x: hidden;
overflow-y: scroll;
overflow-y: auto;
scrollbar-width: none;
}
.borderDelete::-webkit-scrollbar{
Expand Down
4 changes: 2 additions & 2 deletions frontend/infosafe_frontend/src/styling/CreateDataScopePopup.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
top: 4%;
left: 0;
overflow-x: hidden;
overflow-y: scroll;
overflow-y: auto;
scrollbar-width: none;
}
.createDataScopeBorder::-webkit-scrollbar {
Expand Down Expand Up @@ -129,7 +129,7 @@
}
.dataScopeRoles{
height: 2%;
overflow-y: scroll;
overflow-y: auto;
scrollbar-width: none;
}
.dataScopeRoles::-webkit-scrollbar {
Expand Down
4 changes: 2 additions & 2 deletions frontend/infosafe_frontend/src/styling/CreateDevicePopup.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
top: 4%;
left: 0;
overflow-x: hidden;
overflow-y: scroll;
overflow-y: auto;
scrollbar-width: none;
}
.createDeviceBorder::-webkit-scrollbar {
Expand Down Expand Up @@ -125,7 +125,7 @@
border-radius: 2px;
margin-bottom: 0;
overflow-x: hidden;
overflow-y: scroll;
overflow-y: auto;
scrollbar-width: none;
}
.deviceDescriptionInput::-webkit-scrollbar{
Expand Down
8 changes: 4 additions & 4 deletions frontend/infosafe_frontend/src/styling/CreateRisk.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
top: 4%;
left: 0;
overflow-x: hidden;
overflow-y: scroll;
overflow-y: auto;
scrollbar-width: none;
}
.borderCreateRisk::-webkit-scrollbar{
Expand Down Expand Up @@ -118,7 +118,7 @@
border-radius: 2px;
margin-bottom: 0;
overflow-x: hidden;
overflow-y: scroll;
overflow-y: auto;
scrollbar-width: none;
}
.riskDescriptionInput{
Expand All @@ -135,7 +135,7 @@
border-radius: 2px;
margin-bottom: 0;
overflow-x: hidden;
overflow-y: scroll;
overflow-y: auto;
scrollbar-width: none;
}
.riskSuggestedMitigationInput{
Expand All @@ -152,7 +152,7 @@
border-radius: 2px;
margin-bottom: 0;
overflow-x: hidden;
overflow-y: scroll;
overflow-y: auto;
scrollbar-width: none;
}
.riskSuggestedMitigationInput::-webkit-scrollbar{
Expand Down
2 changes: 1 addition & 1 deletion frontend/infosafe_frontend/src/styling/CreateTask.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
top: 4%;
left: 0;
overflow-x: hidden;
overflow-y: scroll;
overflow-y: auto;
scrollbar-width: none;
}
.borderCreateTask::-webkit-scrollbar {
Expand Down
2 changes: 1 addition & 1 deletion frontend/infosafe_frontend/src/styling/CreateUserPopup.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
top: 4%;
left: 0;
overflow-x: hidden;
overflow-y: scroll;
overflow-y: auto;
scrollbar-width: none;
}
.createUserBorder::-webkit-scrollbar {
Expand Down
Loading

0 comments on commit e2e396d

Please sign in to comment.