Skip to content
Snippets Groups Projects
Commit 3581559f authored by Joonas Seppä's avatar Joonas Seppä
Browse files

Managed application colors

parent 3ec524a1
No related branches found
No related tags found
No related merge requests found
Pipeline #61741 canceled
...@@ -5,6 +5,22 @@ import NewMessage from "./NewMessage"; ...@@ -5,6 +5,22 @@ import NewMessage from "./NewMessage";
import Welcome from "./Welcome"; import Welcome from "./Welcome";
import Message from "./Message"; import Message from "./Message";
export const outsideColors = {
discordMessageBox: "#313339",
discordOutside: "#2b2d31",
discordOutside2: "#232428",
discordMessage: "#2e3034",
discordTextColor: "#f3f4f5",
vsCode: "#1e1e1e",
vsCode2: "#252526",
yt: "#0f0f0f"
}
export const appColors = {
//messageColor: "#008B8B"
messageColor: "#A5A6A8"
}
export type messageType = { export type messageType = {
message: string, message: string,
__v: Number, __v: Number,
...@@ -32,7 +48,7 @@ const api = axios.create({ ...@@ -32,7 +48,7 @@ const api = axios.create({
}); });
const messageBox = { const messageBox = {
bgcolor: "darkgreen", bgcolor: outsideColors.discordMessageBox,
marginX: 10, marginX: 10,
padding: 3, padding: 3,
display: "grid", display: "grid",
......
...@@ -3,6 +3,8 @@ import {IconButton, Paper, Typography} from '@mui/material'; ...@@ -3,6 +3,8 @@ import {IconButton, Paper, Typography} from '@mui/material';
import DeleteIcon from '@mui/icons-material/Delete'; import DeleteIcon from '@mui/icons-material/Delete';
import EditIcon from '@mui/icons-material/Edit'; import EditIcon from '@mui/icons-material/Edit';
import type {messageType} from "./App"; import type {messageType} from "./App";
import {outsideColors, appColors} from "./App";
type IProps = { type IProps = {
singleMessage: messageType, singleMessage: messageType,
...@@ -60,7 +62,8 @@ export default class Message extends React.Component<IProps>{ ...@@ -60,7 +62,8 @@ export default class Message extends React.Component<IProps>{
sx={{ sx={{
padding: 1, padding: 1,
margin: 1.5, margin: 1.5,
width: "fit-content" width: "fit-content",
bgcolor: appColors.messageColor
}} }}
> >
{this.props.singleMessage.message} {this.props.singleMessage.message}
......
import React from 'react'; import React from 'react';
import {Typography, Box} from '@mui/material'; import {Typography, Box} from '@mui/material';
import {outsideColors, appColors} from "./App";
export default class Welcome extends React.Component{ export default class Welcome extends React.Component{
render(): React.ReactNode { render(): React.ReactNode {
return( return(
<Box <Box
sx={{ sx={{
bgcolor: 'white', bgcolor: outsideColors.discordMessageBox,
//color: "white",
marginX: 10, marginX: 10,
padding: 1, padding: 1,
marginY: 2, marginY: 2,
...@@ -14,7 +16,7 @@ export default class Welcome extends React.Component{ ...@@ -14,7 +16,7 @@ export default class Welcome extends React.Component{
boxShadow: 20 boxShadow: 20
}} }}
> >
<Typography variant="h3" sx={{textAlign: "center", margin: 3}}> <Typography variant="h3" sx={{textAlign: "center", margin: 3, color: appColors.messageColor}}>
Welcome to my Messaging Application! Welcome to my Messaging Application!
</Typography> </Typography>
</Box> </Box>
......
...@@ -3,12 +3,34 @@ import ReactDOM from 'react-dom/client'; ...@@ -3,12 +3,34 @@ import ReactDOM from 'react-dom/client';
import {App} from './App'; import {App} from './App';
import CssBaseline from "@mui/material/CssBaseline"; import CssBaseline from "@mui/material/CssBaseline";
import { ThemeProvider, createTheme } from "@mui/material/styles"; import { ThemeProvider, createTheme } from "@mui/material/styles";
import {outsideColors} from "./App";
/*
export const colors = {
discord: "#313339",
discord2: "#2b2d31",
discord3: "#232428",
discord4: "#2e3034",
vsCode: "#1e1e1e",
vsCode2: "#252526",
yt: "#0f0f0f"
}
*/
/*
const discord = "#313339";
const discord2 = "#2b2d31";
const discord3 = "#232428";
const vsCode = "#1e1e1e";
const vsCode2 = "#252526";
const yt = "#0f0f0f";
*/
const myTheme = createTheme({ const myTheme = createTheme({
palette: { palette: {
background: { background: {
default: "grey" //default: "lightgrey"
default: outsideColors.discordOutside
} }
} }
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment