chore: 3.0.0-beta.2 release

coreui · Dec 4, 2019 · 6dcf544 · 6dcf544
2 parents 0aaae3d + 20a24e9
commit 6dcf544
Show file tree

Hide file tree

Showing 47 changed files with 2,340 additions and 1,354 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,8 +1,19 @@
 {
   "name": "@coreui/coreui-free-vue-admin-template",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.2",
   "description": "Open Source Bootstrap Admin Template",
-  "author": "Łukasz Holeczek",
+  "author": {
+    "name": "CoreUI",
+    "url": "https://coreui.io",
+    "github": "https://github.com/coreui",
+    "twitter": "https://twitter.com/core_ui"
+  },
+  "contributors": [
+    {
+      "name": "CoreUI Team",
+      "url": "https://github.com/orgs/coreui/people"
+    }
+  ],
   "homepage": "http://coreui.io",
   "copyright": "Copyright 2019 creativeLabs Łukasz Holeczek",
   "license": "MIT",
@@ -14,26 +25,26 @@
     "test:e2e": "vue-cli-service test:e2e"
   },
   "dependencies": {
-    "@coreui/coreui": "3.0.0-beta.3",
-    "@coreui/coreui-vue-chartjs": "1.0.0-alpha.2",
-    "@coreui/icons": "1.0.0-beta.3",
-    "@coreui/vue": "coreui/coreui-vue#3.0.0-beta.2",
+    "@coreui/coreui": "^3.0.0-beta.3",
+    "@coreui/coreui-vue-chartjs": "^1.0.0",
+    "@coreui/icons": "^1.0.0-beta.3",
+    "@coreui/vue": "coreui/coreui-vue#3.0.0-beta.3",
     "vue": "^2.6.10",
     "vue-router": "^3.1.3"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.0.5",
-    "@vue/cli-plugin-e2e-nightwatch": "^4.0.5",
-    "@vue/cli-plugin-eslint": "^4.0.5",
-    "@vue/cli-plugin-unit-jest": "^4.0.5",
-    "@vue/cli-service": "^4.0.5",
-    "@vue/test-utils": "^1.0.0-beta.29",
-    "@babel/core": "7.7.2",
+    "@vue/cli-plugin-babel": "^4.1.1",
+    "@vue/cli-plugin-e2e-nightwatch": "^4.1.1",
+    "@vue/cli-plugin-eslint": "^4.1.1",
+    "@vue/cli-plugin-unit-jest": "^4.1.1",
+    "@vue/cli-service": "^4.1.1",
+    "@vue/test-utils": "1.0.0-beta.29",
+    "@babel/core": "7.7.4",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
-    "core-js": "^3.4.1",
+    "core-js": "^3.4.7",
     "chromedriver": "^78.0.1",
-    "eslint": "^6.6.0",
+    "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.0.1",
     "node-sass": "^4.13.0",
     "sass-loader": "^8.0.0",

diff --git a/public/img/brand/coreui-vue-logo.svg b/public/img/brand/coreui-vue-logo.svg
diff --git a/public/img/favicon.png b/public/img/favicon.png
diff --git a/public/img/logo-symbol.png b/public/img/logo-symbol.png
diff --git a/public/img/logo.png b/public/img/logo.png
diff --git a/src/assets/icons/icons.js b/src/assets/icons/icons.js
@@ -43,7 +43,7 @@ import {
   cilCheck,
   cilChevronBottom,
   cilChevronTop,
-  // cilCircleCheck,
+  cilCheckCircle,
   cilCommentSquare,
   cilCursor,
   cilDrop,
@@ -63,6 +63,7 @@ import {
   cilLockLocked,
   cilMagnifyingGlass,
   cilMoon,
+  cilOptions,
   cilPencil,
   cilPeople,
   cilPuzzle,
@@ -93,7 +94,7 @@ export const iconsSet = Object.assign(
     cilCheck,
     cilChevronBottom,
     cilChevronTop,
-    // cilCircleCheck,
+    cilCheckCircle,
     cilCommentSquare,
     cilCursor,
     cilDrop,
@@ -113,6 +114,7 @@ export const iconsSet = Object.assign(
     cilLockLocked,
     cilMagnifyingGlass,
     cilMoon,
+    cilOptions,
     cilPencil,
     cilPeople,
     cilPuzzle,

diff --git a/src/containers/TheHeader.vue b/src/containers/TheHeader.vue
@@ -12,8 +12,8 @@
     />
     <CHeaderBrand
       class="mx-auto d-lg-none" 
-      src="img/brand/coreui-base.svg"
-      width="97"
+      src="img/brand/coreui-vue-logo.svg"
+      width="190"
       height="46"
       alt="CoreUI Logo"
     />

diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
@@ -300,7 +300,7 @@
                       <CIcon name="cil-globe-alt" class="progress-group-icon"/>
                       <span class="title">Organic Search</span>
                       <span class="ml-auto font-weight-bold">
-                        191,235<span class="text-muted small">(56%)</span>
+                        191,235 <span class="text-muted small">(56%)</span>
                       </span>
                     </div>
                     <div class="progress-group-bars">

diff --git a/src/views/base/Cards.vue b/src/views/base/Cards.vue
@@ -154,7 +154,7 @@
     </CRow>
     <CRow>
       <CCol sm="6" md="4">
-        <CCard color="primary" class="text-center" body-wrapper>
+        <CCard color="primary" class="text-center" body-wrapper text-color="white">
           <blockquote class="card-blockquote">
             <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
             <footer>Someone famous in
@@ -164,7 +164,12 @@
         </CCard>
       </CCol>
       <CCol sm="6" md="4">
-        <CCard color="success" class="text-center" body-wrapper>
+        <CCard 
+          color="success" 
+          class="text-center" 
+          body-wrapper
+          text-color="white"
+        >
           <blockquote class="card-blockquote">
             <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
             <footer>Someone famous in
@@ -174,7 +179,7 @@
         </CCard>
       </CCol>
       <CCol sm="6" md="4">
-        <CCard color="info" class="text-center" body-wrapper>
+        <CCard color="info" class="text-center" body-wrapper text-color="white">
           <blockquote class="card-blockquote">
             <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
             <footer>Someone famous in
@@ -184,7 +189,7 @@
         </CCard>
       </CCol>
       <CCol sm="6" md="4">
-        <CCard color="warning" class="text-center" body-wrapper>
+        <CCard color="warning" class="text-center" body-wrapper text-color="white">
           <blockquote class="card-blockquote">
             <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
             <footer>Someone famous in
@@ -194,7 +199,7 @@
         </CCard>
       </CCol>
       <CCol sm="6" md="4">
-        <CCard color="danger" class="text-center" body-wrapper>
+        <CCard color="danger" class="text-center" body-wrapper text-color="white">
           <blockquote class="card-blockquote">
             <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
             <footer>Someone famous in
@@ -216,27 +221,27 @@
     </CRow>
     <CRow>
       <CCol sm="6" md="4">
-        <CCard color="primary" body-wrapper>
+        <CCard color="primary" body-wrapper text-color="white">
           {{loremIpsum}}
         </CCard>
       </CCol>
       <CCol sm="6" md="4">
-        <CCard color="success" body-wrapper>
+        <CCard color="success" body-wrapper text-color="white">
           {{loremIpsum}}
         </CCard>
       </CCol>
       <CCol sm="6" md="4">
-        <CCard color="info" body-wrapper>
+        <CCard color="info" body-wrapper text-color="white">
           {{loremIpsum}}
         </CCard>
       </CCol>
       <CCol sm="6" md="4">
-        <CCard color="warning" body-wrapper>
+        <CCard color="warning" body-wrapper text-color="white">
           {{loremIpsum}}
         </CCard>
       </CCol>
       <CCol sm="6" md="4">
-        <CCard color="danger" body-wrapper>
+        <CCard color="danger" body-wrapper text-color="white">
           {{loremIpsum}}
         </CCard>
       </CCol>

diff --git a/src/views/base/Forms.vue b/src/views/base/Forms.vue
@@ -245,7 +245,7 @@
             </CForm>
           </CCardBody>
           <CCardFooter>
-            <CButton type="submit" size="sm" color="primary"><CIcon name="cil-circle-check"/> Submit</CButton>
+            <CButton type="submit" size="sm" color="primary"><CIcon name="cil-check-circle"/> Submit</CButton>
             <CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
           </CCardFooter>
         </CCard>
@@ -276,7 +276,7 @@
             </CForm>
           </CCardBody>
           <CCardFooter>
-            <CButton type="submit" size="sm" color="primary"><CIcon name="cil-circle-check"/> Submit</CButton>
+            <CButton type="submit" size="sm" color="primary"><CIcon name="cil-check-circle"/> Submit</CButton>
             <CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
           </CCardFooter>
         </CCard>
@@ -307,7 +307,7 @@
             </CForm>
           </CCardBody>
           <CCardFooter>
-            <CButton type="submit" size="sm" color="primary"><CIcon name="cil-circle-check"/> Submit</CButton>
+            <CButton type="submit" size="sm" color="primary"><CIcon name="cil-check-circle"/> Submit</CButton>
             <CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
           </CCardFooter>
         </CCard>
@@ -337,7 +337,7 @@
               />
             </CCardBody>
             <CCardFooter>
-              <CButton type="submit" size="sm" color="primary"><CIcon name="cil-circle-check"/> Submit</CButton>
+              <CButton type="submit" size="sm" color="primary"><CIcon name="cil-check-circle"/> Submit</CButton>
               <CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
             </CCardFooter>
           </CForm>
@@ -427,7 +427,7 @@
             />
           </CCardBody>
           <CCardFooter>
-            <CButton type="submit" size="sm" color="primary"><CIcon name="cil-circle-check"/> Submit</CButton>
+            <CButton type="submit" size="sm" color="primary"><CIcon name="cil-check-circle"/> Submit</CButton>
             <CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
           </CCardFooter>
         </CCard>
@@ -506,7 +506,7 @@
             </CInput>
           </CCardBody>
           <CCardFooter>
-            <CButton type="submit" size="sm" color="success"><CIcon name="cil-circle-check"/> Submit</CButton>
+            <CButton type="submit" size="sm" color="success"><CIcon name="cil-check-circle"/> Submit</CButton>
             <CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
           </CCardFooter>
         </CCard>
@@ -539,15 +539,15 @@
               autocomplete="email"
             >
               <template #prepend>
-                <CButton color="primary"><CIcon name="cil-facebook" height="14"/></CButton>
+                <CButton color="primary"><CIcon name="cib-facebook" height="14"/></CButton>
               </template>
               <template #append>
-                <CButton color="primary"><CIcon name="cil-twitter" height="14"/></CButton>
+                <CButton color="primary"><CIcon name="cib-twitter" height="14"/></CButton>
               </template>
             </CInput>
           </CCardBody>
           <CCardFooter>
-            <CButton type="submit" size="sm" color="success"><CIcon name="cil-circle-check"/> Submit</CButton>
+            <CButton type="submit" size="sm" color="success"><CIcon name="cil-check-circle"/> Submit</CButton>
             <CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
           </CCardFooter>
         </CCard>
@@ -620,7 +620,7 @@
             </CInput>
           </CCardBody>
           <CCardFooter>
-            <CButton type="submit" size="sm" color="success"><CIcon name="cil-circle-check"/> Submit</CButton>
+            <CButton type="submit" size="sm" color="success"><CIcon name="cil-check-circle"/> Submit</CButton>
             <CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
           </CCardFooter>
         </CCard>

diff --git a/src/views/buttons/ButtonGroups.vue b/src/views/buttons/ButtonGroups.vue
@@ -80,14 +80,14 @@
               <CDropdown right text="Menu" color="success">
                 <CDropdownItem>Item 1</CDropdownItem>
                 <CDropdownItem>Item 2</CDropdownItem>
-                <CDropdownDivider></CDropdownDivider>
+                <CDropdownDivider/>
                 <CDropdownItem>Item 3</CDropdownItem>
               </CDropdown>
               <CButton color="secondary" class="d-sm-down-none">Button 3</CButton>
               <CDropdown right split text="Split Menu" color="info">
                 <CDropdownItem>Item 1</CDropdownItem>
                 <CDropdownItem>Item 2</CDropdownItem>
-                <CDropdownDivider></CDropdownDivider>
+                <CDropdownDivider/>
                 <CDropdownItem>Item 3</CDropdownItem>
               </CDropdown>
             </CButtonGroup>

diff --git a/src/views/buttons/Dropdowns.vue b/src/views/buttons/Dropdowns.vue
@@ -27,7 +27,7 @@
                 <CDropdownItem>First Action</CDropdownItem>
                 <CDropdownItem>Second Action</CDropdownItem>
                 <CDropdownItem>Third Action</CDropdownItem>
-                <CDropdownDivider></CDropdownDivider>
+                <CDropdownDivider/>
                 <CDropdownItem>Something else here...</CDropdownItem>
                 <CDropdownItem disabled>Disabled action</CDropdownItem>
               </CDropdown>
@@ -48,7 +48,7 @@
               >
                 <CDropdownItem>First item</CDropdownItem>
                 <CDropdownItem>Second item</CDropdownItem>
-                <CDropdownDivider></CDropdownDivider>
+                <CDropdownDivider/>
                 <CDropdownItem>Separated Item</CDropdownItem>
               </CDropdown>
             </div>
@@ -242,7 +242,7 @@
                   <CDropdownItem>Add</CDropdownItem>
                   <CDropdownItem>Delete</CDropdownItem>
                 </div>
-                <CDropdownDivider></CDropdownDivider>
+                <CDropdownDivider/>
                 <CDropdownItem>
                   Something <strong>not</strong> associated with user
                 </CDropdownItem>

diff --git a/tests/unit/containers/__snapshots__/TheContainer.spec.js.snap b/tests/unit/containers/__snapshots__/TheContainer.spec.js.snap
@@ -19,6 +19,7 @@ exports[`TheContainer.vue renders correctly 1`] = `
       >
         <ccontainer-stub
           fluid="true"
+          tag="div"
         >
           <router-view-stub
             name="fade"

diff --git a/tests/unit/containers/__snapshots__/TheHeader.spec.js.snap b/tests/unit/containers/__snapshots__/TheHeader.spec.js.snap
@@ -24,8 +24,8 @@ exports[`TheHeader.vue renders correctly 1`] = `
     alt="CoreUI Logo"
     class="mx-auto d-lg-none"
     height="46"
-    src="img/brand/coreui-base.svg"
-    width="97"
+    src="img/brand/coreui-vue-logo.svg"
+    width="190"
   />
    
   <cheadernav-stub