Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit 93dfae5

Browse files
GimleuxGimleux
committed
Added colors
1 parent 424dc32 commit 93dfae5

File tree

10 files changed

+57
-18
lines changed

10 files changed

+57
-18
lines changed

‎webapp_frontend/src/components/App.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ function App(props: Props): ReactElement {
5555
<BrowserRouter>
5656
<TopBanner/>
5757
<Header/>
58-
<main role='main' className={"flex-shrink-0 flex-grow-1"}>
59-
<Router/>
60-
</main>
61-
<footer className='footer mt-auto py-3 bg-dark text-white'>
62-
<Footer/>
63-
</footer>
58+
<div>
59+
<main role='main' className={"flex-shrink-0 flex-grow-1"}>
60+
<Router/>
61+
</main>
62+
</div>
63+
<Footer/>
6464
<PermanentAssets/>
6565
</BrowserRouter>
6666
</div>

‎webapp_frontend/src/components/Constants.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import App from "./App";
33

44
import {Provider} from 'react-redux'
55
import store from '../background/redux/store'
6+
import "../style/colors.css"
67

78

89
function Constants(): ReactElement {

‎webapp_frontend/src/components/basicElements/Footer.tsx‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@ import github from "super-tiny-icons/images/svg/github.svg"
44

55
export default function Footer(): ReactElement {
66
return (
7-
<Container>
8-
<div className="d-flex flex-column justify-content-center">
9-
<a href={"https://github.com/filefighter"} className="align-self-center"><img src={github} alt={"github logo"} width={"50px"}/></a>
10-
<span className="align-self-center mt-2" >Made by</span>
7+
<footer className='footer mt-auto py-3 text-white'>
8+
<Container className="d-flex flex-column justify-content-center bg-primary p-1">
9+
<a href={"https://github.com/filefighter"} className="align-self-center"><img src={github}
10+
alt={"github logo"}
11+
width={"50px"}/></a>
12+
<span className="align-self-center mt-2">Made by</span>
1113
<div className="d-flex justify-content-around">
1214
<span>Gimleux</span>
1315
<span>Open-Schnick</span>
1416
<span>qvalentin</span>
1517
</div>
16-
</div>
17-
</Container>
18+
</Container>
19+
</footer>
1820
);
1921
}
2022

‎webapp_frontend/src/components/basicElements/Header.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function Header(): ReactElement {
5555
return (
5656
<header>
5757
<div className="container">
58-
<Navbar bg="dark" expand="lg" sticky="top">
58+
<Navbar bg="primary" expand="lg" sticky="top">
5959
<NavbarBrand href="/start" onClick={(event: any) => {redirect(history, "/", event);}}>
6060
<img src={logo} className="d-inline-block align-top" alt="Logo" height="30px" width="auto"/>
6161
FileFighter

‎webapp_frontend/src/components/basicElements/TopBanner.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, {ReactElement} from "react";
22

33
export function TopBanner():ReactElement {
44
return(
5-
<div className="d-flex justify-content-center">
5+
<div className="d-flex justify-content-center bg-black color-yellow p-1">
66
Black Lives Matter
77
</div>
88
)

‎webapp_frontend/src/components/pages/Health.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {Button, Table, Container} from "react-bootstrap";
44
import {callBackendHealth} from "../../background/api/api";
55
import {audioOnOff, setAudioVolumeByID} from "../../background/methods/sound"
66
import {logout} from "../../background/api/auth";
7+
import {SymbolFileExcel} from "../../elements/svg/SymbolFile";
78

89
export default function Health() {
910

@@ -36,6 +37,7 @@ export default function Health() {
3637

3738
return (
3839
<Container>
40+
<SymbolFileExcel height={"100"} width={"100"}/>
3941
<h1>
4042
FileFighter
4143
</h1>
@@ -52,7 +54,7 @@ export default function Health() {
5254

5355
<div>
5456
{/*<Button className={"mt-3 mb-2 float-right"} onClick={() => updateVariables()}>Refresh</Button>*/}
55-
<Table striped bordered hover variant="dark">
57+
<Table striped bordered hover>
5658
<thead>
5759
<tr>
5860
<th>Backend information</th>

‎webapp_frontend/src/components/pages/filesytem/FilesBreadcrumb.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ type Props = {
1111

1212
export function FilesBreadcrumb(props: Props): ReactElement {
1313

14-
return (<Breadcrumb>
14+
return (
15+
<Breadcrumb>
1516
<Link className={'breadcrumb-item active'} to={filesBaseUrl + '/'} onClick={() => props.setPath("/")}>root </Link>
1617
{props.path.split('/').filter((s: String) => s).map((folder: string, i: number) => {
1718
return (<Link className={'breadcrumb-item active'} to={filesBaseUrl + props.path.split('/').slice(0, i + 2).join("/")}

‎webapp_frontend/src/elements/svg/SymbolFile.tsx‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import React, {ReactElement} from "react";
2+
3+
export function SymbolFileExcel(props:any): ReactElement {
4+
return (
5+
<svg /*xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"*/ version="1.1"
6+
style={{width:props.width+"px",height:props.height+"px",position:"absolute",overflow:"hidden"}}>
7+
<defs>
8+
<symbol viewBox="0 0 768 1024" aria-labelledby="ddsi-ant-file-excel-title" id="si-ant-file-excel"><title
9+
id="ddsi-ant-file-excel-title">icon file-excel</title>
10+
<path
11+
d="M509 64l195 218v669q0 3-4 6t-9 3H77q-5 0-9-3t-4-6V73q0-3 4-6t9-3h432zm29-64H77Q45 0 22.5 21.5T0 73v878q0 30 22.5 51.5T77 1024h614q32 0 54.5-21.5T768 951V257zm-26 256V0h-64v256q0 26 19 45t45 19h253v-64H512zm33 130q-14 0-22 10L384 563 245 396q-8-10-22-10-18 0-25.5 16.5T201 433l146 175-146 175q-11 14-3.5 30.5T223 830q14 0 22-10l139-168 139 168q8 10 22 10 18 0 25.5-16.5T567 783L421 608l146-176q11-13 3.5-29.5T545 386z"/>
12+
</symbol>
13+
</defs>
14+
</svg>
15+
)
16+
}
17+
18+
// <symbol viewBox="0 0 768 1024" aria-labelledby="desi-ant-file-jpg-title" id="si-ant-file-jpg"><title id="desi-ant-file-jpg-title">icon file-jpg</title><path d="M509 64l195 218v669q0 3-4 6t-9 3H77q-5 0-9-3t-4-6V73q0-3 4-6t9-3h432zm29-64H77Q45 0 22.5 21.5T0 73v878q0 30 22.5 51.5T77 1024h614q32 0 54.5-21.5T768 951V257zm-26 256V0h-64v256q0 26 19 45t45 19h253v-64H512zM323 448q0-27-19-45.5T259 384h-97q-13 0-22.5 9t-9.5 23q0 13 9.5 22.5T162 448h65q13 0 22.5 9t9.5 23v319q0 13-9.5 22.5T227 831h-1q-13 0-22.5-9t-9.5-22v-62q0-14-9.5-23t-22.5-9-22.5 9-9.5 23v93q0 26 19 45t45 19h65q26 0 45-19t19-45V448zm64 0v416q0 13 9.5 22.5T419 896t22.5-9.5T451 864V639h123q26 0 45-18.5t19-45.5V448q0-27-19-45.5T574 384H451q-27 0-45.5 18.5T387 448zm64 95v-63q0-14 9.5-23t22.5-9h59q13 0 22.5 9t9.5 23v63q0 13-9.5 22.5T542 575h-59q-13 0-22.5-9.5T451 543zm157 354q-14 0-23-9.5t-9-22.5 9-22.5 23-9.5q13 0 22.5 9.5T640 865t-9.5 22.5T608 897z"/></symbol>
19+
// <symbol viewBox="0 0 768 1024" aria-labelledby="dfsi-ant-file-pdf-title" id="si-ant-file-pdf"><title id="dfsi-ant-file-pdf-title">icon file-pdf</title><path d="M538 0H77Q45 0 22.5 21.5T0 73v878q0 30 22.5 51.5T77 1024h614q32 0 54.5-21.5T768 951V257zm143 256H512V67zm10 704H77q-5 0-9-3t-4-6V73q0-3 4-6t9-3h371v192q0 26 19 45t45 19h192v631q0 3-4 6t-9 3zm-50-252q-1-7-8-13-15-15-68-16-35 0-81 6-26-15-38-26-44-42-68-106 1-4 3-11 2-10 4.5-26t6-49.5T393 419q-1-5-2-9l-2-4q-9-21-26-20l-9-1q-25 0-30 20-12 44 18 161l-4 12q-13 31-45 93l-1 4q-22 42-42 77l-14 7q-14 7-28 16-71 42-79 80-3 16 7 22l13 7q8 4 17 4 46 0 119-128 92-30 184-44 34 19 71 31t63 12q9 0 16-2 10-3 16-11 9-14 6-38zM159 864q5-13 22-34.5t41-40.5q1-2 12-11-46 73-75 86zm201-462q7 0 11.5 15t4.5 35q1 30-12 53-9-27-9-67 0-36 5-36zm-60 329q13-23 22-40 23-44 38-85 26 47 64 80 3 2 10 8-75 15-134 37zm323-3q-5 3-18 3-21 0-73-22 19-1 34-1 24 0 42 4 8 2 12.5 6t4 6.5-1.5 3.5z"/></symbol>
20+
// <symbol viewBox="0 0 768 1024" aria-labelledby="dgsi-ant-file-ppt-title" id="si-ant-file-ppt"><title id="dgsi-ant-file-ppt-title">icon file-ppt</title><path d="M509 64l195 218v669q0 3-4 6t-9 3H77q-5 0-9-3t-4-6V73q0-3 4-6t9-3h432zm29-64H77Q45 0 22.5 21.5T0 73v878q0 30 22.5 51.5T77 1024h614q32 0 54.5-21.5T768 951V257zm-26 256V0h-64v256q0 26 19 45t45 19h253v-64H512zm1 319V448v127zm0-191H256q-26 0-45 18.5T192 447v416q0 13 9 22.5t23 9.5q13 0 22.5-9.5T256 863V639h257q27 0 45.5-18.5T577 575V448q0-27-18.5-45.5T513 384zm-32 191H288q-14 0-23-9.5t-9-22.5v-63q0-14 9-23t23-9h193q14 0 23 9t9 23v63q0 13-9 22.5t-23 9.5z"/></symbol>
21+
// <symbol viewBox="0 0 768 1024" aria-labelledby="dhsi-ant-file-text-title" id="si-ant-file-text"><title id="dhsi-ant-file-text-title">icon file-text</title><path d="M538 0H77Q45 0 22.5 21.5T0 73v878q0 30 22.5 51.5T77 1024h614q32 0 54.5-21.5T768 951V257zm143 256H512V67zm10 704H77q-5 0-9-3t-4-6V73q0-3 4-6t9-3h371v192q0 26 19 45t45 19h192v631q0 3-4 6t-9 3zM160 448h256q13 0 22.5-9.5T448 416t-9.5-22.5T416 384H160q-13 0-22.5 9.5T128 416t9.5 22.5T160 448zm448 128H160q-13 0-22.5 9.5T128 608t9.5 22.5T160 640h448q14 0 23-9.5t9-22.5-9-22.5-23-9.5zM416 832H160q-13 0-22.5-9.5T128 800t9.5-22.5T160 768h256q13 0 22.5 9.5T448 800t-9.5 22.5T416 832z"/></symbol>
22+
// <symbol viewBox="0 0 768 1024" aria-labelledby="disi-ant-file-unknown-title" id="si-ant-file-unknown"><title id="disi-ant-file-unknown-title">icon file-unknown</title><path d="M509 64l195 218v669q0 3-4 6t-9 3H77q-5 0-9-3t-4-6V73q0-3 4-6t9-3h432zm29-64H77Q45 0 22.5 21.5T0 73v878q0 30 22.5 51.5T77 1024h614q32 0 54.5-21.5T768 951V257zm-26 256V0h-64v256q0 26 19 45t45 19h253v-64H512zM384 774q-13 0-22.5-9t-9.5-23v-2q0-34 19-62t51-41q28-12 45-37.5t17-55.5q0-42-29-71.5T384 443q-35 0-62 21.5T287 519q-3 11-11.5 18t-19.5 7q-16 0-25.5-12.5T225 504q13-54 57.5-89T384 380q68 0 116 48t48 116q0 51-29 92-27 41-73 60-30 12-30 44v2q0 14-9.5 23t-22.5 9zm-1 123q-13 0-22.5-9.5T351 865t9.5-22.5T383 833t22.5 9.5T415 865t-9.5 22.5T383 897z"/></symbol>
23+
// <symbol viewBox="0 0 768 1024" aria-labelledby="dcsi-ant-file-title" id="si-ant-file"><title id="dcsi-ant-file-title">icon file</title><path d="M509 64l195 218v669q0 3-4 6t-9 3H77q-5 0-9-3t-4-6V73q0-3 4-6t9-3h432zm29-64H77Q45 0 22.5 21.5T0 73v878q0 30 22.5 51.5T77 1024h614q32 0 54.5-21.5T768 951V257zm-26 256V0h-64v256q0 26 19 45t45 19h253v-64H512z"/></symbol>
24+
// <symbol viewBox="0 0 1024 896" aria-labelledby="dksi-ant-folder-title" id="si-ant-folder"><title id="dksi-ant-folder-title">icon folder</title><path d="M405 64q5 0 11 5t7 10l19 77v1q5 23 26 39 20 17 45 17h437q10 0 10 11v597q0 5-3 8t-6 3H73q-9 0-9-11V75q0-11 9-11h332zm0-64H73Q43 0 21.5 22T0 75v746q0 31 21.5 53T73 896h878q30 0 51.5-22t21.5-53V224q0-31-21.5-53T951 149H514q-3 0-6-2.5t-4-4.5l-18-77q-7-28-30-46.5T405 0z"/></symbol>

‎webapp_frontend/src/style/colors.css‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.bg-black {
2+
background-color: #000;
3+
}
4+
5+
.color-yellow {
6+
color: #ffc107;
7+
}

‎webapp_frontend/src/style/custom.scss‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
//read this: https://getbootstrap.com/docs/4.1/getting-started/theming
22

33
// Override default variables before the import (see node_modules/bootstrap/scss/_variables.scss for all)
4-
$body-bg: #2a313d;
5-
$body-color: #FFF;
4+
$body-bg: #25040F;
5+
$body-color: #B9CAC8;
66
$blue: #1a4965;
7+
$primary: #771A18;
8+
$secondary: #FF6337;
79

810
// Import Bootstrap and its default variables
911

0 commit comments

Comments
 (0)