ui : templating and config update

This commit is contained in:
simon louvet 2018-11-17 12:08:47 +01:00
parent 5e7a5ac42a
commit 70ae1b033a
6 changed files with 37 additions and 19 deletions

View File

@ -0,0 +1,4 @@
- var sdn = process.env.SDN || 'staging-app.happy-dev.fr'
- var cdn = process.env.CDN || 'staging-app.happy-dev.fr'
- var xmpp = 'https://jabber.happy-dev.fr/http-bind/'
- var client_id = 833925

4
src/config.local.pug Normal file
View File

@ -0,0 +1,4 @@
- var sdn = process.env.SDN || 'http://127.0.0.1:8000'
- var cdn = process.env.CDN || 'staging-app.happy-dev.fr'
- var xmpp = 'https://jabber.happy-dev.fr/http-bind/'
- var client_id = 863031

View File

@ -1,4 +1,4 @@
- var sdn = process.env.SDN || 'http://127.0.0.1:8000' - var sdn = process.env.SDN || 'http://127.0.0.1:8000'
- var cdn = process.env.CDN || 'https://cdn.happy-dev.fr' - var cdn = process.env.CDN || 'https://cdn.happy-dev.fr'
- var xmpp = 'https://jabber.happy-dev.fr/http-bind/' - var xmpp = 'https://jabber.happy-dev.fr/http-bind/'
- var client_id = '863031' - var client_id = '833925'

View File

@ -8,8 +8,8 @@ html(lang="en")
meta(http-equiv="X-UA-Compatible", content="ie=edge") meta(http-equiv="X-UA-Compatible", content="ie=edge")
link(rel="icon" type="image/png" href="/images/logo.png") link(rel="icon" type="image/png" href="/images/logo.png")
include dependencies.pug include dependencies.pug
div.layer body
body div.layer
header#header header#header
include header.pug include header.pug
#subContainer #subContainer

View File

@ -18,19 +18,21 @@ nav#navbar
div.menu-label Projects div.menu-label Projects
div.menu-icon.icon-folder-alt div.menu-icon.icon-folder-alt
sib-route(hidden,name='project', id-prefix=`${sdn}/projects/`) sib-route(hidden,name='project', id-prefix=`${sdn}/projects/`)
sib-display( div.sub-menu
data-src=`${sdn}/projects/`, sib-display(
data-fields='name', data-src=`${sdn}/projects/`,
next='project' data-fields='name',
) next='project'
)
div div
div.menu div.menu
div.menu-notification div.menu-notification
div.menu-label Groups div.menu-label Groups
div.menu-icon.icon-bubbles div.menu-icon.icon-bubbles
sib-route(hidden, name='group', id-prefix=`${sdn}/channels/`) sib-route(hidden, name='group', id-prefix=`${sdn}/channels/`)
sib-display( div.sub-menu
data-src=`${sdn}/channels/`, sib-display(
data-fields='name', data-src=`${sdn}/channels/`,
next='group' data-fields='name',
) next='group'
)

View File

@ -28,7 +28,7 @@
#navbar { #navbar {
//transform: translateX(-120%); //transform: translateX(-120%);
transition: flex-basis 0.5s ease-in-out; transition: flex-basis 0.5s ease-in-out;
flex-basis: 0px; flex-basis: 0;
//position: absolute; //position: absolute;
//top: auto; //top: auto;
//display: none; //display: none;
@ -40,6 +40,13 @@ sib-router {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.sub-menu {
padding-left: 2em;
div{
padding-bottom: 1em;
}
}
.menu { .menu {
display: flex; display: flex;
flex-direction: row-reverse; flex-direction: row-reverse;
@ -61,7 +68,8 @@ sib-router {
color: $color-yellow-light; color: $color-yellow-light;
// transform: perspective(1000px) translateZ(1px) scale(0.8); // transform: perspective(1000px) translateZ(1px) scale(0.8);
} }
.menu-notification>div{
.menu-notification > div {
background-color: $color-purple-dark; background-color: $color-purple-dark;
color: $color-yellow-light; color: $color-yellow-light;
} }
@ -69,7 +77,7 @@ sib-router {
.menu-icon { .menu-icon {
//flex-basis: 2em; //flex-basis: 2em;
width :4em; width: 4em;
flex-shrink: 0; flex-shrink: 0;
flex-grow: 0; flex-grow: 0;
justify-content: center; justify-content: center;
@ -77,7 +85,6 @@ sib-router {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
&:before { &:before {
width: 1.9em; width: 1.9em;
height: 1.9em; height: 1.9em;
@ -110,8 +117,9 @@ sib-router {
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
>div{
color : $color-black; > div {
color: $color-black;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;