sarsoo/Mixonomer
1
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: sarsoo:master
Branches Tags
sarsoo:master
sarsoo:react18
sarsoo:gh-pages
sarsoo:stats
...
pull from: sarsoo:react18
Branches Tags
sarsoo:master
sarsoo:react18
sarsoo:gh-pages
sarsoo:stats

1 Commits
master ... react18

Author SHA1 Message Date
Andy Pack
58a91a937b
fiddling with upgrading react
All checks were successful
test and deploy / Build & Unit Test (push) Successful in 53s
Details
test and deploy / Package & Push Container (push) Has been skipped
Details
2024-10-11 09:02:12 +01:00
24 changed files with 845 additions and 423 deletions
Show Stats Expand all files Collapse all files

962
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

13
package.json
View File

@ -19,13 +19,16 @@
}, },
"homepage": "https://github.com/Sarsoo/Mixonomer#readme", "homepage": "https://github.com/Sarsoo/Mixonomer#readme",
"dependencies": { "dependencies": {
"@material-ui/core": "^4.11.3", "@emotion/react": "^11.13.3",
"@material-ui/icons": "^4.11.2", "@emotion/styled": "^11.13.0",
"@mui/icons-material": "^6.1.3",
"@mui/material": "^6.1.3",
"@mui/styles": "^6.1.3",
"axios": "^1.7.2", "axios": "^1.7.2",
"chart.js": "^4.4.3", "chart.js": "^4.4.3",
"react": "^17.0.2", "react": "^18.3.1",
"react-dom": "^17.0.2", "react-dom": "^18.3.1",
"react-router-dom": "^5.2.0" "react-router-dom": "^6.26.2"
}, },
"devDependencies": { "devDependencies": {
"@babel/cli": "^7.22.10", "@babel/cli": "^7.22.10",

2
src/js/Admin/AdminRouter.js
View File

@ -1,6 +1,6 @@
import React, { Component } from "react"; import React, { Component } from "react";
import { Route, Link, Switch } from "react-router-dom"; import { Route, Link, Switch } from "react-router-dom";
import { Paper, Tabs, Tab} from '@material-ui/core'; import { Paper, Tabs, Tab} from '@mui/material';
import Lock from "./Lock.js"; import Lock from "./Lock.js";

2
src/js/Admin/Functions.js
View File

@ -2,7 +2,7 @@ import React, { Component } from "react";
const axios = require('axios'); const axios = require('axios');
import showMessage from "../Toast.js" import showMessage from "../Toast.js"
import { Card, Button, ButtonGroup, CardContent, CardActions, Typography } from "@material-ui/core"; import { Card, Button, ButtonGroup, CardContent, CardActions, Typography } from "@mui/material";
/** /**
* Admin functions card component * Admin functions card component

4
src/js/Admin/Lock.js
View File

@ -1,8 +1,8 @@
import React, { Component } from "react"; import React, { Component } from "react";
const axios = require('axios'); const axios = require('axios');
import { Card, Button, CardActions, CardContent, Typography, Grid } from '@material-ui/core'; import { Card, Button, CardActions, CardContent, Typography, Grid } from '@mui/material';
import { makeStyles } from '@material-ui/core/styles'; import { makeStyles } from '@mui/styles';
import showMessage from "../Toast.js" import showMessage from "../Toast.js"

2
src/js/Admin/Tasks.js
View File

@ -1,7 +1,7 @@
import React, { Component } from "react"; import React, { Component } from "react";
const axios = require('axios'); const axios = require('axios');
import { Card, CardContent, Typography, Grid } from '@material-ui/core'; import { Card, CardContent, Typography, Grid } from '@mui/material';
import showMessage from "../Toast.js" import showMessage from "../Toast.js"

2
src/js/Index/Index.js
View File

@ -1,6 +1,6 @@
import React, { Component } from "react"; import React, { Component } from "react";
import { Card, CardContent, Typography, Grid } from '@material-ui/core'; import { Card, CardContent, Typography, Grid } from '@mui/material';
/** /**
* Into card for the home page * Into card for the home page

213
src/js/MusicTools.js
View File

@ -1,5 +1,5 @@
import React, { Component } from "react"; import React, { Component } from "react";
import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; import { BrowserRouter as Router, Routes, Route, Link, Switch } from "react-router-dom";
import NotFound from "./Error/NotFound.js"; import NotFound from "./Error/NotFound.js";
import Progress from "./Util/circularProgress.js"; import Progress from "./Util/circularProgress.js";
@ -7,18 +7,20 @@ import showMessage from "./Toast.js";
import GlobalTheme from './Theme.js'; import GlobalTheme from './Theme.js';
import { ThemeProvider } from '@material-ui/core/styles'; import { ThemeProvider, StyledEngineProvider } from '@mui/styles';
import {AppBar, Toolbar, IconButton, Drawer, List, Divider, ListItem, ListItemIcon, ListItemText, Typography} from '@material-ui/core'; import {AppBar, Toolbar, IconButton, Drawer, List, Divider, ListItem, ListItemIcon, ListItemText, Typography} from '@mui/material';
import MenuIcon from '@material-ui/icons/Menu'; import MenuIcon from '@mui/icons-material/Menu';
import ChevronLeftIcon from '@material-ui/icons/ChevronLeft'; import ChevronLeftIcon from '@mui/icons-material/ChevronLeft';
import HomeIcon from '@material-ui/icons/Home'; import HomeIcon from '@mui/icons-material/Home';
import { Build, QueueMusic, ExitToApp, AccountCircle, KeyboardBackspace, GroupWork, Policy } from '@material-ui/icons' import { Build, QueueMusic, ExitToApp, AccountCircle, KeyboardBackspace, GroupWork, Policy } from '@mui/icons-material'
const axios = require('axios'); const axios = require('axios');
import Playlists from './Playlist/AllPlaylistsRouter';
const LazyIndex = React.lazy(() => import(/* webpackChunkName: "index" */ "./Index/Index")) const LazyIndex = React.lazy(() => import(/* webpackChunkName: "index" */ "./Index/Index"))
const LazyPlaylists = React.lazy(() => import(/* webpackChunkName: "allPlaylists" */ "./Playlist/AllPlaylistsRouter")) const LazyPlaylists = React.lazy(() => import(/* webpackChunkName: "allPlaylists" */ "./Playlist/AllPlaylistsRouter"))
const LazyPlaylistView = React.lazy(() => import(/* webpackChunkName: "playlist" */ "./Playlist/View/PlaylistRouter")) const LazyPlaylistView = React.lazy(() => import(/* webpackChunkName: "playlist" */ "./Playlist/View/PlaylistRouter"))
@ -89,110 +91,117 @@ class MusicTools extends Component {
render(){ render(){
return ( return (
<Router> (<Router>
<ThemeProvider theme={GlobalTheme}> {/*<StyledEngineProvider injectFirst>*/}
<ThemeProvider theme={GlobalTheme}>
{/* TOP APP BAR */} {/* TOP APP BAR */}
<AppBar position="sticky"> <AppBar position="sticky">
<Toolbar> <Toolbar>
<IconButton edge="start" color="inherit" aria-label="menu" onClick={(e) => this.setOpen(true)}> <IconButton
<MenuIcon /> edge="start"
</IconButton> color="inherit"
<Typography variant="h6"> aria-label="menu"
<Link to='/app/playlists' style={{textDecoration: 'none'}}> onClick={(e) => this.setOpen(true)}
<div className="title-small"> size="large">
<h1 >Mixonomer</h1> <MenuIcon />
</div> </IconButton>
</Link> <Typography variant="h6">
</Typography> <Link to='/app/playlists' style={{textDecoration: 'none'}}>
</Toolbar> <div className="title-small">
</AppBar> <h1 >Mixonomer</h1>
</div>
</Link>
</Typography>
</Toolbar>
</AppBar>
{/* MENU DRAWER */} {/* MENU DRAWER */}
<Drawer <Drawer
variant="persistent" variant="persistent"
anchor="left" anchor="left"
open={this.state.drawerOpen} open={this.state.drawerOpen}
onClose={(e) => this.setOpen(false)} onClose={(e) => this.setOpen(false)}
>
<div>
<IconButton onClick={(e) => this.setOpen(false)}>
<ChevronLeftIcon />
</IconButton>
</div>
<Divider />
<div
role="presentation"
onClick={(e) => this.setOpen(false)}
onKeyDown={(e) => this.setOpen(false)}
> >
<List> <div>
{/* PLAYLISTS */} <IconButton onClick={(e) => this.setOpen(false)} size="large">
<ListItem button key="playlists" component={Link} to='/app/playlists'> <ChevronLeftIcon />
<ListItemIcon><QueueMusic /></ListItemIcon> </IconButton>
<ListItemText primary="Playlists" /> </div>
</ListItem> <Divider />
<div
{/* TAGS */} role="presentation"
<ListItem button key="tags" component={Link} to='/app/tags'> onClick={(e) => this.setOpen(false)}
<ListItemIcon><GroupWork /></ListItemIcon> onKeyDown={(e) => this.setOpen(false)}
<ListItemText primary="Tags" /> >
</ListItem> <List>
{/* PLAYLISTS */}
{/* SETTINGS */} <ListItem button key="playlists" component={Link} to='/app/playlists'>
<ListItem button key="settings" component={Link} to='/app/settings/password'> <ListItemIcon><QueueMusic /></ListItemIcon>
<ListItemIcon><Build /></ListItemIcon> <ListItemText primary="Playlists" />
<ListItemText primary="Settings" />
</ListItem>
{/* ADMIN */}
{ this.state.type == 'admin' &&
<ListItem button key="admin" component={Link} to='/app/admin/lock'>
<ListItemIcon><AccountCircle /></ListItemIcon>
<ListItemText primary="Admin" />
</ListItem> </ListItem>
}
<ListItem button key="privacy" onClick={(e) => { window.location.href = '/privacy' }}> {/* TAGS */}
<ListItemIcon><Policy /></ListItemIcon> <ListItem button key="tags" component={Link} to='/app/tags'>
<ListItemText primary="Privacy" /> <ListItemIcon><GroupWork /></ListItemIcon>
</ListItem> <ListItemText primary="Tags" />
</ListItem>
{/* LOGOUT */} {/* SETTINGS */}
<ListItem button key="logout" onClick={(e) => { window.location.href = '/auth/logout' }}> <ListItem button key="settings" component={Link} to='/app/settings/password'>
<ListItemIcon><KeyboardBackspace /></ListItemIcon> <ListItemIcon><Build /></ListItemIcon>
<ListItemText primary="Logout" /> <ListItemText primary="Settings" />
</ListItem> </ListItem>
{/* SARSOO.XYZ */} {/* ADMIN */}
<ListItem button key="sarsoo.xyz" onClick={(e) => { window.location.href = 'https://sarsoo.xyz' }}> { this.state.type == 'admin' &&
<ListItemIcon><ExitToApp /></ListItemIcon> <ListItem button key="admin" component={Link} to='/app/admin/lock'>
<ListItemText primary="sarsoo.xyz" /> <ListItemIcon><AccountCircle /></ListItemIcon>
</ListItem> <ListItemText primary="Admin" />
</List> </ListItem>
}
<ListItem button key="privacy" onClick={(e) => { window.location.href = '/privacy' }}>
<ListItemIcon><Policy /></ListItemIcon>
<ListItemText primary="Privacy" />
</ListItem>
{/* LOGOUT */}
<ListItem button key="logout" onClick={(e) => { window.location.href = '/auth/logout' }}>
<ListItemIcon><KeyboardBackspace /></ListItemIcon>
<ListItemText primary="Logout" />
</ListItem>
{/* SARSOO.XYZ */}
<ListItem button key="sarsoo.xyz" onClick={(e) => { window.location.href = 'https://sarsoo.xyz' }}>
<ListItemIcon><ExitToApp /></ListItemIcon>
<ListItemText primary="sarsoo.xyz" />
</ListItem>
</List>
</div>
</Drawer>
{/* ROUTER SWITCH */}
<div className="full-width">
<Routes>
{/*<React.Suspense fallback={<Progress/>}>*/}
{/* <Route path="/app" exact component={LazyIndex} />*/}
<Route path="/app/playlists" element={<Playlists/>} />
{/*<Route path="/app/tags" component={LazyTags} />*/}
{/*<Route path="/app/tag/:tag_id" component={LazyTag} />*/}
{/*<Route path="/app/settings" component={LazySettings} />*/}
{/*{ this.state.type == 'admin' && <Route path="/app/admin" component={LazyAdmin} /> }*/}
{/*<Route path='/app/playlist/:name' component={LazyPlaylistView} />*/}
{/*</React.Suspense>*/}
{/*<Route component={NotFound} />*/}
</Routes>
</div> </div>
</Drawer> </ThemeProvider>
{/*</StyledEngineProvider>*/}
{/* ROUTER SWITCH */} </Router>)
<div className="full-width">
<Switch>
<React.Suspense fallback={<Progress/>}>
<Route path="/app" exact component={LazyIndex} />
<Route path="/app/playlists" component={LazyPlaylists} />
<Route path="/app/tags" component={LazyTags} />
<Route path="/app/tag/:tag_id" component={LazyTag} />
<Route path="/app/settings" component={LazySettings} />
{ this.state.type == 'admin' && <Route path="/app/admin" component={LazyAdmin} /> }
<Route path='/app/playlist/:name' component={LazyPlaylistView} />
</React.Suspense>
<Route component={NotFound} />
</Switch>
</div>
</ThemeProvider>
</Router>
); );
} }

4
src/js/Playlist/AllPlaylistsRouter.js
View File

@ -14,10 +14,10 @@ class Playlists extends Component {
<Switch> <Switch>
{/* PLAYLIST LIST */} {/* PLAYLIST LIST */}
<Route exact path={`${this.props.match.url}/`} component={PlaylistsView} /> <Route exact path={`${this.props.match.url}/`} element={PlaylistsView} />
{/* NEW PLAYLIST */} {/* NEW PLAYLIST */}
<Route path={`${this.props.match.url}/new`} component={NewPlaylist} /> <Route path={`${this.props.match.url}/new`} element={NewPlaylist} />
</Switch> </Switch>
</div> </div>
); );

