From e48e3fb5b176669d3758768d03c831738d087d45 Mon Sep 17 00:00:00 2001 From: Sukhamjot-Singh Date: Mon, 23 May 2022 10:33:52 +0530 Subject: [PATCH] displayed and created channel pages --- webui-src/app/channels/channel.css | 6 ++++++ webui-src/app/channels/channels.js | 10 +++++----- .../app/channels/{my_forums.js => my_channels.js} | 2 +- .../channels/{popular_forums.js => other_channels.js} | 4 ++-- .../{subscribed_forums.js => popular_channels.js} | 4 ++-- .../{other_forums.js => subscribed_channels.js} | 2 +- webui-src/app/mail/mail.css | 6 ++++++ webui-src/app/mail/mail_resolver.js | 2 +- webui-src/app/main.js | 2 +- webui-src/app/theme.css | 2 +- 10 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 webui-src/app/channels/channel.css rename webui-src/app/channels/{my_forums.js => my_channels.js} (69%) rename webui-src/app/channels/{popular_forums.js => other_channels.js} (54%) rename webui-src/app/channels/{subscribed_forums.js => popular_channels.js} (53%) rename webui-src/app/channels/{other_forums.js => subscribed_channels.js} (66%) diff --git a/webui-src/app/channels/channel.css b/webui-src/app/channels/channel.css new file mode 100644 index 0000000..7c6217f --- /dev/null +++ b/webui-src/app/channels/channel.css @@ -0,0 +1,6 @@ +.channel-node-panel { + position: relative; + /* bottom: 650px; */ + margin-left: 200px; + animation: fadein 0.5s; + } \ No newline at end of file diff --git a/webui-src/app/channels/channels.js b/webui-src/app/channels/channels.js index 879f681..dc8d629 100644 --- a/webui-src/app/channels/channels.js +++ b/webui-src/app/channels/channels.js @@ -2,10 +2,10 @@ const m = require('mithril'); const widget = require('widgets'); const sections = { - MyForums: require('channels/my_forums'), - SubscribedFroums: require('channels/subscribed_forums'), - PopularForums: require('channels/popular_forums'), - OtherForums: require('channels/other_forums') + MyChannels: require('channels/my_channels'), + SubscribedChannels: require('channels/subscribed_channels'), + PopularChannels: require('channels/popular_channels'), + OtherChannels: require('channels/other_channels') } const Layout = { @@ -15,7 +15,7 @@ const Layout = { tabs: Object.keys(sections), baseRoute: '/channels/', }), - m('.node-panel .', vnode.children), + m('.channel-node-panel', vnode.children), ]), }; diff --git a/webui-src/app/channels/my_forums.js b/webui-src/app/channels/my_channels.js similarity index 69% rename from webui-src/app/channels/my_forums.js rename to webui-src/app/channels/my_channels.js index 8bcd6c9..a37adca 100644 --- a/webui-src/app/channels/my_forums.js +++ b/webui-src/app/channels/my_channels.js @@ -3,7 +3,7 @@ const m = require('mithril'); const Layout = () => { return{ view: () => [ - m('h2', 'My Forums') + m('.widget',[m('h2', 'My Channels'),m('hr'),]) ] }; }; diff --git a/webui-src/app/channels/popular_forums.js b/webui-src/app/channels/other_channels.js similarity index 54% rename from webui-src/app/channels/popular_forums.js rename to webui-src/app/channels/other_channels.js index 4f6f5ed..65a25ca 100644 --- a/webui-src/app/channels/popular_forums.js +++ b/webui-src/app/channels/other_channels.js @@ -2,8 +2,8 @@ const m = require('mithril'); const Layout = () => { return{ - view: () => [ - m('h2', 'Popular Forums') + view: () => [ + m('.widget',[m('h2', 'Other Channels'),m('hr'),]) ] }; }; diff --git a/webui-src/app/channels/subscribed_forums.js b/webui-src/app/channels/popular_channels.js similarity index 53% rename from webui-src/app/channels/subscribed_forums.js rename to webui-src/app/channels/popular_channels.js index 2c69e68..52d9b22 100644 --- a/webui-src/app/channels/subscribed_forums.js +++ b/webui-src/app/channels/popular_channels.js @@ -2,8 +2,8 @@ const m = require('mithril'); const Layout = () => { return{ - view: () => [ - m('h2', 'Subscribed Forums') + view: () => [ + m('.widget',[m('h2', 'Popular Channels'),m('hr'),]) ] }; }; diff --git a/webui-src/app/channels/other_forums.js b/webui-src/app/channels/subscribed_channels.js similarity index 66% rename from webui-src/app/channels/other_forums.js rename to webui-src/app/channels/subscribed_channels.js index f645386..31b4fad 100644 --- a/webui-src/app/channels/other_forums.js +++ b/webui-src/app/channels/subscribed_channels.js @@ -3,7 +3,7 @@ const m = require('mithril'); const Layout = () => { return{ view: () => [ - m('h2', 'Other Forums') + m('.widget',[m('h2', 'Subscribed Channels'),m('hr'),]) ] }; }; diff --git a/webui-src/app/mail/mail.css b/webui-src/app/mail/mail.css index 8db4dcd..5dff110 100644 --- a/webui-src/app/mail/mail.css +++ b/webui-src/app/mail/mail.css @@ -90,4 +90,10 @@ iframe.msg { bottom: 50%; right: 58%; +} +.mail-node-panel { + position: relative; + bottom: 650px; + margin-left: 200px; + animation: fadein 0.5s; } \ No newline at end of file diff --git a/webui-src/app/mail/mail_resolver.js b/webui-src/app/mail/mail_resolver.js index ff48e6b..ca087f9 100644 --- a/webui-src/app/mail/mail_resolver.js +++ b/webui-src/app/mail/mail_resolver.js @@ -112,7 +112,7 @@ const Layout = { tabs: Object.keys(sectionsquickview), baseRoute: '/mail/', }), - m('.node-panel', vnode.children), + m('.mail-node-panel', vnode.children), ]), }; diff --git a/webui-src/app/main.js b/webui-src/app/main.js index 59edee1..4f302bf 100644 --- a/webui-src/app/main.js +++ b/webui-src/app/main.js @@ -53,7 +53,7 @@ const Layout = () => { chat: '/chat', mail: '/mail/inbox', files: '/files/files', - channels: '/channels/MyForums', + channels: '/channels/MyChannels', config: '/config/network', }, }), diff --git a/webui-src/app/theme.css b/webui-src/app/theme.css index 9b4da28..f4c40ca 100644 --- a/webui-src/app/theme.css +++ b/webui-src/app/theme.css @@ -442,7 +442,7 @@ a.tab-menu-item { /* Content adjacent to sidebar */ .node-panel { position: relative; - bottom: 650px; + /* bottom: 650px; */ margin-left: 200px; animation: fadein 0.5s; }