From 665c33be11fa14b26c1aeaf965dcaea4c6ac44c5 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Tue, 27 Mar 2018 16:41:36 +0200
Subject: [PATCH] [liv.popup-controller] added 'popup.create' popup
 [vue.auth.menu] added link to open popup 'channel.create'

---
 webpack/lib/channel-controller.js |  4 ++++
 webpack/lib/popup-controller.js   | 16 ++++++++--------
 webpack/page/noauth/register.js   |  2 --
 webpack/vue/auth/channel.vue      |  2 +-
 webpack/vue/auth/menu.vue         |  2 +-
 webpack/vue/auth/wrapper.vue      | 27 +++++++++++++++++++++------
 6 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/webpack/lib/channel-controller.js b/webpack/lib/channel-controller.js
index faba422..0d97e87 100644
--- a/webpack/lib/channel-controller.js
+++ b/webpack/lib/channel-controller.js
@@ -28,6 +28,10 @@ export default class ChannelController{
 	*
 	---------------------------------------------------------*/
 	nav(channel_id=null){
+
+		if( channel_id == -2 )
+			return gs.get.popup.show('channel.create');
+
 		console.log(`channel.nav(${channel_id})`);
 
 		/* (1) Get channel data */
diff --git a/webpack/lib/popup-controller.js b/webpack/lib/popup-controller.js
index c4a5a0b..2fe95a3 100644
--- a/webpack/lib/popup-controller.js
+++ b/webpack/lib/popup-controller.js
@@ -29,14 +29,14 @@ export default class PopupController{
 			reset(){ this.data.type = 'text'; this.data.name = ''; },
 			submit(){ gs.get.room.create(this.data.type, this.data.name) && this.parent.hide(); }
 		});
-		// this.croom = {
-
-		// 	active: false,
-		// 	type:   'text',
-		// 	name:   '',
-
-
-		// }; this.reset.push(this.croom.reset);
+		/* (2) Create a new Channel */
+		this.register('channel.create', {
+			data: {
+				name: ''
+			},
+			reset(){ this.data.name = ''; },
+			submit(){ gs.get.channel.create(this.data.name) && this.parent.hide(); }
+		});
 
 	}
 
diff --git a/webpack/page/noauth/register.js b/webpack/page/noauth/register.js
index b1837c9..39e7a21 100644
--- a/webpack/page/noauth/register.js
+++ b/webpack/page/noauth/register.js
@@ -126,8 +126,6 @@ gs.get.register.func.register = function(){
 	/* (3) API bindings */
 	api.call('POST /user', { username: username, password: password }, function(rs){
 
-		console.log(rs);
-
 		// manage error
 		if( rs.error !== 0 || rs.uid == null || rs.token == null )
 			return gs.get.router.push('register');
diff --git a/webpack/vue/auth/channel.vue b/webpack/vue/auth/channel.vue
index ee482aa..75732c2 100644
--- a/webpack/vue/auth/channel.vue
+++ b/webpack/vue/auth/channel.vue
@@ -22,7 +22,7 @@
 			</section>
 
 			<section class='message-input'>
-				<textarea :placeholder='`Message #${gs.room.get("text").name}`' @keydown='gs.content.auto_grow'></textarea>
+				<textarea :placeholder='`Message #${gs.room.get(`text`).name}`' @keydown='gs.content.auto_grow'></textarea>
 			</section>
 
 		</div>
diff --git a/webpack/vue/auth/menu.vue b/webpack/vue/auth/menu.vue
index 871578c..4fafa23 100644
--- a/webpack/vue/auth/menu.vue
+++ b/webpack/vue/auth/menu.vue
@@ -8,7 +8,7 @@
 
 		<!-- Channel List -->
 		<span v-for='c in gs.channel.list'
-			@click='c.link && gs.channel.nav(c.id);'
+			@click='gs.channel.nav(c.id);'
 			:class='c.id == gs.channel.current ? `channel active` : `channel`'
 			:data-sub='c.sub'
 			:data-special='c.id == -1?1:0'
diff --git a/webpack/vue/auth/wrapper.vue b/webpack/vue/auth/wrapper.vue
index e9a0d00..1dd4b4c 100644
--- a/webpack/vue/auth/wrapper.vue
+++ b/webpack/vue/auth/wrapper.vue
@@ -16,22 +16,37 @@
 		<!-- Pop-up Filter Background -->
 		<div id='popup-filter-background' v-show='gs.popup.filter' @click='gs.popup.hide()'></div>
 
-		<!-- Pop-up -->
+		<!-- Pop-up ROOM CREATE -->
 		<div class='popup' v-show='gs.popup.get(`room.create`).active'>
 			<span class='header'>Create {{ gs.popup.get(`room.create`).data.type }} channel</span>
 
 			<span class='body form'>
-				<label for='channel_name'>Channel Name</label>
+				<label for='channel_name'>Room Name</label>
 				<input type='text' name='channel_name' v-model='gs.popup.get(`room.create`).data.name'>
 
-				<label for='channel_name'>Channel Type</label>
-				<span class='select-box' @click='gs.popup.get(`room.create`).data.type=`text`' :data-selected='gs.popup.get(`room.create`).data.type==`text`?1:0' data-type='text'>Text Channel</span>
-				<span class='select-box' @click='gs.popup.get(`room.create`).data.type=`voice`' :data-selected='gs.popup.get(`room.create`).data.type==`voice`?1:0' data-type='voice'>Voice Channel</span>
+				<label for='channel_name'>Room Type</label>
+				<span class='select-box' @click='gs.popup.get(`room.create`).data.type=`text`' :data-selected='gs.popup.get(`room.create`).data.type==`text`?1:0' data-type='text'>Text Room</span>
+				<span class='select-box' @click='gs.popup.get(`room.create`).data.type=`voice`' :data-selected='gs.popup.get(`room.create`).data.type==`voice`?1:0' data-type='voice'>Voice Room</span>
 			</span>
 
 			<span class='footer form'>
 				<button @click='gs.popup.hide()'>Cancel</button>
-				<button class='submit' @click='gs.popup.get(`room.create`).submit()'>Create Channel</button>
+				<button class='submit' @click='gs.popup.get(`room.create`).submit()'>Create Room</button>
+			</span>
+		</div>
+
+		<!-- Pop-up CHANNEL CREATE -->
+		<div class='popup' v-show='gs.popup.get(`channel.create`).active'>
+			<span class='header'>Create {{ gs.popup.get(`channel.create`).data.type }} channel</span>
+
+			<span class='body form'>
+				<label for='channel_name'>Channel Name</label>
+				<input type='text' name='channel_name' v-model='gs.popup.get(`channel.create`).data.name'>
+			</span>
+
+			<span class='footer form'>
+				<button @click='gs.popup.hide()'>Cancel</button>
+				<button class='submit' @click='gs.popup.get(`channel.create`).submit()'>Create Channel</button>
 			</span>
 		</div>