Skip to content

Commit

Permalink
Merge pull request #178 from FotieMConstant/development
Browse files Browse the repository at this point in the history
Added the message tab and fixed the little bug on the home page which…
  • Loading branch information
FotieMConstant authored May 29, 2021
2 parents f123343 + 31a2e2b commit 1926159
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 2 deletions.
2 changes: 1 addition & 1 deletion eru/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<!-- show footer only if the user isn't logged in -->
<Footer v-if="!loggedIn" />
<!-- show app bar only if the user is logged in -->
<Appbar v-if="loggedIn" routeToHome="/" routeToProfile="/u/profile" />
<Appbar v-if="loggedIn" routeToHome="/" routeToProfile="/u/profile" routeToChat="/u/chat" />
</v-app>
</template>

Expand Down
8 changes: 8 additions & 0 deletions eru/src/components/ChatComponent.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<template>
<div class="mt-16">
<center>
This feature is not yet available.
<div>Coming soon, Stay tuned!</div>
</center>
</div>
</template>
3 changes: 2 additions & 1 deletion eru/src/components/HomeComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<div>
<v-container id="wrapper" class="pa-12 mx-auto mt-5" elevation="12" max-width="500">
<center>
<h3 class="title font-weight-regular mb-5">Add your partner to get started.</h3>
<h2 v-if="partnerInfo && currentUser" class="title font-weight-regular mb-5">Bond</h2>
<h3 v-else class="title font-weight-regular mb-5">Add your partner to get started.</h3>
<BondAvatars
v-if="partnerInfo && currentUser"
:yourPhoto="currentUser.photoURL"
Expand Down
4 changes: 4 additions & 0 deletions eru/src/components/userComponents/Appbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<v-tab dark :to="routeToHome" class="primary--text">
<v-icon color="primary">mdi-fire</v-icon>
</v-tab>
<v-tab dark :to="routeToChat" class="primary--text">
<v-icon color="primary">mdi-email</v-icon>
</v-tab>
<v-tab :to="routeToProfile" class="primary--text">
<v-icon color="primary">mdi-account-circle</v-icon>
</v-tab>
Expand All @@ -16,6 +19,7 @@
export default {
props: {
routeToHome: String,
routeToChat: String,
routeToProfile: String,
},
};
Expand Down
6 changes: 6 additions & 0 deletions eru/src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Auth from '../views/Auth.vue';
import Profile from '../views/Profile.vue';
import AcceptInvite from '../views/AcceptInvite.vue';
import userComponents from '../views/userComponents.vue';
import Chat from '../views/Chat.vue';

Vue.use(VueRouter);

Expand Down Expand Up @@ -41,6 +42,11 @@ const routes = [
name: 'userComponents',
component: userComponents,
},
{
path: '/u/chat',
name: 'Chat',
component: Chat,
},
{
path: '/about',
name: 'About',
Expand Down
21 changes: 21 additions & 0 deletions eru/src/views/Chat.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<template>
<span>
<ChatComponent />
</span>
</template>


<script>
import ChatComponent from '@/components/ChatComponent.vue';
export default {
name: 'Chat',
components: {
ChatComponent,
},
};
</script>


<style>
/* css */
</style>

2 comments on commit 1926159

@vercel
Copy link

@vercel vercel bot commented on 1926159 May 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

bond – ./eru/

bond-nu.vercel.app
bond-git-main-fotiemconstant.vercel.app
bond-fotiemconstant.vercel.app

@vercel
Copy link

@vercel vercel bot commented on 1926159 May 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

bond-api – ./okok/node-api

bond-api-fotiemconstant.vercel.app
bond-api-git-main-fotiemconstant.vercel.app
bond-api.vercel.app

Please sign in to comment.