Skip to content

Commit

Permalink
-[x] Design System Implementation Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Yash Maharjan committed Feb 5, 2025
1 parent a94adf4 commit 0346102
Show file tree
Hide file tree
Showing 10 changed files with 285 additions and 143 deletions.
10 changes: 7 additions & 3 deletions public/css/app.css
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions public/js/formbuilder.js
View file

Large diffs are not rendered by default.

20 changes: 5 additions & 15 deletions public/mix-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
{
<<<<<<< HEAD
"/js/app.js": "/js/app.js?id=9ad6a60f9e4920935e882b84c76134bd",
"/js/script.js": "/js/script.js?id=1b7daeec82b90108f10210751a69236d",
"/js/webportal-script.js": "/js/webportal-script.js?id=b575e764668b3559917bdf4cce514c6b",
"/js/formbuilder.js": "/js/formbuilder.js?id=fe5f7ed2f535b132deb64e41f45d7a35",
"/js/app.js": "/js/app.js?id=8755577fa9aa71916bb905f7bc307cf2",
"/js/script.js": "/js/script.js?id=55ce0f13c0d51f359ef8d6fbb645453e",
"/js/webportal-script.js": "/js/webportal-script.js?id=9b789d719aae908afd648cce5afcaee9",
"/js/formbuilder.js": "/js/formbuilder.js?id=458036ec76b78fa7fcb331064571cfe8",
"/manifest.js": "/manifest.js?id=3ed1124c8f4dcb98acc36de67cb80349",
"/css/webportal-app.css": "/css/webportal-app.css?id=71f014dd2fe03c8a8042e36f88cfb349",
"/css/app.css": "/css/app.css?id=77cbecca26daebdbb95eed429e8a1e6e",
=======
"/js/app.js": "/js/app.js?id=5eedfe81456ef0adf128b9e2e3c1a460",
"/js/script.js": "/js/script.js?id=95df6a0e2b922d12659f74807a5b1013",
"/js/webportal-script.js": "/js/webportal-script.js?id=4e3b8856bb2ee647dcaedc85a43fca97",
"/js/formbuilder.js": "/js/formbuilder.js?id=c0972596538d9574558967bec653f72d",
"/manifest.js": "/manifest.js?id=3ed1124c8f4dcb98acc36de67cb80349",
"/css/webportal-app.css": "/css/webportal-app.css?id=af8ac750f9e32cd730d74440f0aa1c0a",
"/css/app.css": "/css/app.css?id=49c20c5d30e48e7ad9788f2521851589",
>>>>>>> 630205eb (-[x] Header Footer Design System Integration)
"/css/app.css": "/css/app.css?id=d1851aa2510f3d4717ad5dd29d5dd3e8",
"/js/vendor.js": "/js/vendor.js?id=1d9dc84f31934bcf90e4083803feee6b"
}
130 changes: 130 additions & 0 deletions resources/assets/js/views/web/partials/AdminFooter copy.vue
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<template>
<footer
id="footer"
class="mt-7 bg-bluecoral text-sm leading-6 text-n-20 sm:mt-10 md:mt-20"
>
<div class="border-b border-white border-opacity-20">
<div class="mx-3 py-10 sm:mx-10 xl:mx-24 xl:px-1">
<div
class="footer__container grid grid-flow-row gap-8 sm:gap-y-10 md:grid-cols-2 lg:grid-cols-4 lg:justify-items-center"
>
<div>
<a href="/">
<svg-vue
class="h-auto w-60 text-6xl sm:w-64"
icon="footer-logo"
/>
</a>
</div>

