Skip to content

Commit

Permalink
Merge branch '885-multiple-language-support' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@PG-Momik
PG-Momik committed Jul 21, 2023
2 parents 3167b58 + f7f2195 commit 47556c6
Show file tree
Hide file tree
Showing 9 changed files with 3,882 additions and 666 deletions.
96 changes: 86 additions & 10 deletions public/css/app.css
View file

Large diffs are not rendered by default.

3,118 changes: 2,871 additions & 247 deletions public/css/webportal-app.css
View file

Large diffs are not rendered by default.

175 changes: 106 additions & 69 deletions public/js/app.js
View file

Large diffs are not rendered by default.

1,016 changes: 697 additions & 319 deletions public/js/vendor.js
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions public/mix-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"/js/app.js": "/js/app.js?id=ac91359c072bda9f9642b313e85b73d7",
"/js/app.js": "/js/app.js?id=7d178e28619e4c27ab09925d2e10fdcb",
"/js/script.js": "/js/script.js?id=4920eb85d84da1e87cb71769c04a12a2",
"/js/webportal-script.js": "/js/webportal-script.js?id=f9c23d4bccd261db9414465886315f45",
"/js/formbuilder.js": "/js/formbuilder.js?id=96f1b9dd5890b8ff09e613117dd94592",
"/manifest.js": "/manifest.js?id=3ed1124c8f4dcb98acc36de67cb80349",
"/css/webportal-app.css": "/css/webportal-app.css?id=bddd8eda6dc9fb7c04027a48f8ea8661",
"/css/app.css": "/css/app.css?id=dec2a1a8cfc46a0977049353fb4c0b3b",
"/js/vendor.js": "/js/vendor.js?id=70e967c5f70013669dbc79ccaf66654c"
"/css/webportal-app.css": "/css/webportal-app.css?id=c30c347bc64923bfb5f0a2e19e723c9d",
"/css/app.css": "/css/app.css?id=24d95c7a117cb96209b7beb7bbd292bc",
"/js/vendor.js": "/js/vendor.js?id=a2b55d447dfd8b187ce74d02597deb8a"
}
89 changes: 75 additions & 14 deletions resources/assets/js/components/AdminHeader.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</li>
</ul>

<ul class="activity-nav-list -mx-4">
<ul class="activity-nav-list activity-list -mx-4 !text-xs">
<li
v-for="(menu, index) in data[
superAdmin ? 'superadmin_menus' : 'org_menus'
Expand All @@ -87,33 +87,45 @@
]"
:href="menu.permalink"
>
<span class="">{{ menu.name }}</span>
<span>{{ menu.name }} </span>
</a>
<span
<div
v-if="menu.name === translation.common_lang.add_import_activity"
:class="[
{ nav__pointer: menu.active },
data.menuNavAnchorClasses,
]"
class="dropdown-trigger-container"
>
<span class="add-import"
>{{ menu.name }}
<div
class="add-import flex w-full items-center space-x-4"
@click="showActivityDropdown = !showActivityDropdown"
>
<span>{{ menu.name }}</span>
<span>
<svg-vue
:class="{ 'rotate-180': showActivityDropdown }"
class="text-[8px] duration-200"
icon="dropdown-arrow"
/>
</span>

<div
v-if="
menu.name === translation.common_lang.add_import_activity
"
style="visibility: hidden"
class="button__dropdown add-import-dropdown absolute top-full z-50 w-56 -translate-y-3 bg-white p-2 text-left shadow-dropdown duration-300"
>
<ul class="flex-col">
<ul class="flex flex-col">
<li>
<a
id="header-add-activity-manually"
class="cursor-pointer"
:class="liClass"
@click="modalValue = true"
>{{ translation.common_lang.add_activity_manually }}</a
>
>{{ translation.common_lang.add_activity_manually }}
</a>
</li>
<li>
<a
Expand All @@ -137,8 +149,43 @@
</li>
</ul>
</div>
</span>
</span>
</div>
<div
v-if="showActivityDropdown"
class="add-import-sidebar-dropdown"
>
<ul class="flex flex-col space-y-2 text-left">
<li>
<a
id="header-add-activity-manually"
class="cursor-pointer text-white"
@click="modalValue = true"
>{{ translation.common_lang.add_activity_manually }}
</a>
</li>
<li>
<a
id="header-import-activity"
class="cursor-pointer text-white"
href="/import"
>{{
translation.common_lang.import_activities_from_csv
}}</a
>
</li>
<li>
<a
id="header-import-xls"
class="cursor-pointer text-white"
href="/import/xls"
>{{
translation.common_lang.import_activities_from_xls
}}</a
>
</li>
</ul>
</div>
</div>

