From c1de266b2d0e5eb25a5f42e99688f32de1fe185b Mon Sep 17 00:00:00 2001 From: Spectralitree <72747870+Spectralitree@users.noreply.github.com> Date: Sat, 26 Jun 2021 19:51:14 +0200 Subject: [PATCH] move a bunch of files around --- src/App.js | 4 ++-- src/Components/{ => Private}/MemberCard.js | 6 +++--- src/Components/{ => Private}/MemberPage.js | 8 ++++---- src/Components/{ => Private}/Memberlist.js | 6 +++--- src/Components/{ => Private}/System.js | 8 ++++---- src/Components/{ => Public}/Profile.js | 8 ++++---- src/Components/{ => Public}/ProfileCard.js | 4 ++-- src/Components/{ => Public}/ProfileList.js | 6 +++--- src/Components/{ => Public}/ProfilePage.js | 4 ++-- src/{Components => Pages}/Dash.js | 4 ++-- src/{Components => Pages}/MemberPages.js | 2 +- src/{Components => Pages}/ProfilePages.js | 2 +- src/{Components => Pages}/Public.js | 2 +- 13 files changed, 32 insertions(+), 32 deletions(-) rename src/Components/{ => Private}/MemberCard.js (99%) rename src/Components/{ => Private}/MemberPage.js (98%) rename src/Components/{ => Private}/Memberlist.js (99%) rename src/Components/{ => Private}/System.js (97%) rename src/Components/{ => Public}/Profile.js (94%) rename src/Components/{ => Public}/ProfileCard.js (98%) rename src/Components/{ => Public}/ProfileList.js (98%) rename src/Components/{ => Public}/ProfilePage.js (98%) rename src/{Components => Pages}/Dash.js (57%) rename src/{Components => Pages}/MemberPages.js (92%) rename src/{Components => Pages}/ProfilePages.js (92%) rename src/{Components => Pages}/Public.js (96%) diff --git a/src/App.js b/src/App.js index 38574def..5e76b2b4 100644 --- a/src/App.js +++ b/src/App.js @@ -9,10 +9,10 @@ import 'bootstrap/dist/css/bootstrap.min.css'; import "react-toggle/style.css" import { FaCog, FaSun, FaMoon } from "react-icons/fa"; -import Dash from './Components/Dash.js' +import Dash from './Pages/Dash.js' import history from "./History.js"; import Footer from './Components/Footer.js' -import Public from './Components/Public.js' +import Public from './Pages/Public.js' import Home from './Pages/Home.js' export default function App() { diff --git a/src/Components/MemberCard.js b/src/Components/Private/MemberCard.js similarity index 99% rename from src/Components/MemberCard.js rename to src/Components/Private/MemberCard.js index 3f92e672..d6a0d8dd 100644 --- a/src/Components/MemberCard.js +++ b/src/Components/Private/MemberCard.js @@ -9,9 +9,9 @@ import autosize from 'autosize'; import LazyLoad from 'react-lazyload'; import Twemoji from 'react-twemoji'; -import API_URL from "../Constants/constants.js"; +import API_URL from "../../Constants/constants.js"; -import defaultAvatar from '../default_discord_avatar.png' +import defaultAvatar from '../../default_discord_avatar.png' import { FaLink, FaLock, FaTrashAlt } from "react-icons/fa"; export default function MemberCard(props) { @@ -69,7 +69,7 @@ export default function MemberCard(props) { }) useEffect(() => { - const { toHTML } = require('../Functions/discord-parser.js'); + const { toHTML } = require('../../Functions/discord-parser.js'); if (member.display_name) { setDisplayName(member.display_name) diff --git a/src/Components/MemberPage.js b/src/Components/Private/MemberPage.js similarity index 98% rename from src/Components/MemberPage.js rename to src/Components/Private/MemberPage.js index 7fae1ebb..0c2a1908 100644 --- a/src/Components/MemberPage.js +++ b/src/Components/Private/MemberPage.js @@ -8,10 +8,10 @@ import 'reactjs-popup/dist/index.css'; import autosize from 'autosize'; import Twemoji from 'react-twemoji'; -import API_URL from "../Constants/constants.js"; -import history from "../History.js"; +import API_URL from "../../Constants/constants.js"; +import history from "../../History.js"; -import defaultAvatar from '../default_discord_avatar.png' +import defaultAvatar from '../../default_discord_avatar.png' import { FaLink, FaLock, FaTrashAlt } from "react-icons/fa"; export default function MemberPage(props) { @@ -69,7 +69,7 @@ export default function MemberPage(props) { }) useEffect(() => { - const { toHTML } = require('../Functions/discord-parser.js'); + const { toHTML } = require('../../Functions/discord-parser.js'); if (member.display_name) { setDisplayName(member.display_name) diff --git a/src/Components/Memberlist.js b/src/Components/Private/Memberlist.js similarity index 99% rename from src/Components/Memberlist.js rename to src/Components/Private/Memberlist.js index 81711ece..9d930246 100644 --- a/src/Components/Memberlist.js +++ b/src/Components/Private/Memberlist.js @@ -6,9 +6,9 @@ import 'reactjs-popup/dist/index.css'; import { useForm } from "react-hook-form"; import MemberCard from './MemberCard.js' -import MemberPages from './MemberPages.js' -import Loading from "./Loading.js"; -import API_URL from "../Constants/constants.js"; +import MemberPages from '../../Pages/MemberPages.js' +import Loading from "../Loading.js"; +import API_URL from "../../Constants/constants.js"; import { FaPlus } from "react-icons/fa"; diff --git a/src/Components/System.js b/src/Components/Private/System.js similarity index 97% rename from src/Components/System.js rename to src/Components/Private/System.js index 0d726a4f..b32e043a 100644 --- a/src/Components/System.js +++ b/src/Components/Private/System.js @@ -8,10 +8,10 @@ import 'moment-timezone'; import Popup from 'reactjs-popup'; import Twemoji from 'react-twemoji'; -import API_URL from "../Constants/constants.js"; +import API_URL from "../../Constants/constants.js"; -import history from "../History.js"; -import defaultAvatar from '../default_discord_avatar.png' +import history from "../../History.js"; +import defaultAvatar from '../../default_discord_avatar.png' import { FaAddressCard } from "react-icons/fa"; export default function System(props) { @@ -47,7 +47,7 @@ export default function System(props) { useEffect(() => { - const { toHTML } = require('../Functions/discord-parser.js'); + const { toHTML } = require('../../Functions/discord-parser.js'); if (user.name) { setName(user.name); diff --git a/src/Components/Profile.js b/src/Components/Public/Profile.js similarity index 94% rename from src/Components/Profile.js rename to src/Components/Public/Profile.js index d7472cd3..2ba561cb 100644 --- a/src/Components/Profile.js +++ b/src/Components/Public/Profile.js @@ -6,9 +6,9 @@ import Popup from 'reactjs-popup'; import Twemoji from 'react-twemoji'; import { FaAddressCard } from "react-icons/fa"; -import defaultAvatar from '../default_discord_avatar.png' -import Loading from "./Loading.js"; -import API_URL from "../Constants/constants.js"; +import defaultAvatar from '../../default_discord_avatar.png' +import Loading from "../Loading.js"; +import API_URL from "../../Constants/constants.js"; import ProfileList from "./ProfileList.js"; export default function Profile () { @@ -42,7 +42,7 @@ export default function Profile () { }, [sysID]) useEffect(() => { - const { toHTML } = require('../Functions/discord-parser.js'); + const { toHTML } = require('../../Functions/discord-parser.js'); if (system.name) { setName(system.name); diff --git a/src/Components/ProfileCard.js b/src/Components/Public/ProfileCard.js similarity index 98% rename from src/Components/ProfileCard.js rename to src/Components/Public/ProfileCard.js index dc597f4a..b97eb545 100644 --- a/src/Components/ProfileCard.js +++ b/src/Components/Public/ProfileCard.js @@ -8,7 +8,7 @@ import autosize from 'autosize'; import LazyLoad from 'react-lazyload'; import Twemoji from 'react-twemoji'; -import defaultAvatar from '../default_discord_avatar.png' +import defaultAvatar from '../../default_discord_avatar.png' import { FaLink } from "react-icons/fa"; export default function MemberCard(props) { @@ -30,7 +30,7 @@ export default function MemberCard(props) { }) useEffect(() => { - const { toHTML } = require('../Functions/discord-parser.js'); + const { toHTML } = require('../../Functions/discord-parser.js'); if (member.display_name) { setDisplayName(member.display_name) diff --git a/src/Components/ProfileList.js b/src/Components/Public/ProfileList.js similarity index 98% rename from src/Components/ProfileList.js rename to src/Components/Public/ProfileList.js index 5f9537d4..f0633962 100644 --- a/src/Components/ProfileList.js +++ b/src/Components/Public/ProfileList.js @@ -4,9 +4,9 @@ import * as BS from 'react-bootstrap' import 'reactjs-popup/dist/index.css'; import ProfileCard from './ProfileCard.js' -import ProfilePages from './ProfilePages.js' -import Loading from "./Loading.js"; -import API_URL from "../Constants/constants.js"; +import ProfilePages from '../../Pages/ProfilePages.js' +import Loading from "../Loading.js"; +import API_URL from "../../Constants/constants.js"; export default function Memberlist() { diff --git a/src/Components/ProfilePage.js b/src/Components/Public/ProfilePage.js similarity index 98% rename from src/Components/ProfilePage.js rename to src/Components/Public/ProfilePage.js index eefa9269..37c3ff62 100644 --- a/src/Components/ProfilePage.js +++ b/src/Components/Public/ProfilePage.js @@ -7,7 +7,7 @@ import 'reactjs-popup/dist/index.css'; import autosize from 'autosize'; import Twemoji from 'react-twemoji'; -import defaultAvatar from '../default_discord_avatar.png' +import defaultAvatar from '../../default_discord_avatar.png' import { FaLink } from "react-icons/fa"; export default function ProfilePage(props) { @@ -30,7 +30,7 @@ export default function ProfilePage(props) { }) useEffect(() => { - const { toHTML } = require('../Functions/discord-parser.js'); + const { toHTML } = require('../../Functions/discord-parser.js'); if (member.display_name) { setDisplayName(member.display_name) diff --git a/src/Components/Dash.js b/src/Pages/Dash.js similarity index 57% rename from src/Components/Dash.js rename to src/Pages/Dash.js index a6617999..36886e22 100644 --- a/src/Components/Dash.js +++ b/src/Pages/Dash.js @@ -1,7 +1,7 @@ import React from 'react'; -import System from './System.js' -import Memberlist from './Memberlist.js' +import System from '../Components/Private/System.js' +import Memberlist from '../Components/Private/Memberlist.js' export default function Dash(props) { diff --git a/src/Components/MemberPages.js b/src/Pages/MemberPages.js similarity index 92% rename from src/Components/MemberPages.js rename to src/Pages/MemberPages.js index 6aaf37ca..1728e046 100644 --- a/src/Components/MemberPages.js +++ b/src/Pages/MemberPages.js @@ -1,7 +1,7 @@ import React, { useEffect } from 'react'; import * as BS from 'react-bootstrap'; import { useParams } from "react-router-dom"; -import MemberPage from './MemberPage.js' +import MemberPage from '../Components/Private/MemberPage.js' export default function MemberPages(props) { const { memberID } = useParams(); diff --git a/src/Components/ProfilePages.js b/src/Pages/ProfilePages.js similarity index 92% rename from src/Components/ProfilePages.js rename to src/Pages/ProfilePages.js index 321c08da..d589b962 100644 --- a/src/Components/ProfilePages.js +++ b/src/Pages/ProfilePages.js @@ -1,7 +1,7 @@ import React, { useEffect } from 'react'; import * as BS from 'react-bootstrap'; import { useParams } from "react-router-dom"; -import ProfilePage from './ProfilePage.js' +import ProfilePage from '../Components/Public/ProfilePage.js' export default function MemberPages(props) { const { memberID } = useParams(); diff --git a/src/Components/Public.js b/src/Pages/Public.js similarity index 96% rename from src/Components/Public.js rename to src/Pages/Public.js index ba95d61a..5b2fc60c 100644 --- a/src/Components/Public.js +++ b/src/Pages/Public.js @@ -4,7 +4,7 @@ import { FaStar } from "react-icons/fa"; import { useForm } from "react-hook-form"; import history from "../History.js"; import { Switch, Route, useRouteMatch } from 'react-router-dom'; -import Profile from './Profile.js' +import Profile from '../Components/Public/Profile.js' export default function Public () { const { path, url } = useRouteMatch();