<div class="footer__links">
<span class="font-bold text-n-10">IATI Publisher</span>
<ul class="mt-2 flex flex-col">
<li>
<a :href="superAdmin ? '/list-organisations' : '/activities'">{{
superAdmin ? 'Organisation List' : 'Your Activities'
}}</a>
</li>
<li><a href="/about">About</a></li>
<li>
<a
target="_blank"
rel="noopener noreferrer"
class="cursor-pointer"
@click="downloadManual('user')"
>User Manual v1.1</a
>
</li>
</ul>
</div>
<div class="footer__links">
<span class="font-bold text-n-10">IATI Standard</span>
<ul class="mt-2 flex flex-col">
<li><a href="/iati-standard">IATI Standard</a></li>
<li><a href="/publishing-checklist">Publishing Checklist</a></li>
<li><a href="/support">Support</a></li>
<li>
<a
href="https://iatistandard.org/en/privacy-policy/"
target="_blank"
>Privacy Policy</a
>
</li>
</ul>
</div>
<div class="footer__links lg:justify-self-end">
<div class="text-xs leading-5">
<p>Part of the IATI Unified Platform</p>
<p>Code licensed under the GNU AGPL.</p>
<p>Documentation licensed under CC BY 3.0</p>
</div>
<div class="my-5 flex items-center space-x-2 text-n-10">
<svg-vue class="text-2xl" icon="headphone" />
<span class="text-xs font-bold uppercase"
>Any questions? Contact Support</span
>
</div>
<ul>
<li>
<a
class="text-sm text-n-10"
href="mailto:[email protected]"
>[email protected]</a
>
</li>
</ul>
</div>
</div>
</div>
</div>
<div class="mx-5 py-7 sm:mx-10 xl:mx-24 xl:px-1">
<div class="footer__container grid gap-3 sm:grid-cols-2">
<span class="flex items-center text-n-30">
<svg-vue class="mr-1 text-base" icon="copyright" />
Copyright IATI 2022. All rights reserved.</span
>
<div class="flex sm:justify-end">
<a
href="https://www.youtube.com/channel/UCAVH1gcgJXElsj8ENC-bDQQ"
target="_blank"
>
<svg-vue class="mr-1 mt-1 text-4xl" icon="youtube" />
</a>
<a class="ml-4" href="https://twitter.com/IATI_aid" target="_blank">
<svg-vue class="mr-1 mt-1 text-4xl" icon="twitter" />
</a>
</div>
</div>
</div>
</footer>
</template>

<script setup lang="ts">
import { defineProps } from 'vue';
import axios from 'axios';
defineProps({
superAdmin: { type: Boolean, required: false, default: false },
});
function downloadManual(type: string) {
let fileName = {
user: 'IATI_Publisher-User_Manual_v1.1.pdf',
};
let url = window.location.origin + `/Data/Manuals/${fileName[type]}`;
axios({
url: url,
method: 'GET',
responseType: 'arraybuffer',
}).then((response) => {
let blob = new Blob([response.data], {
type: 'application/pdf',
});
let link = document.createElement('a');
link.href = window.URL.createObjectURL(blob);
link.download = fileName[type];
link.click();
});
}
</script>
184 changes: 96 additions & 88 deletions resources/assets/js/views/web/partials/AdminFooter.vue
View file
Original file line number Diff line number Diff line change
@@ -1,112 +1,120 @@
<template>
<footer
id="footer"
class="mt-7 bg-bluecoral text-sm leading-6 text-n-20 sm:mt-10 md:mt-20"
>
<div class="border-b border-white border-opacity-20">
<div class="mx-3 py-10 sm:mx-10 xl:mx-24 xl:px-1">
<div
class="footer__container grid grid-flow-row gap-8 sm:gap-y-10 md:grid-cols-2 lg:grid-cols-4 lg:justify-items-center"
>
<div>
<a href="/">
<svg-vue
class="h-auto w-60 text-6xl sm:w-64"
icon="footer-logo"
/>
</a>
<footer class="iati-design-system iati-footer iati-brand-background mt-14">
<div class="iati-brand-background__content">
<div class="iati-footer__section iati-footer__section--first">
<div class="iati-footer__container">
<div class="iati-footer-block">
<h2 class="iati-footer-block__title text-white">Useful Links</h2>
<div class="iati-footer-block__content">
<ul>
<li><a href="/">Home</a></li>
<li><a href="/about">About</a></li>

<li>
<a
rel="noopener noreferrer"
class="cursor-pointer"
@click="downloadManual('user')"
>User Manual v1.1</a
>
</li>
</ul>
</div>
</div>
</div>
</div>

