diff options
| author | Shpuld Shpludson <shp@cock.li> | 2018-12-31 17:35:31 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2018-12-31 17:35:31 +0000 |
| commit | 76cfb15b3c76531b7c3da0261720d13004c8cfdd (patch) | |
| tree | 12d63c530bc9080c8d7449a5f393d0549355b288 /src/App.vue | |
| parent | 7aa42c01eb5f05c2e3ed71fc52be6a30e45802bf (diff) | |
| parent | ace042015e77e507d6323c493596943dd8c657bb (diff) | |
Merge branch 'feature/replace-panel-switcher' into 'develop'
Mobile side drawer
See merge request pleroma/pleroma-fe!443
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/App.vue b/src/App.vue index 4d4680e2..feadb009 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,44 +7,42 @@ </div> <div class='inner-nav'> <div class='item'> - <router-link class="back-button" @click.native="activatePanel('timeline')" :to="{ name: 'root' }" active-class="hidden"> - <i class="icon-left-open" :title="$t('nav.back')"></i> - </router-link> + <a href="#" class="menu-button" @click.stop.prevent="toggleMobileSidebar()"> + <i class="button-icon icon-menu"></i> + <div class="alert-dot" v-if="unseenNotificationsCount"></div> + </a> <router-link class="site-name" :to="{ name: 'root' }" active-class="home">{{sitename}}</router-link> </div> <div class='item right'> - <user-finder class="button-icon nav-icon" @toggled="onFinderToggled"></user-finder> - <router-link @click.native="activatePanel('timeline')" :to="{ name: 'settings'}"><i class="button-icon icon-cog nav-icon" :title="$t('nav.preferences')"></i></router-link> - <a href="#" v-if="currentUser" @click.prevent="logout"><i class="button-icon icon-logout nav-icon" :title="$t('login.logout')"></i></a> + <user-finder class="button-icon nav-icon mobile-hidden" @toggled="onFinderToggled"></user-finder> + <router-link class="mobile-hidden" :to="{ name: 'settings'}"><i class="button-icon icon-cog nav-icon" :title="$t('nav.preferences')"></i></router-link> + <a href="#" class="mobile-hidden" v-if="currentUser" @click.prevent="logout"><i class="button-icon icon-logout nav-icon" :title="$t('login.logout')"></i></a> </div> </div> </nav> - <div class="container" id="content"> - <div class="panel-switcher"> - <button @click="activatePanel('sidebar')">Sidebar</button> - <button @click="activatePanel('timeline')">Timeline</button> - </div> - <div class="sidebar-flexer" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar'}"> + <div v-if="" class="container" id="content"> + <side-drawer ref="sideDrawer" :logout="logout"></side-drawer> + <div class="sidebar-flexer mobile-hidden"> <div class="sidebar-bounds"> <div class="sidebar-scroller"> <div class="sidebar"> - <user-panel :activatePanel="activatePanel"></user-panel> - <nav-panel :activatePanel="activatePanel"></nav-panel> + <user-panel></user-panel> + <nav-panel></nav-panel> <instance-specific-panel v-if="showInstanceSpecificPanel"></instance-specific-panel> <features-panel v-if="!currentUser"></features-panel> <who-to-follow-panel v-if="currentUser && suggestionsEnabled"></who-to-follow-panel> - <notifications :activatePanel="activatePanel" v-if="currentUser"></notifications> + <notifications v-if="currentUser"></notifications> </div> </div> </div> </div> - <div class="main" :class="{ 'mobile-hidden': mobileActivePanel != 'timeline' }"> + <div class="main"> <transition name="fade"> <router-view></router-view> </transition> </div> </div> - <chat-panel v-if="currentUser && chat" class="floating-chat mobile-hidden"></chat-panel> + <chat-panel :floating="true" v-if="currentUser && chat" class="floating-chat mobile-hidden"></chat-panel> </div> </template> |