-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from Lissy93/bug-fixes-and-improvments
Implements custom CSS editor, customizable item grids, other new features and bug fixes
- Loading branch information
Showing
23 changed files
with
375 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| <template> | ||
| <div class="json-editor-outer"> | ||
| <prism-editor class="my-editor" v-model="customCss" :highlight="highlighter" line-numbers /> | ||
| <button class="save-button" @click="save()">Save Changes</button> | ||
| <p>Note, you will need to refresh the page for your changes to take effect</p> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| import { PrismEditor } from 'vue-prism-editor'; | ||
| import { highlight, languages } from 'prismjs/components/prism-core'; | ||
| import 'prismjs/components/prism-css'; | ||
| import 'prismjs/themes/prism-funky.css'; | ||
| import 'vue-prism-editor/dist/prismeditor.min.css'; | ||
| import { localStorageKeys } from '@/utils/defaults'; | ||
| export default { | ||
| name: 'JsonEditor', | ||
| props: { | ||
| config: Object, | ||
| }, | ||
| components: { | ||
| PrismEditor, | ||
| }, | ||
| data() { | ||
| return { | ||
| customCss: this.config.appConfig.customCss || '\n\n\n\n\n', | ||
| }; | ||
| }, | ||
| methods: { | ||
| validate(css) { | ||
| return css.match(/((?:^\s*)([\w#.@*,:\-.:>,*\s]+)\s*{(?:[\s]*)((?:[A-Za-z\- \s]+[:]\s*['"0-9\w .,/()\-!%]+;?)*)*\s*}(?:\s*))/gmi); | ||
| }, | ||
| save() { | ||
| let msg = ''; | ||
| if (this.validate(this.customCss)) { | ||
| const appConfig = { ...this.config.appConfig }; | ||
| appConfig.customCss = this.customCss; | ||
| localStorage.setItem(localStorageKeys.APP_CONFIG, JSON.stringify(appConfig)); | ||
| msg = 'Changes saved succesfully'; | ||
| this.inject(this.customCss); | ||
| } else { | ||
| msg = 'Error - Invalid CSS'; | ||
| } | ||
| this.$toasted.show(msg); | ||
| }, | ||
| inject(userStyles) { | ||
| const cleanedCss = userStyles.replace(/<\/?[^>]+(>|$)/g, ''); | ||
| const style = document.createElement('style'); | ||
| style.textContent = cleanedCss; | ||
| document.head.append(style); | ||
| }, | ||
| highlighter(code) { | ||
| return highlight(code, languages.css); | ||
| }, | ||
| }, | ||
| }; | ||
| </script> | ||
|
|
||
| <style lang="scss"> | ||
| button.save-button { | ||
| padding: 0.5rem 1rem; | ||
| margin: 0.25rem auto; | ||
| font-size: 1.2rem; | ||
| background: var(--config-settings-color); | ||
| color: var(--config-settings-background); | ||
| border: 1px solid var(--config-settings-background); | ||
| border-radius: var(--curve-factor); | ||
| cursor: pointer; | ||
| &:hover { | ||
| background: var(--config-settings-background); | ||
| color: var(--config-settings-color); | ||
| border-color: var(--config-settings-color); | ||
| } | ||
| } | ||
| .prism-editor-wrapper { | ||
| min-height: 200px; | ||
| border: 1px solid var(--transparent-70); | ||
| border-radius: var(--curve-factor); | ||
| width: 90%; | ||
| margin: 0.5rem auto; | ||
| background: var(--transparent-50); | ||
| } | ||
| </style> |
Oops, something went wrong.