From 1b3f188997c5f10b41f0b60434051a096094ee1a Mon Sep 17 00:00:00 2001
From: Jake Fulmine <jake.fulminated@gmail.com>
Date: Sat, 26 Nov 2022 13:23:59 +0100
Subject: [PATCH] refactor(dashboard): re-organize dashboard files

---
 dashboard/src/App.svelte                      |  28 +--
 .../common}/CardsHeader.svelte                |   6 +-
 .../common}/ListPagination.svelte             |   0
 .../common}/Navigation.svelte                 |   3 +-
 .../src/{lib => components}/group/Body.svelte |   0
 .../{lib => components}/group/CardView.svelte |   0
 .../src/{lib => components}/group/Edit.svelte |   0
 .../group/MemberEdit.svelte                   |   2 +-
 .../{lib => components}/group/NewGroup.svelte |   0
 .../{lib => components}/group/Privacy.svelte  |   0
 .../{lib => components}/list/CardView.svelte  |   0
 .../src/{lib => components}/list/List.svelte  |   2 +-
 .../list/ListControl.svelte                   |   0
 .../list/ListSearch.svelte                    |   0
 .../{lib => components}/list/ListView.svelte  |   2 +-
 .../{lib => components}/member/Body.svelte    |   0
 .../member/CardView.svelte                    |   0
 .../{lib => components}/member/Edit.svelte    |   0
 .../member/GroupEdit.svelte                   |   2 +-
 .../member/NewMember.svelte                   |   0
 .../{lib => components}/member/Privacy.svelte |   0
 .../member/ProxyTags.svelte                   |   0
 .../status/Shard.svelte}                      |   0
 .../{lib => components}/system/Body.svelte    |   0
 .../{lib => components}/system/Edit.svelte    |   0
 .../{lib => components}/system/Main.svelte    |   2 +-
 .../{lib => components}/system/Privacy.svelte |   0
 .../system/PrivacyEdit.svelte                 |   0
 .../src/{pages => routes/Dash}/Dash.svelte    |  10 +-
 .../{pages => routes/Dash/Group}/Group.svelte |  14 +-
 .../Dash/Member}/Member.svelte                |  14 +-
 .../src/{pages => routes/Dash}/Profile.svelte |  10 +-
 .../src/{pages => routes/Dash}/Random.svelte  |   6 +-
 .../Dash/System}/BulkGroupPrivacy.svelte      |   4 +-
 .../Dash/System}/BulkMemberPrivacy.svelte     | 218 +++++++++---------
 .../src/{pages => routes}/DiscordLogin.svelte |   0
 dashboard/src/{pages => routes}/Home.svelte   |   0
 .../src/{pages => routes}/PageNotFound.svelte |   0
 dashboard/src/{pages => routes}/Public.svelte |   0
 .../Settings}/Settings.svelte                 |   4 +-
 .../{pages => routes/Status}/status.svelte    |   4 +-
 41 files changed, 165 insertions(+), 166 deletions(-)
 rename dashboard/src/{lib => components/common}/CardsHeader.svelte (93%)
 rename dashboard/src/{lib => components/common}/ListPagination.svelte (100%)
 rename dashboard/src/{lib => components/common}/Navigation.svelte (97%)
 rename dashboard/src/{lib => components}/group/Body.svelte (100%)
 rename dashboard/src/{lib => components}/group/CardView.svelte (100%)
 rename dashboard/src/{lib => components}/group/Edit.svelte (100%)
 rename dashboard/src/{lib => components}/group/MemberEdit.svelte (97%)
 rename dashboard/src/{lib => components}/group/NewGroup.svelte (100%)
 rename dashboard/src/{lib => components}/group/Privacy.svelte (100%)
 rename dashboard/src/{lib => components}/list/CardView.svelte (100%)
 rename dashboard/src/{lib => components}/list/List.svelte (98%)
 rename dashboard/src/{lib => components}/list/ListControl.svelte (100%)
 rename dashboard/src/{lib => components}/list/ListSearch.svelte (100%)
 rename dashboard/src/{lib => components}/list/ListView.svelte (99%)
 rename dashboard/src/{lib => components}/member/Body.svelte (100%)
 rename dashboard/src/{lib => components}/member/CardView.svelte (100%)
 rename dashboard/src/{lib => components}/member/Edit.svelte (100%)
 rename dashboard/src/{lib => components}/member/GroupEdit.svelte (98%)
 rename dashboard/src/{lib => components}/member/NewMember.svelte (100%)
 rename dashboard/src/{lib => components}/member/Privacy.svelte (100%)
 rename dashboard/src/{lib => components}/member/ProxyTags.svelte (100%)
 rename dashboard/src/{lib/shard.svelte => components/status/Shard.svelte} (100%)
 rename dashboard/src/{lib => components}/system/Body.svelte (100%)
 rename dashboard/src/{lib => components}/system/Edit.svelte (100%)
 rename dashboard/src/{lib => components}/system/Main.svelte (96%)
 rename dashboard/src/{lib => components}/system/Privacy.svelte (100%)
 rename dashboard/src/{lib => components}/system/PrivacyEdit.svelte (100%)
 rename dashboard/src/{pages => routes/Dash}/Dash.svelte (93%)
 rename dashboard/src/{pages => routes/Dash/Group}/Group.svelte (94%)
 rename dashboard/src/{pages => routes/Dash/Member}/Member.svelte (94%)
 rename dashboard/src/{pages => routes/Dash}/Profile.svelte (93%)
 rename dashboard/src/{pages => routes/Dash}/Random.svelte (98%)
 rename dashboard/src/{pages => routes/Dash/System}/BulkGroupPrivacy.svelte (96%)
 rename dashboard/src/{pages => routes/Dash/System}/BulkMemberPrivacy.svelte (93%)
 rename dashboard/src/{pages => routes}/DiscordLogin.svelte (100%)
 rename dashboard/src/{pages => routes}/Home.svelte (100%)
 rename dashboard/src/{pages => routes}/PageNotFound.svelte (100%)
 rename dashboard/src/{pages => routes}/Public.svelte (100%)
 rename dashboard/src/{pages => routes/Settings}/Settings.svelte (99%)
 rename dashboard/src/{pages => routes/Status}/status.svelte (98%)

