diff --git a/components/deferredcontent/DeferredContent.spec.js b/components/deferredcontent/DeferredContent.spec.js index 4c3e79c43..782bcb31b 100644 --- a/components/deferredcontent/DeferredContent.spec.js +++ b/components/deferredcontent/DeferredContent.spec.js @@ -5,7 +5,7 @@ describe('DeferredContent', () => { it('should exist', async () => { const wrapper = mount(DeferredContent, { slots: { - default: 'Nature' + default: 'Nature' } }); diff --git a/components/inplace/Inplace.spec.js b/components/inplace/Inplace.spec.js index b158da3d7..d983eaeeb 100644 --- a/components/inplace/Inplace.spec.js +++ b/components/inplace/Inplace.spec.js @@ -33,7 +33,7 @@ describe('Inplace.vue', () => { View Picture `, - content: `` + content: `` } }); diff --git a/layouts/AppConfigurator.vue b/layouts/AppConfigurator.vue index ddb6002cd..4c3aea85d 100755 --- a/layouts/AppConfigurator.vue +++ b/layouts/AppConfigurator.vue @@ -29,25 +29,25 @@
Blue
Purple
Blue
Purple
@@ -57,25 +57,25 @@
Indigo
Deep Purple
Indigo
Deep Purple
@@ -85,25 +85,25 @@
Indigo
Deep Purple
Indigo
Deep Purple
@@ -113,7 +113,7 @@
Tailwind Light
@@ -123,7 +123,7 @@
Fluent Light
@@ -133,49 +133,49 @@
Lara Light Indigo
Lara Light Blue
Lara Light Purple
Lara Light Teal
Lara Dark Indigo
Lara Dark Blue
Lara Dark Purple
Lara Dark Teal
@@ -185,73 +185,73 @@
Saga Blue
Saga Green
Saga Orange
Saga Purple
Vela Blue
Vela Green
Vela Orange
Vela Purple
Arya Blue
Arya Green
Arya Orange
Arya Purple
@@ -262,37 +262,37 @@
Soho Light
Soho Dark
Viva Light
Viva Dark
Mira
Nano
@@ -323,32 +323,32 @@
- Diamond + Diamond
- Verona + Verona
- Poseidon + Poseidon
- Sapphire + Sapphire
- Serenity + Serenity
- Babylon + Babylon
@@ -358,17 +358,29 @@
+ <<<<<<< Updated upstream Apollo + ======= + Apollo + >>>>>>> Stashed changes
+ <<<<<<< Updated upstream Roma + ======= + Roma + >>>>>>> Stashed changes
+ <<<<<<< Updated upstream Prestige + ======= + Prestige + >>>>>>> Stashed changes
diff --git a/layouts/AppTopBar.vue b/layouts/AppTopBar.vue index 5c37ff8e6..d552edd26 100755 --- a/layouts/AppTopBar.vue +++ b/layouts/AppTopBar.vue @@ -32,138 +32,138 @@
  • BOOTSTRAP
  • - Blue LightBlue Light + Blue LightBlue Light
  • - Purple LightPurple Light + Purple LightPurple Light
  • - Blue DarkBlue Dark + Blue DarkBlue Dark
  • - Purple DarkPurple Dark + Purple DarkPurple Dark
  • MATERIAL DESIGN
  • - Indigo LightIndigo Light + Indigo LightIndigo Light
  • - Deep Purple LightDeep Purple Light + Deep Purple LightDeep Purple Light
  • - Indigo DarkIndigo Dark + Indigo DarkIndigo Dark
  • - Deep Purple DarkDeep Purple Dark + Deep Purple DarkDeep Purple Dark
  • MATERIAL DESIGN COMPACT
  • - Indigo LightIndigo Light + Indigo LightIndigo Light
  • - Deep Purple LightDeep Purple Light + Deep Purple LightDeep Purple Light
  • - Indigo DarkIndigo Dark + Indigo DarkIndigo Dark
  • - Deep Purple DarkDeep Purple Dark + Deep Purple DarkDeep Purple Dark
  • TAILWIND
  • - Tailwind LightTailwind Light + Tailwind LightTailwind Light
  • FLUENT UI
  • - Fluent LightFluent Light + Fluent LightFluent Light
  • PRIMEONE 2022
  • - Lara Light IndigoLara Light Indigo + Lara Light IndigoLara Light Indigo
  • - Lara Light BlueLara Light Blue + Lara Light BlueLara Light Blue
  • - Lara Light PurpleLara Light Purple + Lara Light PurpleLara Light Purple
  • - Lara Light TealLara Light Teal + Lara Light TealLara Light Teal
  • - Lara Dark BlueLara Dark Blue + Lara Dark BlueLara Dark Blue
  • - Lara Dark IndigoLara Dark Indigo + Lara Dark IndigoLara Dark Indigo
  • - Lara Dark PurpleLara Dark Purple + Lara Dark PurpleLara Dark Purple
  • - Lara Dark TealLara Dark Teal + Lara Dark TealLara Dark Teal
  • PRIMEONE 2021
  • - Saga BlueSaga Blue + Saga BlueSaga Blue
  • - Saga GreenSaga Green + Saga GreenSaga Green
  • - Saga OrangeSaga Orange + Saga OrangeSaga Orange
  • - Saga PurpleSaga Purple + Saga PurpleSaga Purple
  • - Vela BlueVela Blue + Vela BlueVela Blue
  • - Vela GreenVela Green + Vela GreenVela Green
  • - Vela OrangeVela Orange + Vela OrangeVela Orange
  • - Vela PurpleVela Purple + Vela PurpleVela Purple
  • - Arya BlueArya Blue + Arya BlueArya Blue
  • - Arya GreenArya Green + Arya GreenArya Green
  • - Arya OrangeArya Orange + Arya OrangeArya Orange
  • - Arya PurpleArya Purple + Arya PurpleArya Purple
  • PREMIUM
  • - Soho LightSoho Light + Soho LightSoho Light
  • - Soho DarkSoho Dark + Soho DarkSoho Dark
  • - Viva LightViva Light + Viva LightViva Light
  • - Viva DarkViva Dark + Viva DarkViva Dark
  • - MiraMira + MiraMira
  • - NanoNano + NanoNano
    • @@ -174,47 +174,47 @@ diff --git a/pages/avatar/index.vue b/pages/avatar/index.vue index 6e7e6a6e9..3f0b6263c 100644 --- a/pages/avatar/index.vue +++ b/pages/avatar/index.vue @@ -67,9 +67,9 @@
    Image
    - - - + + +
    @@ -77,11 +77,11 @@
    Avatar Group
    - - - - - + + + + +
    @@ -90,7 +90,7 @@
    Image - Badge
    - +
    diff --git a/pages/card/CardDoc.vue b/pages/card/CardDoc.vue index a5fff61ed..3bf8d4a01 100755 --- a/pages/card/CardDoc.vue +++ b/pages/card/CardDoc.vue @@ -18,7 +18,7 @@ import Card from 'primevue/card'; 
    
 <Card>
     <template #header>
-        <img alt="user header" src="demo/images/usercard.png">
+        <img alt="user header" src="/demo/images/usercard.png">
     </template>
     <template #title>
         Advanced Card
diff --git a/pages/card/index.vue b/pages/card/index.vue
index ba810be56..bf3c14363 100755
--- a/pages/card/index.vue
+++ b/pages/card/index.vue
@@ -21,7 +21,7 @@
 
             
                 
                 
                 
diff --git a/pages/chip/index.vue b/pages/chip/index.vue
index 3798ae0f6..57b7285e5 100644
--- a/pages/chip/index.vue
+++ b/pages/chip/index.vue
@@ -28,18 +28,18 @@
 
                 
    Image
    
                 
    
-                    
-                    
-                    
-                    
+                    
+                    
+                    
+                    
                 
    
 
                 
    Styling
    
                 
    
                     
                     
-                    
-                    
+                    
+
    diff --git a/pages/colorpicker/index.vue b/pages/colorpicker/index.vue index b3e082f49..f84f5741b 100755 --- a/pages/colorpicker/index.vue +++ b/pages/colorpicker/index.vue @@ -22,7 +22,7 @@
    - room + room
    diff --git a/pages/contextmenu/ContextMenuDoc.vue b/pages/contextmenu/ContextMenuDoc.vue index 374f474dd..82173d48d 100755 --- a/pages/contextmenu/ContextMenuDoc.vue +++ b/pages/contextmenu/ContextMenuDoc.vue @@ -170,7 +170,7 @@ export default {

    ContextMenu is attached to a custom element manually using the reference and calling the show(event) method.

    
-<img alt="logo" src="demo/images/nature/nature3.jpg" @contextmenu="onImageRightClick">
+<img alt="logo" src="/demo/images/nature/nature3.jpg" @contextmenu="onImageRightClick">
 <ContextMenu ref="menu" :model="items" />
    diff --git a/pages/contextmenu/index.vue b/pages/contextmenu/index.vue index a43e83fe4..9d5a69c6c 100755 --- a/pages/contextmenu/index.vue +++ b/pages/contextmenu/index.vue @@ -13,7 +13,7 @@
    - logo + logo
    diff --git a/pages/datatable/Templating.vue b/pages/datatable/Templating.vue index b154673f1..fdd92a1b7 100755 --- a/pages/datatable/Templating.vue +++ b/pages/datatable/Templating.vue @@ -20,7 +20,7 @@ diff --git a/pages/deferredcontent/index.vue b/pages/deferredcontent/index.vue index ffb3341f5..7e6301bc8 100755 --- a/pages/deferredcontent/index.vue +++ b/pages/deferredcontent/index.vue @@ -13,7 +13,7 @@
    Scroll down to lazy load an image and the DataTable which initiates a query that is not executed on initial page load to speed up load performance.
    diff --git a/pages/dock/DockDoc.vue b/pages/dock/DockDoc.vue index ce4383fdb..eaec10906 100644 --- a/pages/dock/DockDoc.vue +++ b/pages/dock/DockDoc.vue @@ -28,19 +28,19 @@ import Dock from 'primevue/dock'; items: [ { label: "Finder", - icon: "demo/images/dock/finder.svg" + icon: "/demo/images/dock/finder.svg" }, { label: "App Store", - icon: "demo/images/dock/appstore.svg" + icon: "/demo/images/dock/appstore.svg" }, { label: "Photos", - icon: "demo/images/dock/photos.svg" + icon: "/demo/images/dock/photos.svg" }, { label: "Trash", - icon: "demo/images/dock/trash.png" + icon: "/demo/images/dock/trash.png" } ] } @@ -389,46 +389,46 @@ export default { dockItems: [ { label: 'Finder', - icon: "demo/images/dock/finder.svg", + icon: "/demo/images/dock/finder.svg", command: () => { this.displayFinder = true; } }, { label: 'Terminal', - icon: "demo/images/dock/terminal.svg", + icon: "/demo/images/dock/terminal.svg", command: () => { this.displayTerminal = true; } }, { label: 'App Store', - icon: "demo/images/dock/appstore.svg", + icon: "/demo/images/dock/appstore.svg", command: () => { this.$toast.add({ severity: 'error', summary: 'An unexpected error occurred while signing in.', detail: 'UNTRUSTED_CERT_TITLE', group: 'tc', life: 3000 }); } }, { label: 'Safari', - icon: "demo/images/dock/safari.svg", + icon: "/demo/images/dock/safari.svg", command: () => { this.$toast.add({ severity: 'warn', summary: 'Safari has stopped working', group: 'tc', life: 3000 }); } }, { label: 'Photos', - icon: "demo/images/dock/photos.svg", + icon: "/demo/images/dock/photos.svg", command: () => { this.displayPhotos = true; } }, { label: 'GitHub', - icon: "demo/images/dock/github.svg", + icon: "/demo/images/dock/github.svg", }, { label: 'Trash', - icon: "demo/images/dock/trash.png", + icon: "/demo/images/dock/trash.png", command: () => { this.$toast.add({ severity: 'info', summary: 'Empty Trash', life: 3000 }); } @@ -437,19 +437,19 @@ export default { dockBasicItems: [ { label: "Finder", - icon: "demo/images/dock/finder.svg" + icon: "/demo/images/dock/finder.svg" }, { label: "App Store", - icon: "demo/images/dock/appstore.svg" + icon: "/demo/images/dock/appstore.svg" }, { label: "Photos", - icon: "demo/images/dock/photos.svg" + icon: "/demo/images/dock/photos.svg" }, { label: "Trash", - icon: "demo/images/dock/trash.png" + icon: "/demo/images/dock/trash.png" } ], menubarItems: [ @@ -805,46 +805,46 @@ export default { const dockItems = ref([ { label: 'Finder', - icon: "demo/images/dock/finder.svg", + icon: "/demo/images/dock/finder.svg", command: () => { displayFinder.value = true; } }, { label: 'Terminal', - icon: "demo/images/dock/terminal.svg", + icon: "/demo/images/dock/terminal.svg", command: () => { displayTerminal.value = true; } }, { label: 'App Store', - icon: "demo/images/dock/appstore.svg", + icon: "/demo/images/dock/appstore.svg", command: () => { toast.add({ severity: 'error', summary: 'An unexpected error occurred while signing in.', detail: 'UNTRUSTED_CERT_TITLE', group: 'tc', life: 3000 }); } }, { label: 'Safari', - icon: "demo/images/dock/safari.svg", + icon: "/demo/images/dock/safari.svg", command: () => { toast.add({ severity: 'warn', summary: 'Safari has stopped working', group: 'tc', life: 3000 }); } }, { label: 'Photos', - icon: "demo/images/dock/photos.svg", + icon: "/demo/images/dock/photos.svg", command: () => { displayPhotos.value = true; } }, { label: 'GitHub', - icon: "demo/images/dock/github.svg", + icon: "/demo/images/dock/github.svg", }, { label: 'Trash', - icon: "demo/images/dock/trash.png", + icon: "/demo/images/dock/trash.png", command: () => { toast.add({ severity: 'info', summary: 'Empty Trash', life: 3000 }); } @@ -853,19 +853,19 @@ export default { const dockBasicItems = ref([ { label: "Finder", - icon: "demo/images/dock/finder.svg" + icon: "/demo/images/dock/finder.svg" }, { label: "App Store", - icon: "demo/images/dock/appstore.svg" + icon: "/demo/images/dock/appstore.svg" }, { label: "Photos", - icon: "demo/images/dock/photos.svg" + icon: "/demo/images/dock/photos.svg" }, { label: "Trash", - icon: "demo/images/dock/trash.png" + icon: "/demo/images/dock/trash.png" } ]); const menubarItems = ref([ @@ -1244,46 +1244,46 @@ export default { const dockItems = ref([ { label: 'Finder', - icon: "demo/images/dock/finder.svg", + icon: "/demo/images/dock/finder.svg", command: () => { displayFinder.value = true; } }, { label: 'Terminal', - icon: "demo/images/dock/terminal.svg", + icon: "/demo/images/dock/terminal.svg", command: () => { displayTerminal.value = true; } }, { label: 'App Store', - icon: "demo/images/dock/appstore.svg", + icon: "/demo/images/dock/appstore.svg", command: () => { toast.add({ severity: 'error', summary: 'An unexpected error occurred while signing in.', detail: 'UNTRUSTED_CERT_TITLE', group: 'tc', life: 3000 }); } }, { label: 'Safari', - icon: "demo/images/dock/safari.svg", + icon: "/demo/images/dock/safari.svg", command: () => { toast.add({ severity: 'warn', summary: 'Safari has stopped working', group: 'tc', life: 3000 }); } }, { label: 'Photos', - icon: "demo/images/dock/photos.svg", + icon: "/demo/images/dock/photos.svg", command: () => { displayPhotos.value = true; } }, { label: 'GitHub', - icon: "demo/images/dock/github.svg", + icon: "/demo/images/dock/github.svg", }, { label: 'Trash', - icon: "demo/images/dock/trash.png", + icon: "/demo/images/dock/trash.png", command: () => { toast.add({ severity: 'info', summary: 'Empty Trash', life: 3000 }); } @@ -1292,19 +1292,19 @@ export default { const dockBasicItems = ref([ { label: "Finder", - icon: "demo/images/dock/finder.svg" + icon: "/demo/images/dock/finder.svg" }, { label: "App Store", - icon: "demo/images/dock/appstore.svg" + icon: "/demo/images/dock/appstore.svg" }, { label: "Photos", - icon: "demo/images/dock/photos.svg" + icon: "/demo/images/dock/photos.svg" }, { label: "Trash", - icon: "demo/images/dock/trash.png" + icon: "/demo/images/dock/trash.png" } ]); const menubarItems = ref([ diff --git a/pages/galleria/Advanced.vue b/pages/galleria/Advanced.vue index 057cb2b10..a92475c0d 100644 --- a/pages/galleria/Advanced.vue +++ b/pages/galleria/Advanced.vue @@ -250,11 +250,17 @@ export default { created() { this.galleriaService = new PhotoService(); }, - mounted() { - this.galleriaService.getImages().then((data) => (this.images = data)); + async mounted() { + console.log(this.galleriaService); + await this.test(); + console.log(this.images); this.bindDocumentListeners(); }, methods: { + async test() { + const data = await this.galleriaService.getImages(); + this.images = data; + }, onThumbnailButtonClick() { this.showThumbnails = !this.showThumbnails; }, diff --git a/pages/image/index.vue b/pages/image/index.vue index bb6ab9673..5f12293ed 100644 --- a/pages/image/index.vue +++ b/pages/image/index.vue @@ -11,10 +11,10 @@
    Basic
    - Image + Image
    Preview
    - Image + Image
    diff --git a/pages/inplace/InplaceDoc.vue b/pages/inplace/InplaceDoc.vue index e9f36ac2e..97f4a5f44 100755 --- a/pages/inplace/InplaceDoc.vue +++ b/pages/inplace/InplaceDoc.vue @@ -23,7 +23,7 @@ import Inplace from 'primevue/inplace'; <span style="margin-left:.5rem; vertical-align: middle">View Picture</span> </template> <template #content> - <img src="demo/images/nature/nature1.jpg" /> + <img src="/demo/images/nature/nature1.jpg" /> </template> </Inplace> diff --git a/pages/inplace/index.vue b/pages/inplace/index.vue index bc54de3f8..a58c551ac 100755 --- a/pages/inplace/index.vue +++ b/pages/inplace/index.vue @@ -27,7 +27,7 @@ View Picture diff --git a/pages/landing/BlockSection.vue b/pages/landing/BlockSection.vue index ffb7c4ef8..5693bc940 100644 --- a/pages/landing/BlockSection.vue +++ b/pages/landing/BlockSection.vue @@ -13,7 +13,7 @@
    @@ -106,7 +106,7 @@
    @@ -148,7 +148,7 @@
    @@ -214,7 +214,7 @@
    @@ -278,7 +278,7 @@
    @@ -341,7 +341,7 @@
    @@ -356,7 +356,7 @@
    - question mark + question mark
    diff --git a/pages/landing/ComponentSection.vue b/pages/landing/ComponentSection.vue index a71b2863c..b111b2d5d 100644 --- a/pages/landing/ComponentSection.vue +++ b/pages/landing/ComponentSection.vue @@ -35,31 +35,31 @@
    • - avatar 1 + avatar 1 Darrel Steward 15%
    • - avatar 2 + avatar 2 Albert Flores 85%
    • - avatar 3 + avatar 3 Kathryn Murphy 50%
    • - avatar 4 + avatar 4 Cody Fisher 75%
    • - avatar 5 + avatar 5 Brandon Atkinson 60% @@ -70,7 +70,7 @@
      - Watch + Watch
      @@ -105,7 +105,7 @@
      • - Avatar + Avatar
        Amanda Williams diff --git a/pages/landing/FeaturesSection.vue b/pages/landing/FeaturesSection.vue index 4af15e2ce..04d2b85fd 100644 --- a/pages/landing/FeaturesSection.vue +++ b/pages/landing/FeaturesSection.vue @@ -5,56 +5,56 @@
        - components icon + components icon
        90+ UI Components

        The ultimate set of UI Components to assist you with 90+ impressive Vue Components.

        - components icon + components icon
        Community

        Connect with the other open source community members, collaborate and have a voice in the project roadmap.

        - components icon + components icon
        Productivity

        Boost your productivity by achieving more in less time and accomplish amazing results.

        - components icon + components icon
        Accessibility

        Compliant with the Web Content Accessibility Guidelines (WCAG 2.0).

        - components icon + components icon
        Enterprise Support

        Exceptional support service featuring response within 1 business day and option to request enhancements and new features for the library.

        - components icon + components icon
        Mobile

        First class support for responsive design led by touch optimized elements.

        - components icon + components icon
        Themes

        Built on a design-agnostic api, choose from a vast amount of themes such as material, bootstrap, custom or develop your own.

        - components icon + components icon
        Typescript

        Top-notch support for Typescript with types and tooling assistance.

        diff --git a/pages/landing/HeaderSection.vue b/pages/landing/HeaderSection.vue index ce37f5b73..63660fa03 100644 --- a/pages/landing/HeaderSection.vue +++ b/pages/landing/HeaderSection.vue @@ -9,25 +9,25 @@
        1. - primevue core + primevue core Components
        2. - primevue templates + primevue templates Blocks
        3. - primevue templates + primevue templates Designer
        4. - primevue templates + primevue templates Templates
          5. diff --git a/pages/landing/HeroSection.vue b/pages/landing/HeroSection.vue index 62ab1cb8c..cc02ec059 100644 --- a/pages/landing/HeroSection.vue +++ b/pages/landing/HeroSection.vue @@ -5,7 +5,7 @@
          - primevue templates + primevue templates
          Templates Spectacular Designs @@ -14,7 +14,7 @@
          - primevue templates + primevue templates
          Theme Designer Create Your Own @@ -25,7 +25,7 @@
          - primevue core + primevue core
          Open Source 90+ UI Components @@ -35,7 +35,7 @@