2
src/js/Playlist/New.js
View File

@ -1,7 +1,7 @@
import React, { Component } from "react"; import React, { Component } from "react";
const axios = require('axios'); const axios = require('axios');
import { Card, Button, FormControl, TextField, InputLabel, Select, CardActions, CardContent, Typography, Grid } from '@material-ui/core'; import { Card, Button, FormControl, TextField, InputLabel, Select, CardActions, CardContent, Typography, Grid } from '@mui/material';
import showMessage from "../Toast.js" import showMessage from "../Toast.js"

2
src/js/Playlist/PlaylistsList.js
View File

@ -1,6 +1,6 @@
import React, { Component } from "react"; import React, { Component } from "react";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import { Button, ButtonGroup, Typography, Card, CardActions, CardContent, Grid } from '@material-ui/core'; import { Button, ButtonGroup, Typography, Card, CardActions, CardContent, Grid } from '@mui/material';
const axios = require('axios'); const axios = require('axios');
import showMessage from "../Toast.js" import showMessage from "../Toast.js"

2
src/js/Playlist/View/Count.js
View File

@ -1,7 +1,7 @@
import React, { Component } from "react"; import React, { Component } from "react";
const axios = require('axios'); const axios = require('axios');
import { Card, Button, CardActions, CardContent, Typography, Grid } from '@material-ui/core'; import { Card, Button, CardActions, CardContent, Typography, Grid } from '@mui/material';
import showMessage from "../../Toast.js" import showMessage from "../../Toast.js"