diff --git a/dashboard/src/App.svelte b/dashboard/src/App.svelte
index ac324263..8f6014df 100644
--- a/dashboard/src/App.svelte
+++ b/dashboard/src/App.svelte
@@ -1,21 +1,21 @@
 <script lang="ts">
   import { Router, Route } from "svelte-navigator";
-  import Navigation from "./lib/Navigation.svelte";
-  import Dash from "./pages/Dash.svelte";
-  import Home from "./pages/Home.svelte";
-  import Settings from './pages/Settings.svelte';
-  import Public from "./pages/Public.svelte";
-  import Main from "./pages/Profile.svelte";
-  import Status from './pages/status.svelte';
-  import Member from './pages/Member.svelte';
-  import Group from './pages/Group.svelte';
-  import PageNotFound from './pages/PageNotFound.svelte';
+  import Navigation from "./components/common/Navigation.svelte";
+  import Dash from "./routes/dash/Dash.svelte";
+  import Home from "./routes/Home.svelte";
+  import Settings from './routes/settings/Settings.svelte';
+  import Public from "./routes/Public.svelte";
+  import Main from "./routes/dash/Profile.svelte";
+  import Status from './routes/status/Status.svelte';
+  import Member from './routes/dash/Member/Member.svelte';
+  import Group from './routes/dash/Group/Group.svelte';
+  import PageNotFound from './routes/PageNotFound.svelte';
   import { Alert } from 'sveltestrap';
-import DiscordLogin from "./pages/DiscordLogin.svelte";
+import DiscordLogin from "./routes/DiscordLogin.svelte";
   import { onMount } from 'svelte';
-import BulkGroupPrivacy from "./pages/BulkGroupPrivacy.svelte";
-import BulkMemberPrivacy from "./pages/BulkMemberPrivacy.svelte";
-  import Random from './pages/Random.svelte';
+import BulkGroupPrivacy from "./routes/dash/System/BulkGroupPrivacy.svelte";
+import BulkMemberPrivacy from "./routes/dash/System/BulkMemberPrivacy.svelte";
+  import Random from './routes/dash/Random.svelte';
   
   // theme cdns (I might make some myself too)
   // if there's a style already set, retrieve it
diff --git a/dashboard/src/lib/CardsHeader.svelte b/dashboard/src/components/common/CardsHeader.svelte
similarity index 93%
rename from dashboard/src/lib/CardsHeader.svelte
rename to dashboard/src/components/common/CardsHeader.svelte
index 66b939b4..6e58bfe1 100644
--- a/dashboard/src/lib/CardsHeader.svelte
+++ b/dashboard/src/components/common/CardsHeader.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
     import { tick } from 'svelte';
-    import { Modal, CardHeader, CardTitle, Image, Spinner } from 'sveltestrap';
-    import default_avatar from '../assets/default_avatar.png';
-    import resizeMedia from '../api/resize-media';
+    import { Modal, CardTitle} from 'sveltestrap';
+    import default_avatar from '../../assets/default_avatar.png';
+    import resizeMedia from '../../api/resize-media';
     import { toHTML } from 'discord-markdown';
     import twemoji from 'twemoji';
 
