Skip to content

Commit

Permalink
Merge pull request #153 from IFRCGo/feature/WN-135
Browse files Browse the repository at this point in the history 
Feature/wn 135
  • Loading branch information
@falezekiel
falezekiel authored Feb 14, 2025
2 parents 0c2ca29 + 9f5601c commit 3128b1c
Show file tree
Hide file tree
Showing 26 changed files with 1,145 additions and 473 deletions.
22 changes: 21 additions & 1 deletion resources/assets/js/components/LocaleDropdown.vue
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<template>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" role="button"
<a class="nav-link dd-text dropdown-toggle" href="#" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{$t(`languages.${locale}`)}}
<i class="fa fa-chevron-down" aria-hidden="true"></i>
</a>
<div class="dropdown-menu">
<a v-for="(value, key) in locales" class="dropdown-item dropdown-item--lang" href="#"
Expand All @@ -29,3 +30,22 @@ export default {
}
}
</script>
<style scoped>
.dropdown-toggle {
border-bottom: none!important;
}
.dd-text {
font-size: 14px!important;
}
.styled-navbar li.nav-item a.nav-link.dropdown-toggle:after {
display: none;
}
.fa-chevron-down {
margin-left: 3rem;
}
</style>
54 changes: 32 additions & 22 deletions resources/assets/js/components/Navbar.vue
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<header class="bg-white header pt-2 pb-2">
<b-navbar toggleable="lg" sticky class="navbar styled-navbar navbar-expand-lg navbar-light">
<b-navbar toggleable="lg" sticky class="navbar bottom-grey styled-navbar navbar-expand-lg navbar-light">
<router-link :to="{ name: 'welcome' }" class="header__logo has-no-underline navbar-brand d-inline-flex mr-auto">
<img class="site-footer__logo d-block" :src="src('headerLogo')" :srcSet="srcSet('headerLogo')" alt="Header Logo">
<h1 class="visually-hidden">
Expand All @@ -12,22 +12,11 @@

<b-collapse id="nav-collapse" is-nav>
<b-navbar-nav class="mt-2 mt-lg-0 header-main-links rtl-mr-auto" v-bind:class="{'ml-auto': !user, 'mr-auto': user, 'is-logged-in': user}">
<li class="nav-item">
<router-link :to="{ name: 'get_started' }" class="nav-link text-uppercase">
{{ $t('get_started') }}
</router-link>
</li>

<li v-if="user" class="nav-item">
<router-link :to="{ name: 'applications.dash', params: { } }" class="nav-link text-uppercase">
{{ $t('my_apps') }}
</router-link>
</li>
<li class="nav-item">
<router-link :to="{ name: 'docs' }" class="nav-link text-uppercase">
{{ $t('docs') }}
</router-link>
</li>
<li v-if="user" class="nav-item">
<router-link :to="{ name: 'view-whatnow' }" class="nav-link text-uppercase">
{{ $t('whatnow_content') }}
Expand All @@ -43,19 +32,21 @@
{{ $t('dashboard') }}
</router-link>
</li>
<li v-if="!user" class="nav-item">
<router-link :to="{ name: 'register' }" class="nav-link text-uppercase">
{{ $t('sign_up') }}
</router-link>
</li>
<li v-if="!user" class="nav-item">
<router-link :to="{ name: 'login' }" class="nav-link text-uppercase">
{{ $t('login') }}
</router-link>
</li>

<LocaleDropdown />

<li v-if="!user" class="nav-item div-border">
<router-link :to="{ name: 'register' }" class="nav-link font-light text-capitalize">
{{ $t('sign_up') }}
</router-link>
</li>
<li v-if="!user" class="nav-item div-border d-flex justify-content-center">
<router-link :to="{ name: 'login' }" class="nav-link font-light text-capitalize">
<i class="fa fa-user-circle" aria-hidden="true"></i>
<span class="login-t">{{ $t('login') }}</span>
</router-link>
</li>

