Skip to content
This repository has been archived by the owner on Jan 3, 2024. It is now read-only.

Separate the menus #568

Merged
merged 1 commit into from
Dec 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/assets/icons/apps.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion src/elements/OCAvatar.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<oc-img
class="oc-avatar"
width="50"
:width="width"
:src="src"
:alt="accessibilityLabel"
:aria-hidden="accessibilityLabel === ''"
Expand Down Expand Up @@ -34,6 +34,12 @@ export default {
required: false,
default: "",
},

width: {
type: Number,
required: false,
default: 50,
},
},
}
</script>
Expand Down
133 changes: 111 additions & 22 deletions src/pages/Files.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,119 @@ export default {
<router-link to="/" class="oc-topbar-icon">ownCloud X</router-link>
</oc-navbar-item>
<oc-navbar-item position="right">
<router-link
tag="div"
to="/personal"
<oc-grid
gutter="small"
class="oc-topbar-personal"
uk-tooltip="title: Personal setting; pos: bottom-right;"
>
<oc-avatar
class="oc-topbar-personal-avatar"
src="https://picsum.photos/64/64?image=1027"
:loading="loading"
/><span class="oc-topbar-personal-label">Alice Habanero</span>
</router-link>
<oc-icon
id="oc-notification-bell"
class="oc-cursor-pointer uk-padding-small"
name="bell"
variation="inverted"
aria-label="Notifications"
/>
<oc-button
id="_apps"
icon="apps"
variation="primary"
class="oc-cursor-pointer uk-padding-small uk-height-1-1"
aria-label="Application Switcher"
/>
<div class="padding-small uk-height-1-1">
<oc-avatar
class="oc-topbar-personal-avatar oc-cursor-pointer"
src="https://picsum.photos/64/64?image=1027"
:loading="loading"
id="_account"
/>
</div>
</oc-grid>
</oc-navbar-item>
</oc-navbar>

<oc-drop
id="oc-notification-drop"
toggle="#oc-notification-bell"
position="bottom-right"
class="uk-height-large uk-width-3-4 uk-width-large@s"
>
<div class="uk-overflow-auto">
<div class="uk-width-1-1">
<h5 class="uk-h4">Hello World !</h5>
<p class="uk-text-small">Welcome to The System</p>
<div class="uk-button-group uk-width-1-1 uk-flex-right">
<oc-button
id="resolve-notification-button"
size="small"
>Mark as read</oc-button>
</div>
<hr/>
</div>
<div class="uk-width-1-1">
<h5 class="uk-h4">Hello Again !</h5>

<p class="uk-text-small">Welcome back to The System</p>
<p>
<a href="#" class="uk-link" target="_blank">Link</a>
</p>
<div class="uk-button-group uk-width-1-1 uk-flex-right">
<oc-button
id="resolve-notification-button"
size="small"
>Mark as read</oc-button>
</div>
</div>
</div>
</oc-drop>

<oc-drop toggle="#_apps" mode="click" :options="{pos:'bottom-right'}" class="uk-width-large">
<div class="uk-grid-small uk-text-center" uk-grid>
<div class="uk-width-1-3">
<oc-icon name="folder" size="large"/>
<div>Files</div>
</div>
<div class="uk-width-1-3">
<oc-icon name="movie_filter" size="large"/>
<div>Video</div>
</div>
<div class="uk-width-1-3">
<oc-icon name="group" size="large"/>
<div>Contacts</div>
</div>
</div>
<div class="uk-grid-small uk-text-center" uk-grid>
<div class="uk-width-1-3">
<oc-icon name="linked_camera" size="large"/>
<div>Album</div>
</div>
<div class="uk-width-1-3">
<oc-icon name="lock" size="large"/>
<div>Passwords</div>
</div>
<div class="uk-width-1-3">
<oc-icon name="timer" size="large"/>
<div>Run Tracker</div>
</div>
</div>
</oc-drop>

<oc-drop toggle="#_account" mode="click" :options="{pos:'bottom-right'}" class="uk-width-large">
<div class="uk-card-body uk-flex uk-flex-middle uk-flex-column">
<oc-avatar
src="https://picsum.photos/128/128?image=1027"
:width="128"
/>
<h3 class="uk-card-title">Alice Wonderland</h3>
<span>alice@wonder.land</span>
<br />
<oc-button>Manage your account</oc-button>
<br/>
<oc-button>Sign out</oc-button>
</div>
<div class="uk-card-footer uk-flex uk-flex-middle uk-flex-column">
<span>version: 0.2.6</span>
</div>
</oc-drop>

<oc-application-menu v-model="leftMenuOpen" name="leftMenu" @close="leftMenuOpen = false">
<oc-sidebar-nav-item active icon="folder" target="home">
Expand All @@ -89,20 +186,15 @@ export default {
<oc-sidebar-nav-item>Deleted files</oc-sidebar-nav-item>
</template>
</oc-sidebar-nav-item>

<oc-sidebar-nav-item icon="account_circle" :isolate="true">Personal settings</oc-sidebar-nav-item>
<oc-sidebar-nav-divider />
<oc-sidebar-nav-item icon="application">Administration</oc-sidebar-nav-item>

<oc-sidebar-nav-item icon="exit_to_app" target="login" :isolate="true">Exit ownCloud</oc-sidebar-nav-item>
</oc-application-menu>

<oc-app-layout :rightHidden="rightHidden">
<oc-app-layout :rightHidden="rightHidden" :leftHidden="true">


<template slot="center">
<oc-app-bar id="files-app-bar">
<div class="uk-width-expand">
<oc-breadcrumb :home="goHome" :items="[{text:'Folder',to:{path:'folder'}},{text:'Subfolder'}]"></oc-breadcrumb>
<oc-breadcrumb :home="true" :items="[{text:'Folder',to:{path:'folder'}},{text:'Subfolder'}]"></oc-breadcrumb>
</div>
<div class="uk-width-auto uk-visible@m">
<oc-search-bar label="Search"></oc-search-bar>
Expand Down Expand Up @@ -187,7 +279,7 @@ export default {
</template>
</oc-dialog>

<oc-file-actions />
<!-- <oc-file-actions /> -->

</template>
<template slot="right">
Expand Down Expand Up @@ -285,9 +377,6 @@ export default {
}
},
methods: {
goHome () {
alert('Going home')
},
selectFile(file) {
this.$root.$emit('oc-file-actions:open', {
filename: file.name + "." + file.extension,
Expand Down
1 change: 1 addition & 0 deletions src/styles/theme/oc-app-menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@extend .uk-nav-default;
@extend .uk-nav-parent-icon;
@extend .uk-margin-medium-top;
@extend .uk-margin-small-left;

// Immediate anchor
& > li > a {
Expand Down