diff --git a/dashboard/src/lib/ListPagination.svelte b/dashboard/src/components/common/ListPagination.svelte
similarity index 100%
rename from dashboard/src/lib/ListPagination.svelte
rename to dashboard/src/components/common/ListPagination.svelte
diff --git a/dashboard/src/lib/Navigation.svelte b/dashboard/src/components/common/Navigation.svelte
similarity index 97%
rename from dashboard/src/lib/Navigation.svelte
rename to dashboard/src/components/common/Navigation.svelte
index 16a00e5d..daf9db1d 100644
--- a/dashboard/src/lib/Navigation.svelte
+++ b/dashboard/src/components/common/Navigation.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
     import {Navbar, NavbarBrand, Nav, NavItem, NavLink, Collapse, NavbarToggler, Dropdown, DropdownItem, DropdownMenu, DropdownToggle, Button} from 'sveltestrap';
-    import { loggedIn } from '../stores';
+    import { loggedIn } from '../../stores';
     import { Link, navigate } from 'svelte-navigator';
-import { get } from 'svelte/store';
 
     export let style: string;
 
diff --git a/dashboard/src/lib/group/Body.svelte b/dashboard/src/components/group/Body.svelte
similarity index 100%
rename from dashboard/src/lib/group/Body.svelte
rename to dashboard/src/components/group/Body.svelte
diff --git a/dashboard/src/lib/group/CardView.svelte b/dashboard/src/components/group/CardView.svelte
similarity index 100%
rename from dashboard/src/lib/group/CardView.svelte
rename to dashboard/src/components/group/CardView.svelte
diff --git a/dashboard/src/lib/group/Edit.svelte b/dashboard/src/components/group/Edit.svelte
similarity index 100%
rename from dashboard/src/lib/group/Edit.svelte
rename to dashboard/src/components/group/Edit.svelte
diff --git a/dashboard/src/lib/group/MemberEdit.svelte b/dashboard/src/components/group/MemberEdit.svelte
similarity index 97%
rename from dashboard/src/lib/group/MemberEdit.svelte
rename to dashboard/src/components/group/MemberEdit.svelte
index 07420585..9708b0f6 100644
--- a/dashboard/src/lib/group/MemberEdit.svelte
+++ b/dashboard/src/components/group/MemberEdit.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Row, Col, Button, Alert, ListGroup, ListGroupItem, Spinner } from 'sveltestrap';
-    import ListPagination from "../ListPagination.svelte";
+    import ListPagination from "../common/ListPagination.svelte";
     import twemoji from "twemoji";
     import FaUserPlus from 'svelte-icons/fa/FaUserPlus.svelte'
     import FaUserFriends from 'svelte-icons/fa/FaUserFriends.svelte'
diff --git a/dashboard/src/lib/group/NewGroup.svelte b/dashboard/src/components/group/NewGroup.svelte
similarity index 100%
rename from dashboard/src/lib/group/NewGroup.svelte
rename to dashboard/src/components/group/NewGroup.svelte
diff --git a/dashboard/src/lib/group/Privacy.svelte b/dashboard/src/components/group/Privacy.svelte
similarity index 100%
rename from dashboard/src/lib/group/Privacy.svelte
rename to dashboard/src/components/group/Privacy.svelte
diff --git a/dashboard/src/lib/list/CardView.svelte b/dashboard/src/components/list/CardView.svelte
similarity index 100%
rename from dashboard/src/lib/list/CardView.svelte
rename to dashboard/src/components/list/CardView.svelte
diff --git a/dashboard/src/lib/list/List.svelte b/dashboard/src/components/list/List.svelte
similarity index 98%
rename from dashboard/src/lib/list/List.svelte
rename to dashboard/src/components/list/List.svelte
index bd0dc577..9447c37e 100644
--- a/dashboard/src/lib/list/List.svelte
+++ b/dashboard/src/components/list/List.svelte
@@ -5,7 +5,7 @@
 
     import NewMember from '../member/NewMember.svelte';
     import NewGroup from '../group/NewGroup.svelte';
-    import ListPagination from '../ListPagination.svelte';
+    import ListPagination from '../common/ListPagination.svelte';
     import ListControl from './ListControl.svelte';
     import ListSearch from './ListSearch.svelte';
     import ListView from './ListView.svelte';
