From 848307db955a8002a08be3444eca0e6a339f2198 Mon Sep 17 00:00:00 2001
From: saber-nyan <saber-nyan@ya.ru>
Date: Mon, 13 May 2019 22:45:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BE=D0=BF=D1=86=D0=B8=D1=8E=20=D1=80=D0=B5=D0=B3=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=81=D0=B0=20=D0=B2=20=D0=BF=D0=B0=D1=82=D1=82=D0=B5=D1=80?=
 =?UTF-8?q?=D0=BD=D1=8B,=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B2=D0=B5=D0=B1=D1=81=D0=BE=D0=BA=D0=B5=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FlagPattern.vue |  6 ++---
 src/components/Navbar.vue      | 49 +++++++++++++++++++---------------
 src/views/Home.vue             |  2 +-
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/components/FlagPattern.vue b/src/components/FlagPattern.vue
index 8e5840b..2763009 100644
--- a/src/components/FlagPattern.vue
+++ b/src/components/FlagPattern.vue
@@ -1,8 +1,8 @@
 <template>
 	<div class="dropdown-item" :style="'color:' + color">
-		{{name}}: {{value}}
+		{{name}}: {{regex ? `/${value}/` : `'${value}'`}}
 		<div class="float-right">
-			<button @click.prevent="deleteSelf()" class="btn btn-outline-danger btn-block btn-sm" type="button">x</button>
+			<button @click.prevent.stop="deleteSelf()" class="btn btn-outline-danger btn-block btn-sm" type="button">x</button>
 		</div>
 	</div>
 </template>
@@ -12,7 +12,7 @@ import axios from "axios";
 
 export default {
 	name: "FlagPattern",
-	props: ['name', 'value', 'color', 'id',],
+	props: ['name', 'value', 'color', 'id', 'regex',],
 	methods: {
 		deleteSelf() {
 			const instance = axios.create({
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 4bc0f9e..07b8087 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -3,25 +3,35 @@
 
 <!--		<router-link to="/" class="navbar-brand col-sm-3 col-md-2 mr-0">Packmate</router-link>-->
 		<div class="dropdown">
-			<button class="btn btn-dark dropdown-toggle" type="button" data-toggle="dropdown">
-				Паттерны
-			</button>
-			<div class="dropdown-menu">
-				<div class="input-group">
-					<input type="text" class="form-control" placeholder="Name" v-model="newPattern.name">
-					<input type="text" class="form-control" placeholder="Value" v-model="newPattern.value">
-					<input type="text" class="form-control" placeholder="#Color" v-model="newPattern.color">
-					<div class="input-group-append">
-						<button @click.prevent="createPattern()" class="btn btn-outline-primary" type="button">+</button>
+			<form> <!-- Disable autohide -->
+				<button class="btn btn-dark dropdown-toggle" type="button" data-toggle="dropdown">
+					Паттерны
+				</button>
+				<div class="dropdown-menu">
+					<div class="input-group">
+						<input type="text" class="form-control" placeholder="Name" v-model="newPattern.name">
+						<input type="text" class="form-control" placeholder="Value" v-model="newPattern.value">
+						<input type="text" class="form-control" placeholder="#Color" v-model="newPattern.color">
+						<div class="input-group-append">
+							<button @click.prevent="createPattern()" class="btn btn-outline-primary" type="button">+
+							</button>
+						</div>
 					</div>
+					<div class="custom-control custom-switch" style="margin-left: 10px; margin-bottom: 8px;">
+						<input type="checkbox" class="custom-control-input"
+								id="isRegexCheckbox" v-model="newPattern.regex">
+						<label class="custom-control-label" for="isRegexCheckbox">Regex?</label>
+					</div>
+
+					<FlagPattern v-for="pattern in patterns"
+							:key="pattern.id"
+							:id="pattern.id"
+							:name="pattern.name"
+							:value="pattern.value"
+							:color="pattern.color"
+							:regex="pattern.regex"></FlagPattern>
 				</div>
-				<FlagPattern v-for="pattern in patterns"
-					:key="pattern.id"
-					:id="pattern.id"
-					:name="pattern.name"
-					:value="pattern.value"
-					:color="pattern.color"></FlagPattern>
-			</div>
+			</form>
 		</div>
 
 		<div class="collapse navbar-collapse" id="navbarSupportedContent">
@@ -75,6 +85,7 @@ export default {
 				name: '',
 				value: '',
 				color: '',
+				regex: false,
 			},
 		}
 	},
@@ -142,10 +153,6 @@ export default {
 		dropdown.on('hide.bs.dropdown', function () {
 			$(this).find('.dropdown-menu').first().stop(true, true).slideUp();
 		});
-		$('.dropdown-menu').on("click.bs.dropdown", function (e) {
-			e.stopPropagation();
-			e.preventDefault();
-		});
 	},
 	components: {FlagPattern, CtfService,},
 }
diff --git a/src/views/Home.vue b/src/views/Home.vue
index be35664..ba2ac7e 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -62,7 +62,7 @@ export default {
 			this.socket.onmessage = ev => {
 				const parsed = JSON.parse(ev.data);
 				console.debug('WS got message', parsed);
-				const currentPort = this.$route.params.servicePort;
+				const currentPort = parseInt(this.$route.params.servicePort, 10);
 				if (!(currentPort === undefined || currentPort === parsed.service.port)) {
 					console.debug('not related port, skipping...');
 					return;