xarvh/fipamo
1
0
Fork 0
forked from projects/fipamo
Code Pull requests Activity

cleaned up dash index styles, cleaned up header

Browse source
This commit is contained in:
Roland Pulliam 2019-02-21 11:35:44 -05:00
parent fc59ab90f6
commit b99890d522
15 changed files with 219 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
brain/routes/back/index.js
View file

@ -16,8 +16,8 @@ router.get('/', function(req, res)
] ]
}).then(function(posts) }).then(function(posts)
{ {
let title = ''; let title = 'Fipamo Admin';
(!loggedIn) ? title = "Hi, there." : title = "This is the front" (!loggedIn) ? welcome = "Hello." : welcome = "Welcome back, "+req.session.user.handle
let filtered = []; let filtered = [];
for (let index = 0; index < posts.length; index++) for (let index = 0; index < posts.length; index++)
{ {
@ -34,6 +34,7 @@ router.get('/', function(req, res)
res.render('dash/index', res.render('dash/index',
{ {
title: title, title: title,
welcome: welcome,
user_status: loggedIn, user_status: loggedIn,
items: filtered items: filtered
}); });

1
brain/tools/ui/TextEditor.js
View file

@ -43,6 +43,7 @@ class TextEditor extends EventEmitter
} }
}); });
this.refresh(); this.refresh();
window.scroll(0,0);
} }
//-------------------------- //--------------------------
// methods // methods

92
themes/dash/assets/css/dash.css
View file

