Skip to content

Commit 694a031

Browse files
hawkeye64hawkeye64
committed
Merge branch 'dev'
2 parents e7a1bc7 + 0719f3c commit 694a031

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+340
-280
lines changed

‎README.md‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
QIconPicker (@quasar/qiconpicker)
22
===
33

4-
> Please note that QIconPicker is in alpha state.
5-
64
![official icon](https://img.shields.io/badge/Quasar%201.0-Official%20UI%20App%20Extension-blue.svg)
75
![npm (scoped)](https://img.shields.io/npm/v/@quasar/quasar-app-extension-qiconpicker.svg?style=plastic)
86
[![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/quasarframework/app-extension-qiconpicker.svg)]()
@@ -11,12 +9,14 @@ QIconPicker (@quasar/qiconpicker)
119

1210
QIconPicker is an `UI App Extension` for [Quasar Framework v1](https://quasar.dev/). It will not work with legacy versions of Quasar Framework.
1311

14-
This work is currently in `alpha` and there are expected changes while things get worked out. Your help with testing is greatly appreciated.
12+
![QIconPicker](https://raw.githubusercontent.com/quasarframework/app-extension-qiconpicker/dev/demo/src/statics/q-icon-picker.png)
1513

16-
![QIconPicker example](https://raw.githubusercontent.com/quasarframework/app-extension-qiconpicker/dev/demo/src/statics/q-icon-picker.png)
14+
# Demo Project (source)
15+
Can be found [here](https://github.com/quasarframework/app-extension-qiconpicker/tree/master/demo).
1716

18-
# QIconPicker
19-
Please check out the [documentation](https://quasarframework.github.io/app-extension-qiconpicker/).
17+
18+
# Documentation and Examples
19+
Can be found [here](https://quasarframework.github.io/app-extension-qiconpicker).
2020

2121
# Install
2222
To add this App Extension to your Quasar application, run the following (in your Quasar app folder):
@@ -33,14 +33,5 @@ quasar ext remove @quasar/qiconpicker
3333
# Describe
3434
You can use `quasar describe QIconPicker` (TBD)
3535

36-
# Demo Project
37-
Can be found [here](https://github.com/quasarframework/app-extension-qiconpicker/tree/master/demo).
38-
39-
# Demo
40-
Can be found [here](https://quasarframework.github.io/app-extension-qiconpicker/demo).
41-
42-
# Documentation
43-
Can be found [here](https://quasarframework.github.io/app-extension-qiconpicker).
44-
4536
# Donate
4637
If you appreciate the work that went into this App Extension, please consider [donating to Quasar](https://donate.quasar.dev).

‎demo/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,20 @@
1313
"test": "echo \"No test specified\" && exit 0"
1414
},
1515
"dependencies": {
16-
"@quasar/extras": "^1.1.4",
16+
"@quasar/extras": "^1.2.0",
1717
"@quasar/quasar-app-extension-qiconpicker": "link:../.",
1818
"quasar": "^1.0.4"
1919
},
2020
"devDependencies": {
2121
"@quasar/app": "^1.0.4",
2222
"@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.13",
23+
"@quasar/quasar-app-extension-qribbon": "^1.0.0-alpha.10",
2324
"@vue/eslint-config-standard": "^4.0.0",
2425
"babel-eslint": "^10.0.2",
2526
"eslint": "^6.0.1",
2627
"eslint-loader": "^2.1.2",
2728
"eslint-plugin-vue": "^5.2.3",
28-
"quasar-app-extension-qribbon": "^1.0.0-alpha.3"
29+
"quasar-app-extension-qautomate": "^1.0.0-alpha.5"
2930
},
3031
"engines": {
3132
"node": ">= 8.9.0",

‎demo/quasar.conf.js‎

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,45 +25,50 @@ module.exports = function (ctx) {
2525
// all: true, // --- includes everything; for dev only!
2626

2727
components: [
28-
'QLayout',
29-
'QHeader',
30-
'QDrawer',
31-
'QPageContainer',
32-
'QPage',
33-
'QToolbar',
34-
'QToolbarTitle',
3528
'QBtn',
36-
'QIcon',
37-
'QList',
38-
'QItem',
39-
'QItemSection',
40-
'QItemLabel',
4129
'QCard',
4230
'QCardSection',
43-
'QSeparator',
44-
'QInput',
45-
'QSelect',
46-
'QPopupProxy',
47-
'QMenu',
4831
'QDialog',
32+
'QDrawer',
4933
'QExpansionItem',
34+
'QHeader',
35+
'QIcon',
36+
'QInput',
37+
'QItem',
38+
'QItemLabel',
39+
'QItemSection',
40+
'QLayout',
41+
'QList',
42+
'QMenu',
43+
'QPage',
44+
'QPageContainer',
45+
'QPageScroller',
46+
'QPopupProxy',
5047
'QScrollArea',
51-
'QTabs',
48+
'QSelect',
49+
'QSeparator',
5250
'QTab',
53-
'QTabPanels',
5451
'QTabPanel',
55-
'QTooltip',
56-
'QToggle'
52+
'QTabPanels',
53+
'QTabs',
54+
'QToggle',
55+
'QToolbar',
56+
'QToolbarTitle',
57+
'QTooltip'
5758
],
5859

5960
directives: [
61+
'ClosePopup',
6062
'Ripple',
61-
'ClosePopup'
63+
'Scroll'
6264
],
6365

6466
// Quasar plugins
6567
plugins: [
66-
'Notify'
68+
'Dialog',
69+
'Notify',
70+
'Platform',
71+
'Screen'
6772
]
6873

6974
// iconSet: 'ionicons-v4'

‎demo/quasar.extensions.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
22
"@quasar/qmarkdown": {},
33
"@quasar/qiconpicker": {},
4-
"qribbon": {}
4+
"@quasar/qribbon": {},
5+
"qautomate": {
6+
"quasarConfFixMode": "automatic",
7+
"sort": true
8+
}
59
}

‎demo/src/components/EssentialLinks.vue‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
<template>
2+
<q-list>
3+
<q-item clickable to="/docs">
4+
<q-item-section avatar>
5+
<q-icon name="bolt" />
6+
</q-item-section>
7+
<q-item-section>
8+
<q-item-label>QIconPicker docs</q-item-label>
9+
<q-item-label caption>Documentation</q-item-label>
10+
</q-item-section>
11+
</q-item>
12+
<q-item clickable to="/demo">
13+
<q-item-section avatar>
14+
<q-icon name="bolt" />
15+
</q-item-section>
16+
<q-item-section>
17+
<q-item-label>QIconPicker demo</q-item-label>
18+
<q-item-label caption>Interactively play with properties</q-item-label>
19+
</q-item-section>
20+
</q-item>
21+
<q-item clickable to="/examples">
22+
<q-item-section avatar>
23+
<q-icon name="bolt" />
24+
</q-item-section>
25+
<q-item-section>
26+
<q-item-label>QIconPicker examples</q-item-label>
27+
<q-item-label caption>Examples of how to do it</q-item-label>
28+
</q-item-section>
29+
</q-item>
30+
<q-separator />
31+
<q-item clickable tag="a" target="_blank" href="https://github.com/quasarframework/app-extension-qiconpicker">
32+
<q-item-section avatar>
33+
<q-icon name="extension" />
34+
</q-item-section>
35+
<q-item-section>
36+
<q-item-label>QIconPicker home</q-item-label>
37+
<q-item-label caption>@quasar/qiconpicker</q-item-label>
38+
</q-item-section>
39+
</q-item>
40+
<q-item clickable tag="a" target="_blank" href="https://github.com/quasarframework/app-extension-qmarkdown">
41+
<q-item-section avatar>
42+
<q-icon name="extension" />
43+
</q-item-section>
44+
<q-item-section>
45+
<q-item-label>QMarkdown home</q-item-label>
46+
<q-item-label caption>@quasar/qmarkdown</q-item-label>
47+
</q-item-section>
48+
</q-item>
49+
<q-separator />
50+
<q-item clickable tag="a" target="_blank" href="http://quasar.dev">
51+
<q-item-section avatar>
52+
<q-icon name="school" />
53+
</q-item-section>
54+
<q-item-section>
55+
<q-item-label>Docs</q-item-label>
56+
<q-item-label caption>quasar.dev</q-item-label>
57+
</q-item-section>
58+
</q-item>
59+
<q-item clickable tag="a" target="_blank" href="https://github.com/quasarframework/">
60+
<q-item-section avatar>
61+
<q-icon name="code" />
62+
</q-item-section>
63+
<q-item-section>
64+
<q-item-label>Github</q-item-label>
65+
<q-item-label caption>github.com/quasarframework</q-item-label>
66+
</q-item-section>
67+
</q-item>
68+
<q-item clickable tag="a" target="_blank" href="http://chat.quasar.dev">
69+
<q-item-section avatar>
70+
<q-icon name="chat" />
71+
</q-item-section>
72+
<q-item-section>
73+
<q-item-label>Discord Chat Channel</q-item-label>
74+
<q-item-label caption>chat.quasar.dev</q-item-label>
75+
</q-item-section>
76+
</q-item>
77+
<q-item clickable tag="a" target="_blank" href="https://forum.quasar.dev">
78+
<q-item-section avatar>
79+
<q-icon name="record_voice_over" />
80+
</q-item-section>
81+
<q-item-section>
82+
<q-item-label>Forum</q-item-label>
83+
<q-item-label caption>forum.quasar.dev</q-item-label>
84+
</q-item-section>
85+
</q-item>
86+
<q-item clickable tag="a" target="_blank" href="https://twitter.com/quasarframework">
87+
<q-item-section avatar>
88+
<q-icon name="rss_feed" />
89+
</q-item-section>
90+
<q-item-section>
91+
<q-item-label>Twitter</q-item-label>
92+
<q-item-label caption>@quasarframework</q-item-label>
93+
</q-item-section>
94+
</q-item>
95+
</q-list>
96+
97+
</template>
98+
99+
<script>
100+
export default {
101+
// name: 'ComponentName',
102+
data () {
103+
return {}
104+
}
105+
}
106+
</script>
107+
108+
<style>
109+
</style>

‎demo/src/css/app.styl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ a {
9393
.page-header {
9494
color: #fff;
9595
text-align: center;
96-
background-color: #159957;
97-
background-image: linear-gradient(120deg, #155799, #159957); }
96+
background-color: #9932CC;
97+
background-image: linear-gradient(120deg, #155799, #9932CC); }
9898

9999
@media screen and (min-width: 64em) {
100100
.page-header {

‎demo/src/layouts/IconPickerLayout.vue‎

Lines changed: 3 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -50,100 +50,7 @@
5050
icon="fas fa-link"
5151
label="Essential Links"
5252
>
53-
<q-list>
54-
<q-item clickable tag="a" target="_blank" href="http://quasar.dev">
55-
<q-item-section avatar>
56-
<q-icon name="school" />
57-
</q-item-section>
58-
<q-item-section>
59-
<q-item-label>Docs</q-item-label>
60-
<q-item-label caption>quasar.dev</q-item-label>
61-
</q-item-section>
62-
</q-item>
63-
<q-item clickable tag="a" target="_blank" href="https://github.com/quasarframework/">
64-
<q-item-section avatar>
65-
<q-icon name="code" />
66-
</q-item-section>
67-
<q-item-section>
68-
<q-item-label>Github</q-item-label>
69-
<q-item-label caption>github.com/quasarframework</q-item-label>
70-
</q-item-section>
71-
</q-item>
72-
<q-item clickable tag="a" target="_blank" href="http://chat.quasar.dev">
73-
<q-item-section avatar>
74-
<q-icon name="chat" />
75-
</q-item-section>
76-
<q-item-section>
77-
<q-item-label>Discord Chat Channel</q-item-label>
78-
<q-item-label caption>chat.quasar.dev</q-item-label>
79-
</q-item-section>
80-
</q-item>
81-
<q-item clickable tag="a" target="_blank" href="https://forum.quasar.dev">
82-
<q-item-section avatar>
83-
<q-icon name="record_voice_over" />
84-
</q-item-section>
85-
<q-item-section>
86-
<q-item-label>Forum</q-item-label>
87-
<q-item-label caption>forum.quasar.dev</q-item-label>
88-
</q-item-section>
89-
</q-item>
90-
<q-item clickable tag="a" target="_blank" href="https://twitter.com/quasarframework">
91-
<q-item-section avatar>
92-
<q-icon name="rss_feed" />
93-
</q-item-section>
94-
<q-item-section>
95-
<q-item-label>Twitter</q-item-label>
96-
<q-item-label caption>@quasarframework</q-item-label>
97-
</q-item-section>
98-
</q-item>
99-
<q-separator />
100-
<q-item clickable tag="a" target="_blank" href="https://github.com/quasarframework/app-extension-qiconpicker">
101-
<q-item-section avatar>
102-
<q-icon name="extension" />
103-
</q-item-section>
104-
<q-item-section>
105-
<q-item-label>QIconPicker home</q-item-label>
106-
<q-item-label caption>@quasar/qiconpicker</q-item-label>
107-
</q-item-section>
108-
</q-item>
109-
<q-item clickable tag="a" target="_blank" href="https://github.com/quasarframework/app-extension-qmarkdown">
110-
<q-item-section avatar>
111-
<q-icon name="extension" />
112-
</q-item-section>
113-
<q-item-section>
114-
<q-item-label>QMarkdown home</q-item-label>
115-
<q-item-label caption>@quasar/qmarkdown</q-item-label>
116-
</q-item-section>
117-
</q-item>
118-
<q-separator />
119-
<q-item clickable to="/docs">
120-
<q-item-section avatar>
121-
<q-icon name="calendar_today" />
122-
</q-item-section>
123-
<q-item-section>
124-
<q-item-label>QIconPicker docs</q-item-label>
125-
<q-item-label caption>Documentation</q-item-label>
126-
</q-item-section>
127-
</q-item>
128-
<q-item clickable to="/demo">
129-
<q-item-section avatar>
130-
<q-icon name="calendar_today" />
131-
</q-item-section>
132-
<q-item-section>
133-
<q-item-label>QIconPicker demo</q-item-label>
134-
<q-item-label caption>Interactively play with properties</q-item-label>
135-
</q-item-section>
136-
</q-item>
137-
<q-item clickable to="/examples">
138-
<q-item-section avatar>
139-
<q-icon name="calendar_today" />
140-
</q-item-section>
141-
<q-item-section>
142-
<q-item-label>QIconPicker examples</q-item-label>
143-
<q-item-label caption>Examples of how to do it</q-item-label>
144-
</q-item-section>
145-
</q-item>
146-
</q-list>
53+
<essential-links />
14754
</q-expansion-item>
14855
</div>
14956
</q-drawer>
@@ -160,7 +67,8 @@ import { openURL } from 'quasar'
16067
export default {
16168
name: 'IconPickerLayout',
16269
components: {
163-
'playground': () => import('../components/Playground')
70+
'playground': () => import('../components/Playground'),
71+
'essential-links': () => import('../components/EssentialLinks')
16472
},
16573
data () {
16674
return {

0 commit comments

Comments
 (0)