diff --git a/dashboard/src/lib/list/ListControl.svelte b/dashboard/src/components/list/ListControl.svelte
similarity index 100%
rename from dashboard/src/lib/list/ListControl.svelte
rename to dashboard/src/components/list/ListControl.svelte
diff --git a/dashboard/src/lib/list/ListSearch.svelte b/dashboard/src/components/list/ListSearch.svelte
similarity index 100%
rename from dashboard/src/lib/list/ListSearch.svelte
rename to dashboard/src/components/list/ListSearch.svelte
diff --git a/dashboard/src/lib/list/ListView.svelte b/dashboard/src/components/list/ListView.svelte
similarity index 99%
rename from dashboard/src/lib/list/ListView.svelte
rename to dashboard/src/components/list/ListView.svelte
index f314b3d3..a3b2a832 100644
--- a/dashboard/src/lib/list/ListView.svelte
+++ b/dashboard/src/components/list/ListView.svelte
@@ -9,7 +9,7 @@
 
     import MemberBody from '../member/Body.svelte';
     import GroupBody from '../group/Body.svelte';
-    import CardsHeader from '../CardsHeader.svelte';
+    import CardsHeader from '../common/CardsHeader.svelte';
 
     let settings = JSON.parse(localStorage.getItem("pk-settings"));
     
diff --git a/dashboard/src/lib/member/Body.svelte b/dashboard/src/components/member/Body.svelte
similarity index 100%
rename from dashboard/src/lib/member/Body.svelte
rename to dashboard/src/components/member/Body.svelte
diff --git a/dashboard/src/lib/member/CardView.svelte b/dashboard/src/components/member/CardView.svelte
similarity index 100%
rename from dashboard/src/lib/member/CardView.svelte
rename to dashboard/src/components/member/CardView.svelte
diff --git a/dashboard/src/lib/member/Edit.svelte b/dashboard/src/components/member/Edit.svelte
similarity index 100%
rename from dashboard/src/lib/member/Edit.svelte
rename to dashboard/src/components/member/Edit.svelte
diff --git a/dashboard/src/lib/member/GroupEdit.svelte b/dashboard/src/components/member/GroupEdit.svelte
similarity index 98%
rename from dashboard/src/lib/member/GroupEdit.svelte
rename to dashboard/src/components/member/GroupEdit.svelte
index 7f46ef52..3084208c 100644
--- a/dashboard/src/lib/member/GroupEdit.svelte
+++ b/dashboard/src/components/member/GroupEdit.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Row, Col, Button, Alert, ListGroup, ListGroupItem, Spinner } from 'sveltestrap';
-    import ListPagination from "../ListPagination.svelte";
+    import ListPagination from "../common/ListPagination.svelte";
     import twemoji from "twemoji";
     import Svelecte, { addFormatter } from 'svelecte';
     import { toHTML } from 'discord-markdown';
diff --git a/dashboard/src/lib/member/NewMember.svelte b/dashboard/src/components/member/NewMember.svelte
similarity index 100%
rename from dashboard/src/lib/member/NewMember.svelte
rename to dashboard/src/components/member/NewMember.svelte
diff --git a/dashboard/src/lib/member/Privacy.svelte b/dashboard/src/components/member/Privacy.svelte
similarity index 100%
rename from dashboard/src/lib/member/Privacy.svelte
rename to dashboard/src/components/member/Privacy.svelte
diff --git a/dashboard/src/lib/member/ProxyTags.svelte b/dashboard/src/components/member/ProxyTags.svelte
similarity index 100%
rename from dashboard/src/lib/member/ProxyTags.svelte
rename to dashboard/src/components/member/ProxyTags.svelte
diff --git a/dashboard/src/lib/shard.svelte b/dashboard/src/components/status/Shard.svelte
similarity index 100%
rename from dashboard/src/lib/shard.svelte
rename to dashboard/src/components/status/Shard.svelte
diff --git a/dashboard/src/lib/system/Body.svelte b/dashboard/src/components/system/Body.svelte
similarity index 100%
rename from dashboard/src/lib/system/Body.svelte
rename to dashboard/src/components/system/Body.svelte
diff --git a/dashboard/src/lib/system/Edit.svelte b/dashboard/src/components/system/Edit.svelte
similarity index 100%
rename from dashboard/src/lib/system/Edit.svelte
rename to dashboard/src/components/system/Edit.svelte
diff --git a/dashboard/src/lib/system/Main.svelte b/dashboard/src/components/system/Main.svelte
similarity index 96%
rename from dashboard/src/lib/system/Main.svelte
rename to dashboard/src/components/system/Main.svelte
index c2fa6b71..cc7742df 100644
--- a/dashboard/src/lib/system/Main.svelte
+++ b/dashboard/src/components/system/Main.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { Card, CardBody, CardHeader, Tooltip } from 'sveltestrap';
     import FaAddressCard from 'svelte-icons/fa/FaAddressCard.svelte'
-    import CardsHeader from '../CardsHeader.svelte';
+    import CardsHeader from '../common/CardsHeader.svelte';
     import Body from './Body.svelte';
     import Privacy from './Privacy.svelte';
     import Edit from './Edit.svelte';
