Skip to content
This repository has been archived by the owner on Nov 14, 2022. It is now read-only.

Refactor backend and frontend #7

Merged
merged 12 commits into from
Mar 11, 2019
Merged

Refactor backend and frontend #7

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fd0fed7
:arrow_up: Upgrade backend dependencies in Dockerfiles
tiangolo Mar 11, 2019
86ad729
:memo: Update generated docs to use latest integrated /start-reload.sh
tiangolo Mar 11, 2019
c0b0eb7
:wrench: Add scripts for project generator development
tiangolo Mar 11, 2019
c5f5c41
:heavy_plus_sign: Add backend development dependencies
tiangolo Mar 11, 2019
85ab7c5
:fire: Remove scripts provided by base image
tiangolo Mar 11, 2019
e68326f
:loud_sound: Add logs to starting scripts
tiangolo Mar 11, 2019
6d1c020
:building_construction: Upgrade backend structure, names, dependencies
tiangolo Mar 11, 2019
a28ea10
:art: Upgrade linting script to include dead code detection
tiangolo Mar 11, 2019
6713d9c
:arrow_up: Upgrade frontend dependencies
tiangolo Mar 11, 2019
7f652be
:building_construction: Upgrade vuex integration and standardize layout
tiangolo Mar 11, 2019
962a4eb
:bug: Fix backend logic to update users
tiangolo Mar 11, 2019
3a8db50
:art: Format frontend code
tiangolo Mar 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
🎨 Format frontend code
  • Loading branch information
@tiangolo
tiangolo committed Mar 11, 2019
commit 3a8db5082211a3f7e482d551397fb8f789201ae5
22 changes: 4 additions & 18 deletions {{cookiecutter.project_slug}}/frontend/src/views/main/admin/EditUser.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,8 @@
<template>
<div class="my-3">
<div class="subheading secondary--text text--lighten-2">Username</div>
<div
class="title primary--text text--darken-2"
v-if="user"
>{{user.username}}</div>
<div
class="title primary--text text--darken-2"
v-else
>-----</div>
<div class="title primary--text text--darken-2" v-if="user">{{user.username}}</div>
<div class="title primary--text text--darken-2" v-else>-----</div>
</div>
<v-form
v-model="valid"
Expand All @@ -37,17 +31,9 @@
required
></v-text-field>
<div class="subheading secondary--text text--lighten-2">Roles</div>
<v-checkbox
v-for="(value, role) in selectedRoles"
:key="role"
:label="role"
v-model="selectedRoles[role]"
></v-checkbox>
<v-checkbox v-for="(value, role) in selectedRoles" :key="role" :label="role" v-model="selectedRoles[role]"></v-checkbox>
<div class="subheading secondary--text text--lighten-2">Disable User <span v-if="userDisabled">(currently disabled)</span><span v-else>(currently enabled)</span></div>
<v-checkbox
:label="'Disabled'"
v-model="userDisabled"
></v-checkbox>
<v-checkbox :label="'Disabled'" v-model="userDisabled"></v-checkbox>
<v-layout align-center>
<v-flex shrink>
<v-checkbox
Expand Down
30 changes: 6 additions & 24 deletions {{cookiecutter.project_slug}}/frontend/src/views/main/profile/UserProfile.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,18 @@
<v-card-text>
<div class="my-4">
<div class="subheading secondary--text text--lighten-3">Full Name</div>
<div
class="title primary--text text--darken-2"
v-if="userProfile && userProfile.full_name"
>{{userProfile.full_name}}</div>
<div
class="title primary--text text--darken-2"
v-else
>-----</div>
<div class="title primary--text text--darken-2" v-if="userProfile && userProfile.full_name">{{userProfile.full_name}}</div>
<div class="title primary--text text--darken-2" v-else>-----</div>
</div>
<div class="my-3">
<div class="subheading secondary--text text--lighten-3">Username</div>
<div
class="title primary--text text--darken-2"
v-if="userProfile && userProfile.username"
>{{userProfile.username}}</div>
<div
class="title primary--text text--darken-2"
v-else
>-----</div>
<div class="title primary--text text--darken-2" v-if="userProfile && userProfile.username">{{userProfile.username}}</div>
<div class="title primary--text text--darken-2" v-else>-----</div>
</div>
<div class="my-3">
<div class="subheading secondary--text text--lighten-3">Email</div>
<div
class="title primary--text text--darken-2"
v-if="userProfile && userProfile.email"
>{{userProfile.email}}</div>
<div
class="title primary--text text--darken-2"
v-else
>-----</div>
<div class="title primary--text text--darken-2" v-if="userProfile && userProfile.email">{{userProfile.email}}</div>
<div class="title primary--text text--darken-2" v-else>-----</div>
</div>
</v-card-text>
<v-card-actions>
Expand Down
10 changes: 2 additions & 8 deletions {{cookiecutter.project_slug}}/frontend/src/views/main/profile/UserProfileEdit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,8 @@
<template>
<div class="my-3">
<div class="subheading secondary--text text--lighten-2">Username</div>
<div
class="title primary--text text--darken-2"
v-if="userProfile.username"
>{{userProfile.username}}</div>
<div
class="title primary--text text--darken-2"
v-else
>-----</div>
<div class="title primary--text text--darken-2" v-if="userProfile.username">{{userProfile.username}}</div>
<div class="title primary--text text--darken-2" v-else>-----</div>
</div>
<v-form
v-model="valid"
Expand Down
23 changes: 6 additions & 17 deletions {{cookiecutter.project_slug}}/frontend/src/views/main/profile/UserProfileEditPassword.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,11 @@
<template>
<div class="my-3">
<div class="subheading secondary--text text--lighten-2">Username</div>
<div
class="title primary--text text--darken-2"
v-if="userProfile.username"
>{{userProfile.username}}</div>
<div
class="title primary--text text--darken-2"
v-else
>-----</div>
<div class="title primary--text text--darken-2" v-if="userProfile.username">{{userProfile.username}}</div>
<div class="title primary--text text--darken-2" v-else>-----</div>
</div>
<v-form ref="form">
<v-text-field
<v-text-field
type="password"
ref="password"
label="Password"
Expand All @@ -27,8 +21,7 @@
data-vv-rules="required"
v-validate="'required'"
v-model="password1"
:error-messages="errors.first('password')"
>
:error-messages="errors.first('password')">
</v-text-field>
<v-text-field
type="password"
Expand All @@ -39,8 +32,7 @@
data-vv-as="password"
v-validate="'required|confirmed:password'"
v-model="password2"
:error-messages="errors.first('password_confirmation')"
>
:error-messages="errors.first('password_confirmation')">
</v-text-field>
</v-form>
</template>
Expand All @@ -49,10 +41,7 @@
<v-spacer></v-spacer>
<v-btn @click="cancel">Cancel</v-btn>
<v-btn @click="reset">Reset</v-btn>
<v-btn
@click="submit"
:disabled="!valid"
>Save</v-btn>
<v-btn @click="submit" :disabled="!valid">Save</v-btn>
</v-card-actions>
</v-card>
</v-container>
Expand Down