Skip to content

Commit 0a193f0

Browse files
committed
feat: use my Vue.js project structure
1 parent ad15a1d commit 0a193f0

File tree

21 files changed

+44
-45
lines changed

21 files changed

+44
-45
lines changed

app/GraphQL/Mutation/AddUserMutation.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public function args() : array
4242
public function resolve($root, $args)
4343
{
4444
$input = $args['input'];
45+
$input['password'] = bcrypt($input['password']);
4546

4647
$user = User::create($input);
4748

app/GraphQL/Mutation/EditUserMutation.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ public function resolve($root, $args)
4343
{
4444
$input = $args['input'];
4545

46+
if (!empty($input['password'])) {
47+
$input['password'] = bcrypt($input['password']);
48+
}
49+
4650
$user = User::find($input['id']);
4751
$user->update($input);
4852

app/Http/Controllers/Resources/UserController.php

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,12 @@ public function store(Request $request)
3131
{
3232
$this->validator($request);
3333

34-
return response()->json(tap(new User($request->all()), function ($user) {
35-
$user->save();
36-
}), 201);
34+
$input = $request->all();
35+
$input['password'] = bcrypt($input['password']);
36+
37+
$user = User::create($input);
38+
39+
return response()->json($user, 201);
3740
}
3841

3942
/**
@@ -45,13 +48,17 @@ public function store(Request $request)
4548
*/
4649
public function update(Request $request, User $user)
4750
{
48-
if (empty($request['password'])) {
49-
unset($request['password']);
50-
}
51+
$input = $request->all();
5152

5253
$this->validator($request, $user->id);
5354

54-
return tap($user)->update($request->all());
55+
if (!empty($input['password'])) {
56+
$input['password'] = bcrypt($input['password']);
57+
}
58+
59+
$user->update($input);
60+
61+
return $user;
5562
}
5663

5764
/**

resources/assets/vue/App.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<script lang="ts">
2-
import axios from 'axios';
32
import { Component, Vue, Watch } from 'vue-property-decorator';
43
import { Action, State, namespace } from 'vuex-class';
54
6-
import BaseAuth from './components/BaseAuth.vue';
5+
import BaseAuth from './views/auth/components/BaseAuth.vue';
76
import TheHeader from './components/TheHeader.vue';
87
98
import dialog from '@/utils/dialog';
10-
import userTypes from '@/utils/userTypes';
119
1210
const aStore = namespace('auth');
1311

resources/assets/vue/components/TheHeader.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Component, Vue } from 'vue-property-decorator';
33
import { State, namespace } from 'vuex-class';
44
import { BIconArrowLeftShort, BIconGithub } from 'bootstrap-vue';
55
6-
import TheMessageBadge from './TheMessageBadge.vue';
6+
import TheMessageBadge from '../views/messages/components/TheMessageBadge.vue';
77
import TheSettings from './TheSettings.vue';
88
99
const aStore = namespace('auth');

resources/assets/vue/router/index.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ import Router from 'vue-router';
33

44
import NProgress from 'nprogress';
55

6-
const BaseAuth = () => import('@/components/BaseAuth.vue');
7-
const AuthLogin = () => import('../views/AuthLogin.vue');
8-
const AuthRegister = () => import('../views/AuthRegister.vue');
9-
const AuthResetLink = () => import('../views/AuthResetLink.vue');
10-
const AuthResetForm = () => import('../views/AuthResetForm.vue');
11-
12-
const Example = () => import('../views/Example.vue');
13-
const Home = () => import('../views/Home.vue');
14-
const Messages = () => import('../views/Messages.vue');
15-
const Users = () => import('../views/Users.vue');
16-
const UsersGraphQL = () => import('../views/UsersGraphQL.vue');
6+
const BaseAuth = () => import('@/views/auth/components/BaseAuth.vue');
7+
const AuthLogin = () => import('../views/auth/AuthLogin.vue');
8+
const AuthRegister = () => import('../views/auth/AuthRegister.vue');
9+
const AuthResetLink = () => import('../views/auth/AuthResetLink.vue');
10+
const AuthResetForm = () => import('../views/auth/AuthResetForm.vue');
11+
12+
const Example = () => import('../views/example/Example.vue');
13+
const Home = () => import('../views/home/Home.vue');
14+
const Messages = () => import('../views/messages/Messages.vue');
15+
const Users = () => import('../views/users/Users.vue');
16+
const UsersGraphQL = () => import('../views/users/UsersGraphQL.vue');
1717

1818
import userTypes from '@/utils/userTypes';
1919

resources/assets/vue/views/Example.vue renamed to resources/assets/vue/views/example/Example.vue

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,8 @@
22
import { Component, Vue } from 'vue-property-decorator';
33
import { Action } from 'vuex-class';
44
5-
import dialog from '@/utils/dialog';
6-
7-
import HomeCard from '@/components/HomeCard.vue';
8-
95
// TODO change
10-
@Component({
11-
components: {
12-
HomeCard,
13-
},
14-
})
6+
@Component
157
export default class Home extends Vue {
168
@Action setBackUrl;
179
@Action setMenu;

resources/assets/vue/views/Home.vue renamed to resources/assets/vue/views/home/Home.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { Component, Vue } from 'vue-property-decorator';
33
import { Action, State, namespace } from 'vuex-class';
44
5-
import HomeCard from '@/components/HomeCard.vue';
5+
import HomeCard from './components/HomeCard.vue';
66
77
const aStore = namespace('auth');
88

resources/assets/vue/views/Messages.vue renamed to resources/assets/vue/views/messages/Messages.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
import { Component, Vue } from 'vue-property-decorator';
33
import { Action, namespace } from 'vuex-class';
44
5-
import Echo from 'laravel-echo';
6-
75
const aStore = namespace('auth');
86
const mStore = namespace('messages');
97

resources/assets/vue/views/Users.vue renamed to resources/assets/vue/views/users/Users.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<script lang="ts">
2-
import { Component, Vue, Watch } from 'vue-property-decorator';
3-
import { Action, State, namespace } from 'vuex-class';
2+
import { Component, Vue } from 'vue-property-decorator';
3+
import { Action, namespace } from 'vuex-class';
44
55
import dialog from '@/utils/dialog';
66
7-
import UsersCard from '@/components/UsersCard.vue';
8-
import UsersModal from '@/components/UsersModal.vue';
7+
import UsersCard from './components/UsersCard.vue';
8+
import UsersModal from './components/UsersModal.vue';
99
1010
const uStore = namespace('users');
1111
@@ -56,7 +56,7 @@ export default class Users extends Vue {
5656
};
5757
}
5858
59-
editUser(user: User, index: number): void {
59+
editUser(user: User): void {
6060
this.isModalAdd = false;
6161
this.setModalVisible(true);
6262

resources/assets/vue/views/UsersGraphQL.vue renamed to resources/assets/vue/views/users/UsersGraphQL.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<script lang="ts">
22
import { Component, Vue, Watch } from 'vue-property-decorator';
3-
import { Action, State, namespace } from 'vuex-class';
3+
import { Action } from 'vuex-class';
44
55
import dialog from '@/utils/dialog';
66
7-
import UsersCard from '@/components/UsersCard.vue';
8-
import UsersModalGraphQL from '@/components/UsersModalGraphQL.vue';
7+
import UsersCard from './components/UsersCard.vue';
8+
import UsersModalGraphQL from './components/UsersModalGraphQL.vue';
99
import deleteUserMutation from '@/graphql/mutations/deleteUser.gql';
1010
1111
@Component({

resources/assets/vue/components/UsersModal.vue renamed to resources/assets/vue/views/users/components/UsersModal.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script lang="ts">
2-
import { Component, Emit, Prop, Vue } from 'vue-property-decorator';
3-
import { Action, State, namespace } from 'vuex-class';
2+
import { Component, Prop, Vue } from 'vue-property-decorator';
3+
import { namespace } from 'vuex-class';
44
55
import checkPassword from '@/utils/checkPassword';
66

resources/assets/vue/components/UsersModalGraphQL.vue renamed to resources/assets/vue/views/users/components/UsersModalGraphQL.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { Action } from 'vuex-class';
55
import addUserMutation from '@/graphql/mutations/addUser.gql';
66
import editUserMutation from '@/graphql/mutations/editUser.gql';
77
8-
import checkPassword from '@/utils/checkPassword';
98
import checkGraphQLError from '@/utils/checkGraphQLError';
109
1110
@Component

0 commit comments

Comments
 (0)