Skip to content

Commit 674b6da

Browse files
teamupdivisionteamupdivision
authored
Merge pull request #22 from creativetimofficial/master
Update readme
2 parents 7174439 + 4822ba4 commit 674b6da

File tree

208 files changed

+14748
-342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+14748
-342
lines changed

‎.vscode/settings.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"workbench.colorCustomizations": {
3+
"activityBar.background": "#490D65",
4+
"titleBar.activeBackground": "#67128E",
5+
"titleBar.activeForeground": "#FCF8FE"
6+
}
7+
}

‎docs/documentation.html‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
<!DOCTYPE html>
2+
<html>
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
7+
<meta name="description" content="Start your development with a Dashboard for Bootstrap 4.">
8+
<meta name="author" content="Creative Tim">
9+
<title>Argon Dashboard Laravel - Free Dashboard for Bootstrap 4</title>
10+
<!-- Favicon -->
11+
<link href="../assets/img/brand/favicon.png" rel="icon" type="image/png">
12+
<!-- Fonts -->
13+
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet">
14+
<!-- Icons -->
15+
<link href="../assets/vendor/nucleo/css/nucleo.css" rel="stylesheet">
16+
<link href="../assets/vendor/@fortawesome/fontawesome-free/css/all.min.css" rel="stylesheet">
17+
<!-- Argon CSS -->
18+
<link type="text/css" href="../assets/css/argon.css?v=1.0.0" rel="stylesheet">
19+
</head>
20+
21+
<body>
22+
23+
<!-- Main content -->
24+
<div class="main-content">
25+
<!-- Top navbar -->
26+
<nav class="navbar navbar-top navbar-expand-md navbar-dark" id="navbar-main">
27+
<div class="container-fluid">
28+
<!-- Brand -->
29+
<a class="h4 mb-0 text-white text-uppercase d-none d-lg-inline-block" href="https://argon-dashboard-laravel.creative-tim.com/docs/getting-started/overview.html?ref=argon-dashboard-laravel-local">Argon Dashboard Laravel Documentation</a>
30+
<!-- Form -->
31+
<form class="navbar-search navbar-search-dark form-inline mr-3 d-none d-md-flex ml-lg-auto">
32+
<div class="form-group mb-0">
33+
<div class="input-group input-group-alternative">
34+
<div class="input-group-prepend">
35+
<span class="input-group-text"><i class="fas fa-search"></i></span>
36+
</div>
37+
<input class="form-control" placeholder="Search" type="text">
38+
</div>
39+
</div>
40+
</form>
41+
<!-- User -->
42+
<ul class="navbar-nav align-items-center d-none d-md-flex">
43+
<li class="nav-item dropdown">
44+
<a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
45+
<div class="media align-items-center">
46+
<span class="avatar avatar-sm rounded-circle">
47+
<img alt="Image placeholder" src="../assets/img/theme/team-4-800x800.jpg">
48+
</span>
49+
<div class="media-body ml-2 d-none d-lg-block">
50+
<span class="mb-0 text-sm font-weight-bold">Jessica Jones</span>
51+
</div>
52+
</div>
53+
</a>
54+
<div class="dropdown-menu dropdown-menu-arrow dropdown-menu-right">
55+
<div class=" dropdown-header noti-title">
56+
<h6 class="text-overflow m-0">Welcome!</h6>
57+
</div>
58+
<a href="../examples/profile.html" class="dropdown-item">
59+
<i class="ni ni-single-02"></i>
60+
<span>My profile</span>
61+
</a>
62+
<a href="../examples/profile.html" class="dropdown-item">
63+
<i class="ni ni-settings-gear-65"></i>
64+
<span>Settings</span>
65+
</a>
66+
<a href="../examples/profile.html" class="dropdown-item">
67+
<i class="ni ni-calendar-grid-58"></i>
68+
<span>Activity</span>
69+
</a>
70+
<a href="../examples/profile.html" class="dropdown-item">
71+
<i class="ni ni-support-16"></i>
72+
<span>Support</span>
73+
</a>
74+
<div class="dropdown-divider"></div>
75+
<a href="#!" class="dropdown-item">
76+
<i class="ni ni-user-run"></i>
77+
<span>Logout</span>
78+
</a>
79+
</div>
80+
</li>
81+
</ul>
82+
</div>
83+
</nav>
84+
<!-- Header -->
85+
<div class="header bg-gradient-primary pb-8 pt-5 pt-lg-8 d-flex align-items-center">
86+
<!-- Header container -->
87+
<div class="container-fluid">
88+
<div class="row justify-content-center">
89+
<div class="col-lg-6 col-md-10 text-center">
90+
<h1 class="display-2 text-white">Argon Dashboard Laravel <small>Documentation - v1.0.0</small></h1>
91+
<p class="text-white mt-0 mb-5">We are constatly doing updates on the product and documentation, so please check the online version.</p>
92+
</div>
93+
</div>
94+
</div>
95+
</div>
96+
<!-- Page content -->
97+
<div class="container-fluid mt--7">
98+
<div class="row justify-content-center">
99+
<div class="col-lg-4">
100+
<div class="card bg-gradient-default text-center p-5">
101+
<a href="https://argon-dashboard-laravel.creative-tim.com/docs/getting-started/overview.html?ref=argon-dashboard-laravel-local" class="btn btn-white btn-icon mb-3 mb-sm-0">
102+
<span class="btn-inner--icon"><i class="ni ni-collection"></i></span>
103+
<span class="btn-inner--text">View Docs Online</span>
104+
</a>
105+
</div>
106+
</div>
107+
</div>
108+
<!-- Footer -->
109+
</div>
110+
</div>
111+
<!-- Argon Scripts -->
112+
<!-- Core -->
113+
<script src="../assets/vendor/jquery/dist/jquery.min.js"></script>
114+
<script src="../assets/vendor/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
115+
<!-- Argon JS -->
116+
<script src="../assets/js/argon.js?v=1.0.0"></script>
117+
</body>
118+
119+
</html>

