Skip to content
Snippets Groups Projects
Commit 76545508 authored by btalhaoui's avatar btalhaoui
Browse files

changing pages style

parent 967ddad3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 54474 additions and 153 deletions
Web/package.json
+ 7
− 1
View file @ 76545508
......@@ -7,15 +7,21 @@
"watch-poll": "npm run watch -- --watch-poll",
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"prod": "npm run production",
"gulp": "gulp",
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"devDependencies": {
"axios": "^0.17",
"bootstrap-sass": "^3.3.7",
"bootstrap": "^4.0.0-beta",
"cross-env": "^5.1",
"jquery": "^3.2",
"laravel-mix": "^1.0",
"lodash": "^4.17.4",
"popper.js": "^1.14.3",
"vue": "^2.5.7"
},
"dependencies": {
"gulp": "^3.9.1",
"gulp-util": "^3.0.8"
}
}
Web/public/css/app.css
+ 9316
− 5
View file @ 76545508
Source diff could not be displayed: it is too large. Options to address this: view the blob.
Web/public/js/app.js
+ 44745
− 1
View file @ 76545508
Source diff could not be displayed: it is too large. Options to address this: view the blob.
Web/public/mix-manifest.json 0 → 100644
+ 4
− 0
View file @ 76545508
{
"/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css"
}
\ No newline at end of file
Web/resources/assets/js/bootstrap.js
+ 1
− 1
View file @ 76545508
......@@ -10,7 +10,7 @@ window._ = require('lodash');
try {
window.$ = window.jQuery = require('jquery');
require('bootstrap-sass');
require('bootstrap');
} catch (e) {}
/**
......
Web/resources/assets/sass/_variables.scss
+ 2
− 2
View file @ 76545508
......@@ -17,9 +17,9 @@ $brand-warning: #cbb956;
$brand-danger: #bf5329;
// Typography
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
$icon-font-path: "~bootstrap/assets/fonts/bootstrap/";
$font-family-sans-serif: "Raleway", sans-serif;
$font-size-base: 14px;
$font-size-base: 1rem;
$line-height-base: 1.6;
$text-color: #636b6f;
......
Web/resources/assets/sass/app.scss
+ 162
− 5
View file @ 76545508
// Fonts
@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
// Bootstrap
@import "~bootstrap/scss/bootstrap";
/*!
* Based on Bootstrap v4.0.0 (https://getbootstrap.com)
*/
// Options
//
// Quickly modify global styling by enabling or disabling optional features.
$enable-rounded: true !default;
$enable-shadows: true;
$enable-transitions: true;
$enable-hover-media-query: false;
$enable-grid-classes: true;
$enable-print-styles: true;
// Variables
@import "variables";
//
// Colors
// Bootstrap
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
$theme-colors: (
primary: #333333,
secondary: #4f70ce,
light: #f3f3f3,
dark: #151515,
info: #ccc,
success: #28a745,
warning: #ffc107,
danger: #dc3545
);
$body-bg: white;
$body-color: #333;
$body-color-inverse: invert($body-color) !default;
$link-color: #FFF;
// Fonts
$font-family-base: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
$headings-font-family: $font-family-base;
$display-font-family: $font-family-base;
$font-weight-normal: 200;
$headings-font-weight: 200;
$lead-font-size: 1.30rem;
$spacer: 1.5rem;
html,body {
height:100%;
}
.cover {
min-height:100%;
display:flex;
align-items:center
}
.bg-gradient {
overflow: hidden;
color: color-yiq(map-get($theme-colors, 'primary'));
background: linear-gradient(-30deg, theme-color("secondary") 0%, theme-color("primary") 50%, theme-color("primary") 100%);
}
.filter-dark {
overflow: hidden;
position: relative;
color: color-yiq(map-get($theme-colors, 'dark'));
&:before {
position: absolute;
top:0px;
left:0px;
width:100%;
height: 100%;
content: ' ';
background: rgba(map-get($theme-colors, 'dark'), 0.75);
}
}
.filter-light {
overflow: hidden;
position: relative;
color: color-yiq(map-get($theme-colors, 'light'));
&:before {
position: absolute;
top:0px;
left:0px;
width:100%;
height: 100%;
content: ' ';
background: rgba(map-get($theme-colors, 'light'),0.75);
}
}
.filter-color {
overflow: hidden;
position: relative;
color: color-yiq(map-get($theme-colors, 'primary'));
&:before {
position: absolute;
top:0px;
left:0px;
width:100%;
height: 100%;
content: ' ';
background: rgba($body-color, 0.75);
}
}
.filter-gradient {
overflow: hidden;
position: relative;
color: color-yiq(map-get($theme-colors, 'primary'));
&:before {
position: absolute;
top:0px;
left:0px;
width:100%;
height: 100%;
content: ' ';
background: linear-gradient(-30deg, transparentize($body-color, 0.1) 0%, transparentize($body-color, 0.1) 50%, transparentize($body-color, 0.05) 100%);
}
}
.filter-fade-in {
overflow: hidden;
position: relative;
&:before {
position: absolute;
top:0px;
left:0px;
width:100%;
height: 100%;
content: ' ';
background: linear-gradient($body-bg, transparentize($body-bg, 0.2),transparentize($body-bg, 0.9),transparentize($body-bg, 1));
}
}
.card {
margin-top:2px;
}
@media (min-width: 1200px) {
.container{
max-width: 970px;
}
}
.collapse.show {
background-color:white;
}
.container{
padding-bottom:5px;
}
.bg-primary {
background-color: #333 !important;
}
Web/resources/views/home.blade.php
+ 54
− 33
View file @ 76545508
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">Dashboard</div>
<div class="panel-body">
@if (session('status'))
<div class="alert alert-success">
{{ session('status') }}
</div>
@endif
Look at your organizations : <a href="org">
Organizations
</a>
@foreach($organization as $org)
<p> Organization : {{ $org->name }}</p>
@foreach ($org->servers as $server)
<p> Server : {{ $server->name }}</p>
@if ($server->lastState["content"] != null)
<p> Last updated state:</p>
@if($server->lastState["content"]->{"Reboot"})
<p> ok</p>
@else
<p>not ok</p>
@endif
@endif
@endforeach
@endforeach
<div class="py-5">
<div class="container bg-light">
<div class="row bg-primary">
<div class="col-md-12">
<h3 class="display-5 text-light">Dashboard</h3>
</div>
</div>
<div class="row my-1">
<div class="col-md-12"><a class="text-muted text-xs-center" href="org">
Look at your organizations
</a>
</div>
@foreach($organization as $org)
<div class="col-md-12">
<div class="card border">
<div class="card-header"> {{ $org->name }}<a class="text-dark"
href="OrganizationManagement.html"><i
class="pull-right fa fa-lg fa-cog"></i></a></div>
<div class="card-body">
<table class="table">
<thead>
<tr>
<th scope="col">Server</th>
<th scope="col">Disk</th>
<th scope="col">Reboot</th>
<th scope="col">Updates</th>
<th scope="col"></th>
</tr>
</thead>
<tbody>
@foreach ($org->servers as $server)
<tr>
<th scope="row">{{ $server->name }}</th>
@if ($server->lastState["content"] != null)
<td>OK</td>
<td>@if($server->lastState["content"]->{"Reboot"})
<p>ok</p>
@else
<p>not ok</p>
@endif</td>
<td>OK</td>
@else
<td></td>
<td></td>
<td></td>
@endif
<td><a class="btn btn-secondary" href="server.html">Go to details</a></td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
@endforeach
</div>
</div>
</div>
</div>
@endsection
Web/resources/views/layouts/app.blade.php
+ 100
− 59
View file @ 76545508
......@@ -9,78 +9,119 @@
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>Monitoring</title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"
type="text/css">
<!-- Styles -->
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
</head>
<body>
<div id="app">
<nav class="navbar navbar-default navbar-static-top">
<div class="container">
<div class="navbar-header">
<div id="app">
<nav class="navbar navbar-expand-md bg-primary navbar-dark">
<div class="container">
<a class="navbar-brand" href="{{ url('/') }}"><i
class="fa d-inline fa-lg fa-line-chart"></i><b>Monitoring</b></a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
data-target="#navbar2SupportedContent" aria-controls="navbar2SupportedContent" aria-expanded="false"
aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
<div class="collapse navbar-collapse text-center justify-content-end" id="navbar2SupportedContent">
<ul class="navbar-nav">
@guest
<li><a href="{{ route('login') }}">Login</a></li>
<li><a href="{{ route('register') }}">Register</a></li>
@else
<!-- Collapsed Hamburger -->
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#app-navbar-collapse" aria-expanded="false">
<span class="sr-only">Toggle Navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<li class="nav-item">
<a class="nav-link" href="org"><i
class="fa d-inline fa-lg fa-bookmark-o"></i>&nbsp;My organizations</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#"><i class="fa d-inline fa-lg fa-envelope-o"></i>&nbsp;Notifications</a>
</li>
<li>
<a class="nav-link" href="{{ route('logout') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
Logout
</a>
<!-- Branding Image -->
<a class="navbar-brand" href="{{ url('/') }}">
Monitoring
</a>
</div>
<form id="logout-form" action="{{ route('logout') }}" method="POST"
style="display: none;">
{{ csrf_field() }}
</form>
</li>
<div class="collapse navbar-collapse" id="app-navbar-collapse">
<!-- Left Side Of Navbar -->
<ul class="nav navbar-nav">
&nbsp;
</ul>
<!-- Right Side Of Navbar -->
<ul class="nav navbar-nav navbar-right">
<!-- Authentication Links -->
@guest
<li><a href="{{ route('login') }}">Login</a></li>
<li><a href="{{ route('register') }}">Register</a></li>
@else
<li class="dropdown">
@endguest
</ul>
</div>
</div>
</nav>
{{--<nav class="navbar navbar-default navbar-static-top">
<div class="container">
<div class="navbar-header">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true">
{{ Auth::user()->name }} <span class="caret"></span>
</a>
<!-- Collapsed Hamburger -->
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#app-navbar-collapse" aria-expanded="false">
<span class="sr-only">Toggle Navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<!-- Branding Image -->
<a class="navbar-brand" href="{{ url('/') }}">
Monitoring
</a>
</div>
<ul class="dropdown-menu">
<li>
<a href="org">
Organizations
</a>
</li>
<li>
<a href="{{ route('logout') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
Logout
</a>
<div class="collapse navbar-collapse" id="app-navbar-collapse">
<!-- Left Side Of Navbar -->
<ul class="nav navbar-nav">
&nbsp;
</ul>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
{{ csrf_field() }}
</form>
</li>
</ul>
</li>
@endguest
</ul>
</div>
<!-- Right Side Of Navbar -->
<ul class="nav navbar-nav navbar-right">
<!-- Authentication Links -->
@guest
<li><a href="{{ route('login') }}">Login</a></li>
<li><a href="{{ route('register') }}">Register</a></li>
@else
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true">
{{ Auth::user()->name }} <span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li>
<a href="org">
Organizations
</a>
</li>
<li>
<a href="{{ route('logout') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
Logout
</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
{{ csrf_field() }}
</form>
</li>
</ul>
</li>
@endguest
</ul>
</div>
</nav>
</div>
</nav>--}}
@yield('content')
</div>
@yield('content')
</div>
<!-- Scripts -->
<script src="{{ asset('js/app.js') }}"></script>
<!-- Scripts -->
<script src="{{ asset('js/app.js') }}"></script>
</body>
</html>
Web/resources/views/org/detail.blade.php
+ 32
− 22
View file @ 76545508
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">Organization : {{ $organization->name }}</div>
<div class="py-5">
<div class="container bg-light">
<div class="row bg-primary">
<div class="col-md-12">
<h3 class="display-5 text-light">{{ $organization->name }}</h3>
</div>
</div>
{{ Form::open(array('url' => 'org/'.$organization->name )) }}
Add a server : {{Form::text('token','Token')}}
{{ Form::submit('Add a server')}}
{{ Form::hidden('organization', $organization->name) }}
{{ Form::close() }}
<div class="row">
@foreach ($servers as $server)
<p> Server : {{ $server->name }}</p>
@if ($server->sensors !=null)
<p> Sensors :}</p>
@foreach($server->sensors as $sensor){
<p> {{$sensor["content"]->{"TCP"} }}</p>
<p> {{$sensor["content"]->{"UDP"} }}</p>
<p> {{$sensor["content"]->{"Network"} }}</p>
<p> {{$sensor["content"]->{"Inodes"} }}</p>
@if($sensor["content"]->{"Reboot"})
<p> ok</p>
@else
<p>not ok</p>
@endif
@endforeach
@endif
<div class="col-md-3">
<div class="card border">
<div class="card-header">{{ $server->name }} <a class="text-dark" href="#"><i class="pull-right fa fa-lg fa-cog"></i></a></div>
<div class="card-body">
<h6 class="text-muted"><i class="fa d-inline fa-lg fa-exclamation-circle text-danger"></i>&nbsp;Reboot needed</h6>
<p><i class="fa d-inline fa-lg fa-circle text-success"></i>&nbsp;Free space ok</p>
@if ($server->sensors !=null)
@foreach($server->sensors as $sensor){
<p> {{$sensor["content"]->{"TCP"} }}</p>
<p> {{$sensor["content"]->{"UDP"} }}</p>
<p> {{$sensor["content"]->{"Network"} }}</p>
<p> {{$sensor["content"]->{"Inodes"} }}</p>
@if($sensor["content"]->{"Reboot"})
<p> ok</p>
@else
<p>not ok</p>
@endif
@endforeach
@endif
</div>
</div>
</div>
@endforeach
</div>
</div>
</div>
</div>
</div>
@endsection
web/resources/views/org/manage.blade.php
+ 51
− 24
View file @ 76545508
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">Your organizations</div>
<div class="panel-body">
@if (session('status'))
<div class="alert alert-success">
{{ session('status') }}
</div>
@endif
@foreach ($organizations as $org)
<p><a href="\org\{{ $org->name }}">{{ $org->name }}</a></p>
@endforeach
<div class="py-5">
<div class="container bg-light">
<div class="row bg-primary">
<div class="col-md-12">
<h3 class="display-5 text-light">Your organizations</h3>
</div>
<div class="panel-heading">Join an organization</div>
<div class="panel-body">
<form class="form-horizontal" method="POST" action="{{ action('OrganizationController@addOrg') }}">
{{ csrf_field() }}
</div>
<div class="row bg-light">
<div class="col-md-12">
<p class="lead">Join a new organization
<br>
</p>
</div>
</div>
<div class="row">
<div class="col-md-12">
<form class="form-horizontal" method="POST"
action="{{ action('OrganizationController@addOrg') }}">
{{ csrf_field() }}
<div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
<label for="name" class="col-md-4 control-label">Name</label>
<label for="name" class="col-md-4 control-label">Organization name</label>
<div class="col-md-6">
<input id="name" type="text" class="form-control" name="name" value="{{ old('name') }}" required autofocus>
<input id="name" type="text" class="form-control" name="name"
value="{{ old('name') }}" required autofocus>
@if ($errors->has('name'))
<span class="help-block">
......@@ -47,7 +45,36 @@
</form>
</div>
</div>
<div class="row bg-light">
<div class="col-md-12">
<p class="lead">You're a part of :&nbsp;</p>
</div>
</div>
<div class="row bg-light">
<div class="col-md-12">
<table class="table">
<thead>
<tr>
<th>Organization</th>
<th>Since</th>
<th></th>
</tr>
</thead>
<tbody>
@foreach ($organizations as $org)
<tr>
<td>{{ $org->name }}</td>
<td>22-02-17</td>
<td><a class="text-dark" href="\org\{{ $org->name }}"><i
class="pull-right fa fa-lg fa-cog"></i></a></td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
@endsection
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment