Skip to content

Commit

Permalink
Chore: push dev to create v3.0.0-alpha version
Browse files Browse the repository at this point in the history
  • Loading branch information
@woothu
woothu committed Feb 25, 2019
1 parent b358563 commit f0e3d72
Show file tree
Hide file tree
Showing 49 changed files with 7,700 additions and 8,382 deletions.
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coreui/coreui-free-vue-admin-template",
"version": "2.0.1",
"version": "3.0.0-alpha",
"description": "Open Source Bootstrap Admin Template",
"author": "Łukasz Holeczek",
"homepage": "http://coreui.io",
Expand All @@ -17,7 +17,7 @@
"@coreui/coreui": "^2.1.6",
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
"@coreui/icons": "0.3.0",
"@coreui/vue": "github:coreui/coreui-vue#test",
"@coreui/vue": "github:coreui/coreui-vue#v3-bridge-alpha",
"bootstrap": "^4.1.3",
"bootstrap-vue": "^2.0.0-rc.11",
"chart.js": "^2.7.3",
Expand All @@ -29,7 +29,7 @@
"perfect-scrollbar": "^1.4.0",
"simple-line-icons": "^2.4.1",
"tooltip.js": "^1.3.1",
"vue": "^2.5.17",
"vue": "^2.6.6",
"vue-chartjs": "^3.4.0",
"vue-perfect-scrollbar": "^0.1.0",
"vue-router": "^3.0.1"
Expand All @@ -47,7 +47,7 @@
"https-proxy-agent": "^2.2.1",
"node-sass": "^4.9.4",
"sass-loader": "^7.1.0",
"vue-template-compiler": "^2.5.17"
"vue-template-compiler": "^2.6.6"
},
"browserslist": [
"> 1%",
Expand Down
78 changes: 37 additions & 41 deletions src/containers/DefaultAside.vue
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<template>
<b-tabs>
<b-tab>
<CTabs>
<CTab active>
<template slot="title">
<i class='icon-list'></i>
<i class="icon-list"></i>
</template>
<b-list-group class="list-group-accent">
<b-list-group-item class="list-group-item-accent-secondary bg-light text-center font-weight-bold text-muted text-uppercase small">
<CListGroup class="list-group-accent">
<CListGroupItem class="list-group-item-accent-secondary bg-light text-center font-weight-bold text-muted text-uppercase small">
Today
</b-list-group-item>
<b-list-group-item href="#" class="list-group-item-accent-warning list-group-item-divider">
</CListGroupItem>
<CListGroupItem href="#" class="list-group-item-accent-warning list-group-item-divider">
<div class="avatar float-right">
<img class="img-avatar" src="img/avatars/7.jpg" alt="admin@bootstrapmaster.com">
</div>
Expand All @@ -21,21 +21,21 @@
<small class="text-muted">
<i class="icon-location-pin"></i>&nbsp;&nbsp;Palo Alto, CA
</small>
</b-list-group-item>
<b-list-group-item href="#" class="list-group-item-accent-info">
</CListGroupItem>
<CListGroupItem href="#" class="list-group-item-accent-info">
<div class="avatar float-right">
<img class="img-avatar" src="img/avatars/4.jpg" alt="admin@bootstrapmaster.com">
</div>
<div>Skype with <strong>Megan</strong>
</div>
<small class="text-muted mr-3"><i class="icon-calendar"></i>&nbsp;&nbsp;4 - 5pm</small>
<small class="text-muted"><i class="icon-social-skype"></i>&nbsp;&nbsp;On-line</small>
</b-list-group-item>
</CListGroupItem>
<hr class="transparent mx-3 my-0">
<b-list-group-item class="list-group-item-accent-secondary bg-light text-center font-weight-bold text-muted text-uppercase small">
<CListGroupItem class="list-group-item-accent-secondary bg-light text-center font-weight-bold text-muted text-uppercase small">
Tomorrow
</b-list-group-item>
<b-list-group-item href="#" class="list-group-item-accent-danger list-group-item-divider">
</CListGroupItem>
<CListGroupItem href="#" class="list-group-item-accent-danger list-group-item-divider">
<div>New UI Project - <strong>deadline</strong>
</div>
<small class="text-muted mr-3"><i class="icon-calendar"></i>&nbsp;&nbsp;10 - 11pm</small>
Expand All @@ -57,13 +57,13 @@
<img class="img-avatar" src="img/avatars/6.jpg" alt="admin@bootstrapmaster.com">
</div>
</div>
</b-list-group-item>
<b-list-group-item href="#" class="list-group-item-accent-success list-group-item-divider">
</CListGroupItem>
<CListGroupItem href="#" class="list-group-item-accent-success list-group-item-divider">
<div><strong>#10 Startups.Garden</strong> Meetup</div>
<small class="text-muted mr-3"><i class="icon-calendar"></i>&nbsp; 1 - 3pm</small>
<small class="text-muted"><i class="icon-location-pin"></i>&nbsp; Palo Alto, CA</small>
</b-list-group-item>
<b-list-group-item href="#" class="list-group-item-accent-primary list-group-item-divider">
</CListGroupItem>
<CListGroupItem href="#" class="list-group-item-accent-primary list-group-item-divider">
<div><strong>Team meeting</strong></div>
<small class="text-muted mr-3"><i class="icon-calendar"></i>&nbsp; 4 - 6pm</small>
<small class="text-muted"><i class="icon-home"></i>&nbsp; creativeLabs HQ</small>
Expand All @@ -90,10 +90,10 @@
<img src="img/avatars/8.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
</div>
</div>
</b-list-group-item>
</b-list-group>
</b-tab>
<b-tab>
</CListGroupItem>
</CListGroup>
</CTab>
<CTab>
<template slot="title">
<i class='icon-speech'></i>
</template>
Expand All @@ -117,7 +117,7 @@
<div class="py-3 pb-5 mr-3 float-left">
<div class="avatar">
<img src="img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
<c-badge variant="danger" class="avatar-status"></c-badge>
<CBadge variant="danger" class="avatar-status"></CBadge>
</div>
</div>
<div>
Expand All @@ -132,7 +132,7 @@
<div class="py-3 pb-5 mr-3 float-left">
<div class="avatar">
<img src="img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
<c-badge variant="info" class="avatar-status"></c-badge>
<CBadge variant="info" class="avatar-status"></CBadge>
</div>
</div>
<div>
Expand All @@ -147,7 +147,7 @@
<div class="py-3 pb-5 mr-3 float-left">
<div class="avatar">
<img src="img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
<c-badge variant="warning" class="avatar-status"></c-badge>
<CBadge variant="warning" class="avatar-status"></CBadge>
</div>
</div>
<div>
Expand All @@ -162,7 +162,7 @@
<div class="py-3 pb-5 mr-3 float-left">
<div class="avatar">
<img src="img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
<c-badge variant="dark" class="avatar-status"></c-badge>
<CBadge variant="dark" class="avatar-status"></CBadge>
</div>
</div>
<div>
Expand All @@ -173,8 +173,8 @@
<small class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt...</small>
</div>
</div>
</b-tab>
<b-tab>
</CTab>
<CTab>
<template slot="title">
<i class='icon-settings'></i>
</template>
Expand All @@ -183,7 +183,7 @@
<div class="aside-options">
<div class="clearfix mt-4">
<small><b>Option 1</b></small>
<c-switch color="success" label variant="pill" size="sm" class="float-right" checked />
<CSwitch variant="success" label shape="pill" size="sm" class="float-right" checked />
</div>
<div>
<small class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</small>
Expand All @@ -192,7 +192,7 @@
<div class="aside-options">
<div class="clearfix mt-3">
<small><b>Option 2</b></small>
<c-switch color="success" label variant="pill" size="sm" class="float-right" />
<CSwitch variant="success" label shape="pill" size="sm" class="float-right" />
</div>
<div>
<small class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</small>
Expand All @@ -201,7 +201,7 @@
<div class="aside-options">
<div class="clearfix mt-3">
<small><b>Option 3</b></small>
<c-switch color="success" label variant="pill" size="sm" class="float-right" disabled defaultChecked/>
<CSwitch variant="success" label shape="pill" size="sm" class="float-right" disabled defaultChecked/>
</div>
<div>
<small class="text-muted">Disabled option.</small>
Expand All @@ -210,42 +210,38 @@
<div class="aside-options">
<div class="clearfix mt-3">
<small><b>Option 4</b></small>
<c-switch color="success" label variant="pill" size="sm" class="float-right" checked />
<CSwitch variant="success" label shape="pill" size="sm" class="float-right" checked />
</div>
</div>
<hr>
<h6>System Utilization</h6>
<div class="text-uppercase mb-1 mt-4">
<small><b>CPU Usage</b></small>
</div>
<b-progress height={} class="progress-xs" variant="info" :value="25"></b-progress>
<CProgress class="progress-xs" variant="info" :value="25"></CProgress>
<small class="text-muted">348 Processes. 1/4 Cores.</small>
<div class="text-uppercase mb-1 mt-2">
<small><b>Memory Usage</b></small>
</div>
<b-progress height={} class="progress-xs" variant="warning" :value="70"></b-progress>
<CProgress class="progress-xs" variant="warning" :value="70"></CProgress>
<small class="text-muted">11444GB/16384MB</small>
<div class="text-uppercase mb-1 mt-2">
<small><b>SSD 1 Usage</b></small>
</div>
<b-progress height={} class="progress-xs" variant="danger" :value="95"></b-progress>
<CProgress class="progress-xs" variant="danger" :value="95"></CProgress>
<small class="text-muted">243GB/256GB</small>
<div class="text-uppercase mb-1 mt-2">
<small><b>SSD 2 Usage</b></small>
</div>
<b-progress height={} class="progress-xs" variant="success" :value="10"></b-progress>
<CProgress class="progress-xs" variant="success" :value="10"></CProgress>
<small class="text-muted">25GB/256GB</small>
</div>
</b-tab>
</b-tabs>
</CTab>
</CTabs>
</template>

<script>
import { Switch as cSwitch } from '@coreui/vue'
export default {
name: 'DefaultAside',
components: {
cSwitch
}
}
</script>
76 changes: 32 additions & 44 deletions src/containers/DefaultContainer.vue
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
<template>
<div class="app">
<AppHeader fixed>
<SidebarToggler class="d-lg-none" display="md" mobile />
<b-link class="navbar-brand" to="#">
<CHeader fixed>
<CSidebarToggler class="d-lg-none" display="md" mobile />
<CLink class="navbar-brand" to="#">
<img class="navbar-brand-full" src="img/brand/logo.svg" width="89" height="25" alt="CoreUI Logo">
<img class="navbar-brand-minimized" src="img/brand/sygnet.svg" width="30" height="30" alt="CoreUI Logo">
</b-link>
<SidebarToggler class="d-md-down-none" display="lg" />
<b-navbar-nav class="d-md-down-none">
<b-nav-item class="px-3" to="/dashboard">Dashboard</b-nav-item>
<b-nav-item class="px-3" to="/users" exact>Users</b-nav-item>
<b-nav-item class="px-3">Settings</b-nav-item>
</b-navbar-nav>
<b-navbar-nav class="ml-auto">
<b-nav-item class="d-md-down-none">
</CLink>
<CSidebarToggler class="d-md-down-none" display="lg" />
<CNavbarNav class="d-md-down-none">
<CNavItem class="px-3" to="/dashboard">Dashboard</CNavItem>
<CNavItem class="px-3" to="/users" exact>Users</CNavItem>
<CNavItem class="px-3">Settings</CNavItem>
</CNavbarNav>
<CNavbarNav class="ml-auto">
<CNavItem class="d-md-down-none">
<i class="icon-bell"></i>
<b-badge pill variant="danger">5</b-badge>
</b-nav-item>
<b-nav-item class="d-md-down-none">
<CBadge pill variant="danger">5</CBadge>
</CNavItem>
<CNavItem class="d-md-down-none">
<i class="icon-list"></i>
</b-nav-item>
<b-nav-item class="d-md-down-none">
</CNavItem>
<CNavItem class="d-md-down-none">
<i class="icon-location-pin"></i>
</b-nav-item>
</CNavItem>
<DefaultHeaderDropdownAccnt/>
</b-navbar-nav>
<AsideToggler class="d-none d-lg-block" />
</CNavbarNav>
<CAsideToggler class="d-none d-lg-block" />
<!--<AsideToggler class="d-lg-none" mobile />-->
</AppHeader>
</CHeader>
<div class="app-body">
<AppSidebar fixed>
<SidebarHeader/>
<SidebarForm/>
<SidebarNav :navItems="computedNav"></SidebarNav>
<SidebarFooter/>
<SidebarMinimizer/>
</AppSidebar>
<CSidebar fixed>
<CSidebarHeader/>
<CSidebarForm/>
<CSidebarNav :navItems="computedNav"></CSidebarNav>
<CSidebarFooter/>
<CSidebarMinimizer/>
</CSidebar>
<main class="main">
<CBreadcrumbRouter/>
<div class="container-fluid">
<router-view></router-view>
</div>
</main>
<AppAside fixed>
<CAside fixed>
<!--aside-->
<DefaultAside/>
</AppAside>
</CAside>
</div>
<TheFooter>
<CFooter>
<!--footer-->
<div>
<a href="https://coreui.io">CoreUI</a>
Expand All @@ -57,32 +57,20 @@
<span class="mr-1">Powered by</span>
<a href="https://coreui.io">CoreUI for Vue</a>
</div>
</TheFooter>
</CFooter>
</div>
</template>

<script>
import nav from '@/_nav'
import { Header as AppHeader, SidebarToggler, Sidebar as AppSidebar, SidebarFooter,SidebarNav, SidebarForm, SidebarHeader, SidebarMinimizer, Aside as AppAside, AsideToggler, Footer as TheFooter } from '@coreui/vue'
import DefaultAside from './DefaultAside'
import DefaultHeaderDropdownAccnt from './DefaultHeaderDropdownAccnt'
export default {
name: 'full',
components: {
AsideToggler,
AppHeader,
AppSidebar,
AppAside,
TheFooter,
DefaultAside,
DefaultHeaderDropdownAccnt,
SidebarForm,
SidebarFooter,
SidebarToggler,
SidebarHeader,
SidebarNav,
SidebarMinimizer
},
data () {
return {
Expand Down
Loading

0 comments on commit f0e3d72

Please sign in to comment.