WIP: Optimize webui

webui-src/app/home.js

@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const widget = require('widgets');
+const widget = require('components/widgets');
 
 const logo = () => {
   return {

webui-src/app/main.js

@@ -2,15 +2,15 @@ const m = require('mithril');
 
 const login = require('login');
 const home = require('home');
-const network = require('network/network');
-const people = require('people/people_resolver');
-const chat = require('chat/chat');
-const mail = require('mail/mail_resolver');
-const files = require('files/files_resolver');
-const channels = require('channels/channels');
-const forums = require('forums/forums');
-const boards = require('boards/boards');
-const config = require('config/config_resolver');
+const network = require('pages/network/network');
+const people = require('pages/people/people_resolver');
+const chat = require('pages/chat/chat');
+const mail = require('pages/mail/mail_resolver');
+const files = require('pages/files/files_resolver');
+const channels = require('pages/channels/channels');
+const forums = require('pages/forums/forums');
+const boards = require('pages/boards/boards');
+const config = require('pages/config/config_resolver');
 
 const navIcon = {
   home: m('i.fas.fa-home.sidenav-icon'),

webui-src/app/boards/board_view.js → webui-src/app/pages/boards/board_view.js

@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('boards/boards_util');
+const util = require('pages/boards/boards_util');
 const Data = util.Data;
 
 const messageGroups = ['Public', 'Restricted Circle', 'Restricted Node Group'];

webui-src/app/boards/boards.js → webui-src/app/pages/boards/boards.js

@@ -1,9 +1,9 @@
 const m = require('mithril');
-const widget = require('widgets');
+const widget = require('components/widgets');
 const rs = require('rswebui');
-const util = require('boards/boards_util');
-const viewUtil = require('boards/board_view');
-const peopleUtil = require('people/people_util');
+const util = require('pages/boards/boards_util');
+const viewUtil = require('pages/boards/board_view');
+const peopleUtil = require('pages/people/people_util');
 
 const getBoards = {
   All: [],
@@ -29,10 +29,10 @@ const getBoards = {
 };
 
 const sections = {
-  MyBoards: require('boards/my_boards'),
-  SubscribedBoards: require('boards/subscribed_boards'),
-  PopularBoards: require('boards/popular_boards'),
-  OtherBoards: require('boards/other_boards'),
+  MyBoards: require('pages/boards/my_boards'),
+  SubscribedBoards: require('pages/boards/subscribed_boards'),
+  PopularBoards: require('pages/boards/popular_boards'),
+  OtherBoards: require('pages/boards/other_boards'),
 };
 
 const Layout = () => {

webui-src/app/boards/my_boards.js → webui-src/app/pages/boards/my_boards.js

@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('boards/boards_util');
+const util = require('pages/boards/boards_util');
 
 const Layout = () => {
   return {

webui-src/app/boards/other_boards.js → webui-src/app/pages/boards/other_boards.js

@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('boards/boards_util');
+const util = require('pages/boards/boards_util');
 
 const Layout = () => {
   return {

webui-src/app/boards/popular_boards.js → webui-src/app/pages/boards/popular_boards.js

@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('boards/boards_util');
+const util = require('pages/boards/boards_util');
 
 const Layout = () => {
   return {

webui-src/app/boards/subscribed_boards.js → webui-src/app/pages/boards/subscribed_boards.js

@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('boards/boards_util');
+const util = require('pages/boards/boards_util');
 
 const Layout = () => {
   return {

webui-src/app/channels/channel_view.js → webui-src/app/pages/channels/channel_view.js

@@ -1,12 +1,12 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('channels/channels_util');
-const widget = require('widgets');
+const util = require('pages/channels/channels_util');
+const widget = require('components/widgets');
 const Data = util.Data;
-const peopleUtil = require('people/people_util');
-const sha1 = require('channels/sha1');
-const fileUtil = require('files/files_util');
-const fileDown = require('files/files_downloads');
+const peopleUtil = require('pages/people/people_util');
+const sha1 = require('pages/channels/sha1');
+const fileUtil = require('pages/files/files_util');
+const fileDown = require('pages/files/files_downloads');
 
 const filesUploadHashes = {
   // figure out a better way later.

webui-src/app/channels/channels.js → webui-src/app/pages/channels/channels.js

@@ -1,9 +1,9 @@
 const m = require('mithril');
-const widget = require('widgets');
+const widget = require('components/widgets');
 const rs = require('rswebui');
-const util = require('channels/channels_util');
-const viewUtil = require('channels/channel_view');
-const peopleUtil = require('people/people_util');
+const util = require('pages/channels/channels_util');
+const viewUtil = require('pages/channels/channel_view');
+const peopleUtil = require('pages/people/people_util');
 
 const getChannels = {
   All: [],
@@ -35,10 +35,10 @@ const getChannels = {
 };
 
 const sections = {
-  MyChannels: require('channels/my_channels'),
-  SubscribedChannels: require('channels/subscribed_channels'),
-  PopularChannels: require('channels/popular_channels'),
-  OtherChannels: require('channels/other_channels'),
+  MyChannels: require('pages/channels/my_channels'),
+  SubscribedChannels: require('pages/channels/subscribed_channels'),
+  PopularChannels: require('pages/channels/popular_channels'),
+  OtherChannels: require('pages/channels/other_channels'),
 };
 
 const Layout = () => {

webui-src/app/channels/my_channels.js → webui-src/app/pages/channels/my_channels.js

@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('channels/channels_util');
+const util = require('pages/channels/channels_util');
 
 const Layout = () => {
   return {

webui-src/app/channels/other_channels.js → webui-src/app/pages/channels/other_channels.js

@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('channels/channels_util');
+const util = require('pages/channels/channels_util');
 
 const Layout = () => {
   return {

webui-src/app/channels/popular_channels.js → webui-src/app/pages/channels/popular_channels.js

@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('channels/channels_util');
+const util = require('pages/channels/channels_util');
 
 const Layout = () => {
   return {

webui-src/app/channels/subscribed_channels.js → webui-src/app/pages/channels/subscribed_channels.js

@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('channels/channels_util');
+const util = require('pages/channels/channels_util');
 
 const Layout = () => {
   return {

webui-src/app/chat/chat.js → webui-src/app/pages/chat/chat.js

@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const peopleUtil = require('people/people_util');
+const peopleUtil = require('pages/people/people_util');
 
 // **************** utility functions ********************
 

webui-src/app/config/config_files.js → webui-src/app/pages/config/config_files.js

@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('config/config_util');
+const util = require('pages/config/config_util');
 
 const SharedDirectories = () => {
   let directories = [];
@@ -230,4 +230,4 @@ const Layout = () => {
   };
 };
 
-module.exports = Layout;
+module.exports = Layout;

webui-src/app/config/config_mail.js → webui-src/app/pages/config/config_mail.js

@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const widget = require('widgets');
-const util = require('config/config_util');
+const widget = require('components/widgets');
+const util = require('pages/config/config_util');
 
 const msgTagObj = {
   tagId: 100,

webui-src/app/config/config_network.js → webui-src/app/pages/config/config_network.js

@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
 
-const util = require('config/config_util');
+const util = require('pages/config/config_util');
 
 const SetNwMode = () => {
   const networkModes = [

webui-src/app/config/config_resolver.js → webui-src/app/pages/config/config_resolver.js

@@ -1,13 +1,13 @@
 const m = require('mithril');
-const widget = require('widgets');
+const widget = require('components/widgets');
 
 const sections = {
-  network: require('config/config_network'),
-  node: require('config/config_node'),
-  services: require('config/config_services'),
-  files: require('config/config_files'),
-  people: require('config/config_people'),
-  mail: require('config/config_mail'),
+  network: require('pages/config/config_network'),
+  node: require('pages/config/config_node'),
+  services: require('pages/config/config_services'),
+  files: require('pages/config/config_files'),
+  people: require('pages/config/config_people'),
+  mail: require('pages/config/config_mail'),
 };
 
 const Layout = {

webui-src/app/files/files_downloads.js → webui-src/app/pages/files/files_downloads.js

@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('files/files_util');
-const widget = require('widgets');
+const util = require('pages/files/files_util');
+const widget = require('components/widgets');
 
 const Downloads = {
   strategies: {},

webui-src/app/files/files_manager.js → webui-src/app/pages/files/files_manager.js

@@ -1,8 +1,8 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const widget = require('widgets');
-const futil = require('files/files_util');
-const cutil = require('config/config_util');
+const widget = require('components/widgets');
+const futil = require('pages/files/files_util');
+const cutil = require('pages/config/config_util');
 
 const shareManagerInfo = `
   This is a list of shared folders. You can add and remove folders using the buttons at the bottom.

webui-src/app/files/files_proxy.js → webui-src/app/pages/files/files_proxy.js

@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const futil = require('files/files_util');
+const futil = require('pages/files/files_util');
 
 const fileProxyObj = futil.createProxy({}, () => {
   m.redraw();

webui-src/app/files/files_resolver.js → webui-src/app/pages/files/files_resolver.js

@@ -1,13 +1,13 @@
 const m = require('mithril');
 
-const widget = require('widgets');
+const widget = require('components/widgets');
 
-const downloads = require('files/files_downloads');
-const uploads = require('files/files_uploads');
-const util = require('files/files_util');
-const search = require('files/files_search');
-const myfile = require('files/my_files');
-const friendfile = require('files/friends_files');
+const downloads = require('pages/files/files_downloads');
+const uploads = require('pages/files/files_uploads');
+const util = require('pages/files/files_util');
+const search = require('pages/files/files_search');
+const myfile = require('pages/files/my_files');
+const friendfile = require('pages/files/friends_files');
 
 const MyFiles = () => {
   return {

webui-src/app/files/files_search.js → webui-src/app/pages/files/files_search.js

@@ -1,8 +1,8 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const widget = require('widgets');
-const futil = require('files/files_util');
-const fproxy = require('files/files_proxy');
+const widget = require('components/widgets');
+const futil = require('pages/files/files_util');
+const fproxy = require('pages/files/files_proxy');
 
 let matchString = '';
 let currentItem = 0;

webui-src/app/files/files_uploads.js → webui-src/app/pages/files/files_uploads.js

@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('files/files_util');
+const util = require('pages/files/files_util');
 
 const Uploads = {
   statusMap: {},

webui-src/app/files/files_util.js → webui-src/app/pages/files/files_util.js

@@ -1,6 +1,6 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const widget = require('widgets');
+const widget = require('components/widgets');
 
 const RS_FILE_CTRL_PAUSE = 0x00000100;
 const RS_FILE_CTRL_START = 0x00000200;

webui-src/app/files/friends_files.js → webui-src/app/pages/files/friends_files.js

@@ -1,8 +1,8 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('files/files_util');
-const widget = require('widgets');
-const fileDown = require('files/files_downloads');
+const util = require('pages/files/files_util');
+const widget = require('components/widgets');
+const fileDown = require('pages/files/files_downloads');
 
 function displayfiles() {
   const childrenList = []; // stores children details

webui-src/app/files/my_files.js → webui-src/app/pages/files/my_files.js

@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('files/files_util');
-const manager = require('files/files_manager');
+const util = require('pages/files/files_util');
+const manager = require('pages/files/files_manager');
 
 const DisplayFiles = () => {
   const childrenList = []; // stores children details

webui-src/app/forums/forum_view.js → webui-src/app/pages/forums/forum_view.js

@@ -1,7 +1,7 @@
 const m = require('mithril');
 const rs = require('rswebui');
-const util = require('forums/forums_util');
-const peopleUtil = require('people/people_util');
+const util = require('pages/forums/forums_util');
+const peopleUtil = require('pages/people/people_util');
 const { updatedisplayforums } = require('./forums_util');
 
 function createforum() {

webui-src/app/forums/forums.js → webui-src/app/pages/forums/forums.js

@@ -1,9 +1,9 @@
 const m = require('mithril');
-const widget = require('widgets');
+const widget = require('components/widgets');
 const rs = require('rswebui');
-const util = require('forums/forums_util');
-const viewUtil = require('forums/forum_view');
-const peopleUtil = require('people/people_util');
+const util = require('pages/forums/forums_util');
+const viewUtil = require('pages/forums/forum_view');
+const peopleUtil = require('pages/people/people_util');
 
 const getForums = {
   All: [],
@@ -25,10 +25,10 @@ const getForums = {
   },
 };
 const sections = {
-  MyForums: require('forums/my_forums'),
-  SubscribedForums: require('forums/subscribed_forums'),
-  PopularForums: require('forums/popular_forums'),
-  OtherForums: require('forums/other_forums'),
+  MyForums: require('pages/forums/my_forums'),
+  SubscribedForums: require('pages/forums/subscribed_forums'),
+  PopularForums: require('pages/forums/popular_forums'),
+  OtherForums: require('pages/forums/other_forums'),
 };
 
 const Layout = () => {

webui-src/app/forums/my_forums.js → webui-src/app/pages/forums/my_forums.js

@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('forums/forums_util');
+const util = require('pages/forums/forums_util');
 
 const Layout = () => {
   return {

webui-src/app/forums/popular_forums.js → webui-src/app/pages/forums/popular_forums.js

@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('forums/forums_util');
+const util = require('pages/forums/forums_util');
 
 const Layout = () => {
   return {

webui-src/app/forums/subscribed_forums.js → webui-src/app/pages/forums/subscribed_forums.js

@@ -1,5 +1,5 @@
 const m = require('mithril');
-const util = require('forums/forums_util');
+const util = require('pages/forums/forums_util');
 
 const Layout = () => {
   return {