diff --git a/dashboard/src/lib/system/Privacy.svelte b/dashboard/src/components/system/Privacy.svelte
similarity index 100%
rename from dashboard/src/lib/system/Privacy.svelte
rename to dashboard/src/components/system/Privacy.svelte
diff --git a/dashboard/src/lib/system/PrivacyEdit.svelte b/dashboard/src/components/system/PrivacyEdit.svelte
similarity index 100%
rename from dashboard/src/lib/system/PrivacyEdit.svelte
rename to dashboard/src/components/system/PrivacyEdit.svelte
diff --git a/dashboard/src/pages/Dash.svelte b/dashboard/src/routes/Dash/Dash.svelte
similarity index 93%
rename from dashboard/src/pages/Dash.svelte
rename to dashboard/src/routes/Dash/Dash.svelte
index b69a96cc..ca0a7eb2 100644
--- a/dashboard/src/pages/Dash.svelte
+++ b/dashboard/src/routes/Dash/Dash.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
     import { Container, Col, Row, TabContent, TabPane } from 'sveltestrap';
     import { navigate, useLocation } from "svelte-navigator";
-    import { currentUser, loggedIn } from '../stores';
+    import { currentUser, loggedIn } from '../../stores';
     
-    import SystemMain from '../lib/system/Main.svelte';
-    import List from '../lib/list/List.svelte';
+    import SystemMain from '../../components/system/Main.svelte';
+    import List from '../../components/list/List.svelte';
 
-    import { System } from '../api/types';
-    import api from '../api';
+    import { System } from '../../api/types';
+    import api from '../../api';
 
     // get the state from the navigator so that we know which tab to start on
     let location = useLocation();
diff --git a/dashboard/src/pages/Group.svelte b/dashboard/src/routes/Dash/Group/Group.svelte
similarity index 94%
rename from dashboard/src/pages/Group.svelte
rename to dashboard/src/routes/Dash/Group/Group.svelte
index 02aeb3f8..309cfa8e 100644
--- a/dashboard/src/pages/Group.svelte
+++ b/dashboard/src/routes/Dash/Group/Group.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
     import { Container, Row, Col, Alert, Spinner, Card, CardHeader, CardBody, CardTitle, Tooltip } from "sveltestrap";
-    import Body from '../lib/group/Body.svelte';
+    import Body from '../../../components/group/Body.svelte';
     import { useParams, Link, navigate, useLocation } from 'svelte-navigator';
     import { onMount } from 'svelte';
-    import api from "../api";
-    import { Member, Group } from "../api/types";
-    import CardsHeader from "../lib/CardsHeader.svelte";
+    import api from "../../../api";
+    import { Member, Group } from "../../../api/types";
+    import CardsHeader from "../../../components/common/CardsHeader.svelte";
     import FaUsers from 'svelte-icons/fa/FaUsers.svelte';
     import FaList from 'svelte-icons/fa/FaList.svelte';
-    import ListPagination from '../lib/ListPagination.svelte';
-    import ListView from '../lib/list/ListView.svelte';
-    import CardView from '../lib/list/CardView.svelte';
+    import ListPagination from '../../../components/common/ListPagination.svelte';
+    import ListView from '../../../components/list/ListView.svelte';
+    import CardView from '../../../components/list/CardView.svelte';
 
     // get the state from the navigator so that we know which tab to start on
     let location = useLocation();
diff --git a/dashboard/src/pages/Member.svelte b/dashboard/src/routes/Dash/Member/Member.svelte
similarity index 94%
rename from dashboard/src/pages/Member.svelte
rename to dashboard/src/routes/Dash/Member/Member.svelte
index 4a667c1f..52387337 100644
--- a/dashboard/src/pages/Member.svelte
+++ b/dashboard/src/routes/Dash/Member/Member.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
     import { Container, Row, Col, Alert, Spinner, Card, CardHeader, CardBody, CardTitle, Tooltip } from "sveltestrap";
-    import Body from '../lib/member/Body.svelte';
-    import ListView from '../lib/list/ListView.svelte';
+    import Body from '../../../components/member/Body.svelte';
+    import ListView from '../../../components/list/ListView.svelte';
     import { useParams, Link, navigate, useLocation } from 'svelte-navigator';
     import { onMount } from 'svelte';
-    import api from "../api";
-    import { Member, Group } from "../api/types";
-    import CardsHeader from "../lib/CardsHeader.svelte";
+    import api from "../../../api";
+    import { Member, Group } from "../../../api/types";
+    import CardsHeader from "../../../components/common/CardsHeader.svelte";
     import FaAddressCard from 'svelte-icons/fa/FaAddressCard.svelte'
     import FaList from 'svelte-icons/fa/FaList.svelte'