<div
v-if="menu.name === translation.common_lang.logs.default"
Expand Down Expand Up @@ -393,7 +440,7 @@ const props = defineProps({

const translation = window['globalLang'];
const showUserDropdown = ref(false);

const showActivityDropdown = ref(false);
const toastVisibility = ref(false);
const isLoading = ref(false);

Expand Down Expand Up @@ -614,6 +661,12 @@ onUnmounted(() => {
<style src="@vueform/multiselect/themes/default.css"></style>

<style lang="scss" scoped>
.add-import-sidebar-dropdown {
padding: 8px;
@media (min-width: 1420px) {
display: none;
}
}
.activity__header {
top: 0px;
z-index: 100;
Expand Down Expand Up @@ -717,10 +770,18 @@ onUnmounted(() => {
visibility: hidden;
opacity: 0;
}
.dropdown-trigger-container {
display: block;
@media (min-width: 1420px) {
display: flex;
}
}
.add-import:hover .add-import-dropdown {
visibility: visible !important;
opacity: 1 !important;
transform: translateY(0);
@media (min-width: 1420px) {
visibility: visible !important;
opacity: 1 !important;
transform: translateY(0);
}
}

.spinner {
Expand Down
2 changes: 1 addition & 1 deletion resources/assets/js/views/activity/ActivityDetail.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
:data="element"
:types="types"
:default-language="
activityProps.default_field_values.default_language
activityProps.default_field_values?.default_language
"
:title="String(name)"
:activity-id="activity.id"
Expand Down
2 changes: 1 addition & 1 deletion resources/assets/js/views/activity/elements/Result.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
: types.languages[
result?.result?.description?.[0]
?.narrative?.[0]?.language ??
defaultLanguage
(defaultLanguage?? 'en')
]
}})
</div>
Expand Down
42 changes: 41 additions & 1 deletion resources/assets/sass/layouts/_header.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,46 @@

.activity-nav-list {
@apply flex flex-col gap-y-4 pl-4 text-sm;
.nav__pointer,
.nav__pointer-hover {
@apply relative;
&:after {
content: '';
@apply absolute bottom-0 left-0 h-1 w-full scale-x-0 scale-y-100 rounded-sm bg-turquoise transition-all duration-500;

@media screen and (max-width: 1420px) {
@apply -bottom-2 h-1 w-full;
}
}

&:hover:after {
@apply scale-x-100;
}
}
.nav__pointer:after {
@apply scale-x-100;
}
}

.activity-nav-list.activity-list {
.nav__pointer,
.nav__pointer-hover {
@apply relative;
&:after {
content: '';

@media screen and (max-width: 1420px) {
@apply top-0 -left-4 h-4 w-1;
}
}

&:hover:after {
@apply scale-x-100;
}
}
.nav__pointer:after {
@apply scale-x-100;
}
}
.activity-nav-list.language-nav-list {
flex-direction: row;
Expand Down Expand Up @@ -230,7 +270,7 @@
@apply absolute bottom-0 left-0 h-1 w-full scale-x-0 scale-y-100 rounded-sm bg-turquoise transition-all duration-500;

@media screen and (max-width: 1420px) {
@apply -left-4 h-full w-1;
@apply -left-4 h-4 w-1;
}
}

Expand Down

0 comments on commit 47556c6

Please sign in to comment.