Skip to content

Commit c290eeb

Browse files
vs0uz4vs0uz4
committed
Install other dependencies and rebuilt assets
- install browserify and font-awesome dependencies; - update jquery dependency; - changed app.js; - changed gulpfile; - changed welcome view.
1 parent b646f2e commit c290eeb

File tree

7 files changed

+1134
-1297
lines changed

7 files changed

+1134
-1297
lines changed

‎gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ elixir((mix) => {
1111
/**
1212
* Building Javascript files
1313
*/
14-
// mix.webpack('app.js');
14+
mix.webpack('app.js');
1515
});

‎package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@
77
"devDependencies": {
88
"bootstrap-sass": "^3.3.7",
99
"gulp": "^3.9.1",
10-
"jquery": "^3.1.0",
10+
"jquery": "^3.2.1",
1111
"laravel-elixir": "^6.0.0-14",
12+
"laravel-elixir-browserify-official": "^0.1.3",
1213
"laravel-elixir-vue-2": "^0.2.0",
1314
"laravel-elixir-webpack-official": "^1.0.2",
1415
"lodash": "^4.16.2",
1516
"vue": "^2.0.1",
1617
"vue-resource": "^1.0.3"
18+
},
19+
"dependencies": {
20+
"font-awesome": "^4.7.0"
1721
}
1822
}

‎public/js/app.js

Lines changed: 80 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/js/app.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/assets/js/app.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
window.jQuery = window.$ = require('jquery')
3+

‎resources/views/welcome.blade.php

Lines changed: 17 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,18 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
8-
<title>Laravel</title>
9-
10-
<!-- Fonts -->
11-
<link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
12-
13-
<!-- Styles -->
14-
<style>
15-
html, body {
16-
background-color: #fff;
17-
color: #636b6f;
18-
font-family: 'Raleway', sans-serif;
19-
font-weight: 100;
20-
height: 100vh;
21-
margin: 0;
22-
}
23-
24-
.full-height {
25-
height: 100vh;
26-
}
27-
28-
.flex-center {
29-
align-items: center;
30-
display: flex;
31-
justify-content: center;
32-
}
33-
34-
.position-ref {
35-
position: relative;
36-
}
37-
38-
.top-right {
39-
position: absolute;
40-
right: 10px;
41-
top: 18px;
42-
}
43-
44-
.content {
45-
text-align: center;
46-
}
47-
48-
.title {
49-
font-size: 84px;
50-
}
51-
52-
.links > a {
53-
color: #636b6f;
54-
padding: 0 25px;
55-
font-size: 12px;
56-
font-weight: 600;
57-
letter-spacing: .1rem;
58-
text-decoration: none;
59-
text-transform: uppercase;
60-
}
61-
62-
.m-b-md {
63-
margin-bottom: 30px;
64-
}
65-
</style>
66-
</head>
67-
<body>
68-
<div class="flex-center position-ref full-height">
69-
@if (Route::has('login'))
70-
<div class="top-right links">
71-
@if (Auth::check())
72-
<a href="{{ url('/home') }}">Home</a>
73-
@else
74-
<a href="{{ url('/login') }}">Login</a>
75-
<a href="{{ url('/register') }}">Register</a>
76-
@endif
77-
</div>
78-
@endif
79-
80-
<div class="content">
81-
<div class="title m-b-md">
82-
Laravel
83-
</div>
84-
85-
<div class="links">
86-
<a href="https://laravel.com/docs">Documentation</a>
87-
<a href="https://laracasts.com">Laracasts</a>
88-
<a href="https://laravel-news.com">News</a>
89-
<a href="https://forge.laravel.com">Forge</a>
90-
<a href="https://github.com/laravel/laravel">GitHub</a>
91-
</div>
92-
</div>
93-
</div>
94-
</body>
95-
</html>
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta name="viewport"
6+
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
7+
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8+
<title>Bem Vindos so Curso!</title>
9+
<link rel="stylesheet" href="{{ asset('css/app.css') }}">
10+
</head>
11+
<body>
12+
<div class="container">
13+
<h1>Curso Laravel e Vue.Js</h1>
14+
</div>
15+
16+
<script src="{{ asset('js/app.js') }}"></script>
17+
</body>
18+
</html>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy