Merging 1.2 features into Master

Author: leoGalani

Dockerfile

@@ -19,7 +19,7 @@ WORKDIR /sherlock/frontsherlock/
 RUN apt-get update && \
     apt-get install -y curl && \
     curl -sL https://deb.nodesource.com/setup_8.x | bash && \
-    apt-get install -y nodejs && \
+    apt-get install -y nodejs bzip2 && \
     npm install && \
     npm run build && \
     rm -rf /sherlock/frontsherlock/node_modules && \

README.md

@@ -7,30 +7,43 @@ others involved in regression testing.
 
 Automated regression tests are ideal, but sometimes do not cover 100% of functionality. Additionally, it can be helpful for non-technical people to help test your code.
 
+
 To run locally you will need to have the latest version of Docker Community Edition and docker-compose.
 Please, visit the following pages for information on how to install these tools.
 
 - docker: https://docs.docker.com/engine/installation/
 - docker-compose: https://docs.docker.com/compose/install/
 
+If you are using windows, consider installing 'bash' for windows (https://msdn.microsoft.com/en-us/commandline/wsl/about) in order to make use of the setup _bashscript_.
+
 ### Setup
 
 As easy as this:
 
-    docker-compose up -d
+    sh sherlock.sh fast-setup
 
 
 This will download the compiled version of Sherlock with all the dependencies. You will be ready to use Sherlock as soon the command finishes.
 
 You can also build the image yourself, but it may take a while (if you build it on a small machine like the entry machine on digitalocean, you might face some troubles due to lack of memory):
 
 
-    docker-compose -f docker-compose_build.yml build
-    docker-compose -f docker-compose_build.ymlup -d
+    sh sherlock.sh build-setup
+
+
+Don't delete the folders called 'database' inside the Sherlock folder, since it's used by the docker to persist the mysql data.
+
+### Update
+
+If you started to use Sherlock with the _build-setup_ or also want to add your local changes:
+
+  sh sherlock.sh build-upgrade
+
 
+If you used the _fast-setup_ option, you can update using:
 
+  sh sherlock.sh fast-upgrade
 
-Don't delete the folder called 'database' inside the Sherlock folder, since it's used by the docker to persist the mysql data.
 
 ###  Demo
 

docs/index.rst

@@ -6,7 +6,7 @@ SherlockQA
 Deploy in production with Docker
 ------------
 
-To run locally you will need to have the last version of docker Comunity Edition and docker-compose. Please, visit the following pages to know how to install them in your system.
+To run locally you will need to have the last version of docker Community Edition and docker-compose. Please, visit the following pages to know how to install them in your system.
 
 docker: https://docs.docker.com/engine/installation/
 docker-compose: https://docs.docker.com/compose/install/
@@ -15,21 +15,32 @@ After that you can:
 
 .. code-block:: console
 
-    docker-compose up -d
+  sh sherlock.sh fast-setup
 
 
 This will download the compiled version of Sherlock with all the dependencies and you will be ready to use as soon the command finish.
 
-You can also build the image yourself, but it may take a while (if you build it on a small machine like the entry machine on digitalocean, you might face some troubles because of lack of memory):
+You can also build the image yourself, but it may take a while (if you build it on a small machine like the entry machine on digitalocean, you might face some troubles because lack of memory):
+
 
 .. code-block:: console
 
-  docker-compose -f docker-compose_build.yml build
-  docker-compose -f docker-compose_build.ymlup -d
+  sh sherlock.sh build-setup
+
+
+Don't delete the folders called 'database' inside the Sherlock folder, since it's used by the docker to persist the mysql data.
+
+
+/sUpdate
+
+If you started to use Sherlock with the _build-setup_ or also want to add your local changes:
+
+  sh sherlock.sh build-upgrade
 
 
+If you used the _fast-setup_ option, you can update using:
 
-Don't delete the folder called 'database' inside the Sherlock folder, since it's used by the docker to persist the MySQL data.
+  sh sherlock.sh fast-upgrade
 
 
 

frontsherlock/package.json

@@ -16,10 +16,11 @@
     "chartist": "^0.11.0",
     "chartist-plugin-legend": "^0.6.2",
     "jquery": "^3.2.1",
-    "uikit": "^3.0.0-beta.28",
-    "vue": "^2.4.2",
+    "uikit": "^3.0.0-beta.35",
+    "vue": "^2.5.2",
     "vue-resource": "^1.3.4",
-    "vue-router": "^2.7.0"
+    "vue-router": "^3.0.1",
+    "vue-select": "github:sagalbot/vue-select"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.2",
@@ -73,7 +74,7 @@
     "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
     "url-loader": "^0.5.8",
-    "vue-loader": "^12.2.2",
+    "vue-loader": "^13.5.0",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.4.2",
     "webpack": "^2.7.0",

frontsherlock/src/Footer.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="menu_Component" style="padding-top:20px">
-    <center><span style="font-size:12px"> sherlock qa testmanager - v1.1.0 | <a uk-icon="icon: github-alt" href="https://github.com/leoGalani/sherlock"> source code </a></span></center>
+    <center><span style="font-size:12px"> sherlock qa testmanager - v1.2.0 | <a uk-icon="icon: github-alt" href="https://github.com/leoGalani/sherlock"> source code </a></span></center>
   </div>
 </template>
 

frontsherlock/src/Menu.vue

@@ -20,8 +20,8 @@
               <span>
                 <i class="material-icons" style="color: rgb(248, 248, 248); margin-top:5px">build</i>
               </span>
-              <span style="padding: 6px; color: rgb(248, 248, 248);">
-                {{project_name}} Settings
+              <span style="padding: 6px; color: rgb(248, 248, 248);" data-test-id="project_settings_dropdown">
+                Project Settings
               </span>
             </span>
           </a>
@@ -75,32 +75,28 @@ export default {
   methods: {
     logoff () {
       UIkit.notification('See you later!', {timout: '700'})
-      window.localStorage.removeItem('user')
-      window.localStorage.removeItem('auth')
       this.$router.push({path: '/login'})
     },
     getUserInfo () {
       this.currentUser = JSON.parse(window.localStorage.getItem('user'))
     },
     getProjectInfo () {
-      this.$http.get('project/show/' + this.$route.params.projectId).then(function (response) {
+      this.$http.get('project/show/' + this.projectId).then(function (response) {
         this.project = response.body
         this.project_name = this.project.name
       },
       function (response) {
       })
     }
   },
-  updated: function () {
-    if (['login', 'register', 'dashboard'].indexOf(this.$route.name) === -1) {
-      this.projectId = this.$route.params.projectId
-    }
-  },
   watch: {
     $route: function () {
       if (['login', 'register'].indexOf(this.$route.name) === -1) {
         this.getUserInfo()
-        if (['dashboard', 'new_project', 'settings', 'user_edit'].indexOf(this.$route.name) === -1) {
+        if (['dashboard'].indexOf(this.$route.name) === -1) {
+          this.projectId = this.$route.params.projectId
+        }
+        if (['dashboard', 'new_project', 'settings', 'user_edit', '404'].indexOf(this.$route.name) === -1) {
           this.getProjectInfo()
         } else {
           this.project_name = ''

frontsherlock/src/assets/img/flag_brazil.png

@@ -25,10 +25,30 @@ h1, h2, h3, h4{
   font-size: 30px;
 }
 
+#small_loading{
+  background-color: #b2b2bb;
+  border-radius: 10px;
+  color: #fff;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: 5px auto;
+  position: absolute;
+  width: 140px;
+  height:28px;
+  padding: 13px;
+  font-size: 20px;
+}
+
 #loading > center{
   margin-top: 20%;
 }
 
+fieldset{
+  border: 1px solid #ababab;
+}
+
 /* HEADER  */
   .uk-navbar-item, .uk-navbar-nav>li>a, .uk-navbar-toggle {
     height: 70px;
@@ -41,13 +61,10 @@ h1, h2, h3, h4{
     width:0;
     height:0;
     position:absolute;
-
-
     border-bottom: 8px solid gray;
     border-right:8px solid transparent;
     border-left:8px solid transparent;
     left:40%;
-
     top:-8px;
 }
 
@@ -61,24 +78,28 @@ h1, h2, h3, h4{
 
 .project_box {
   background: #fff;
-  border-radius: 2px;
+  border-radius: 4px;
   display: inline-block;
   height: 230px;
   margin: 1rem;
   position: relative;
   width: 200px;
-  box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+  border: 1px solid #e6e6e6;
   transition: all 0.3s cubic-bezier(.25,.8,.25,1);
   padding: 8px;
 }
 
 .project_box:hover {
-  box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22);
+  border: 1px solid #bdbdbd;
 }
 
 
 /* COMMON */
 
+.uk-switcher>* {
+  width: 98%;
+}
+
 .uk-link, a {
   display:block;
   text-decoration: none !important;
@@ -168,4 +189,18 @@ input[type=number]:focus {
     border-color: #453d3f;
 }
 
-  /* SWITCHER */
+.fade-enter-active, .fade-leave-active {
+  transition: opacity .5s;
+}
+.fade-enter, .fade-leave-to {
+  opacity: 0;
+}
+
+.uk-label {
+  background: #546475;
+  border-radius: 4px;
+}
+
+.uk-input, .uk-button-default, .uk-textarea {
+  border-radius: 4px;
+}

frontsherlock/src/assets/img/flag_france.png

@@ -63,22 +63,14 @@
 </transition>
     <div v-if="showGreetings">
       <hr>
-      <center><h2 style="margin-left:20px"><span class="uk-margin-small-right" uk-icon="icon: heart"></span> Hey, this seems like a brand new installation!  Thanks for giving sherlock a try! <span class="uk-margin-small-right" uk-icon="icon: heart"></span></h2>
+      <center>
         <h3> Hmm seems like you don't have any project yet... </h3>
         <img src='../assets/img/sherlock_raposa_bored.png'>
         <h3>
-            You can start creating your first one here: <router-link :to="{ name: 'new_project' }" title="New Project" uk-tooltip="delay: 300" > <i class="material-icons" style="color: rgb(117, 117, 117);">note_add</i> </router-link>
+            You can start creating your first one here: <router-link :to="{ name: 'new_project' }" title="New Project">Add new Project <i class="material-icons" style="color: rgb(117, 117, 117);">note_add</i> </router-link>
         </h3>
-
-        <h3> Also checkout a demo on how to use Sherlock </h3>
-        <iframe width="560" height="315" src="https://www.youtube.com/embed/bAMoUoXXLUU" frameborder="0" allowfullscreen></iframe>
-
-
       </center>
-
-
     </div>
-
   </div>
 </template>
 
@@ -152,7 +144,7 @@ export default {
 
 .filter_state {
   border: solid 1px #333;
-  border-radius: 7px;
+  border-radius: 2px;
   padding: 0px 20px;
   line-height: 28px;
   text-transform: none;
@@ -161,14 +153,14 @@ export default {
     font-weight: 500;
     z-index: -1;
     transform: scale(1);
-    box-shadow: 3px 4px 7px -4px #000000;
-    -webkit-box-shadow: 3px 4px 7px -4px #000000;
-    -moz-box-shadow: 3px 4px 7px -4px #000000;
-    box-shadow: 3px 4px 7px -4px #444444;
+    box-shadow: 0px 4px 9px -3px #3333;
+    -webkit-box-shadow: 0px 4px 9px -3px #3333;
+    -moz-box-shadow: 0px 4px 9px -3px #3333;
+    box-shadow: 0px 4px 9px -3px #3333;
 }
 .filter_state_active{
     color: #fff !important;
-    background-color: #2f5c86;
+    background-color: #2578bf;
     font-weight: 500;
     z-index: -1;
     transform: scale(.9);
@@ -178,11 +170,4 @@ export default {
     box-shadow: 3px 4px 7px -4px #444444;
 }
 
-.fade-enter-active, .fade-leave-active {
-  transition: opacity .5s
-}
-.fade-enter, .fade-leave-to {
-  opacity: 0
-}
-
 </style>

frontsherlock/src/assets/img/sherlock_butterfly.png

@@ -91,6 +91,8 @@ export default {
     }
   },
   created: function () {
+    window.localStorage.removeItem('user')
+    window.localStorage.removeItem('auth')
     this.interval = setInterval(function () {
       this.checkOpenRegister()
     }.bind(this), 7000)