Skip to content

Commit

Permalink
deps updated. Some info added.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergio committed Dec 18, 2020
1 parent e981b86 commit 2e169b8
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 35 deletions.
42 changes: 21 additions & 21 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"dependencies": {
"apexcharts": "^3.23.0",
"core-js": "^3.8.1",
"element-plus": "^1.0.1-beta.8",
"firebase": "^8.2.0",
"element-plus": "^1.0.1-beta.10",
"firebase": "^8.2.1",
"firebaseui": "^4.7.1",
"primeflex": "^2.0.0",
"primeicons": "^4.1.0",
Expand All @@ -35,7 +35,7 @@
"babel-eslint": "^10.1.0",
"css-loader": "^5.0.1",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^7.2.0",
"eslint-plugin-vue": "^7.3.0",
"typescript": "~3.9.3"
},
"eslintConfig": {
Expand Down
21 changes: 21 additions & 0 deletions client/src/assets/Open-source-hardware-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/avatar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/osw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/oswguilds.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions client/src/components/NavBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Menubar :model="items">
<template #start>
<router-link to="/" class="brand-logo" tag="a">
<img alt="logo" src="../assets/logo.svg" height="40" class="p-mr-2" />
<img alt="logo" src="../assets/osw.png" height="40" class="p-mr-2" />
</router-link>
</template>
</Menubar>
Expand All @@ -21,8 +21,8 @@ export default {
providerData: [{ providerId: '' }]
},
items: [
{ label: 'Dashboard', icon: 'pi pi-fw pi-chart-bar', to: '/dashboard' },
{ label: 'Profile', icon: 'pi pi-fw pi-user', to: '/profile' },
// { label: 'Login', icon: 'pi pi-fw pi-unlock', to: '/login' },
{ label: 'About', icon: 'pi pi-fw pi-book', to: '/about' },
{
label: 'Logout',
Expand Down
28 changes: 27 additions & 1 deletion client/src/views/About.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,33 @@
<Panel header="About" class="p-shadow-3">
<div class="p-grid">
<div class="p-col-12">
Make with love to OSW community
<h1>Miniestaciones calidad del aire en interiores</h1>
<h2>
Mini estaciones DIY para medir diferentes gases y contaminantes
presentes en el aire en tiempo real.
</h2>
<h3>
<a href="https://github.com/OSWeekends/miniestaciones">
https://github.com/OSWeekends/miniestaciones
</a>
</h3>
</div>
<div class="p-col-12">
<img
class="p-mx-auto"
height="200"
src="../assets/Open-source-hardware-logo.svg"
alt="Logo open hardware"
/>
<img
class="p-mx-auto"
height="200"
src="../assets/oswguilds.png"
alt="Logo osw guilds"
/>
</div>
<div class="p-col-12">
<p>Make with <i class="pi pi-heart"></i> to OSW community</p>
</div>
</div>
</Panel>
Expand Down
14 changes: 6 additions & 8 deletions client/src/views/Profile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,17 @@
<Panel header="Profile" class="p-shadow-3">
<Card style="width: 25rem; margin-bottom: 2em">
<template #header>
<img alt="user avatar" :src="user.photoURL" />
<img :src="user.photoURL || 'https://upload.wikimedia.org/wikipedia/commons/thumb/9/96/Generic-person.svg/240px-Generic-person.svg.png'" />
</template>
<template #title>
{{ user.displayName }}
{{ user.displayName || user.email }}
</template>
<template #content>
<p>
name:
<strong>{{ user.displayName }}</strong>
<strong>{{ user.displayName || 'N/A' }}</strong>
<br />email:
<strong>{{ user.email }}</strong>
<br />uid:
<strong>{{ user.uid }}</strong>
<br />provider:
<strong class="teal-text">{{
user.providerData[0].providerId
Expand All @@ -35,14 +33,14 @@ export default {
email: '',
displayName: '',
photoURL: '',
providerData: [{ providerId: '' }],
},
providerData: [{ providerId: '' }]
}
};
},
created() {
if (AuthService.currentUser) {
this.user = AuthService.currentUser;
}
},
}
};
</script>

0 comments on commit 2e169b8

Please sign in to comment.