6
src/js/Playlist/View/Edit.js
View File

@ -2,9 +2,9 @@ import React, { Component } from "react";
const axios = require('axios'); const axios = require('axios');
import { Card, Button, FormControl, TextField, InputLabel, Select, FormControlLabel, import { Card, Button, FormControl, TextField, InputLabel, Select, FormControlLabel,
CardActions, CardContent, Typography, Grid, MenuItem, Switch } from '@material-ui/core'; CardActions, CardContent, Typography, Grid, MenuItem, Switch } from '@mui/material';
import { Delete } from '@material-ui/icons'; import { Delete } from '@mui/icons-material';
import { makeStyles } from '@material-ui/core/styles'; import { makeStyles } from '@mui/styles';
import showMessage from "../../Toast.js"; import showMessage from "../../Toast.js";
import Progress from "../../Util/circularProgress.js"; import Progress from "../../Util/circularProgress.js";

8
src/js/Playlist/View/PlaylistRouter.js
View File

@ -1,6 +1,6 @@
import React, { Component } from "react"; import React, { Component } from "react";
import { Route, Link, Switch } from "react-router-dom"; import { Route, Link, Routes } from "react-router-dom";
import { Paper, Tabs, Tab} from '@material-ui/core'; import { Paper, Tabs, Tab} from '@mui/material';
import {Edit} from "./Edit.js"; import {Edit} from "./Edit.js";
@ -49,14 +49,14 @@ class View extends Component{
<Tab label="Count" component={Link} to={`${this.props.match.url}/count`} /> <Tab label="Count" component={Link} to={`${this.props.match.url}/count`} />
</Tabs> </Tabs>
</Paper> </Paper>
<Switch> <Routes>
{/* VIEW/EDIT */} {/* VIEW/EDIT */}
<Route path={`${this.props.match.url}/edit`} render={(props) => <Edit {...props} name={this.props.match.params.name}/>} /> <Route path={`${this.props.match.url}/edit`} render={(props) => <Edit {...props} name={this.props.match.params.name}/>} />
{/* STATS */} {/* STATS */}
<Route path={`${this.props.match.url}/count`} render={(props) => <Count {...props} name={this.props.match.params.name}/>} /> <Route path={`${this.props.match.url}/count`} render={(props) => <Count {...props} name={this.props.match.params.name}/>} />
</Switch> </Routes>
</div> </div>
); );
} }

