mirror of
https://gitlab.com/TheGamecraft/c-cms.git
synced 2026-04-21 02:39:10 -04:00
Edit Material Design Dashboard
This commit is contained in:
@@ -52,3 +52,19 @@ deploy_736:
|
||||
url: http://736.exvps.ca
|
||||
only:
|
||||
- master
|
||||
|
||||
deploy_dev:
|
||||
stage: deploy
|
||||
script:
|
||||
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
|
||||
- eval $(ssh-agent -s)
|
||||
- ssh-add <(echo "$SSH_PRIVATE_KEY")
|
||||
- mkdir -p ~/.ssh
|
||||
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
|
||||
|
||||
- ~/.composer/vendor/bin/envoy run deploy_736 --commit="$CI_COMMIT_SHA"
|
||||
environment:
|
||||
name: dev
|
||||
url: http://dev.exvps.ca
|
||||
only:
|
||||
- dev
|
||||
@@ -11,6 +11,10 @@
|
||||
$releases_dir_736 = '/var/www/c-cms/escadron736/releases';
|
||||
$app_dir_736 = '/var/www/c-cms/escadron736';
|
||||
$new_release_dir_736 = $releases_dir_736 .'/'. $release;
|
||||
|
||||
$releases_dir_dev = '/var/www/c-cms/dev/releases';
|
||||
$app_dir_dev = '/var/www/c-cms/dev';
|
||||
$new_release_dir_dev = $releases_dir_dev .'/'. $release;
|
||||
@endsetup
|
||||
|
||||
@story('deploy_697')
|
||||
@@ -25,6 +29,12 @@
|
||||
update_symlinks_736
|
||||
@endstory
|
||||
|
||||
@story('deploy_dev')
|
||||
clone_repository_dev
|
||||
run_composer_dev
|
||||
update_symlinks_dev
|
||||
@endstory
|
||||
|
||||
@task('clone_repository_697')
|
||||
echo 'Cloning repository'
|
||||
[ -d {{ $releases_dir_697 }} ] || mkdir {{ $releases_dir_697 }}
|
||||
@@ -90,3 +100,36 @@
|
||||
cd {{ $app_dir_736 }}/current/
|
||||
php artisan migrate
|
||||
@endtask
|
||||
|
||||
@task('clone_repository_dev')
|
||||
echo 'Cloning repository'
|
||||
[ -d {{ $releases_dir_dev }} ] || mkdir {{ $releases_dir_dev }}
|
||||
git clone --depth 1 --branch dev {{ $repository }} {{ $new_release_dir_dev }}
|
||||
cd {{ $new_release_dir_dev }}
|
||||
git reset --hard {{ $commit }}
|
||||
@endtask
|
||||
|
||||
@task('run_composer_dev')
|
||||
echo "Starting deployment ({{ $release }})"
|
||||
cd {{ $new_release_dir_dev }}
|
||||
composer install --prefer-dist --no-scripts -q -o
|
||||
@endtask
|
||||
|
||||
@task('update_symlinks_dev')
|
||||
echo "Linking storage directory"
|
||||
rm -rf {{ $new_release_dir_dev }}/storage
|
||||
ln -nfs {{ $app_dir_dev }}/storage {{ $new_release_dir_dev }}/storage
|
||||
|
||||
echo 'Linking .env file'
|
||||
ln -nfs {{ $app_dir_dev }}/.env {{ $new_release_dir_dev }}/.env
|
||||
|
||||
echo 'Linking current release'
|
||||
ln -nfs {{ $new_release_dir_dev }} {{ $app_dir_dev }}/current
|
||||
|
||||
echo 'Setting permission'
|
||||
chmod -R 777 {{ $app_dir_dev }}/current/bootstrap/
|
||||
|
||||
echo 'Migrate DB'
|
||||
cd {{ $app_dir_dev }}/current/
|
||||
php artisan migrate
|
||||
@endtask
|
||||
2
LICENSE
2
LICENSE
@@ -1,6 +1,6 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2018 Mathieu Lagace
|
||||
Copyright (c) 2019 Mathieu Lagace
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
@@ -112,11 +112,17 @@ class ScheduleController extends Controller
|
||||
'title' => $schedule->data['event_name'],
|
||||
'start' => $schedule->date.'T'.$schedule->data['event_begin_time'],
|
||||
'end' => $schedule->date.'T'.$schedule->data['event_end_time'],
|
||||
'color' => $color
|
||||
'color' => $color,
|
||||
'id' => $schedule->id
|
||||
];
|
||||
array_push($events,$event);
|
||||
}
|
||||
|
||||
return json_encode($events);
|
||||
}
|
||||
|
||||
public function loadModal($id)
|
||||
{
|
||||
return view('public.modal.schedule',['event' => \App\Schedule::find($id)]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -208,7 +208,7 @@ class UserController extends Controller
|
||||
|
||||
$user->save();
|
||||
|
||||
return back()->with('status', 'Votre avatar a été mis à jour !');
|
||||
return back()->with('success', 'Votre avatar a été mis à jour !');
|
||||
}
|
||||
|
||||
public function UserAvatar()
|
||||
@@ -229,7 +229,7 @@ class UserController extends Controller
|
||||
|
||||
$user->save();
|
||||
|
||||
return back()->with('status', 'Modification enregistré');
|
||||
return back()->with('success', 'Modification enregistré');
|
||||
}
|
||||
|
||||
public function UserAdress()
|
||||
@@ -245,6 +245,6 @@ class UserController extends Controller
|
||||
|
||||
$user->save();
|
||||
|
||||
return back()->with('status', 'Modification enregistré');
|
||||
return back()->with('success', 'Modification enregistré');
|
||||
}
|
||||
}
|
||||
|
||||
2240
public/css/custom.css
vendored
2240
public/css/custom.css
vendored
File diff suppressed because it is too large
Load Diff
2240
resources/custom.css
vendored
2240
resources/custom.css
vendored
File diff suppressed because it is too large
Load Diff
@@ -24,9 +24,11 @@
|
||||
<title>
|
||||
Material Dashboard PRO by Creative Tim
|
||||
</title>
|
||||
<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no' name='viewport' />
|
||||
<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
|
||||
name='viewport' />
|
||||
<!-- Fonts and icons -->
|
||||
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Slab:400,700|Material+Icons" />
|
||||
<link rel="stylesheet" type="text/css"
|
||||
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Slab:400,700|Material+Icons" />
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css">
|
||||
<!-- CSS Files -->
|
||||
<link href="../assets/css/material-dashboard.css?v=2.1.0" rel="stylesheet" />
|
||||
@@ -355,7 +357,8 @@
|
||||
</div>
|
||||
<a class="navbar-brand" href="#pablo">Dashboard</a>
|
||||
</div>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" aria-controls="navigation-index" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" aria-controls="navigation-index"
|
||||
aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="navbar-toggler-icon icon-bar"></span>
|
||||
<span class="navbar-toggler-icon icon-bar"></span>
|
||||
@@ -381,7 +384,8 @@
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link" href="http://example.com" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<a class="nav-link" href="http://example.com" id="navbarDropdownMenuLink" data-toggle="dropdown"
|
||||
aria-haspopup="true" aria-expanded="false">
|
||||
<i class="material-icons">notifications</i>
|
||||
<span class="notification">5</span>
|
||||
<p class="d-lg-none d-md-block">
|
||||
@@ -397,7 +401,8 @@
|
||||
</div>
|
||||
</li>
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link" href="#pablo" id="navbarDropdownProfile" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<a class="nav-link" href="#pablo" id="navbarDropdownProfile" data-toggle="dropdown" aria-haspopup="true"
|
||||
aria-expanded="false">
|
||||
<i class="material-icons">person</i>
|
||||
<p class="d-lg-none d-md-block">
|
||||
Account
|
||||
@@ -436,9 +441,8 @@
|
||||
<tr>
|
||||
<td>
|
||||
<div class="flag">
|
||||
<img src="../assets/img/flags/US.png" </div>
|
||||
<img src="../assets/img/flags/US.png" </div> </td> <td>USA
|
||||
</td>
|
||||
<td>USA</td>
|
||||
<td class="text-right">
|
||||
2.920
|
||||
</td>
|
||||
@@ -449,9 +453,8 @@
|
||||
<tr>
|
||||
<td>
|
||||
<div class="flag">
|
||||
<img src="../assets/img/flags/DE.png" </div>
|
||||
<img src="../assets/img/flags/DE.png" </div> </td> <td>Germany
|
||||
</td>
|
||||
<td>Germany</td>
|
||||
<td class="text-right">
|
||||
1.300
|
||||
</td>
|
||||
@@ -462,9 +465,8 @@
|
||||
<tr>
|
||||
<td>
|
||||
<div class="flag">
|
||||
<img src="../assets/img/flags/AU.png" </div>
|
||||
<img src="../assets/img/flags/AU.png" </div> </td> <td>Australia
|
||||
</td>
|
||||
<td>Australia</td>
|
||||
<td class="text-right">
|
||||
760
|
||||
</td>
|
||||
@@ -475,9 +477,8 @@
|
||||
<tr>
|
||||
<td>
|
||||
<div class="flag">
|
||||
<img src="../assets/img/flags/GB.png" </div>
|
||||
<img src="../assets/img/flags/GB.png" </div> </td> <td>United Kingdom
|
||||
</td>
|
||||
<td>United Kingdom</td>
|
||||
<td class="text-right">
|
||||
690
|
||||
</td>
|
||||
@@ -488,9 +489,8 @@
|
||||
<tr>
|
||||
<td>
|
||||
<div class="flag">
|
||||
<img src="../assets/img/flags/RO.png" </div>
|
||||
<img src="../assets/img/flags/RO.png" </div> </td> <td>Romania
|
||||
</td>
|
||||
<td>Romania</td>
|
||||
<td class="text-right">
|
||||
600
|
||||
</td>
|
||||
@@ -501,9 +501,8 @@
|
||||
<tr>
|
||||
<td>
|
||||
<div class="flag">
|
||||
<img src="../assets/img/flags/BR.png" </div>
|
||||
<img src="../assets/img/flags/BR.png" </div> </td> <td>Brasil
|
||||
</td>
|
||||
<td>Brasil</td>
|
||||
<td class="text-right">
|
||||
550
|
||||
</td>
|
||||
@@ -523,9 +522,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <button type="button" class="btn btn-round btn-default dropdown-toggle btn-link" data-toggle="dropdown">
|
||||
7 days
|
||||
</button> -->
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<div class="card card-chart">
|
||||
@@ -537,10 +533,12 @@
|
||||
<button type="button" class="btn btn-danger btn-link fix-broken-card">
|
||||
<i class="material-icons">build</i> Fix Header!
|
||||
</button>
|
||||
<button type="button" class="btn btn-info btn-link" rel="tooltip" data-placement="bottom" title="Refresh">
|
||||
<button type="button" class="btn btn-info btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="Refresh">
|
||||
<i class="material-icons">refresh</i>
|
||||
</button>
|
||||
<button type="button" class="btn btn-default btn-link" rel="tooltip" data-placement="bottom" title="Change Date">
|
||||
<button type="button" class="btn btn-default btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="Change Date">
|
||||
<i class="material-icons">edit</i>
|
||||
</button>
|
||||
</div>
|
||||
@@ -564,16 +562,19 @@
|
||||
<button type="button" class="btn btn-danger btn-link fix-broken-card">
|
||||
<i class="material-icons">build</i> Fix Header!
|
||||
</button>
|
||||
<button type="button" class="btn btn-info btn-link" rel="tooltip" data-placement="bottom" title="Refresh">
|
||||
<button type="button" class="btn btn-info btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="Refresh">
|
||||
<i class="material-icons">refresh</i>
|
||||
</button>
|
||||
<button type="button" class="btn btn-default btn-link" rel="tooltip" data-placement="bottom" title="Change Date">
|
||||
<button type="button" class="btn btn-default btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="Change Date">
|
||||
<i class="material-icons">edit</i>
|
||||
</button>
|
||||
</div>
|
||||
<h4 class="card-title">Daily Sales</h4>
|
||||
<p class="card-category">
|
||||
<span class="text-success"><i class="fa fa-long-arrow-up"></i> 55% </span> increase in today sales.</p>
|
||||
<span class="text-success"><i class="fa fa-long-arrow-up"></i> 55% </span> increase in today
|
||||
sales.</p>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<div class="stats">
|
||||
@@ -592,10 +593,12 @@
|
||||
<button type="button" class="btn btn-danger btn-link fix-broken-card">
|
||||
<i class="material-icons">build</i> Fix Header!
|
||||
</button>
|
||||
<button type="button" class="btn btn-info btn-link" rel="tooltip" data-placement="bottom" title="Refresh">
|
||||
<button type="button" class="btn btn-info btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="Refresh">
|
||||
<i class="material-icons">refresh</i>
|
||||
</button>
|
||||
<button type="button" class="btn btn-default btn-link" rel="tooltip" data-placement="bottom" title="Change Date">
|
||||
<button type="button" class="btn btn-default btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="Change Date">
|
||||
<i class="material-icons">edit</i>
|
||||
</button>
|
||||
</div>
|
||||
@@ -692,13 +695,16 @@
|
||||
<button type="button" class="btn btn-danger btn-link fix-broken-card">
|
||||
<i class="material-icons">build</i> Fix Header!
|
||||
</button>
|
||||
<button type="button" class="btn btn-default btn-link" rel="tooltip" data-placement="bottom" title="View">
|
||||
<button type="button" class="btn btn-default btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="View">
|
||||
<i class="material-icons">art_track</i>
|
||||
</button>
|
||||
<button type="button" class="btn btn-success btn-link" rel="tooltip" data-placement="bottom" title="Edit">
|
||||
<button type="button" class="btn btn-success btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="Edit">
|
||||
<i class="material-icons">edit</i>
|
||||
</button>
|
||||
<button type="button" class="btn btn-danger btn-link" rel="tooltip" data-placement="bottom" title="Remove">
|
||||
<button type="button" class="btn btn-danger btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="Remove">
|
||||
<i class="material-icons">close</i>
|
||||
</button>
|
||||
</div>
|
||||
@@ -706,7 +712,8 @@
|
||||
<a href="#pablo">Cozy 5 Stars Apartment</a>
|
||||
</h4>
|
||||
<div class="card-description">
|
||||
The place is close to Barceloneta Beach and bus stop just 2 min by walk and near to "Naviglio" where you can enjoy the main night life in Barcelona.
|
||||
The place is close to Barceloneta Beach and bus stop just 2 min by walk and near to "Naviglio"
|
||||
where you can enjoy the main night life in Barcelona.
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
@@ -731,13 +738,16 @@
|
||||
<button type="button" class="btn btn-danger btn-link fix-broken-card">
|
||||
<i class="material-icons">build</i> Fix Header!
|
||||
</button>
|
||||
<button type="button" class="btn btn-default btn-link" rel="tooltip" data-placement="bottom" title="View">
|
||||
<button type="button" class="btn btn-default btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="View">
|
||||
<i class="material-icons">art_track</i>
|
||||
</button>
|
||||
<button type="button" class="btn btn-success btn-link" rel="tooltip" data-placement="bottom" title="Edit">
|
||||
<button type="button" class="btn btn-success btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="Edit">
|
||||
<i class="material-icons">edit</i>
|
||||
</button>
|
||||
<button type="button" class="btn btn-danger btn-link" rel="tooltip" data-placement="bottom" title="Remove">
|
||||
<button type="button" class="btn btn-danger btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="Remove">
|
||||
<i class="material-icons">close</i>
|
||||
</button>
|
||||
</div>
|
||||
@@ -745,7 +755,8 @@
|
||||
<a href="#pablo">Office Studio</a>
|
||||
</h4>
|
||||
<div class="card-description">
|
||||
The place is close to Metro Station and bus stop just 2 min by walk and near to "Naviglio" where you can enjoy the night life in London, UK.
|
||||
The place is close to Metro Station and bus stop just 2 min by walk and near to "Naviglio" where
|
||||
you can enjoy the night life in London, UK.
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
@@ -770,13 +781,16 @@
|
||||
<button type="button" class="btn btn-danger btn-link fix-broken-card">
|
||||
<i class="material-icons">build</i> Fix Header!
|
||||
</button>
|
||||
<button type="button" class="btn btn-default btn-link" rel="tooltip" data-placement="bottom" title="View">
|
||||
<button type="button" class="btn btn-default btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="View">
|
||||
<i class="material-icons">art_track</i>
|
||||
</button>
|
||||
<button type="button" class="btn btn-success btn-link" rel="tooltip" data-placement="bottom" title="Edit">
|
||||
<button type="button" class="btn btn-success btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="Edit">
|
||||
<i class="material-icons">edit</i>
|
||||
</button>
|
||||
<button type="button" class="btn btn-danger btn-link" rel="tooltip" data-placement="bottom" title="Remove">
|
||||
<button type="button" class="btn btn-danger btn-link" rel="tooltip" data-placement="bottom"
|
||||
title="Remove">
|
||||
<i class="material-icons">close</i>
|
||||
</button>
|
||||
</div>
|
||||
@@ -784,7 +798,8 @@
|
||||
<a href="#pablo">Beautiful Castle</a>
|
||||
</h4>
|
||||
<div class="card-description">
|
||||
The place is close to Metro Station and bus stop just 2 min by walk and near to "Naviglio" where you can enjoy the main night life in Milan.
|
||||
The place is close to Metro Station and bus stop just 2 min by walk and near to "Naviglio" where
|
||||
you can enjoy the main night life in Milan.
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
@@ -919,16 +934,21 @@
|
||||
</a>
|
||||
</li>
|
||||
<li class="button-container">
|
||||
<a href="https://www.creative-tim.com/product/material-dashboard-pro" target="_blank" class="btn btn-rose btn-block btn-fill">Buy Now</a>
|
||||
<a href="https://demos.creative-tim.com/material-dashboard-pro/docs/2.1/getting-started/introduction.html" target="_blank" class="btn btn-default btn-block">
|
||||
<a href="https://www.creative-tim.com/product/material-dashboard-pro" target="_blank"
|
||||
class="btn btn-rose btn-block btn-fill">Buy Now</a>
|
||||
<a href="https://demos.creative-tim.com/material-dashboard-pro/docs/2.1/getting-started/introduction.html"
|
||||
target="_blank" class="btn btn-default btn-block">
|
||||
Documentation
|
||||
</a>
|
||||
<a href="https://www.creative-tim.com/product/material-dashboard" target="_blank" class="btn btn-info btn-block">
|
||||
<a href="https://www.creative-tim.com/product/material-dashboard" target="_blank"
|
||||
class="btn btn-info btn-block">
|
||||
Get Free Demo!
|
||||
</a>
|
||||
</li>
|
||||
<li class="button-container github-star">
|
||||
<a class="github-button" href="https://github.com/creativetimofficial/ct-material-dashboard-pro" data-icon="octicon-star" data-size="large" data-show-count="true" aria-label="Star ntkme/github-buttons on GitHub">Star</a>
|
||||
<a class="github-button" href="https://github.com/creativetimofficial/ct-material-dashboard-pro"
|
||||
data-icon="octicon-star" data-size="large" data-show-count="true"
|
||||
aria-label="Star ntkme/github-buttons on GitHub">Star</a>
|
||||
</li>
|
||||
<li class="header-title">Thank you for 95 shares!</li>
|
||||
<li class="button-container text-center">
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
@extends('layouts.admin.main')
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header card-header-primary">
|
||||
@@ -57,6 +58,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-6 col-lg-6">
|
||||
<div class="card">
|
||||
<div class="card-header card-header-primary">
|
||||
@@ -95,6 +98,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-lg-8 col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header card-header-primary">
|
||||
@@ -139,6 +144,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@section('breadcrumb')
|
||||
|
||||
@@ -3,12 +3,11 @@
|
||||
@section('content')
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<strong class="card-title">Liste des utilisateurs <a href="#"><i class="fa fa-question-circle" aria-hidden="true"></i>
|
||||
</a></strong>
|
||||
<div class="card-header card-header-primary">
|
||||
<h4 class="card-title">Liste des utilisateurs </h4>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<table id="log-data" class="table table-striped table-bordered">
|
||||
<table id="log-data" class="table table-striped table-no-bordered table-hover dataTable dtr-inline">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
@@ -25,7 +24,10 @@
|
||||
<td>{{$item->fullname()}}</td>
|
||||
<td>{{\App\Rank::find($item->rank)->name}}</td>
|
||||
<td>{{\App\Job::find($item->job)->name}}</td>
|
||||
<td style="width: 12%;"><a href="/admin/user/edit/{{$item->id}}" type="button" class="btn btn-secondary"><i class="fa fa-cog"></i> Modifier</a><a type="button" class="btn btn-danger" onclick="deleteEvent({{$item->id}});"><i class="fa fa-times-circle" style="color:white;"></i></a></td>
|
||||
<td class="td-actions text-right" style="width: 12%;">
|
||||
<a class="btn btn-info p-2 text-white" href="/admin/user/edit/{{$item->id}}"><i class="material-icons">edit</i></a>
|
||||
<a class="btn btn-danger p-2 text-white" onclick="deleteEvent({{$item->id}});"><i class="material-icons">close</i></a>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
|
||||
@@ -1,18 +1,11 @@
|
||||
@extends('layouts.admin.main')
|
||||
|
||||
@section('content')
|
||||
<div @if ($user->id == \Auth::User()->id) class="col-md-12 col-lg-9" @else class="col-sm-12" @endif>
|
||||
<div class="row">
|
||||
<div @if ($user->id == \Auth::User()->id) class="col-md-12 col-lg-7 col-xl-8" @else class="col-sm-12" @endif>
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
@if (session('status'))
|
||||
<div class="sufee-alert alert with-close alert-success alert-dismissible fade show">
|
||||
<span class="badge badge-pill badge-success">Félicitation</span>
|
||||
{{session('status')}}
|
||||
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
@endif
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<div class="mx-auto d-block">
|
||||
<img class="rounded-circle mx-auto d-block" src="/assets/admin/images/avatar/user-{{\Auth::User()->avatar}}.jpg" alt="Card image cap" style="height:12rem">
|
||||
@@ -21,7 +14,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-6 text-center">
|
||||
<br>
|
||||
<div class="row mt-3">
|
||||
<div class="col-md-12">
|
||||
<p>{{\App\Rank::find($user->job)->name}}</p>
|
||||
<hr>
|
||||
@@ -70,8 +63,9 @@
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="col-md-10 offset-md-1">
|
||||
<div class="col-md-10 offset-md-1 mt-3">
|
||||
<p class="text-center">Dernières activitées de l'utilisateur</p>
|
||||
<table class="table table-striped">
|
||||
<thead class="thead-default">
|
||||
@@ -93,8 +87,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@if ($user->id == \Auth::User()->id)
|
||||
<div class="col-md-12 col-lg-3">
|
||||
<div class="col-md-12 col-lg-5 col-xl-4">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<a name="changepsw" id="changepsw" class="btn btn-warning btn-block" href="/admin/profil/password" role="button">Modifier mon mot de passe</a>
|
||||
@@ -107,6 +102,7 @@
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@section('breadcrumb')
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
@if ($configs->where('name','is_schedule_build')->first()->state == 0)
|
||||
@if (\Auth::User()->getPerm('schedule_edit'))
|
||||
<div class="alert alert-primary" role="alert">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
Attention ! L'horaire n'est pas marqué comme complet, les utilisateurs ne receverons pas de notification concernant l'horaire <a href="/admin/config#schedule_build">Cliquer ici pour accéder aux options</a>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
25
resources/views/layouts/admin/footer.blade.php
Normal file
25
resources/views/layouts/admin/footer.blade.php
Normal file
@@ -0,0 +1,25 @@
|
||||
<footer class="footer">
|
||||
<div class="container-fluid">
|
||||
<nav class="float-left">
|
||||
<ul>
|
||||
<li>
|
||||
<a href="https://gitlab.com/TheGamecraft/c-cms/wikis/home">
|
||||
Documentation
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://gitlab.com/TheGamecraft/c-cms/blob/master/LICENSE">
|
||||
Licenses
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
<div class="copyright float-right">
|
||||
©
|
||||
<script>
|
||||
document.write(new Date().getFullYear())
|
||||
</script>, fait avec <i class="material-icons">favorite</i> par
|
||||
<a href="https://gitlab.com/c-cms" target="_blank">L'équipe de C-CMS</a>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
@@ -1,15 +1,14 @@
|
||||
<!-- Meta Tag -->
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
||||
<?php
|
||||
$lang = str_replace('_', '-', app()->getLocale());
|
||||
setlocale( LC_ALL, $lang.'_'.strtoupper($lang).'.utf8','fra');
|
||||
?>
|
||||
<title>C-CMS - Espace Administration</title>
|
||||
<meta name="description" content="Sufee Admin - HTML5 Admin Template">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
||||
|
||||
<title>C-CMS - Espace Administration</title>
|
||||
<meta charset="utf-8">
|
||||
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
|
||||
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<!-- CSRF Token -->
|
||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||
|
||||
|
||||
@@ -32,10 +32,10 @@ foreach (Auth::user()->unreadNotifications as $notification) {
|
||||
</form>
|
||||
<ul class="navbar-nav">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="#pablo">
|
||||
<i class="material-icons">dashboard</i>
|
||||
<a class="nav-link" href="https://gitlab.com/TheGamecraft/c-cms/wikis/home" data-toggle="tooltip" data-placement="bottom" title="Aide">
|
||||
<i class="material-icons">help</i>
|
||||
<p class="d-lg-none d-md-block">
|
||||
Stats
|
||||
Aide
|
||||
</p>
|
||||
</a>
|
||||
</li>
|
||||
@@ -46,7 +46,7 @@ foreach (Auth::user()->unreadNotifications as $notification) {
|
||||
<span class="notification">{{ $nbOfNotification }}</span>
|
||||
@endif
|
||||
<p class="d-lg-none d-md-block">
|
||||
Some Actions
|
||||
Notifications
|
||||
</p>
|
||||
</a>
|
||||
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
|
||||
@@ -62,7 +62,7 @@ foreach (Auth::user()->unreadNotifications as $notification) {
|
||||
<a class="nav-link" href="#pablo" id="navbarDropdownProfile" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<i class="material-icons">person</i>
|
||||
<p class="d-lg-none d-md-block">
|
||||
Account
|
||||
Profil
|
||||
</p>
|
||||
</a>
|
||||
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownProfile">
|
||||
|
||||
@@ -35,6 +35,10 @@ use App\Notifications\Alert;
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Including Footer -->
|
||||
@include('layouts.admin.footer')
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- Including Javascripts -->
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<div class="sidebar" data-color="white" data-background-color="black">
|
||||
<div class="sidebar" data-background-color="black">
|
||||
<div class="logo">
|
||||
<a href="http://www.creative-tim.com" class="simple-text logo-mini">
|
||||
<img src="/assets/admin/images/favicon.png" alt="Logo">
|
||||
<a href="http://www.creative-tim.com" class="logo-mini">
|
||||
<img class="img-fluid" src="/assets/admin/images/favicon.png" alt="Logo">
|
||||
</a>
|
||||
<a href="http://www.creative-tim.com" class="ml-4 simple-text logo-normal">
|
||||
<img src="/assets/admin/images/C-CMS_s.png" alt="Logo">
|
||||
<a href="http://www.creative-tim.com" class="simple-text logo-normal">
|
||||
C-CMS
|
||||
</a>
|
||||
</div>
|
||||
<div class="sidebar-wrapper">
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<div id="header" class="page-header pricing-page header-filter" style="background-image: url('/assets/public/images/banner.jpg')">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="container mt-lg-5 pt-md-5">
|
||||
<div class="row mt-sm-5 pt-md-5">
|
||||
<div class="col-md-6 ml-auto mr-auto text-center">
|
||||
<h1>
|
||||
{{App\Config::getData('escadron_name_full')}}
|
||||
@@ -17,16 +17,10 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="m-5">
|
||||
<h4 class="m-5">
|
||||
<h4 class="m-md-5">
|
||||
{{ App\Config::getData('text_public_banner_cadet_desc') }}
|
||||
<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_banner_cadet_desc" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a>
|
||||
</h4>
|
||||
</div>
|
||||
<div class="text-center">
|
||||
<a href="#one" class="btn btn-primary">{{ App\Config::getData('text_public_banner_apprendre_plus') }}</a>
|
||||
<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_banner_apprendre_plus" style="top: 30vh;left: 8vw;display:none">
|
||||
<i class="fa fa-pencil" aria-hidden="true"></i>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -64,7 +64,11 @@
|
||||
},
|
||||
events: '/api/schedule/events',
|
||||
eventClick: function(info) {
|
||||
alert('Event: ' + info.event.title);
|
||||
console.log(info.event.id)
|
||||
$.get( "/api/schedule/events/"+info.event.id+"/modal", function( data ) {
|
||||
$( "#schedulemodal" ).html( data );
|
||||
});
|
||||
$('#schedulemodal').modal('toggle')
|
||||
}
|
||||
});
|
||||
|
||||
@@ -72,6 +76,25 @@
|
||||
});
|
||||
|
||||
</script>
|
||||
<div class="modal fade" id="schedulemodal" tabindex="-1" role="dialog" aria-labelledby="schedulemodal" aria-hidden="true">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="exampleModalLabel">Modal title</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
...
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
|
||||
<button type="button" class="btn btn-primary">Save changes</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@@ -4,14 +4,20 @@
|
||||
<!-- Header -->
|
||||
|
||||
<!-- Banner -->
|
||||
<section id="banner">
|
||||
<div id="banner">
|
||||
|
||||
<!-- Include Banner -->
|
||||
@include('layouts.public.banner')
|
||||
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<div class="main main-raised">
|
||||
<div class="w-100 text-center">
|
||||
<a href="#one" class="btn btn-primary btn-lg" style="margin-top:-10rem;">{{ App\Config::getData('text_public_banner_apprendre_plus') }}</a>
|
||||
<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_banner_apprendre_plus" style="top: 30vh;left: 8vw;display:none">
|
||||
<i class="fa fa-pencil" aria-hidden="true"></i>
|
||||
</a>
|
||||
</div>
|
||||
<div class="container">
|
||||
<!-- Introduction -->
|
||||
<div class="section text-center" id="activity">
|
||||
|
||||
17
resources/views/public/modal/schedule.blade.php
Normal file
17
resources/views/public/modal/schedule.blade.php
Normal file
@@ -0,0 +1,17 @@
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="exampleModalLabel">{{$event->data['event_name']}}</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
{{$event->type}}
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
|
||||
<button type="button" class="btn btn-primary">Save changes</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -13,6 +13,7 @@ use Illuminate\Http\Request;
|
||||
|
|
||||
*/
|
||||
Route::get('/schedule/events','ScheduleController@apiIndex');
|
||||
Route::get('/schedule/events/{id}/modal','ScheduleController@loadModal');
|
||||
|
||||
Route::middleware('auth:api')->group(function () {
|
||||
Route::get('/user', function (Request $request) {
|
||||
|
||||
Reference in New Issue
Block a user