Merge pull request #71 from sbs20/development-v2

Development v2

.gitattributes

@@ -1,63 +1,14 @@
 ###############################################################################
 # Set default behavior to automatically normalize line endings.
 ###############################################################################
-* text=auto
-
-###############################################################################
-# Set default behavior for command prompt diff.
-#
-# This is need for earlier builds of msysgit that does not have it on by
-# default for csharp files.
-# Note: This is only used by command line
-###############################################################################
-#*.cs     diff=csharp
-
-###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just uncomment the entries below
-###############################################################################
-#*.sln       merge=binary
-#*.csproj    merge=binary
-#*.vbproj    merge=binary
-#*.vcxproj   merge=binary
-#*.vcproj    merge=binary
-#*.dbproj    merge=binary
-#*.fsproj    merge=binary
-#*.lsproj    merge=binary
-#*.wixproj   merge=binary
-#*.modelproj merge=binary
-#*.sqlproj   merge=binary
-#*.wwaproj   merge=binary
+* text eol=lf
 
 ###############################################################################
 # behavior for image files
 #
 # image files are treated as binary by default.
 ###############################################################################
-#*.jpg   binary
-#*.png   binary
-#*.gif   binary
-
-###############################################################################
-# diff behavior for common document formats
-# 
-# Convert binary document formats to text before diffing them. This feature
-# is only available from the command line. Turn it on by uncommenting the 
-# entries below.
-###############################################################################
-#*.doc   diff=astextplain
-#*.DOC   diff=astextplain
-#*.docx  diff=astextplain
-#*.DOCX  diff=astextplain
-#*.dot   diff=astextplain
-#*.DOT   diff=astextplain
-#*.pdf   diff=astextplain
-#*.PDF   diff=astextplain
-#*.rtf   diff=astextplain
-#*.RTF   diff=astextplain
+*.jpg   binary
+*.png   binary
+*.tif   binary
+*.svg   binary

.gitignore

@@ -96,6 +96,7 @@ dist/**/*
 *.tif
 *.pdf
 *.png
+data/output/*.txt
 scan*.jpg
 config/devices.json
 var

client/App.vue

@@ -3,8 +3,13 @@
 </template>
 
 <script>
+import Vue from 'vue';
 import Scanserv from './components/Scanserv.vue';
+import { BootstrapVue } from 'bootstrap-vue';
 import 'bootstrap/dist/css/bootstrap.css';
+import 'bootstrap-vue/dist/bootstrap-vue.css';
+
+Vue.use(BootstrapVue);
 
 export default {
   name: 'App',
@@ -37,7 +42,7 @@ body {
     width: auto;
 }
 
-#navbar > div {
+.navbar-brand, .navbar-text {
     color: white;
     font-size: xx-large;
 }
@@ -46,8 +51,8 @@ body {
     margin-top: 1em;
 }
 
-.navbar-inverse {
-    background-color: #101030;
+.bg-dark {
+    background-color: #101030 !important;
     background-image: none;
     border-color: black;
 }
@@ -72,7 +77,7 @@ body {
     font-size: small;
 }
 
-label, th {
+.col-form-label, label, th {
     font-size: x-large;
     font-weight: 300;
     color: #0E5EA0;