2
src/js/Settings/ChangePassword.js
View File

@ -1,7 +1,7 @@
import React, { Component } from "react"; import React, { Component } from "react";
const axios = require('axios'); const axios = require('axios');
import { Card, Grid, Button, TextField, CardContent, CardActions, Typography } from "@material-ui/core"; import { Card, Grid, Button, TextField, CardContent, CardActions, Typography } from "@mui/material";
import showMessage from "../Toast.js" import showMessage from "../Toast.js"

2
src/js/Settings/LastFM.js
View File

@ -1,7 +1,7 @@
import React, { Component } from "react"; import React, { Component } from "react";
const axios = require('axios'); const axios = require('axios');
import { Card, Button, CardContent, CardActions, Typography, TextField, Grid } from "@material-ui/core"; import { Card, Button, CardContent, CardActions, Typography, TextField, Grid } from "@mui/material";
import showMessage from "../Toast.js" import showMessage from "../Toast.js"

2
src/js/Settings/SettingsRouter.js
View File

@ -1,6 +1,6 @@
import React, { Component } from "react"; import React, { Component } from "react";
import { Route, Link, Switch } from "react-router-dom"; import { Route, Link, Switch } from "react-router-dom";
import { Paper, Tabs, Tab} from '@material-ui/core'; import { Paper, Tabs, Tab} from '@mui/material';
import ChangePassword from "./ChangePassword.js"; import ChangePassword from "./ChangePassword.js";
import SpotifyLink from "./SpotifyLink.js"; import SpotifyLink from "./SpotifyLink.js";

