Skip to content

Commit

Permalink
Merge pull request #2 from OriginalYellow/master
Browse files Browse the repository at this point in the history 
Updating abilities button
  • Loading branch information
@eerlikh
eerlikh authored Jan 13, 2019
2 parents 252f157 + 3e449a4 commit 1f4f425
Show file tree
Hide file tree
Showing 6 changed files with 298 additions and 115 deletions.
119 changes: 105 additions & 14 deletions src/App.vue
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,109 @@
<template>
<v-app>
<app-toolbar />
<v-btn
absolute
<v-btn-toggle
flat
multiple
class="v-btn-toggle--only-child"
:style="{'z-index': 1000}"
>
<v-btn
@click="isFormatToggled = !isFormatToggled"
:flat="!isFormatToggled"
color="accentLight"
:ripple="false"
>
<v-icon>text_format</v-icon>
</v-btn>
<template v-if="isFormatToggled">
<v-btn
flat
active-class="asdfasdf"
>
<v-icon>format_bold</v-icon>
</v-btn>
<v-btn
flat
active-class="asdfasdf"
>
<v-icon>format_italic</v-icon>
</v-btn>
<v-btn
flat
active-class="asdfasdf"
>
<v-icon>format_underlined</v-icon>
</v-btn>
<v-btn
flat
active-class="asdfasdf"
>
<v-icon>format_size</v-icon>
<sup>1</sup>
</v-btn>
<v-btn
flat
active-class="asdfasdf"
>
<v-icon>format_size</v-icon>
<sup>2</sup>
</v-btn>
<v-btn
flat
active-class="asdfasdf"
>
<v-icon>undo</v-icon>
</v-btn>
<v-btn
flat
active-class="asdfasdf"
>
<v-icon>redo</v-icon>
</v-btn>
</template>
</v-btn-toggle>
<!-- <v-speed-dial
v-model="fab"
fixed
dark
fab
bottom
right
color="accent"
class="nav-fab"
@click="$router.go(-1)"
direction="top"
:style="{'z-index': 1000}"
>
<v-icon large>arrow_back</v-icon>
</v-btn>
<v-btn
dark
fab
outline
color="accent"
slot="activator"
>
<v-icon large>arrow_back</v-icon>
</v-btn>
<v-btn
fab
dark
small
color="green"
>
<v-icon>edit</v-icon>
</v-btn>
<v-btn
fab
dark
small
color="indigo"
>
<v-icon>add</v-icon>
</v-btn>
<v-btn
fab
dark
small
color="red"
>
<v-icon>delete</v-icon>
</v-btn>
</v-speed-dial> -->
<v-content>
<router-view />
<v-container>
Expand Down Expand Up @@ -45,11 +135,12 @@ export default {
ReferenceContainer,
},
// data() {
// return {
// drawerIsOpen: false,
// };
// },
data() {
return {
// drawerIsOpen: false,
isFormatToggled: false,
};
},
computed: {
...mapState(['drawerIsOpen']),
Expand Down
9 changes: 0 additions & 9 deletions src/components/AppToolbar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,3 @@ export default {
.stats-container
padding: 0
</style>

<!-- <v-layout row fill-height align-center>
<v-flex xs7>
<p class="title">{{characterSummary.name | titleCase}}</p>
</v-flex>
<v-flex xs5>
<p>{{levelAndClassText | titleCase}}</p>
</v-flex>
</v-layout> -->
59 changes: 0 additions & 59 deletions src/components/DebugPanel.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,66 +25,7 @@
>
Log State
</v-btn>
<!-- <v-btn
color="secondary"
@click="createRecords"
flat
>
Create Records
</v-btn> -->
</v-layout>
<!-- <v-layout
row
wrap
>
<v-btn
color="secondary"
@click="logQuery"
flat
>
Log Query
</v-btn>
<v-btn
color="secondary"
@click="insertUser"
flat
>
Insert User
</v-btn>
<v-btn
color="secondary"
@click="updateUser"
flat
>
Update User
</v-btn>
</v-layout>
<v-layout
row
wrap
>
<v-btn
color="secondary"
@click="logQuery2"
flat
>
Log Query 2
</v-btn>
<v-btn
color="secondary"
@click="logQuery3"
flat
>
Log Query 3
</v-btn>
<v-btn
color="secondary"
@click="increaseStat"
flat
>
Increase Stat
</v-btn>
</v-layout> -->
</v-container>
</template>

Expand Down
24 changes: 0 additions & 24 deletions src/components/EditorMenu.vue
View file

This file was deleted.

66 changes: 57 additions & 9 deletions src/components/ReferenceContainer.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<v-flex xs12>
<character-info-card title="editor">
<v-container
grid-list-xs
grid-list-md
class="pa-0"
>
<v-layout
Expand All @@ -23,7 +23,6 @@
<editor-menu-bar :editor="editor">
<v-btn-toggle
slot-scope="{ commands, isActive }"
@change="handleButtonGroupChange"
flat
multiple
class="v-btn-toggle--only-child"
Expand Down Expand Up @@ -61,13 +60,45 @@
>
<v-icon>format_underlined</v-icon>
</v-btn>
<v-btn
<!-- <v-btn
flat
:class="{ 'v-btn--active': isActive.strike() }"
@click.stop.prevent="commands.strike()"
active-class="asdfasdf"
>
<v-icon>format_strikethrough</v-icon>
</v-btn> -->
<v-btn
flat
:class="{ 'v-btn--active': isActive.heading({ level: 1 }) }"
@click="commands.heading({ level: 1 })"
active-class="asdfasdf"
>
<v-icon>format_size</v-icon>
<sup>1</sup>
</v-btn>
<v-btn
flat
:class="{ 'v-btn--active': isActive.heading({ level: 3 }) }"
@click="commands.heading({ level: 3 })"
active-class="asdfasdf"
>
<v-icon>format_size</v-icon>
<sup>2</sup>
</v-btn>
<v-btn
flat
@click="commands.undo()"
active-class="asdfasdf"
>
<v-icon>undo</v-icon>
</v-btn>
<v-btn
flat
@click="commands.redo()"
active-class="asdfasdf"
>
<v-icon>redo</v-icon>
</v-btn>
</template>
</v-btn-toggle>
Expand Down Expand Up @@ -112,6 +143,8 @@ import {
Strike,
Underline,
History,
Image,
Mention,
} from 'tiptap-extensions';
export default {
Expand Down Expand Up @@ -142,14 +175,31 @@ export default {
new Strike(),
new Underline(),
new History(),
new Image(),
new Mention(),
],
content: `
<h1>Yay Headlines!</h1>
<p>All these <strong>cool tags</strong> are working now.</p>
`,
<h1>TOP NEP!</h1>
<h3>Why nep is the best and better than the rest!</h3>
<p>As you can see by this digram, nep is clearly the best:</p>
<p>
<img src="http://pa1.narvii.com/6266/c557f97f2ba4bbc5500b0a20959259c62f8a9015_128.gif" contenteditable="false" draggable="true" class="">
</p>
<p>And if you look at this list you'll see my point:</p>
<ul>
<li>
<p>Nep is cute</p>
</li>
<li>
<p>Nep is perfect</p>
</li>
<li>
<p>Nep is the best</p>
</li>
</ul>
`,
onUpdate: this.handleEditorContentUpdate,
}),
lastButtonGroupStates: [],
};
},
Expand All @@ -158,8 +208,6 @@ export default {
},
methods: {
handleButtonGroupChange(buttonGroupStates) {},
handleEditorContentUpdate(stuff) {
console.log(stuff);
},
Expand Down
Loading

0 comments on commit 1f4f425

Please sign in to comment.