diff --git a/custom_configs/order b/custom_configs/order
index 54451253fecadde4fa14b712a26a0153c231ff78..0cd3bc5502bde50bff78cb0fa1d07990e9127b0d 100644
--- a/custom_configs/order
+++ b/custom_configs/order
@@ -1,2 +1 @@
-customPersonal-Info.json
-customDango-mango.json
+customLinks.json
diff --git a/public/.DS_Store b/public/.DS_Store
index 38b883f434a1e574f9eaa158dd39395005d99789..cebd279f6005b11332c4a870f5b7db388876d2f2 100644
Binary files a/public/.DS_Store and b/public/.DS_Store differ
diff --git a/public/client.html b/public/client.html
index 029658d02dc422335dee1413c7390d3f1f970a1f..574ec68295e481f9d8d9f667ca71c6e0be79e40d 100755
--- a/public/client.html
+++ b/public/client.html
@@ -79,8 +79,10 @@
<div id="myModal" class="modal">
<div id="modal-content" class="modal-content">
+
<button type="button" class="close" data-dismiss="modal">×</button>
- <button class="password-button" id="passcode"><i class="mdi-notification-vpn-lock"></i> PassCode</a>
+ <a class="btn btn-primary" href="/public/faq"> Help Page </a>
+ <button class="password-button" id="passcode"><i class="mdi-notification-vpn-lock"></i> PassCode</a></button>
<br>
<button class="settings-button" id="new-keyboard"> New Keyboard </button>
<button class="settings-button" id="delete-keyboard"> Delete Keyboard </button>
diff --git a/public/faq/css/style.css b/public/faq/css/style.css
index 4abff86caf04e70c95b1254b61159c5c0cd515c0..ae4442f3f021c819706dfa9fc4eba266ac50d023 100755
--- a/public/faq/css/style.css
+++ b/public/faq/css/style.css
@@ -433,7 +433,7 @@ header h1 {
}
}
-#test{
+.picture{
display: block;
margin-left: auto;
margin-right: auto;
diff --git a/public/faq/images/default_keyboard.png b/public/faq/images/default_keyboard.png
deleted file mode 100644
index defed8251e77e487d647aabb33582210c345e887..0000000000000000000000000000000000000000
Binary files a/public/faq/images/default_keyboard.png and /dev/null differ
diff --git a/public/faq/images/default_screen.png b/public/faq/images/default_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..84bee67a3d1440fea10c10237ce41996b10292d5
Binary files /dev/null and b/public/faq/images/default_screen.png differ
diff --git a/public/faq/images/desktop_password.png b/public/faq/images/desktop_password.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ff3e15616c07533cd6a1b059fbda04ef82e3c37
Binary files /dev/null and b/public/faq/images/desktop_password.png differ
diff --git a/public/faq/images/edit_keys.png b/public/faq/images/edit_keys.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0b6a236ee2eb50e8469de9d6fed8b270bc4b170
Binary files /dev/null and b/public/faq/images/edit_keys.png differ
diff --git a/public/faq/images/edit_mode.png b/public/faq/images/edit_mode.png
deleted file mode 100644
index ab07759ee61cedafaabf4b0bec08e972667eb87f..0000000000000000000000000000000000000000
Binary files a/public/faq/images/edit_mode.png and /dev/null differ
diff --git a/public/faq/images/flip_screen.png b/public/faq/images/flip_screen.png
deleted file mode 100644
index d931d057d13418c043053267f02b5f9c7266865c..0000000000000000000000000000000000000000
Binary files a/public/faq/images/flip_screen.png and /dev/null differ
diff --git a/public/faq/images/hotkeys.png b/public/faq/images/hotkeys.png
index d97a812c13a8e499d7a974893ce0ee7caed35abd..5fff16a40f26c466348fba289966587d43c9859d 100644
Binary files a/public/faq/images/hotkeys.png and b/public/faq/images/hotkeys.png differ
diff --git a/public/faq/images/main_screen.png b/public/faq/images/main_screen.png
index e15f10f9ac2cdfddc51d8c3b4ec99f021e210408..239c625ea64c3f31e5f53bbb148e85a60c5585e8 100644
Binary files a/public/faq/images/main_screen.png and b/public/faq/images/main_screen.png differ
diff --git a/public/faq/images/navigation.png b/public/faq/images/navigation.png
new file mode 100644
index 0000000000000000000000000000000000000000..a076f27f5834c0384f316f061c97af03998dd2c1
Binary files /dev/null and b/public/faq/images/navigation.png differ
diff --git a/public/faq/images/new_keyboard.png b/public/faq/images/new_keyboard.png
index bf2da9c6f4c537ac9f4e45e70061c46d04f033bc..5a24b2cec5dcf6659a0407f2028efac86f53b448 100644
Binary files a/public/faq/images/new_keyboard.png and b/public/faq/images/new_keyboard.png differ
diff --git a/public/faq/images/new_keyboard2.png b/public/faq/images/new_keyboard2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7135504f71e186716c5fc80054507e83c543518
Binary files /dev/null and b/public/faq/images/new_keyboard2.png differ
diff --git a/public/faq/images/overview.png b/public/faq/images/overview.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f944ee7a120bacfc6188dda741f718944b3c597
Binary files /dev/null and b/public/faq/images/overview.png differ
diff --git a/public/faq/images/qr_code.png b/public/faq/images/qr_code.png
deleted file mode 100644
index bfc6c48779b71efe478a7890db050acdb95ed456..0000000000000000000000000000000000000000
Binary files a/public/faq/images/qr_code.png and /dev/null differ
diff --git a/public/faq/images/test.png b/public/faq/images/test.png
deleted file mode 100644
index 239c625ea64c3f31e5f53bbb148e85a60c5585e8..0000000000000000000000000000000000000000
Binary files a/public/faq/images/test.png and /dev/null differ
diff --git a/public/faq/index.html b/public/faq/index.html
index 13d17802d2b365765a0b2fb60e7261c8157c5214..91e72d78809a8576338f7bb0e5ff5ea5ca4ee547 100755
--- a/public/faq/index.html
+++ b/public/faq/index.html
@@ -17,77 +17,83 @@
</header>
<section class="cd-faq">
<ul class="cd-faq-categories">
- <li><a class="selected" href="#basics">Basics</a></li>
- <li><a href="#mobile">Mobile</a></li>
- <li><a href="#account">Account</a></li>
- <li><a href="#payments">Payments</a></li>
- <li><a href="#privacy">Privacy</a></li>
- <li><a href="#delivery">Delivery</a></li>
- </ul> <!-- cd-faq-categories -->
+ <li><a class="selected" href="#basics">Basic Controls</a></li>
+ <li><a href="#tech">Technical Specs</a></li>
+ <li><a href="#privacy">Privacy and Security</a></li>
+ <li><a href="#back">Back to UBoard</a></li>
+
+ </ul>
<div class="cd-faq-items">
<ul id="basics" class="cd-faq-group">
- <li class="cd-faq-title"><h2>Basics</h2></li>
+ <li class="cd-faq-title"><h2>Basic Controls</h2></li>
+ <div class="cd-faq-content">
+ </div>
<li>
- <a class="cd-faq-trigger" href="#0">How do I change my password?</a>
+ <a class="cd-faq-trigger" href="#0">Navigation Features</a>
<div class="cd-faq-content">
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quae quidem blanditiis delectus corporis, possimus officia sint sequi ex tenetur id impedit est pariatur iure animi non a ratione reiciendis nihil sed consequatur atque repellendus fugit perspiciatis rerum et. Dolorum consequuntur fugit deleniti, soluta fuga nobis. Ducimus blanditiis velit sit iste delectus obcaecati debitis omnis, assumenda accusamus cumque perferendis eos aut quidem! Aut, totam rerum, cupiditate quae aperiam voluptas rem inventore quas, ex maxime culpa nam soluta labore at amet nihil laborum? Explicabo numquam, sit fugit, voluptatem autem atque quis quam voluptate fugiat earum rem hic, reprehenderit quaerat tempore at. Aperiam.</p>
- </div> <!-- cd-faq-content -->
- </li>
- </ul> <!-- cd-faq-group -->
-
- <ul id="mobile" class="cd-faq-group">
- <li class="cd-faq-title"><h2>Mobile</h2></li>
+ <img class="picture" src="images/navigation.png" align ='top'>
+ </div>
+ </li>
<li>
- <a class="cd-faq-trigger" href="#0">What are uBoard's main features?</a>
+ <a class="cd-faq-trigger" href="#0">Main Interface</a>
<div class="cd-faq-content">
- <img id='test' src="images/test.png" align ='top'>
- <br>
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Impedit quidem delectus rerum eligendi mollitia, repudiandae quae beatae. Et repellat quam atque corrupti iusto architecto</p>
- </div>
- </li>
- </ul> <!-- cd-faq-group -->
-
- <ul id="account" class="cd-faq-group">
- <li class="cd-faq-title"><h2>Account</h2></li>
+ <img class="picture" src="images/main_screen.png" align ='top'>
+ </div>
+ </li>
<li>
- <a class="cd-faq-trigger" href="#0">How do I change my password?</a>
+ <a class="cd-faq-trigger" href="#0">Default iOS Interface</a>
<div class="cd-faq-content">
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Perferendis earum autem consectetur labore eius tenetur esse, in temporibus sequi cum voluptatem vitae repellat nostrum odio perspiciatis dolores recusandae necessitatibus, unde, deserunt voluptas possimus veniam magni soluta deleniti! Architecto, quidem, totam. Fugit minus odit unde ea cupiditate ab aperiam sed dolore facere nihil laboriosam dolorum repellat deleniti aliquam fugiat laudantium delectus sint iure odio, necessitatibus rem quisquam! Ipsum praesentium quam nisi sint, impedit sapiente facilis laudantium mollitia quae fugiat similique. Dolor maiores aliquid incidunt commodi doloremque rem! Quaerat, debitis voluptatem vero qui enim, sunt reiciendis tempore inventore maxime quasi fugiat accusamus beatae modi voluptates iste officia esse soluta tempora labore quisquam fuga, cum. Sint nemo iste nulla accusamus quam qui quos, vero, minus id. Eius mollitia consequatur fugit nam consequuntur nesciunt illo id quis reprehenderit obcaecati voluptates corrupti, minus! Possimus, perspiciatis!</p>
- </div> <!-- cd-faq-content -->
- </li>
+ <img class="picture" src="images/default_screen.png" align ='top'>
+ </div>
+ </li>
+ <li>
+ <a class="cd-faq-trigger" href="#0">Hotkeys Interface</a>
+ <div class="cd-faq-content">
+ <img class="picture" src="images/hotkeys.png" align ='top'>
+ </div>
+ </li>
+ <li>
+ <a class="cd-faq-trigger" href="#0">New Board Interface</a>
+ <div class="cd-faq-content">
+ <img class="picture" src="images/new_keyboard.png" align ='top'>
+ </div>
+ </li>
+ <li>
+ <a class="cd-faq-trigger" href="#0">Edit Keys</a>
+ <div class="cd-faq-content">
+ <img class="picture" src="images/edit_keys.png" align ='top'>
+ </div>
+ </li>
</ul> <!-- cd-faq-group -->
- <ul id="payments" class="cd-faq-group">
- <li class="cd-faq-title"><h2>Payments</h2></li>
+ <ul id="tech" class="cd-faq-group">
+ <li class="cd-faq-title"><h2>Technical Specs</h2></li>
<li>
- <a class="cd-faq-trigger" href="#0">Can I have an invoice for my subscription?</a>
+ <a class="cd-faq-trigger" href="#0">How uBoard Works</a>
<div class="cd-faq-content">
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Impedit quidem delectus rerum eligendi mollitia, repudiandae quae beatae. Et repellat quam atque corrupti iusto architecto impedit explicabo repudiandae qui similique aut iure ipsum quis inventore nulla error aliquid alias quia dolorem dolore, odio excepturi veniam odit veritatis. Quo iure magnam, et cum. Laudantium, eaque non? Tempore nihil corporis cumque dolor ipsum accusamus sapiente aliquid quis ea assumenda deserunt praesentium voluptatibus, accusantium a mollitia necessitatibus nostrum voluptatem numquam modi ab, sint rem.</p>
- </div> <!-- cd-faq-content -->
+ <img class="picture" src="images/overview.png" align ='top'>
+ <br>
+ <p>uBoard works by connecting your mobile device to a local server on your desktop. When you launch the uBoard app on your desktop, the local server starts up on port 8000. When you scan the QR code, your mobile device connects to your computer and launches a web browser to display the interface. When you interact with the mobile interface, your mobile device sends websocket signals to your computer. The server receives these signals and translates them into computer commands. </p>
+ </div>
</li>
</ul> <!-- cd-faq-group -->
<ul id="privacy" class="cd-faq-group">
<li class="cd-faq-title"><h2>Privacy</h2></li>
<li>
- <a class="cd-faq-trigger" href="#0">Can I specify my own private key?</a>
- <div class="cd-faq-content">
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Impedit quidem delectus rerum eligendi mollitia, repudiandae quae beatae. Et repellat quam atque corrupti iusto architecto impedit explicabo repudiandae qui similique aut iure ipsum quis inventore nulla error aliquid alias quia dolorem dolore, odio excepturi veniam odit veritatis. Quo iure magnam, et cum. Laudantium, eaque non? Tempore nihil corporis cumque dolor ipsum accusamus sapiente aliquid quis ea assumenda deserunt praesentium voluptatibus, accusantium a mollitia necessitatibus nostrum voluptatem numquam modi ab, sint rem.</p>
- </div> <!-- cd-faq-content -->
+ <a class="cd-faq-trigger" href="#0">Desktop Password Feature</a>
+ <img class="picture" src="images/desktop_password.png" align ='top'>
</li>
</ul> <!-- cd-faq-group -->
- <ul id="delivery" class="cd-faq-group">
- <li class="cd-faq-title"><h2>Delivery</h2></li>
+ <ul id="back" class="cd-faq-group">
+ <li class="cd-faq-title"><h2>Back To uBoard</h2></li>
<li>
- <a class="cd-faq-trigger" href="#0">What should I do if my order hasn't been delivered yet?</a>
- <div class="cd-faq-content">
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Impedit quidem delectus rerum eligendi mollitia, repudiandae quae beatae. Et repellat quam atque corrupti iusto architecto impedit explicabo repudiandae qui similique aut iure ipsum quis inventore nulla error aliquid alias quia dolorem dolore, odio excepturi veniam odit veritatis. Quo iure magnam, et cum. Laudantium, eaque non? Tempore nihil corporis cumque dolor ipsum accusamus sapiente aliquid quis ea assumenda deserunt praesentium voluptatibus, accusantium a mollitia necessitatibus nostrum voluptatem numquam modi ab, sint rem.</p>
- </div> <!-- cd-faq-content -->
- </li>
+ <a class="btn btn-primary" href="../../"> Back to UBoard </a>
</li>
</ul> <!-- cd-faq-group -->
+
</div> <!-- cd-faq-items -->
<a href="#0" class="cd-close-panel">Close</a>
</section> <!-- cd-faq -->
diff --git a/public/js/client.js b/public/js/client.js
index b5f7e40f41e31e694b3621974dce70f9f69bb996..a2a9a15394e9968babd71aedd0c00eff9b0fc26a 100755
--- a/public/js/client.js
+++ b/public/js/client.js
@@ -520,10 +520,12 @@ interact('.key-button').on('tap', function (event) {
interact('.url-button').on('tap', function (event) {
if(event.target.id.indexOf("url-icon") != -1){
+ console.log("Parent")
emitUrl($("#" + event.target.id).parent().clone().children().remove().end().text().trim())
}
else{
- emitUrl(event.target.innerText);
+ console.log("Error")
+ emitUrl($("#" + event.target.id).clone().children().remove().end().text().trim());
}
});
diff --git a/public/style/main.css b/public/style/main.css
index fe3dda288f64151c668599b7fcc7bc6f9534dbac..56efbba68af851befdb352515fee9e7620b3013d 100755
--- a/public/style/main.css
+++ b/public/style/main.css
@@ -216,7 +216,7 @@ icon {
#leftClick{
width: 40%;
- height: 25%;
+ height: 40%;
background-color: rgb(150, 180, 200);
float: left;
border: black solid;
@@ -225,7 +225,7 @@ icon {
#scrollWheel{
width: 20%;
- height: 25%;
+ height: 40%;
background-color: rgb(100, 150, 150);
float: left;
border: black solid;
@@ -233,7 +233,7 @@ icon {
#rightClick{
width: 40%;
- height: 25%;
+ height: 40%;
background-color: rgb(150, 180, 200);
float: left;
border: black solid;