Skip to content

Commit

Permalink
Merge pull request #98 from walt-id/develop
Browse files Browse the repository at this point in the history 
Issue  #97
  • Loading branch information
@taminobaumann
taminobaumann authored Dec 5, 2022
2 parents e75ba0c + b23925f commit 2ecad37
Show file tree
Hide file tree
Showing 6 changed files with 89 additions and 79 deletions.
2 changes: 1 addition & 1 deletion assets/css/core.css
View file

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

2 changes: 1 addition & 1 deletion assets/css/core.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ body {
}
}
._setting {
margin-top: -70px;
// margin-top: -70px;
._tag {
color: white;
background-color: $second-text-muted;
Expand Down
4 changes: 2 additions & 2 deletions layouts/default.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
</a>
</div>
<div :class="['_content justify-content-center d-flex', !$store.state.utils.fullPageModal && 'align-items-center']" :style="{ marginTop: $store.state.utils.fullPageModal ? '2em' : '-2em' }">
<div id="content">
<Nuxt />
<div id="content" class="h-100">
<Nuxt class="h-100" />
</div>
<div id="menu-content" class="_menu-content hide">
<ul>
Expand Down
2 changes: 1 addition & 1 deletion nuxt.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default {

// Global CSS: https://go.nuxtjs.dev/config-css
css: [
"@/assets/css/core.scss",
// "@/assets/css/core.scss",
"@/assets/css/core.css",
"@/assets/css/animate.min.css",
"@/assets/css/animations.css",
Expand Down
156 changes: 83 additions & 73 deletions pages/Settings/Ecosystems/index.vue
View file
Original file line number Diff line number Diff line change
@@ -1,67 +1,69 @@
<template>
<div>
<div :class="this.didListModal === false ? '':'hide'">
<div class="_setting">
<div class="h-100">
<div :class="['h-100', this.didListModal === false ? '':'hide']">
<div class="_setting h-100">
<h2>Ecosystems</h2>
<br>
<!--<p class="mt-3">You have no Ecosystems.</p>-->
<!-- EBSI / ESSIF -->
<div class="d-flex mt-3 align-items-start _setting-items">
<div class="col-10 _item">
<h4>EBSI/ESSIF</h4>
<p>Based on the<br>EU blockchain (EBSI).</p>
<b v-if="hasType(currentDid, 'ebsi')" class="_tag"><em>Selected</em></b>
<div class="holder">
<div class="d-flex mt-3 align-items-start _setting-items">
<div class="flex-grow-1 _item">
<h4>EBSI/ESSIF</h4>
<p>Based on the<br>EU blockchain (EBSI).</p>
<b v-if="hasType(currentDid, 'ebsi')" class="_tag"><em>Selected</em></b>
</div>
<div class="ms-auto">
<NuxtLink to="/settings/ecosystems/ebsi-essif" class="_button-view _bounce">Add</NuxtLink>
</div>
</div>
<div class="col">
<NuxtLink to="/settings/ecosystems/ebsi-essif" class="_button-view _bounce">Add</NuxtLink>
<!-- DNS (web) -->
<div class="d-flex mt-4 align-items-start _setting-items">
<div class="flex-grow-1 _item">
<h4>DNS</h4>
<p>Based on the domain<br>name service (DNS).</p>
<b v-if="hasType(currentDid, 'web')" class="_tag">
<em>Selected</em>
</b>
</div>
<div class="ms-auto">
<NuxtLink to="/settings/ecosystems/dns" class="_button-view _bounce">Add</NuxtLink>
</div>
</div>
</div>
<!-- DNS (web) -->
<div class="d-flex mt-4 align-items-start _setting-items">
<div class="col-10 _item">
<h4>DNS</h4>
<p>Based on the domain<br>name service (DNS).</p>
<b v-if="hasType(currentDid, 'web')" class="_tag">
<em>Selected</em>
</b>
</div>
<div class="col">
<NuxtLink to="/settings/ecosystems/dns" class="_button-view _bounce">Add</NuxtLink>
<!-- Gaia-X -->
<div class="d-flex mt-4 align-items-start _setting-items">
<div class="flex-grow-1 _item">
<h4>Gaia-X</h4>
<p>Onboard the Gaia-X ecosystem.</p>
<b v-if="hasType(currentDid, 'gaia-x')" class="_tag">
</b>
</div>
<div class="ms-auto">
<NuxtLink to="/settings/ecosystems/gaia-x" class="_button-view _bounce">Add</NuxtLink>
</div>
</div>
</div>
<!-- Gaia-X -->
<div class="d-flex mt-4 align-items-start _setting-items">
<div class="col-10 _item">
<h4>Gaia-X</h4>
<p>Onboard the Gaia-X ecosystem.</p>
<b v-if="hasType(currentDid, 'gaia-x')" class="_tag">
</b>
<!-- IOTA -->
<div class="d-flex mt-4 align-items-start _setting-items">
<div class="flex-grow-1 _item">
<h4>IOTA</h4>
<p>Onboard the IOTA ecosystem.</p>
<b v-if="hasType(currentDid, 'iota')" class="_tag">
</b>
</div>
<div class="ms-auto">
<NuxtLink to="/settings/ecosystems/iota" class="_button-view _bounce">Add</NuxtLink>
</div>
</div>
<div class="col">
<NuxtLink to="/settings/ecosystems/gaia-x" class="_button-view _bounce">Add</NuxtLink>
</div>
</div>
<!-- IOTA -->
<div class="d-flex mt-4 align-items-start _setting-items">
<div class="col-10 _item">
<h4>IOTA</h4>
<p>Onboard the IOTA ecosystem.</p>
<b v-if="hasType(currentDid, 'iota')" class="_tag">
</b>
</div>
<div class="col">
<NuxtLink to="/settings/ecosystems/iota" class="_button-view _bounce">Add</NuxtLink>
</div>
</div>
<!-- Key -->
<div class="d-flex mt-4 align-items-start _setting-items">
<div class="col-10 _item">
<h4>Key</h4>
<p>Peer-to-peer based<br>key distribution.</p>
<b v-if="hasType(currentDid, 'key')" class="_tag"><em>Selected</em></b>
</div>
<div class="col">
<NuxtLink to="/settings/ecosystems/key" class="_button-view _bounce">Add</NuxtLink>
<!-- Key -->
<div class="d-flex mt-4 align-items-start _setting-items">
<div class="flex-grow-1 _item">
<h4>Key</h4>
<p>Peer-to-peer based<br>key distribution.</p>
<b v-if="hasType(currentDid, 'key')" class="_tag"><em>Selected</em></b>
</div>
<div class="ms-auto">
<NuxtLink to="/settings/ecosystems/key" class="_button-view _bounce">Add</NuxtLink>
</div>
</div>
</div>
<div class=" mt-3">
Expand All @@ -71,9 +73,9 @@
</div>
</div>
</div>
<div :class="this.didListModal === true ? '_content d-flex':'hide'">
<div class="mt-3">
<div class="_top-bar px-3">
<div :class="['h-100', this.didListModal === true ? '_content d-flex':'hide']">
<div class="mt-3 h-100">
<div class="_top-bar px-3" style="min-height: auto;">
<div class="d-flex align-items-center _animation-fade">
<a href="#" @click="hideModal" class="_back-button">
<span class="d-flex align-items-center">
Expand All @@ -83,24 +85,26 @@
</a>
</div>
</div>
<div class="_did-content">
<div class="_did-content h-100">
<h2>All Selected DID</h2>
<br>
<div class="d-grid justify-content-center">
<a href="#" v-for="did in dids" @click="setDefaultDID(did)" v-bind:key="did.index"
class="_card d-flex">
<div class="col-9 d-flex align-items-center">
<div>
<h5 class="mb-1">{{did.slice(0,25)}}...</h5>
<p class="text-truncate" style="max-width: 12em">{{copyright}}</p>
<div class="d-grid justify-content-center holder">
<div v-for="did in dids" v-bind:key="did.index">
<a href="#" @click="setDefaultDID(did)"
class="_card d-flex">
<div class="col-9 d-flex align-items-center">
<div>
<h5 class="mb-1">{{did.slice(0,25)}}...</h5>
<p class="text-truncate" style="max-width: 12em">{{copyright}}</p>
</div>
</div>
</div>
<div class="col d-flex justify-content-end align-items-start">
<b v-if="currentDid === did" class="_tag mt-2"><em>Default</em></b>
<b v-else class="_tag-active mt-2"><em>Set default</em></b>

</div>
</a>
<div class="col d-flex justify-content-end align-items-start">
<b v-if="currentDid === did" class="_tag mt-2"><em>Default</em></b>
<b v-else class="_tag-active mt-2"><em>Set default</em></b>

</div>
</a>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -157,3 +161,9 @@ export default {
}
};
</script>

<style lang="sass" scoped>
.holder
overflow-y: auto
height: calc( 100% - 48px - 65px )
</style>
2 changes: 1 addition & 1 deletion pages/Settings/data/index.vue
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<div :class="this.didListModal === false ? '_content justify-content-center d-flex align-items-center':'hide'">
<div :class="this.didListModal === false ? '_content justify-content-center d-flex':'hide'">
<div class="_setting">
<h2>Data</h2>
<br>
Expand Down

0 comments on commit 2ecad37

Please sign in to comment.