2
src/js/Settings/SpotifyLink.js
View File

@ -1,7 +1,7 @@
import React, { Component } from "react"; import React, { Component } from "react";
const axios = require('axios'); const axios = require('axios');
import { Card, Button, CardContent, CardActions, Typography } from "@material-ui/core"; import { Card, Button, CardContent, CardActions, Typography } from "@mui/material";
import showMessage from "../Toast.js" import showMessage from "../Toast.js"

2
src/js/Tag/New.js
View File

@ -1,7 +1,7 @@
import React, { Component } from "react"; import React, { Component } from "react";
const axios = require('axios'); const axios = require('axios');
import { Card, Button, TextField, CardActions, CardContent, Typography, Grid } from '@material-ui/core'; import { Card, Button, TextField, CardActions, CardContent, Typography, Grid } from '@mui/material';
import showMessage from "../Toast.js" import showMessage from "../Toast.js"

2
src/js/Tag/TagList.js
View File

@ -1,6 +1,6 @@
import React, { Component } from "react"; import React, { Component } from "react";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import { Button, ButtonGroup, Typography, Card, CardActions, CardContent, Grid } from '@material-ui/core'; import { Button, ButtonGroup, Typography, Card, CardActions, CardContent, Grid } from '@mui/material';
const axios = require('axios'); const axios = require('axios');