-    import ListPagination from '../lib/ListPagination.svelte';
-    import CardView from '../lib/list/CardView.svelte';
+    import ListPagination from '../../../components/common/ListPagination.svelte';
+    import CardView from '../../../components/list/CardView.svelte';
 
     // get the state from the navigator so that we know which tab to start on
     let location = useLocation();
diff --git a/dashboard/src/pages/Profile.svelte b/dashboard/src/routes/Dash/Profile.svelte
similarity index 93%
rename from dashboard/src/pages/Profile.svelte
rename to dashboard/src/routes/Dash/Profile.svelte
index 6c38d10f..205094d3 100644
--- a/dashboard/src/pages/Profile.svelte
+++ b/dashboard/src/routes/Dash/Profile.svelte
@@ -3,11 +3,11 @@
     import { useParams, useLocation, navigate } from "svelte-navigator";
     import { onMount } from 'svelte';
     
-    import SystemMain from '../lib/system/Main.svelte';
-    import List from '../lib/list/List.svelte';
-
-    import { System } from '../api/types';
-    import api from '../api';
+    import SystemMain from '../../components/system/Main.svelte';
+    import List from '../../components/list/List.svelte';
+    
+    import { System } from '../../api/types';
+    import api from '../../api';
 
     let user: System = {};
     let settings = JSON.parse(localStorage.getItem("pk-settings"));
diff --git a/dashboard/src/pages/Random.svelte b/dashboard/src/routes/Dash/Random.svelte
similarity index 98%
rename from dashboard/src/pages/Random.svelte
rename to dashboard/src/routes/Dash/Random.svelte
index bd074418..0a453cb5 100644
--- a/dashboard/src/pages/Random.svelte
+++ b/dashboard/src/routes/Dash/Random.svelte
@@ -4,9 +4,9 @@
     import { Alert, Col, Container, Row, Card, CardBody, CardHeader, CardTitle, Input, Label, Button, Accordion, AccordionHeader, AccordionItem } from 'sveltestrap';
     import FaRandom from 'svelte-icons/fa/FaRandom.svelte'
     
-    import CardsList from '../lib/list/ListView.svelte';
-    import api from '../api';
-    import { Group, Member } from '../api/types';
+    import CardsList from '../../components/list/ListView.svelte';
+    import api from '../../api';
+    import { Group, Member } from '../../api/types';
 
     export let isPublic: boolean = false;
     export let type: string = "member";
diff --git a/dashboard/src/pages/BulkGroupPrivacy.svelte b/dashboard/src/routes/Dash/System/BulkGroupPrivacy.svelte
similarity index 96%
rename from dashboard/src/pages/BulkGroupPrivacy.svelte
rename to dashboard/src/routes/Dash/System/BulkGroupPrivacy.svelte
index b6abb7c9..f9a8ad0a 100644
--- a/dashboard/src/pages/BulkGroupPrivacy.svelte
+++ b/dashboard/src/routes/Dash/System/BulkGroupPrivacy.svelte
@@ -3,8 +3,8 @@
     import { navigate } from 'svelte-navigator';
 	import FaUserLock from 'svelte-icons/fa/FaUserLock.svelte';
 
-	import api from '../api';
-    import { GroupPrivacy, System } from '../api/types';
+	import api from '../../../api';
+    import { GroupPrivacy, System } from '../../../api/types';
 	const user: System = JSON.parse(localStorage.getItem("pk-user"));
 
 	if (!user) navigate('/');