‎readme.md‎

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ After initializing a fresh instance of Laravel (and making all the necessary con
5252

5353
Register a user or login using **admin@argon.com** and **secret** and start testing the preset (make sure to run the migrations and seeders for these credentials to be available).
5454

55-
Besides the dashboard and the auth pages this preset also has a user management example and an edit profile page. All the necessary files (controllers, requests, views) are installed out of the box and all the needed routes are added to `routes/web.php`. Keep in mind that all of the features can be viewed once you login using the credentials provided above or by registering your own user.
55+
Besides the dashboard and the auth pages this preset also has an edit profile page. All the necessary files (controllers, requests, views) are installed out of the box and all the needed routes are added to `routes/web.php`. Keep in mind that all of the features can be viewed once you login using the credentials provided above or by registering your own user.
5656

5757
### Dashboard
5858

@@ -86,56 +86,6 @@ public function rules()
8686
}
8787
```
8888

89-
### User management
90-
91-
The preset comes with a user management option out of the box. To access this click the "**User Management**" link in the left sidebar or add **/user** to the url.
92-
The first thing you will see is the listing of the existing users. You can add new ones by clicking the "**Add user**" button (above the table on the right). On the Add user page you will see the form that allows you to do this. All pages are generate using blade templates:
93-
94-
```
95-
<div class="form-group{{ $errors->has('name') ? ' has-danger' : '' }}">
96-
<label class="form-control-label" for="input-name">{{ __('Name') }}</label>
97-
<input type="text" name="name" id="input-name" class="form-control form-control-alternative{{ $errors->has('name') ? ' is-invalid' : '' }}" placeholder="{{ __('Name') }}" value="{{ old('name') }}" required autofocus>
98-
99-
@if ($errors->has('name'))
100-
<span class="invalid-feedback" role="alert">
101-
<strong>{{ $errors->first('name') }}</strong>
102-
</span>
103-
@endif
104-
</div>
105-
```
106-
107-
Also validation rules were added so you will know exactely what to enter in the form fields (see `App\Http\Requests\UserRequest`). Note that these validation rules also apply for the user edit option.
108-
109-
```
110-
public function rules()
111-
{
112-
return [
113-
'name' => [
114-
'required', 'min:3'
115-
],
116-
'email' => [
117-
'required', 'email', Rule::unique((new User)->getTable())->ignore($this->route()->user->id ?? null)
118-
],
119-
'password' => [
120-
$this->route()->user ? 'nullable' : 'required', 'confirmed', 'min:6'
121-
]
122-
];
123-
}
124-
```
125-
126-
Once you add more users, the list will get bigger and for every user you will have edit and delete options (access these options by clicking the three dotted menu that appears at the end of every line).
127-
128-
All the sample code for the user management can be found in `App\Http\Controllers\UserController`. See store method example bellow:
129-
130-
```
131-
public function store(UserRequest $request, User $model)
132-
{
133-
$model->create($request->merge(['password' => Hash::make($request->get('password'))])->all());
134-
135-
return redirect()->route('user.index')->withStatus(__('User successfully created.'));
136-
}
137-
```
138-
13989
## Change log
14090

14191
Please see the [changelog](changelog.md) for more information on what has changed recently.
@@ -149,7 +99,7 @@ Please see the [changelog](changelog.md) for more information on what has change
14999

150100
[MIT License](https://github.com/laravel-frontend-presets/argon/blob/master/license.md).
151101

152-
## Screen shots
102+
## Screen shots
153103

154104
![Argon Login](/screens/Login.png)
155105

‎src/argon-stubs/app/Http/Controllers/UserController.php‎

Lines changed: 1 addition & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -16,71 +16,6 @@ class UserController extends Controller
1616
*/
1717
public function index(User $model)
1818
{
19-
return view('users.index', ['users' => $model->paginate(15)]);
20-
}
21-
22-
/**
23-
* Show the form for creating a new user
24-
*
25-
* @return \Illuminate\View\View
26-
*/
27-
public function create()
28-
{
29-
return view('users.create');
30-
}
31-
32-
/**
33-
* Store a newly created user in storage
34-
*
35-
* @param \App\Http\Requests\UserRequest $request
36-
* @param \App\User $model
37-
* @return \Illuminate\Http\RedirectResponse
38-
*/
39-
public function store(UserRequest $request, User $model)
40-
{
41-
$model->create($request->merge(['password' => Hash::make($request->get('password'))])->all());
42-
43-
return redirect()->route('user.index')->withStatus(__('User successfully created.'));
44-
}
45-
46-
/**
47-
* Show the form for editing the specified user
48-
*
49-
* @param \App\User $user
50-
* @return \Illuminate\View\View
51-
*/
52-
public function edit(User $user)
53-
{
54-
return view('users.edit', compact('user'));
55-
}
56-
57-
/**
58-
* Update the specified user in storage
59-
*
60-
* @param \App\Http\Requests\UserRequest $request
61-
* @param \App\User $user
62-
* @return \Illuminate\Http\RedirectResponse
63-
*/
64-
public function update(UserRequest $request, User $user)
65-
{
66-
$user->update(
67-
$request->merge(['password' => Hash::make($request->get('password'))])
68-
->except([$request->get('password') ? '' : 'password']
69-
));
70-
71-
return redirect()->route('user.index')->withStatus(__('User successfully updated.'));
72-
}
73-
74-
/**
75-
* Remove the specified user from storage
76-
*
77-
* @param \App\User $user
78-
* @return \Illuminate\Http\RedirectResponse
79-
*/
80-
public function destroy(User $user)
81-
{
82-
$user->delete();
83-
84-
return redirect()->route('user.index')->withStatus(__('User successfully deleted.'));
19+
return view('users.index');
8520
}
8621
}

‎src/argon-stubs/resources/assets/css/argon.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard
8-
* Copyright 2018 Creative Tim (https://www.creative-tim.com)
8+
Copyright 2018 Creative Tim (https://www.creative-tim.com) & UPDIVISION (https://www.updivision.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard/blob/master/LICENSE.md)
1010
11-
* Coded by Creative Tim
11+
* Coded by www.creative-tim.com & www.updivision.com
1212
1313
=========================================================
1414

‎src/argon-stubs/resources/assets/js/argon.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard
8-
* Copyright 2018 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2018 Creative Tim (https://www.creative-tim.com) & UPDIVISION (https://www.updivision.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard/blob/master/LICENSE.md)
1010
11-
* Coded by www.creative-tim.com
11+
* Coded by www.creative-tim.com & www.updivision.com
1212
1313
=========================================================
1414

‎src/argon-stubs/resources/assets/scss/argon-dashboard.scss‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
2+
3+
/*!
4+
5+
=========================================================
6+
* Argon Dashboard - v1.1.0
7+
=========================================================
8+
9+
* Product Page: https://www.creative-tim.com/product/argon-dashboard
10+
* Copyright 2018 Creative Tim (https://www.creative-tim.com)
11+
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard/blob/master/LICENSE.md)
12+
13+
* Coded by Creative Tim
14+
15+
=========================================================
16+
17+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
18+
19+
*/
20+
21+
// Core
22+
23+
@import "argon-dashboard/custom/functions";
24+
@import "argon-dashboard/custom/variables";
25+
@import "argon-dashboard/custom/mixins";
26+
27+
// bootstrap (4.3.1) components
28+
29+
@import "argon-dashboard/bootstrap/root";
30+
@import "argon-dashboard/bootstrap/reboot";
31+
@import "argon-dashboard/bootstrap/type";
32+
@import "argon-dashboard/bootstrap/images";
33+
@import "argon-dashboard/bootstrap/code";
34+
@import "argon-dashboard/bootstrap/grid";
35+
@import "argon-dashboard/bootstrap/tables";
36+
@import "argon-dashboard/bootstrap/forms";
37+
@import "argon-dashboard/bootstrap/buttons";
38+
@import "argon-dashboard/bootstrap/transitions";
39+
@import "argon-dashboard/bootstrap/dropdown";
40+
@import "argon-dashboard/bootstrap/button-group";
41+
@import "argon-dashboard/bootstrap/input-group";
42+
@import "argon-dashboard/bootstrap/custom-forms";
43+
@import "argon-dashboard/bootstrap/nav";
44+
@import "argon-dashboard/bootstrap/navbar";
45+
@import "argon-dashboard/bootstrap/card";
46+
@import "argon-dashboard/bootstrap/breadcrumb";
47+
@import "argon-dashboard/bootstrap/pagination";
48+
@import "argon-dashboard/bootstrap/badge";
49+
@import "argon-dashboard/bootstrap/jumbotron";
50+
@import "argon-dashboard/bootstrap/alert";
51+
@import "argon-dashboard/bootstrap/progress";
52+
@import "argon-dashboard/bootstrap/media";
53+
@import "argon-dashboard/bootstrap/list-group";
54+
@import "argon-dashboard/bootstrap/close";
55+
@import "argon-dashboard/bootstrap/modal";
56+
@import "argon-dashboard/bootstrap/tooltip";
57+
@import "argon-dashboard/bootstrap/popover";
58+
@import "argon-dashboard/bootstrap/carousel";
59+
@import "argon-dashboard/bootstrap/utilities";
60+
@import "argon-dashboard/bootstrap/print";
61+
62+
// Argon utilities and components
63+
64+
@import "argon-dashboard/custom/reboot";
65+
@import "argon-dashboard/custom/utilities";
66+
@import "argon-dashboard/custom/components";
67+
68+
// Vendor (Plugins)
69+
70+
@import "argon-dashboard/custom/vendors";
71+
72+
// Docs components
73+
74+
@import "argon-dashboard/docs/variables";
75+
@import "argon-dashboard/docs/nav";
76+
@import "argon-dashboard/docs/clipboard-js";
77+
@import "argon-dashboard/docs/component-examples";
78+
@import "argon-dashboard/docs/prism";
79+
@import "argon-dashboard/docs/content";
80+
@import "argon-dashboard/docs/sidebar";
81+
@import "argon-dashboard/docs/footer";

0 commit comments

Comments
 (0)