<li class="nav-item d-lg-none" v-if="user">
<router-link :to="{ name: 'settings.profile', params: { id: user.data.id, profile: true } }" class="nav-link text-uppercase">
{{ $t('common.my_profile') }}
Expand Down Expand Up @@ -134,4 +125,23 @@ export default {
.profile-photo {
height: 2rem;
}
.div-border {
border-left: 1px solid #BDBEC0;
}
.font-light {
font-weight: 500;
font-size: 20px;
}
.bottom-grey {
box-shadow: 0px 12px 12px rgba(0, 0, 0, 0.3);
padding: 1.8rem 5rem;
}
.login-t {
font-size: 14px;
}
</style>
62 changes: 48 additions & 14 deletions resources/assets/js/pages/api_usage/terms_conditions.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<b-container fluid>
<page-banner>
<b-col cols="6">
<h1>{{ $t('sidebar.terms_conditions') }}</h1>
<h1 class="sec-title">{{ $t('sidebar.terms_conditions') }}</h1>
</b-col>
<b-col cols="6">
<b-button size="lg" variant="primary" class="float-right rtl-float-left mr-2" :disabled="updatingTerms" @click="saveTerms">
<b-button class="float-right rtl-float-left mr-2 btn-outline-primary" :disabled="updatingTerms" @click="saveTerms">
<fa spin :icon="['fas', 'spinner']" v-if="updatingTerms"/>
<span v-if="updatingTerms">{{ $t('content.whatnow.publishing') }}</span>
<span v-else>{{ $t('common.publish_new') }}</span>
Expand All @@ -17,24 +17,28 @@
<b-card>
<b-row class="mb-3" v-if="can(user, permissions.TERMS_UPDATE)">
<b-col cols="12">
<div class="input-section">
<div class="input-container">
<label for="termsVersion" class="text-uppercase text-secondary ml-2"><b>{{ $t('api_usage.version') }}</b></label>
<b-form-input
v-if="terms"
id="termsVersion"
type="number"
v-model="terms.version"
class="mb-2 ml-2"
:state="updateErrors.errors.version ? false : null">
</b-form-input>
</div>
</div>
</b-col>
<b-col class="mt-4" cols="12">
<p v-if="terms">
{{ $t('common.published') }} {{ terms.createdAt | moment('MMM DD YYYY, HH:mm') }}
</p>
<router-link :to="{ name: 'api-usage.prev_terms_conditions', params: {} }" class="underlined-link">
{{ $t('api_usage.view_prev_terms') }}
</router-link>
<hr>
</b-col>

<b-col cols="12" class="mt-4">
<label for="termsVersion" class="text-uppercase text-secondary"><b>{{ $t('api_usage.version') }}</b></label>
<b-form-input
v-if="terms"
id="termsVersion"
type="number"
v-model="terms.version"
class="mb-2"
:state="updateErrors.errors.version ? false : null">
</b-form-input>
<b-form-invalid-feedback id="termsVersionFeedback">
<!-- This will only be shown if the preceeding input has an invalid state -->
<p v-for="error in updateErrors.errors.version">
Expand Down Expand Up @@ -73,6 +77,36 @@
}
}
}
.input-section {
background: #F7F7F7;
border-radius: 10px;
padding: 1.4rem;
}
.input-container {
background: #E9E9E9;
display: flex;
justify-content: left;
align-items: center;
padding: 0.4rem;
padding-bottom: 0.2rem;
border-radius: 10px;
width: 10%;
input {
background: transparent;
border: none;
}
input:focus {
background: transparent;
border: none;
}
}
.CodeMirror {
border: none;
}
</style>

<script>
Expand Down
26 changes: 21 additions & 5 deletions resources/assets/js/pages/content/auditLog.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,26 @@
<b-container fluid>
<page-banner>
<b-col>
<h1>{{ $t('content.audit_log.audit_log') }}</h1>
<h1 class="sec-title">{{ $t('content.audit_log.my_audit_log') }}</h1>
</b-col>
<b-col>
<b-button size="lg" variant="dark" class="float-right rtl-float-left mr-2 rtl-ml-2" prop='link' href="/api/organisations/instructions/export" v-if="can(user, permissions.USERS_CREATE)" @click="$fireGTEvent($gtagEvents.DownloadAuditLogReport)">
<b-button class="float-right rtl-float-left mr-2 rtl-ml-2 btn-outline-primary" prop='link' href="/api/organisations/instructions/export" v-if="can(user, permissions.USERS_CREATE)" @click="$fireGTEvent($gtagEvents.DownloadAuditLogReport)">
{{ $t('users.list.download_report') }}
</b-button>
</b-col>
</page-banner>

<b-row class="pb-2 px-4 pt-4 bg-white" align-v="center">
<b-col cols="3">
<p class="select-header" v-if="!apiUsers"> {{ $t('content.audit_log.select_hazard') }}</p>
<SelectHazardType class="bg-white" v-model="hazardTypeFilter" :hazardTypeList="filteredHazardsList"></SelectHazardType>
</b-col>
<b-col cols="3">
<p class="select-header" v-if="!apiUsers"> {{ $t('content.audit_log.select_language') }}</p>
<v-select
:dir="isLangRTL(locale) ? 'rtl' : 'ltr'"
v-model="languageFilter"
class="w-100 styled-select"
class="w-100 v-select-custom"
:options="filteredLanguages"
label="text" :disabled="filteredLanguages.length === 0"
:placeholder="$t('content.whatnow.select_language')">
Expand All @@ -36,12 +38,13 @@
</v-select>
</b-col>
<b-col cols="3">
<p class="select-header" v-if="!apiUsers"> {{ $t('content.audit_log.select_soc') }}</p>
<selectSociety
:selected.sync="selectedSoc"
:staynull="true" />
</b-col>
<b-col cols="3">
<b-button size="sm" variant="dark" @click="clearFilters" :disabled="noFilters" class="float-right rtl-float-left">
<b-button @click="clearFilters" :disabled="noFilters" class="float-right rtl-float-left btn-outline-primary">
{{ $t('users.list.clear_filters') }}
</b-button>
</b-col>
Expand Down Expand Up @@ -76,7 +79,7 @@
{{ data.item.created_at | moment("MM/DD/YY HH:mm:ss") }}
</template>
<template #cell(actions)="data">
<b-button v-if="data.item.entity_id" variant="primary" size="sm" class="mb-1" @click="viewChanges(data.item)" :to="{ name: '', params: {} }"> {{ $t('common.view_content') }} </b-button>
<b-button v-if="data.item.entity_id" class="mb-1 new-btn" @click="viewChanges(data.item)" :to="{ name: '', params: {} }"> {{ $t('common.view_content') }} </b-button>
</template>
</b-table>
<b-pagination
Expand Down Expand Up @@ -303,3 +306,16 @@ export default {
}
</script>
<style>
td {
div {
div {
background: #F6333F;
color: white;
}
}
}
.select-header {
font-size: 1rem;
}
</style>
Loading

0 comments on commit 3128b1c

Please sign in to comment.