diff --git a/dashboard/src/pages/BulkMemberPrivacy.svelte b/dashboard/src/routes/Dash/System/BulkMemberPrivacy.svelte
similarity index 93%
rename from dashboard/src/pages/BulkMemberPrivacy.svelte
rename to dashboard/src/routes/Dash/System/BulkMemberPrivacy.svelte
index 5dada199..c41948a3 100644
--- a/dashboard/src/pages/BulkMemberPrivacy.svelte
+++ b/dashboard/src/routes/Dash/System/BulkMemberPrivacy.svelte
@@ -1,110 +1,110 @@
-<script lang="ts">
-    import { Container, Row, Col, Card, CardHeader, CardBody, CardTitle, Label, Input, Button, Spinner, Alert } from 'sveltestrap';
-    import { navigate } from 'svelte-navigator';
-	import FaUserLock from 'svelte-icons/fa/FaUserLock.svelte';
-
-	import api from '../api';
-    import { MemberPrivacy, System } from '../api/types';
-	const user: System = JSON.parse(localStorage.getItem("pk-user"));
-
-	if (!user) navigate('/');
-
-	// const capitalize = (str: string) => str[0].toUpperCase() + str.substr(1);
-
-	let loading = false;
-	let err = "";
-	let success = false;
-
-	const privacy: { [P in keyof MemberPrivacy]-?: string; } = {
-		description_privacy: "no change",
-		name_privacy: "no change",
-		avatar_privacy: "no change",
-		birthday_privacy: "no change",
-		pronoun_privacy: "no change",
-		visibility: "no change",
-		metadata_privacy: "no change",
-	};
-
-	const privacyNames: { [P in keyof MemberPrivacy]-?: string; } = {
-		avatar_privacy: "Avatar",
-		birthday_privacy: "Birthday",
-		description_privacy: "Description",
-		metadata_privacy: "Metadata",
-		name_privacy: "Name",
-		pronoun_privacy: "Pronouns",
-		visibility: "Visibility",
-	};
-
-	async function submit() {
-		success = false;
-		loading = true;
-		const dataArray = Object.entries(privacy).filter(([, value]) => value === "no change" ? false : true);
-		const data = Object.fromEntries(dataArray);
-		try {
-			await api().private.bulk_privacy.member.post({ data });
-			success = true;
-		} catch (error) {
-			console.log(error);
-			err = error.message;
-		}
-		loading = false;
-	}
-	
-	function changeAll(e: Event) {
-		const target = e.target as HTMLInputElement;
-		Object.keys(privacy).forEach(x => privacy[x] = target.value);
-	}
-</script>
-
-{#if user}
-<Container>
-    <Row>
-        <Col class="mx-auto" xs={12} lg={11} xl={10}>
-			<Card class="mb-4">
-				<CardHeader>
-					<CardTitle style="margin-top: 8px; outline: none;">
-						<div class="icon d-inline-block">
-							<FaUserLock />
-						</div> Bulk member privacy
-					</CardTitle>
-				</CardHeader>
-				<CardBody style="border-left: 4px solid #{user.color}">
-					{#if err}
-					<Alert color="danger">{err}</Alert>
-					{/if}
-					{#if success}
-					<Alert color="success">Member privacy updated!</Alert>
-					{/if}
-					<Label><b>Set all to:</b></Label>
-					<Input type="select" on:change={(e) => changeAll(e)} aria-label="set all to">
-						<option>no change</option>
-						<option>public</option>
-						<option>private</option>
-					</Input>
-					<hr/>
-					<Row>
-						{#each Object.keys(privacy) as x}
-						<Col xs={12} lg={6} class="mb-3">
-							<Label>{privacyNames[x]}:</Label>
-							<Input type="select" bind:value={privacy[x]} aria-label={`member ${privacyNames[x]} privacy`}>
-								<option default>no change</option>
-								<option>public</option>
-								<option>private</option>
-							</Input>
-						</Col>
-						{/each}
-					</Row>
-
-					<Button color="primary" on:click={submit} bind:disabled={loading} aria-label="submit bulk member privacy">
-						{#if loading}
-						<Spinner />
-						{:else}
-						Submit
-						{/if}
-					</Button>
-				</CardBody>
-			</Card>
-		</Col>
-	</Row>
-</Container>
+<script lang="ts">
+    import { Container, Row, Col, Card, CardHeader, CardBody, CardTitle, Label, Input, Button, Spinner, Alert } from 'sveltestrap';
+    import { navigate } from 'svelte-navigator';
+	import FaUserLock from 'svelte-icons/fa/FaUserLock.svelte';
+
+	import api from '../../../api';
+    import { MemberPrivacy, System } from '../../../api/types';
+	const user: System = JSON.parse(localStorage.getItem("pk-user"));
+
+	if (!user) navigate('/');
+
+	// const capitalize = (str: string) => str[0].toUpperCase() + str.substr(1);
+
+	let loading = false;
+	let err = "";
+	let success = false;
+
+	const privacy: { [P in keyof MemberPrivacy]-?: string; } = {
+		description_privacy: "no change",
+		name_privacy: "no change",
+		avatar_privacy: "no change",
+		birthday_privacy: "no change",
+		pronoun_privacy: "no change",
+		visibility: "no change",
+		metadata_privacy: "no change",
+	};
+
+	const privacyNames: { [P in keyof MemberPrivacy]-?: string; } = {
+		avatar_privacy: "Avatar",
+		birthday_privacy: "Birthday",
+		description_privacy: "Description",
+		metadata_privacy: "Metadata",
+		name_privacy: "Name",
+		pronoun_privacy: "Pronouns",
+		visibility: "Visibility",
+	};
+
+	async function submit() {
+		success = false;
+		loading = true;
+		const dataArray = Object.entries(privacy).filter(([, value]) => value === "no change" ? false : true);
+		const data = Object.fromEntries(dataArray);
+		try {
+			await api().private.bulk_privacy.member.post({ data });
+			success = true;
+		} catch (error) {
+			console.log(error);
+			err = error.message;
+		}
+		loading = false;
+	}
+	
+	function changeAll(e: Event) {
+		const target = e.target as HTMLInputElement;
+		Object.keys(privacy).forEach(x => privacy[x] = target.value);
+	}
+</script>
+
+{#if user}
+<Container>
+    <Row>
+        <Col class="mx-auto" xs={12} lg={11} xl={10}>
+			<Card class="mb-4">
+				<CardHeader>
+					<CardTitle style="margin-top: 8px; outline: none;">
+						<div class="icon d-inline-block">
+							<FaUserLock />
+						</div> Bulk member privacy
+					</CardTitle>
+				</CardHeader>
+				<CardBody style="border-left: 4px solid #{user.color}">
+					{#if err}
+					<Alert color="danger">{err}</Alert>
+					{/if}
+					{#if success}
+					<Alert color="success">Member privacy updated!</Alert>
+					{/if}
+					<Label><b>Set all to:</b></Label>
+					<Input type="select" on:change={(e) => changeAll(e)} aria-label="set all to">
+						<option>no change</option>
+						<option>public</option>
+						<option>private</option>
+					</Input>
+					<hr/>
+					<Row>
+						{#each Object.keys(privacy) as x}
+						<Col xs={12} lg={6} class="mb-3">
+							<Label>{privacyNames[x]}:</Label>
+							<Input type="select" bind:value={privacy[x]} aria-label={`member ${privacyNames[x]} privacy`}>
+								<option default>no change</option>
+								<option>public</option>
+								<option>private</option>
+							</Input>
+						</Col>
+						{/each}
+					</Row>
+
+					<Button color="primary" on:click={submit} bind:disabled={loading} aria-label="submit bulk member privacy">
+						{#if loading}
+						<Spinner />
+						{:else}
+						Submit
+						{/if}
+					</Button>
+				</CardBody>
+			</Card>
+		</Col>
+	</Row>
+</Container>
 {/if}
\ No newline at end of file
diff --git a/dashboard/src/pages/DiscordLogin.svelte b/dashboard/src/routes/DiscordLogin.svelte
similarity index 100%
rename from dashboard/src/pages/DiscordLogin.svelte
rename to dashboard/src/routes/DiscordLogin.svelte
diff --git a/dashboard/src/pages/Home.svelte b/dashboard/src/routes/Home.svelte
similarity index 100%
rename from dashboard/src/pages/Home.svelte
rename to dashboard/src/routes/Home.svelte
diff --git a/dashboard/src/pages/PageNotFound.svelte b/dashboard/src/routes/PageNotFound.svelte
similarity index 100%
rename from dashboard/src/pages/PageNotFound.svelte
rename to dashboard/src/routes/PageNotFound.svelte
diff --git a/dashboard/src/pages/Public.svelte b/dashboard/src/routes/Public.svelte
similarity index 100%
rename from dashboard/src/pages/Public.svelte
rename to dashboard/src/routes/Public.svelte
diff --git a/dashboard/src/pages/Settings.svelte b/dashboard/src/routes/Settings/Settings.svelte
similarity index 99%
rename from dashboard/src/pages/Settings.svelte
rename to dashboard/src/routes/Settings/Settings.svelte
index 6bed707b..7a709681 100644
--- a/dashboard/src/pages/Settings.svelte
+++ b/dashboard/src/routes/Settings/Settings.svelte
@@ -3,8 +3,8 @@
     import Toggle from 'svelte-toggle';
     import { autoresize } from 'svelte-textarea-autoresize';
     import FaCogs from 'svelte-icons/fa/FaCogs.svelte'
-    import { Config } from '../api/types';
-    import api from '../api';
+    import { Config } from '../../api/types';
+    import api from '../../api';
 
     let savedSettings = JSON.parse(localStorage.getItem("pk-settings"));
     let apiConfig: Config = JSON.parse(localStorage.getItem("pk-config"));
diff --git a/dashboard/src/pages/status.svelte b/dashboard/src/routes/Status/status.svelte
similarity index 98%
rename from dashboard/src/pages/status.svelte
rename to dashboard/src/routes/Status/status.svelte
index 32fd5938..c73cda30 100644
--- a/dashboard/src/pages/status.svelte
+++ b/dashboard/src/routes/Status/status.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
     import { Container, Row, Col, Card, CardHeader, CardTitle, CardBody, Input, Button } from 'sveltestrap';
     import FaInfoCircle from 'svelte-icons/fa/FaInfoCircle.svelte'
-    import ShardItem from '../lib/shard.svelte';
+    import ShardItem from '../../components/status/Shard.svelte';
 
-    import api from '../api';
+    import api from '../../api';
 
     let message = "Loading...";
     let shards = [];