Skip to content

Commit 23b1498

Browse files
muarachmannmuarachmann
committed
fixed menu and other pages
1 parent 7e6d69a commit 23b1498

File tree

7 files changed

+444
-379
lines changed

7 files changed

+444
-379
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Run this command to install dependencies
9191
composer install --prefer-dist
9292
```
9393

94-
This command will install all dependencies needed by the Akivas platform to run successfully!
94+
This command will install all dependencies needed by the LibreHealth EHR platform to run successfully!
9595

9696
Generate application key
9797

‎resources/app/global-components/EhrHeaderMenu.vue

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<template>
2+
<div
3+
:id="id"
4+
class="dropdown inline-block relative" @mouseleave="is_open = false">
5+
<div @mouseover="is_open = true" :class="isActiveClass('dashboard.calendar')">
6+
<span class="mr-0.5">{{ label }}</span>
7+
<svg class="fill-current h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z"/> </svg>
8+
</div>
9+
<transition
10+
enter-active-class="transition ease-out duration-100"
11+
enter-class="transform opacity-0 scale-95"
12+
enter-to-class="transform opacity-100 scale-100"
13+
leave-active-class="transition ease-in duration-75"
14+
leave-class="transform opacity-100 scale-100"
15+
leave-to-class="transform opacity-0 scale-95">
16+
<div
17+
v-show="is_open"
18+
class="dropdown-menu absolute border-t-2 border-theme-1 py-1 w-48 bg-white shadow-lg z-50">
19+
<div class="relative bg-white">
20+
<slot/>
21+
</div>
22+
</div>
23+
</transition>
24+
</div>
25+
</template>
26+
27+
<script>
28+
export default {
29+
name: "EhrHeaderMenu",
30+
props: {
31+
label: String,
32+
id: String,
33+
},
34+
data() {
35+
return {
36+
is_open: false
37+
}
38+
},
39+
methods: {
40+
url() {
41+
return location.pathname.substr(1);
42+
},
43+
isUrl(...urls) {
44+
if (urls[0] === '') {
45+
return this.url() === ''
46+
}
47+
return urls.filter(url => this.url().startsWith(url)).length
48+
},
49+
isActiveClass: function(url) {
50+
return this.isUrl(url) ?
51+
'mr-1 ml-1 px-2 py-2 rounded-md text-xs font-small text-gray-300 hover:text-white ' +
52+
'inline-flex items-center bg-theme-1 hover:bg-gray-700 focus:outline-none focus:text-white focus:bg-gray-theme-1' +
53+
'transition duration-500 ease-in-out transform hover:-translate-y-1 hover:scale-100 cursor-pointer':
54+
55+
'mr-1 ml-1 px-2 py-2 rounded-md text-xs font-small text-gray-300 hover:text-white ' +
56+
'inline-flex items-center bg-gray-800 hover:bg-gray-700 focus:outline-none focus:text-white focus:bg-gray-700 ' +
57+
'transition duration-500 ease-in-out transform hover:-translate-y-1 hover:scale-100 cursor-pointer'
58+
},
59+
isSubMenuActive: function (url) {
60+
return this.isUrl(url) ?
61+
'block px-4 py-2 text-sm text-gray-700 bg-gray-100 hover:bg-gray-100' :
62+
'block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100'
63+
}
64+
},
65+
}
66+
</script>

‎resources/app/global-components/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ Vue.component('Icon', () => import('./Icon'))
66
Vue.component('EhrInput', () => import('./EhrInput'))
77
Vue.component('EhrButton', () => import('./EhrButton'))
88
Vue.component('EhrLabel', () => import('./EhrLabel'));
9+
Vue.component('EhrHeaderMenu', () => import('./EhrHeaderMenu'));
910
Vue.component('Breadcrumb', () => import('./Breadcrumb'))
1011
Vue.component('DatePicker', () => import('./DatePicker'))

‎resources/app/layouts/StaticPageLayout.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<img class="w-full mx-5 my-5 items-center" :src="'/images/logos/ehr_logo.png'" alt="LibreHealth Logo">
55
<h2 class="text-lg uppercase font-bold items-center text-center">The Power of medical health data</h2>
66
<div v-if="$page.props.auth.user" class="flex m-5 items-center">
7-
<inertia-link :href="route('dashboard')" class="inline-flex text-base text-white items-center justify-center ml-10 mr-10 px-10 py-3 rounded-md bg-gray-900 mb-3">
7+
<inertia-link :href="route('dashboard.index')" class="inline-flex text-base text-white items-center justify-center ml-10 mr-10 px-10 py-3 rounded-md bg-gray-900 mb-3">
88
<icon name="dashboard" class="mx-2 h-5 w-5 text-white"/>
9-
{{ $t('general.ehr_dashboard') }}
9+
{{ $t('menu.dashboard') }}
1010
</inertia-link>
1111
</div>
1212
<div v-else class="flex m-5 items-center">

‎resources/app/pages/About.vue

Lines changed: 47 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,65 @@
11
<template>
22
<div>
3-
<div class="p-10">
4-
<article class="prose">
5-
<h2>About LibreHealth EHR</h2>
3+
<dashboard-layout v-if="$page.props.auth.user">
4+
<div class="p-10">
5+
<article class="prose">
6+
<h2>About LibreHealth EHR</h2>
7+
<p>
8+
LibreHealth EHR is a free and open-source electronic health records and medical practice management application.
69

7-
<p>
8-
LibreHealth EHR is a free and open-source electronic health records and medical practice management application.
10+
The mission of LibreHealth is to help provide high quality medical care to all people, regardless of race, socioeconomic status, or geographic location, by providing medical practices and clinics across the globe access to free of charge medical software. That same software is designed to save clinics both time and money, which gives practitioners more time to spend with individual patients, thereby supplying patients with higher quality care.
911

10-
The mission of LibreHealth is to help provide high quality medical care to all people, regardless of race, socioeconomic status, or geographic location, by providing medical practices and clinics across the globe access to free of charge medical software. That same software is designed to save clinics both time and money, which gives practitioners more time to spend with individual patients, thereby supplying patients with higher quality care.
12+
We are current and former contributors to OpenEMR and thank that community for years of hard work. We intend to honor that legacy by allowing this new community to leverage the good things in OpenEMR, share what we create and not be afraid to break backward compatibility in the name of forward progress and modern development models.
1113

12-
We are current and former contributors to OpenEMR and thank that community for years of hard work. We intend to honor that legacy by allowing this new community to leverage the good things in OpenEMR, share what we create and not be afraid to break backward compatibility in the name of forward progress and modern development models.
14+
We are collaborating closely with the LibreHealth Project, an umbrella organization for health IT projects with similar goals.
15+
</p>
16+
</article>
17+
</div>
18+
<button type="submit" class="flex text-base text-white justify-center items-center ml-10 mr-10 px-10 py-3 rounded-md bg-gray-900 mb-3">
19+
<icon name="document-report" class="mx-2 h-5 w-5 text-white"/>
20+
{{ $t('forms.docs') }}
21+
</button>
22+
</dashboard-layout>
23+
<static-page-layout v-else>
24+
<div class="p-10">
25+
<article class="prose">
26+
<h2>About LibreHealth EHR</h2>
27+
<p>
28+
LibreHealth EHR is a free and open-source electronic health records and medical practice management application.
1329

14-
We are collaborating closely with the LibreHealth Project, an umbrella organization for health IT projects with similar goals.
30+
The mission of LibreHealth is to help provide high quality medical care to all people, regardless of race, socioeconomic status, or geographic location, by providing medical practices and clinics across the globe access to free of charge medical software. That same software is designed to save clinics both time and money, which gives practitioners more time to spend with individual patients, thereby supplying patients with higher quality care.
1531

16-
</p>
32+
We are current and former contributors to OpenEMR and thank that community for years of hard work. We intend to honor that legacy by allowing this new community to leverage the good things in OpenEMR, share what we create and not be afraid to break backward compatibility in the name of forward progress and modern development models.
1733

18-
</article>
19-
</div>
20-
<button type="submit" class="flex text-base text-white justify-center items-center ml-10 mr-10 px-10 py-3 rounded-md bg-gray-900 mb-3">
21-
<icon name="document-report" class="mx-2 h-5 w-5 text-white"/>
22-
{{ $t('forms.docs') }}
23-
</button>
34+
We are collaborating closely with the LibreHealth Project, an umbrella organization for health IT projects with similar goals.
35+
</p>
36+
</article>
37+
</div>
38+
<button type="submit" class="flex text-base text-white justify-center items-center ml-10 mr-10 px-10 py-3 rounded-md bg-gray-900 mb-3">
39+
<icon name="document-report" class="mx-2 h-5 w-5 text-white"/>
40+
{{ $t('forms.docs') }}
41+
</button>
42+
</static-page-layout>
2443
</div>
2544
</template>
2645

2746
<script>
2847
import StaticPageLayout from "../layouts/StaticPageLayout"
48+
import DashboardLayout from "../layouts/DashboardLayout.vue";
2949
3050
export default {
3151
name: 'About',
32-
layout: StaticPageLayout
52+
metaInfo() {
53+
return {
54+
title: this.title
55+
}
56+
},
57+
components: {
58+
DashboardLayout,
59+
StaticPageLayout,
60+
},
61+
props: {
62+
status: Number,
63+
},
3364
}
3465
</script>

‎resources/app/pages/Contact.vue

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,33 @@
11
<template>
22
<div>
3-
<h1 class="text-2xl font-semibold mb-3">Contact</h1>
4-
<p>Contact LibreHealth EHR</p>
3+
<dashboard-layout v-if="$page.props.auth.user">
4+
<h1 class="text-2xl font-semibold mb-3">Contact</h1>
5+
<p>Contact LibreHealth EHR</p>
6+
</dashboard-layout>
7+
<static-page-layout v-else>
8+
<h1 class="text-2xl font-semibold mb-3">Contact</h1>
9+
<p>Contact LibreHealth EHR</p>
10+
</static-page-layout>
511
</div>
612
</template>
713

814
<script>
915
import DashboardLayout from "../layouts/DashboardLayout"
16+
import StaticPageLayout from "../layouts/StaticPageLayout"
1017
1118
export default {
12-
layout: DashboardLayout
19+
name: 'Contact',
20+
metaInfo() {
21+
return {
22+
title: this.title
23+
}
24+
},
25+
components: {
26+
DashboardLayout,
27+
StaticPageLayout,
28+
},
29+
props: {
30+
status: Number,
31+
},
1332
}
1433
</script>

0 commit comments

Comments
 (0)