<div class="footer__links">
<span class="font-bold text-n-10">IATI Publisher</span>
<ul class="mt-2 flex flex-col">
<li>
<a :href="superAdmin ? '/list-organisations' : '/activities'">{{
superAdmin ? 'Organisation List' : 'Your Activities'
}}</a>
</li>
<li><a href="/about">About</a></li>
<li>
<a
target="_blank"
rel="noopener noreferrer"
class="cursor-pointer"
@click="downloadManual('user')"
>User Manual v1.1</a
>
</li>
</ul>
<div class="iati-footer__section">
<div class="iati-footer__container">
<div class="iati-footer-block">
<h2 class="iati-footer-block__title text-white">
Additional Information
</h2>
<div
class="iati-footer-block__content iati-footer-block__content--columns"
>
<div>
<p>Part of the IATI Unified Platform.</p>
<p>
Code licensed under
<a href="https://www.gnu.org/licenses/agpl-3.0.en.html"
>GNU AGPL</a
>.
</p>
<p>
Documentation licensed under
<a href="https://creativecommons.org/licenses/by/4.0/"
>CC BY 3.0</a
>.
</p>
</div>
</div>
</div>
<div class="footer__links">
<span class="font-bold text-n-10">IATI Standard</span>
<ul class="mt-2 flex flex-col">
<li><a href="/iati-standard">IATI Standard</a></li>
<li><a href="/publishing-checklist">Publishing Checklist</a></li>
<li><a href="/support">Support</a></li>
</div>
</div>

<div class="iati-footer__section iati-footer__section--last">
<div class="iati-footer__container">
<nav>
<ul class="iati-piped-list iati-footer__legal-nav">
<li>
<a
href="https://iatistandard.org/en/privacy-policy/"
target="_blank"
>Privacy Policy</a
<a href="https://iatistandard.org/en/privacy-policy/"
>Privacy</a
>
</li>
</ul>
</div>
<div class="footer__links lg:justify-self-end">
<div class="text-xs leading-5">
<p>Part of the IATI Unified Platform</p>
<p>Code licensed under the GNU AGPL.</p>
<p>Documentation licensed under CC BY 3.0</p>
</div>
<div class="my-5 flex items-center space-x-2 text-n-10">
<svg-vue class="text-2xl" icon="headphone" />
<span class="text-xs font-bold uppercase"
>Any questions? Contact Support</span
>
</div>
<ul>
<li>
<a
class="text-sm text-n-10"
href="mailto:[email protected]"
>[email protected]</a
<a href="https://iatistandard.org/en/data-removal/"
>Data removal</a
>
</li>
<li><span>© Copyright IATI 2024</span></li>
</ul>
</nav>

<div class="iati-country-switcher">
<label
for="iati-country-switcher"
class="iati-country-switcher__label"
>Choose your language</label
>
<select
id="iati-country-switcher"
class="iati-country-switcher__control"
>
<option>English</option>
<option>French</option>
</select>
</div>

<div class="iati-footer__social">
<a
href="https://www.linkedin.com/company/international-aid-transparency-initiative/"
aria-label="LinkedIn"
>
<i class="iati-icon iati-icon--linkedin"></i>
</a>
<a href="https://x.com/IATI_aid" aria-label="X">
<i class="iati-icon iati-icon--x"></i>
</a>
<a
href="https://www.youtube.com/channel/UCAVH1gcgJXElsj8ENC-bDQQ"
aria-label="YouTube"
>
<i class="iati-icon iati-icon--youtube"></i>
</a>
<a href="https://www.facebook.com/IATIaid/" aria-label="Facebook">
<i class="iati-icon iati-icon--facebook"></i>
</a>
</div>
</div>
</div>
</div>
<div class="mx-5 py-7 sm:mx-10 xl:mx-24 xl:px-1">
<div class="footer__container grid gap-3 sm:grid-cols-2">
<span class="flex items-center text-n-30">
<svg-vue class="mr-1 text-base" icon="copyright" />
Copyright IATI 2022. All rights reserved.</span
>
<div class="flex sm:justify-end">
<a
href="https://www.youtube.com/channel/UCAVH1gcgJXElsj8ENC-bDQQ"
target="_blank"
>
<svg-vue class="mr-1 mt-1 text-4xl" icon="youtube" />
</a>
<a class="ml-4" href="https://twitter.com/IATI_aid" target="_blank">
<svg-vue class="mr-1 mt-1 text-4xl" icon="twitter" />
</a>
</div>
</div>
</div>
</footer>
</template>

<script setup lang="ts">
import { defineProps } from 'vue';
import axios from 'axios';
defineProps({
superAdmin: { type: Boolean, required: false, default: false },
});
function downloadManual(type: string) {
let fileName = {
user: 'IATI_Publisher-User_Manual_v1.1.pdf',
Expand Down
6 changes: 0 additions & 6 deletions resources/assets/js/views/web/partials/WebFooter.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@
>.
</p>
</div>
<div>
<ul>
<li><a href="#">Web vX.Y.Z</a></li>
<li><a href="#">API vX.Y.Z</a></li>
</ul>
</div>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit 0346102

Please sign in to comment.