Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
chrisl
/
upccrt
1
0
Haarauta 0
Tiedostot Esitykset 0 Vetopyynnöt 0 Wiki
Selaa lähdekoodia

Adds content to NavBar and Asset box.

Christopher Leggett 5 vuotta sitten
vanhempi
b15e25dc9f
sitoutus
fa92d740c1
4 muutettua tiedostoa jossa 34 lisäystä ja 7 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 13 1
      public/js/app.js
  2. 4 0
      resources/js/components/assetinfo.vue
  3. 13 2
      resources/views/layouts/app.blade.php
  4. 4 4
      resources/views/workorders/show.blade.php

+ 13 - 1
public/js/app.js
Näytä tiedosto 

@@ -1946,6 +1946,10 @@ __webpack_require__.r(__webpack_exports__);
 
 //
 
 //
 
 //
 
+//
 
+//
 
+//
 
+//
 
 /* harmony default export */ __webpack_exports__["default"] = ({
 
   props: ['asset'],
 
   data: function data() {
 
@@ -47297,7 +47301,15 @@ var render = function() {
 
       _c("small", { staticClass: "text-muted" }, [
 
         _vm._v(_vm._s(this.data.pcnickname))
 
       ])
 
-    ])
 
+    ]),
 
+    _vm._v(" "),
 
+    _c("p", [_vm._v("S/N: " + _vm._s(this.data.pcserial))]),
 
+    _vm._v(" "),
 
+    _c("p", [_vm._v("CPU: " + _vm._s(this.data.pcproc))]),
 
+    _vm._v(" "),
 
+    _c("p", [_vm._v("RAM: " + _vm._s(this.data.pcram))]),
 
+    _vm._v(" "),
 
+    _c("p", [_vm._v("OS: " + _vm._s(this.data.pcos))])
 
   ])
 
 }
 
 var staticRenderFns = []

+ 4 - 0
resources/js/components/assetinfo.vue
Näytä tiedosto 

@@ -1,6 +1,10 @@
 
 <template>
 
     <div>
 
         <h4 class="text-center">{{ this.data.pcmanu }} {{ this.data.pcmake }} - <small class="text-muted">{{this.data.pcnickname}}</small></h4>
 
+        <p>S/N: {{ this.data.pcserial }}</p>
 
+        <p>CPU: {{ this.data.pcproc}}</p>
 
+        <p>RAM: {{ this.data.pcram }}</p>
 
+        <p>OS: {{this.data.pcos}}</p>
 
     </div>
 
 </template>
 
 <script>

+ 13 - 2
resources/views/layouts/app.blade.php
Näytä tiedosto 

@@ -21,7 +21,7 @@
 
 </head>
 
 <body>
 
     <div id="app">
 
-        <nav class="navbar navbar-expand-md navbar-dark bg-primary text-light shadow-sm">
 
+        <nav class="navbar navbar-expand navbar-dark bg-primary text-light shadow-sm">
 
             <div class="container">
 
                 <a class="navbar-brand" href="{{ url('/') }}">
 
                     {{ config('app.name', 'Laravel') }}
 
@@ -33,7 +33,18 @@
 
                 <div class="collapse navbar-collapse" id="navbarSupportedContent">
 
                     <!-- Left Side Of Navbar -->
 
                     <ul class="navbar-nav mr-auto">
 
-
 
+                        <li class="nav-item">
 
+                            <a href="#" class="nav-link"><i class="fas fa-sign-in-alt"></i> <span class="d-none d-md-inline">Check-In</span></a>
 
+                        </li>
 
+                        <li class="nav-item">
 
+                            <a href="#" class="nav-link"><i class="fas fa-sign-out-alt"></i> <span class="d-none d-md-inline">Check-Out</span></a>
 
+                        </li>
 
+                        <li class="nav-item">
 
+                            <a href="#" class="nav-link"><i class="fas fa-tachometer-alt"></i> <span class="d-none d-md-inline">Dashboard</span></a>
 
+                        </li>
 
+                        <li class="nav-item">
 
+                            <a href="#" class="nav-link"><i class="fas fa-chart-bar"></i> <span class="d-none d-md-inline">Reports</span></a>
 
+                        </li>
 
                     </ul>
 
 
                     <!-- Right Side Of Navbar -->

+ 4 - 4
resources/views/workorders/show.blade.php
Näytä tiedosto 

@@ -5,8 +5,8 @@
 
 <div id="app">
 
     <div class="d-sm-flex flex-wrap">
 
         <div class="card m-3 flex-fill">
 
-            <div class="card-header">
 
-                <button type="button" class="btn btn-default xs-toggle float-right" data-toggle="collapse" data-target="#assetTab">
 
+            <div class="card-header text-right">
 
+                <button type="button" class="btn btn-default xs-toggle" data-toggle="collapse" data-target="#assetTab">
 
                     <span class="sr-only">Toggle Navigation</span>
 
                     <span class="icon-bar"></span>
 
                     <span class="icon-bar"></span>
 
@@ -44,8 +44,8 @@
 
             </div>
 
         </div>
 
         <div class="card m-3 flex-fill">
 
-            <div class="card-header">
 
-                <button type="button" class="btn btn-default xs-toggle float-right" data-toggle="collapse" data-target="#workorderTab">
 
+            <div class="card-header text-right">
 
+                <button type="button" class="btn btn-default xs-toggle" data-toggle="collapse" data-target="#workorderTab">
 
                     <span class="sr-only">Toggle Navigation</span>
 
                     <span class="icon-bar"></span>
 
                     <span class="icon-bar"></span>