Skip to content

Commit 25f2e77

Browse files
anindya-dhrubaanindya-dhruba
committed
upgraded to bootstrap4 beta3
1 parent 350057e commit 25f2e77

File tree

20 files changed

+118
-163
lines changed

20 files changed

+118
-163
lines changed

‎package-lock.json

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

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
"devDependencies": {
1313
"axios": "^0.17",
1414
"babel-plugin-transform-object-rest-spread": "^6.26.0",
15-
"bootstrap-sass": "^3.3.7",
15+
"bootstrap": "^4.0.0-beta.3",
1616
"cross-env": "^5.1",
1717
"jquery": "^3.2",
1818
"laravel-mix": "^1.0",
19+
"popper.js": "^1.12.9",
1920
"vue": "^2.5.7",
2021
"vue-router": "^3.0.1",
2122
"vuejs-noty": "^0.1.2",

‎public/css/app.css

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

‎public/js/app.js

Lines changed: 1 addition & 1 deletion
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import axios from 'axios';
55

66
window.$ = window.jQuery = $;
77
window.axios = axios;
8-
require('bootstrap-sass');
8+
require('bootstrap');
99

1010
Vue.use(VueNoty, {
1111
progressBar: false,
1212
layout: 'bottomRight',
13-
theme: 'bootstrap-v3',
13+
theme: 'bootstrap-v4',
1414
timeout: 3000
1515
});
1616

‎resources/assets/js/components/home/Home.vue

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
<template>
22
<div class="container">
33
<div class="jumbotron">
4-
<h1 v-once>{{siteName}}</h1>
5-
<p>Starter Boilerplate SPA made with Laravel 5.5, JWT Auth, Vue 2, Vue-router 3, Vuex 3, Axios and love</p>
4+
<h1 class="display-4" v-once>{{siteName}}</h1>
5+
<p class="lead">Starter Boilerplate SPA made with Laravel 5.5, JWT Auth, Vue 2, Vue-router 3, Vuex 3, Axios and love</p>
6+
<div class="pt-3">
7+
<iframe src="https://ghbtns.com/github-btn.html?user=anindya-dhruba&repo=laravel-vue-spa&type=star&count=true&size=large" frameborder="0" scrolling="0" width="130px" height="30px"></iframe>
8+
<iframe src="https://ghbtns.com/github-btn.html?user=anindya-dhruba&repo=laravel-vue-spa&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="130px" height="30px"></iframe>
9+
<iframe src="https://ghbtns.com/github-btn.html?user=anindya-dhruba&repo=laravel-vue-spa&type=watch&count=true&size=large&v=2" frameborder="0" scrolling="0" width="130px" height="30px"></iframe>
10+
</div>
611
</div>
712
</div>
813
</template>

‎resources/assets/js/components/login/Login.vue

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<template>
22
<div class="container">
33
<div class="row">
4-
<div class="col-md-8">
4+
<div class="col-12 col-md-6 col-lg-8">
55
<div class="page-header">
6-
<h1>Login</h1>
6+
<h1 class="display-4">Login</h1>
7+
</div>
8+
<div class="py-4">
9+
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aspernatur corporis deserunt, dolorem eligendi esse eum illo illum inventore libero minus nam numquam officiis praesentium quas quasi repudiandae sed tempore voluptatibus?</p>
710
</div>
8-
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aspernatur corporis deserunt, dolorem eligendi esse eum illo illum inventore libero minus nam numquam officiis praesentium quas quasi repudiandae sed tempore voluptatibus?</p>
911
</div>
10-
<div class="col-md-4">
11-
<div class="panel panel-default">
12-
<div class="panel-heading">Login</div>
13-
<div class="panel-body">
12+
<div class="col-12 col-md-6 col-lg-4">
13+
<div class="card">
14+
<div class="card-body">
1415
<login-form @loginSuccess="loginSuccess"></login-form>
1516
</div>
1617
</div>

‎resources/assets/js/components/login/LoginForm.vue

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
<template>
22
<div>
33
<form @submit.prevent="login">
4-
<div class="form-group" :class="{'has-error' : error.email}">
5-
<label class="control-label" for="email">Email</label>
4+
<div class="form-group">
5+
<label for="email">Email</label>
66
<input
77
type="email"
88
class="form-control"
9+
:class="{'is-invalid' : error.email}"
910
id="email"
1011
v-model="form.email"
12+
autocomplete="off"
1113
:disabled="loading"
1214
/>
13-
<span class="help-block" v-show="error.email">{{ error.email }}</span>
15+
<div class="invalid-feedback" v-show="error.email">{{ error.email }}</div>
1416
</div>
15-
<div class="form-group" :class="{'has-error' : error.password}">
16-
<label class="control-label" for="password">Password</label>
17+
<div class="form-group">
18+
<label for="password">Password</label>
1719
<input
1820
type="password"
1921
class="form-control"
22+
:class="{'is-invalid' : error.password}"
2023
id="password"
2124
v-model="form.password"
2225
:disabled="loading"
2326
/>
24-
<span class="help-block" v-show="error.password">{{ error.password }}</span>
27+
<div class="invalid-feedback" v-show="error.password">{{ error.password }}</div>
2528
</div>
2629
<div class="form-group">
2730
<button type="submit" class="btn btn-primary btn-block" :disabled="loading">

‎resources/assets/js/components/profile/Profile.vue

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<template>
22
<div>
3-
<h1 class="page-header">{{user.name}}'s Profile</h1>
4-
<div class="panel panel-default">
5-
<ul class="list-group">
3+
<h3 class="mb-4">{{user.name}}'s Profile</h3>
4+
<div class="card">
5+
<ul class="list-group list-group-flush">
66
<li class="list-group-item">
77
Name
8-
<br>
9-
<h4>{{ user.name }}</h4>
8+
<p class="lead">{{ user.name }}</p>
109
</li>
1110
<li class="list-group-item">
1211
Email
13-
<br>
14-
<h4>{{ user.email }}</h4>
12+
<p class="lead">{{ user.email }}</p>
1513
</li>
1614
</ul>
1715
</div>

‎resources/assets/js/components/profile/ProfileWrapper.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<template>
22
<div class="container">
33
<div class="row">
4-
<div class="col-md-3">
5-
<div class="list-group">
6-
<router-link :to="{name: 'profile'}" class="list-group-item" activeClass="active" exact>
4+
<div class="col-12 col-md-3">
5+
<nav class="nav flex-column nav-pills mb-4">
6+
<router-link :to="{name: 'profile'}" class="nav-link" activeClass="active" exact>
77
View Profile
88
</router-link>
9-
<router-link :to="{name: 'profile.editProfile'}" class="list-group-item" activeClass="active" exact>
9+
<router-link :to="{name: 'profile.editProfile'}" class="nav-link" activeClass="active" exact>
1010
Edit Profile
1111
</router-link>
12-
<router-link :to="{name: 'profile.editPassword'}" class="list-group-item" activeClass="active" exact>
12+
<router-link :to="{name: 'profile.editPassword'}" class="nav-link" activeClass="active" exact>
1313
Edit Password
1414
</router-link>
15-
</div>
15+
</nav>
1616
</div>
17-
<div class="col-md-9">
17+
<div class="col-12 col-md-9">
1818
<transition name="fade" mode="out-in">
1919
<router-view></router-view>
2020
</transition>

0 commit comments

Comments
 (0)