@ -1547,7 +1547,7 @@ h2 {
} }
h3 { h3 {
font-size: 1.5em; font-size: 1.5em;
font-weight: 500; font-weight: 300;
} }
/** /**
------------------------------- -------------------------------
@ -1561,7 +1561,7 @@ body {
height: 100%; height: 100%;
} }
a { a {
font: 300 1em $titleType; font: 300 1em 'Apercu', Helvetica, Arial, sans-serif;
color: #b2cce5; color: #b2cce5;
text-decoration: underline; text-decoration: underline;
-moz-transition: all 0.1s linear; -moz-transition: all 0.1s linear;
@ -1614,15 +1614,21 @@ svg.icons {
z-index: 10; z-index: 10;
position: relative; position: relative;
} }
.main-container section header #header-wrapper #header-one label#the-title, .main-container section header #header-wrapper #header-two {
text-align: right;
color: #f2f1ef;
}
.main-container section header #header-wrapper #header-two a {
text-decoration-color: #fc6399;
}
.main-container section header #header-wrapper #header-two label#the-title { .main-container section header #header-wrapper #header-two label#the-title {
font-family: 'Apercu-Mono'; font-family: 'Apercu-Mono';
font-size: 1.5em; font-size: 1.2em;
font-weight: 300;
color: #f5ab35; color: #f5ab35;
text-decoration: none; text-decoration: none;
display: block; display: block;
} }
.main-container section header #header-wrapper #header-one #dash-menu,
.main-container section header #header-wrapper #header-two #dash-menu { .main-container section header #header-wrapper #header-two #dash-menu {
text-align: right; text-align: right;
} }
@ -1799,17 +1805,38 @@ svg.icons {
} }
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list { #dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list {
padding: 0.75em; padding: 0.75em;
position: relative;
} }
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a { #dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list .recent-header {
height: 50px;
}
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list .recent-header h3 {
vertical-align: top;
display: inline-block;
width: 50%;
}
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list .recent-header .index-menu {
width: 50%;
text-align: right;
vertical-align: top;
display: inline-block;
margin: 24px 0 24px 0;
right: 10px;
color: #f2f1ef;
}
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list .recent-header .index-menu a {
text-decoration-color: #fc6399;
}
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a.post-link {
font-size: 1.5em; font-size: 1.5em;
font-weight: 300; font-weight: 300;
background: #f2f1ef;
display: inline-block; display: inline-block;
border-radius: 3px; border-radius: 3px;
vertical-align: top; vertical-align: top;
text-decoration: none; text-decoration: none;
position: relative;
} }
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a label { #dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a.post-link label {
font-size: 0.7em; font-size: 0.7em;
font-weight: 700; font-weight: 700;
color: #161d23; color: #161d23;
@ -1818,7 +1845,7 @@ svg.icons {
display: inline-block; display: inline-block;
width: 60%; width: 60%;
} }
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a span { #dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a.post-link span {
float: right; float: right;
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
@ -1827,35 +1854,36 @@ svg.icons {
padding: 7px; padding: 7px;
color: #161d23; color: #161d23;
} }
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a div { #dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a.post-link div {
width: 100%; width: 100%;
background-size: cover; background: #f2f1ef;
border-radius: 3px 3px 0 0; position: absolute;
} bottom: 0;
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a:nth-child(2) { border-radius: 0 0 3px 3px;
width: 100%;
margin-bottom: 20px;
}
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a:nth-child(2) div {
height: 500px;
} }
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a:nth-child(3) { #dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a:nth-child(3) {
width: 47%; width: 100%;
margin-right: 20px; margin-bottom: 20px;
height: 500px;
} }
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a:nth-child(3) div { #dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a:nth-child(4) {
height: 600px; width: 49%;
}
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a:nth-child(4),
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a:nth-child(5) {
width: 50.6%;
}
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a:nth-child(4) div,
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a:nth-child(5) div {
height: 275px; height: 275px;
margin: 0 15px 15px 0;
} }
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a:nth-child(5) { #dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a:nth-child(5) {
margin: -305px 0 0 49.3%; width: 49%;
height: 550px;
}
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a:nth-child(6) {
width: 49%;
height: 550px;
margin: -260px 15px 0 0;
}
#dash-index-content #dash-index #dash-index-wrapper #dash-recent #recent-list a:nth-child(7) {
width: 49%;
height: 275px;
margin: 15px 0 0 0;
} }
/** /**
------------------------------- -------------------------------
@ -2682,7 +2710,7 @@ select {
fill: #f2f1ef; fill: #f2f1ef;
} }
#edit-control .submit-delete { #edit-control .submit-delete {
background: #ce483b !important; background: #f64747 !important;
} }
#edit-control .submit-delete svg { #edit-control .submit-delete svg {
fill: #f2f1ef !important; fill: #f2f1ef !important;

2
themes/dash/assets/css/dash.css.map
View file

File diff suppressed because one or more lines are too long

76
themes/dash/assets/images/the-logo.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

8
themes/dash/assets/js/dash.min.js vendored
View file

@ -7832,6 +7832,7 @@ function (_EventEmitter) {
_this.refresh(); _this.refresh();
window.scroll(0, 0);
return _this; return _this;
} //-------------------------- } //--------------------------
// methods // methods
@ -8031,6 +8032,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
var PostEditor = var PostEditor =
/*#__PURE__*/ /*#__PURE__*/
function () { function () {
//TODO - FIX POST FEATURE URLS IN DB
//-------------------------- //--------------------------
// constructor // constructor
//-------------------------- //--------------------------
@ -9046,7 +9048,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
document.addEventListener('DOMContentLoaded', function () { document.addEventListener('DOMContentLoaded', function () {
var base = new _Base.default(); var base = new _Base.default();
}, false); }, false);
},{"./Base":"Base.js"}],"../../../../../../.nvm/versions/node/v8.12.0/lib/node_modules/parcel-bundler/src/builtins/hmr-runtime.js":[function(require,module,exports) { },{"./Base":"Base.js"}],"../../../../../../../.nvm/versions/node/v8.15.0/lib/node_modules/parcel/src/builtins/hmr-runtime.js":[function(require,module,exports) {
var global = arguments[3]; var global = arguments[3];
var OVERLAY_ID = '__parcel__error__overlay__'; var OVERLAY_ID = '__parcel__error__overlay__';
var OldModule = module.bundle.Module; var OldModule = module.bundle.Module;
@ -9073,7 +9075,7 @@ var parent = module.bundle.parent;
if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') { if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
var hostname = "" || location.hostname; var hostname = "" || location.hostname;
var protocol = location.protocol === 'https:' ? 'wss' : 'ws'; var protocol = location.protocol === 'https:' ? 'wss' : 'ws';
var ws = new WebSocket(protocol + '://' + hostname + ':' + "55155" + '/'); var ws = new WebSocket(protocol + '://' + hostname + ':' + "64724" + '/');
ws.onmessage = function (event) { ws.onmessage = function (event) {
var data = JSON.parse(event.data); var data = JSON.parse(event.data);
@ -9215,5 +9217,5 @@ function hmrAccept(bundle, id) {
return hmrAccept(global.parcelRequire, id); return hmrAccept(global.parcelRequire, id);
}); });
} }
},{}]},{},["../../../../../../.nvm/versions/node/v8.12.0/lib/node_modules/parcel-bundler/src/builtins/hmr-runtime.js","Start.js"], null) },{}]},{},["../../../../../../../.nvm/versions/node/v8.15.0/lib/node_modules/parcel/src/builtins/hmr-runtime.js","Start.js"], null)
//# sourceMappingURL=/dash/assets/js/dash.min.map //# sourceMappingURL=/dash/assets/js/dash.min.map

2
themes/dash/assets/js/dash.min.map
View file

File diff suppressed because one or more lines are too long

4
themes/dash/frame.pug
View file

@ -19,8 +19,10 @@ html(xmlns='http://www.w3.org/1999/xhtml', lang='en', xml:lang="en")
header#header header#header
#header-wrapper.columns #header-wrapper.columns
#header-one.column #header-one.column
label#the-title= title a(href="/@/dashboard")
img(src="/dash/assets/images/the-logo.svg")
#header-two.column #header-two.column
label#the-title= welcome
-if(user_status) -if(user_status)
include partials/dash-nav include partials/dash-nav
block main-content block main-content

9
themes/dash/partials/dash-nav.pug
View file