6
src/js/Tag/View.js
View File

@ -1,9 +1,9 @@
import React, { Component } from "react"; import React, { Component } from "react";
const axios = require('axios'); const axios = require('axios');
import { Card, Button, ButtonGroup, CardActions, CardContent, FormControl, InputLabel, Select, Typography, Grid, TextField, MenuItem, FormControlLabel, Switch } from '@material-ui/core'; import { Card, Button, ButtonGroup, CardActions, CardContent, FormControl, InputLabel, Select, Typography, Grid, TextField, MenuItem, FormControlLabel, Switch } from '@mui/material';
import { Delete, ExitToApp } from '@material-ui/icons'; import { Delete, ExitToApp } from '@mui/icons-material';
import { makeStyles } from '@material-ui/core/styles'; import { makeStyles } from '@mui/styles';
import showMessage from "../Toast.js"; import showMessage from "../Toast.js";
import Progress from "../Util/circularProgress.js" import Progress from "../Util/circularProgress.js"

8
src/js/Theme.js
View File

@ -1,6 +1,6 @@
import { createTheme, responsiveFontSizes } from '@material-ui/core/styles'; import { createTheme, adaptV4Theme, responsiveFontSizes } from '@mui/material/styles';
let GlobalTheme = createTheme({ let GlobalTheme = createTheme(adaptV4Theme({
root: { root: {
display: 'flex', display: 'flex',
flexDirection: 'column', flexDirection: 'column',
@ -22,7 +22,7 @@ let GlobalTheme = createTheme({
spacing: 5 spacing: 5
}, },
palette: { palette: {
type: 'dark', mode: 'dark',
// https://colorhunt.co/palette/907fa4a58faaa6d6d6ededd0 // https://colorhunt.co/palette/907fa4a58faaa6d6d6ededd0
primary: { primary: {
main: '#907FA4', main: '#907FA4',
@ -41,7 +41,7 @@ let GlobalTheme = createTheme({
status: { status: {
danger: 'orange', danger: 'orange',
} }
}); }));
GlobalTheme = responsiveFontSizes(GlobalTheme); GlobalTheme = responsiveFontSizes(GlobalTheme);
export default GlobalTheme; export default GlobalTheme;

2
src/js/Util/circularProgress.js
View File

@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import { Grid, CircularProgress } from '@material-ui/core'; import { Grid, CircularProgress } from '@mui/material';
function Progress (props) { function Progress (props) {
return ( return (

16
src/js/app.js
View File

@ -1,8 +1,20 @@
import React from "react"; import React from "react";
import ReactDOM from "react-dom"; import { createRoot } from 'react-dom/client';
import { ThemeProvider, StyledEngineProvider, makeStyles } from '@mui/styles';
import { createTheme, adaptV4Theme } from '@mui/material/styles';
import MusicTools from "./MusicTools"; import MusicTools from "./MusicTools";
const theme = createTheme();
const useStyles = makeStyles((theme) => {
root: {
// some CSS that accesses the theme
}
});
// ROOT file for bootstrapping the Mixonomer component and app // ROOT file for bootstrapping the Mixonomer component and app
ReactDOM.render(<MusicTools />, document.getElementById('react')); // ReactDOM.render(<MusicTools theme={theme} />, document.getElementById('react'));
const root = createRoot(document.getElementById('react')); // createRoot(container!) if you use TypeScript
root.render(<MusicTools theme={theme} />);