Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Autoformatting with js-beautify-html #241

Merged
merged 2 commits into from
Mar 23, 2020
Merged

Autoformatting with js-beautify-html #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c2fec5
format html with js-beautify-html
subdavis Mar 23, 2020
f4b8279
style lint
subdavis Mar 23, 2020
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
7 changes: 7 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"vetur.format.defaultFormatter.js": "none",
"vetur.format.defaultFormatter.html": "js-beautify-html",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
}
137 changes: 88 additions & 49 deletions demo/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,44 @@
<v-list>
<nav-link
class="mb-1 font-weight-bold"
title="Components"/>
title="Components"
/>
<nav-link
title="Authentication"
href="#auth"/>
href="#auth"
/>
<nav-link
title="Upload"
href="#upload"/>
href="#upload"
/>
<nav-link
title="Search"
href="#search"/>
href="#search"
/>
<nav-link
title="File manager"
href="#file-manager"/>
href="#file-manager"
/>
<nav-link
title="Data details"
href="#data-details"/>
href="#data-details"
/>
<nav-link
title="Job list"
href="#job-list"/>
href="#job-list"
/>
<nav-link
title="Access control"
href="#access-control"/>
href="#access-control"
/>
<nav-link
title="Add / edit folder"
href="#upsert-folder"/>
href="#upsert-folder"
/>
<nav-link
title="Breadcrumb"
href="#breadcrumb"/>
href="#breadcrumb"
/>
</v-list>
</v-navigation-drawer>
<v-content>
Expand All @@ -42,7 +52,8 @@
lg="10"
offset-lg="1"
md="12"
offset-md="0">
offset-md="0"
>
<div class="display-3">Girder Web Components</div>
<div class="title mb-1">A Vue + Vuetify library for interacting with
<a href="https://www.kitware.com/">Kitware's</a>
Expand All @@ -52,7 +63,8 @@
v-for="badge in badges"
:key="badge"
:src="badge"
class="pr-3" >
class="pr-3"
>
<v-row class="ma-0">
<div class="title mb-1">This demo integrates with
<a href="https://data.kitware.com">data.kitware.com</a>
Expand All @@ -61,108 +73,126 @@
v-model="$vuetify.theme.dark"
class="mx-4 my-0"
hide-details="hide-details"
label="Dark theme"/>
</v-row><a id="auth"/>
label="Dark theme"
/>
</v-row><a id="auth" />
<headline
title="girder-auth"
link="src/components/Authentication/Authentication.vue"
description="allows users to authenticate with girder"/>
description="allows users to authenticate with girder"
/>
<v-row class="mb-2">
<v-switch
v-model="authRegister"
class="ma-2"
hide-details="hide-details"
label="register"/>
label="register"
/>
<v-switch
v-model="authOauth"
class="ma-2"
hide-details="hide-details"
label="oauth"/>
label="oauth"
/>
</v-row><template v-if="loggedOut">
<girder-auth
:force-otp="false"
:register="authRegister"
:oauth="authOauth"
:key="girderRest.token"
:forgot-password-url="forgotPasswordUrl"/>
:forgot-password-url="forgotPasswordUrl"
/>
</template><template v-else>
<v-btn
v-if="!loggedOut"
color="primary"
@click="girderRest.logout()">Log Out
@click="girderRest.logout()"
>Log Out
<v-icon class="pl-2">$vuetify.icons.logout</v-icon>
</v-btn>
</template><a id="upload"/>
</template><a id="upload" />
<headline
title="girder-upload"
link="src/components/Upload.vue"
description="upload files to a specified location in girder"/>
description="upload files to a specified location in girder"
/>
<v-card>
<girder-upload
:dest="uploadDest"
:post-upload="postUpload"/>
</v-card><a id="search"/>
:post-upload="postUpload"
/>
</v-card><a id="search" />
<headline
title="girder-search"
link="src/components/Search.vue"
description="provides global search functionality"/>
description="provides global search functionality"
/>
<v-toolbar color="primary">
<girder-search @select="handleSearchSelect"/>
<girder-search @select="handleSearchSelect" />
</v-toolbar>
<v-row>
<v-col
class="pr-4"
xl="8"
lg="8"
md="6"
sm="12"><a id="file-manager"/>
sm="12"
><a id="file-manager" />
<headline
title="girder-file-manager"
link="src/components/Snippet/FileManager.vue"
description="a wrapper around girder-data-browser. It packages the browser with
defaults including folder creation, item upload, and a breadcrumb bar"/>
defaults including folder creation, item upload, and a breadcrumb bar"
/>
</v-col>
<v-col class="pa-0"><a id="data-details"/>
<v-col class="pa-0"><a id="data-details" />
<headline
title="girder-data-details"
link="src/components/DataDetails.vue"
description="in-depth information and controls for a single folder or item, or
batch operations for groups of objects."/>
batch operations for groups of objects."
/>
</v-col>
</v-row>
<v-row>
<v-switch
v-model="selectable"
class="ma-2"
hide-details="hide-details"
label="Select"/>
label="Select"
/>
<v-switch
v-model="dragEnabled"
class="ma-2"
hide-details="hide-details"
label="Draggable"/>
label="Draggable"
/>
<v-switch
v-model="newFolderEnabled"
class="ma-2"
hide-details="hide-details"
label="New Folder"/>
label="New Folder"
/>
<v-switch
v-model="uploadEnabled"
class="ma-2"
hide-details="hide-details"
label="Upload"/>
label="Upload"
/>
<v-switch
v-model="rootLocationDisabled"
class="mt-2"
hide-details="hide-details"
label="Root Disabled"/>
label="Root Disabled"
/>
</v-row>
<v-row>
<v-col
class="pr-4"
lg="8"
md="6"
sm="12">
sm="12"
>
<girder-file-manager
ref="girderFileManager"
v-model="selected"
Expand All @@ -173,46 +203,55 @@
:location.sync="location"
:root-location-disabled="rootLocationDisabled"
:upload-multiple="uploadMultiple"
:upload-enabled="uploadEnabled"/>
:upload-enabled="uploadEnabled"
/>
</v-col>
<v-col
class="pl-0"
lg="4"
md="6"
sm="12">
sm="12"
>
<girder-data-details
:value="detailsList"
@action="handleAction"/>
@action="handleAction"
/>
</v-col>
</v-row><a id="job-list"/>
</v-row><a id="job-list" />
<headline
title="girder-job-list"
link="src/components/Job/JobList.vue"
description="display and filter girder jobs"/>
<girder-job-list/><a id="access-control"/>
description="display and filter girder jobs"
/>
<girder-job-list /><a id="access-control" />
<headline
title="girder-access-control"
link="src/components/AccessControl.vue"
description="access controls for folders and items"/>
<girder-access-control :model="uploadDest"/><a id="upsert-folder"/>
description="access controls for folders and items"
/>
<girder-access-control :model="uploadDest" /><a id="upsert-folder" />
<headline
title="girder-upsert-folder"
link="src/components/UpsertFolder.vue"
description="create and edit folders"/>
description="create and edit folders"
/>
<v-switch
v-model="upsertEdit"
label="Edit Mode"/>
label="Edit Mode"
/>
<v-card>
<girder-upsert-folder
:location="uploadDest"
:edit="upsertEdit"/>
</v-card><a id="breadcrumb"/>
:edit="upsertEdit"
/>
</v-card><a id="breadcrumb" />
<headline
title="girder-breadcrumb"
link="src/components/Breadcrumb.vue"
description="filesystem path breadcrumb"/>
description="filesystem path breadcrumb"
/>
<v-card class="pa-4">
<girder-breadcrumb :location="uploadDest"/>
<girder-breadcrumb :location="uploadDest" />
</v-card>
</v-col>
</v-container>
Expand Down
3 changes: 2 additions & 1 deletion demo/Headline.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ export default {
:href="repoBase + link"
class="ml-2"
icon="icon"
title="View source">
title="View source"
>
<v-icon>$vuetify.icons.externalLink</v-icon>
</v-btn>
</div>
Expand Down
3 changes: 2 additions & 1 deletion demo/NavLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ export default {
<v-list-item
:link="!!href"
:href="href"
v-on="listeners">
v-on="listeners"
>
<v-list-item-content>
<v-list-item-title>{{ title }}</v-list-item-title>
</v-list-item-content>
Expand Down
Loading