@ -1,7 +1,4 @@
#dash-menu #dash-menu
a#settings(href="/@/dashboard/settings") a#settings(href="/@/dashboard/settings") Settings
svg(viewBox="0 0 10 10" class="icons") | .
use(xlink:href='/dash/assets/images/sprite.svg#entypo-cog') a#navigation(href="/@/dashboard/navigation") Navigation
a#navigation(href="/@/dashboard/navigation")
svg(viewBox="0 0 20 20" class="icons")
use(xlink:href='/dash/assets/images/sprite.svg#entypo-list')

23
themes/dash/partials/front.pug
View file

@ -1,11 +1,18 @@
#dash-recent #dash-recent
#recent-list #recent-list
h3 Recent
- var index = 0; .recent-header
- var cap = 4; // number of respect posts to display h3 Recent
- for ( index; index < cap; index++) .index-menu
a(href="/@/dashboard/posts/edit/"+items[index].post.uuid id=items[index].post.uuid) a(href='/@/dashboard/posts') View Posts
div(style="background:url("+items[index].post.feature.substr(8)+") no-repeat center center / cover") | .
label= items[index].post.title a(href='/@/dashboard/posts/add/new') Create Post
span= items[index].post.created br
- var index = 0;
- var cap = 5; // number of posts to display
- for ( index; index < cap; index++)
a.post-link(href="/@/dashboard/posts/edit/"+items[index].post.uuid id=items[index].post.uuid style="background:url("+items[index].post.feature.substr(8)+") no-repeat center center / cover")
div
label= items[index].post.title
span= items[index].post.created

3
themes/dash/src/com/controllers/PostEditor.js
View file

@ -22,6 +22,9 @@ import DBUtils,
from '../../../../../brain/tools/utilities/DBUtils'; from '../../../../../brain/tools/utilities/DBUtils';
export default class PostEditor export default class PostEditor
{ {
//TODO - FIX POST FEATURE URLS IN DB
//-------------------------- //--------------------------
// constructor // constructor
//-------------------------- //--------------------------

2
themes/dash/src/styles/main/_colors.styl
View file

@ -9,7 +9,7 @@ $black = #32302f;
//editor colors //editor colors
$eventCool = #32cd32 $eventCool = #32cd32
$eventLame = #ce483b $eventLame = #F64747
$editorPrimary = #bebebe; $editorPrimary = #bebebe;
$editorSecondary = #ffa07a; $editorSecondary = #ffa07a;

63
themes/dash/src/styles/main/_index.styl
View file

@ -73,15 +73,31 @@
#recent-list #recent-list
padding 0.75em padding 0.75em
a position relative
.recent-header
height 50px
h3
vertical-align: top
display inline-block
width: 50%
.index-menu
width: 50%
text-align: right
vertical-align: top
display inline-block
margin 24px 0 24px 0
right 10px
color $white
a
text-decoration-color: $highlight
a.post-link
font-size 1.5em font-size 1.5em
font-weight 300 font-weight 300
background $white
display inline-block display inline-block
border-radius 3px border-radius 3px
vertical-align top vertical-align top
text-decoration: none text-decoration: none
position relative
label label
font-size: .7em font-size: .7em
font-weight: 700 font-weight: 700
@ -101,26 +117,31 @@
div div
width 100% width 100%
background-size cover background: $white;
border-radius 3px 3px 0 0 position: absolute
bottom: 0
a:nth-child(2) border-radius: 0 0 3px 3px
width 100%
margin-bottom 20px
div
height 500px
a:nth-child(3) a:nth-child(3)
width 47% width 100%
margin-right 20px margin-bottom 20px
div height 500px
height 600px
a:nth-child(4), a:nth-child(5) a:nth-child(4)
width 49%
width 50.6% height 275px
div margin 0 15px 15px 0
height 275px
a:nth-child(5) a:nth-child(5)
margin -305px 0 0 49.3% width 49%
height 550px
a:nth-child(6)
width 49%
height 550px
margin -260px 15px 0 0
a:nth-child(7)
width 49%
height 275px
margin: 15px 0 0 0

10
themes/dash/src/styles/main/_structure.styl
View file

@ -4,7 +4,7 @@ html, body
height 100% height 100%
a a
font 300 1em $titleType font 300 1em $baseType
color $secondary color $secondary
text-decoration underline text-decoration underline
object-transitions(0.1s) object-transitions(0.1s)
@ -53,10 +53,16 @@ svg.icons
#header-one, #header-two #header-one, #header-two
z-index 10 z-index 10
position relative position relative
#header-two
text-align right
color $white
a
text-decoration-color: $highlight
label#the-title label#the-title
font-family 'Apercu-Mono' font-family 'Apercu-Mono'
font-size 1.5em font-size 1.2em
font-weight: 300
color $tertiary color $tertiary
text-decoration none text-decoration none
display block display block

2
themes/dash/src/styles/main/_typography.styl
View file

@ -114,5 +114,5 @@ h2
h3 h3
font-size 1.5em font-size 1.5em
font-weight 500 font-weight 300