are0h
/
Fipamo
1
2
Fork 0
Code Issues 19 Pull Requests 1 Packages Projects 1 Releases 22 Wiki Activity

Merging all UI updates

Browse Source
beta
Ro 3 years ago
parent 005de8027e 20fc9c64a1
commit 18e67691f5
13 changed files with 629 additions and 404 deletions
Show Stats Download Patch File Download Diff File

38
brain/views/dash/_frame.twig
Unescape Escape View File

@ -26,23 +26,29 @@
</div>
<div id="main-content" class="main-container">
<section id="dash-index-content">
<header id="header">
<div id="wrapper">
<div id="left">
<a href="/dashboard"><img id="the-logo" src="/assets/images/global/the-logo.svg"/></a>
{% if status %}
<header id="header">
<div id="wrapper">
{% apply spaceless %}
<div id="left">
<a href="/dashboard"><img id="the-logo" src="/assets/images/global/the-logo.svg"/></a>
</div>
<div id="right">
{% if status %}
{% apply spaceless %}
{{ include("dash/partials/navigation.twig") }}
{% endapply %}
{% endif %}
</div>
{% endapply %}
</div>
<div id="right">
{% if status %}
{% apply spaceless %}
{{ include("dash/partials/navigation.twig") }}
{% endapply %}
{% endif %}
</div>
</div>
</header>
{% block mainContent %}{% endblock %}
</header>
{% endif %}
{% apply spaceless %}
{% block mainContent %}{% endblock %}
{% endapply %}
</section>

111
brain/views/dash/book.twig
Unescape Escape View File

@ -11,49 +11,88 @@
{% block mainContent %}
<div id="post-index">
<div id="post-index-wrapper">
<div id="post-index-menu">
<a href="/dashboard/pages/all">All Pages ({{ stats['all'] }})</a>
.
<a href="/dashboard/pages/published">Published ({{ stats['published'] }})</a>
.
<a href="/dashboard/pages/deleted">Deleted ({{ stats['deleted'] }})</a>
<div id="post-index-header">
<div id="post-index-header-left">
{{ filter }} Pages
</div>
<div id="post-index-header-right">
<a href="/dashboard/pages/all" title="view all pages">
<button>
<svg >
<use xlink:href="/assets/images/global/sprite.svg#entypo-archive"/>
</svg>
{{ stats['all'] }}
</button>
</a>
<a href="/dashboard/pages/published" title="view publised pages">
<button>
<svg >
<use xlink:href="/assets/images/global/sprite.svg#entypo-globe"/>
</svg>
{{ stats['published'] }}
</button>
</a>
<a href="/dashboard/pages/deleted" title="view deleted pages">
<button>
<svg >
<use xlink:href="/assets/images/global/sprite.svg#entypo-circle-with-cross"/>
</svg>
{{ stats['deleted'] }}
</button>
</a>
</div>
</div>
<div id="posts-list">
{% for page in pages %}
<a class="page-link" href="/dashboard/page/edit/{{ page.uuid }}">
<div class="page-bg" style="background: url({{ page.feature }}) no-repeat center center / cover">
<div id="meta">
<span>
{{ page.updated }}
</span>
<label>
{{ page.title }}
</label>
{% if page.menu == 'true' %}
{% set menu = "true" %}
{% else %}
{% set menu = "false" %}
{% endif %}
{% if page.published == 'true' %}
{% set published = "true" %}
{% else %}
{% set published = "false" %}
{% endif %}
{% if page.featured == 'true' %}
{% set featured = "true" %}
{% else %}
{% set featured = "false" %}
{% endif %}
<label>
{{ page.title }}
</label>
<div id="meta">
<div id="options">
<span class="meta-options" data-active="{{ menu }}">
Menu Item</span>
<span class="meta-options" data-active="{{ published }}">
Published</span>
<span class="meta-options" data-active="{{ featured }}">
Featured</span>
{% if page.menu == 'true' %}
{% set menu = "true" %}
{% else %}
{% set menu = "false" %}
{% endif %}
{% if page.published == 'true' %}
{% set published = "true" %}
{% else %}
{% set published = "false" %}
{% endif %}
{% if page.featured == 'true' %}
{% set featured = "true" %}
{% else %}
{% set featured = "false" %}
{% endif %}
<div id="option-left">
<button data-active="{{ menu }}">
<svg>
<use xlink:href="/assets/images/global/sprite.svg#entypo-add-to-list"/>
</svg>
</button>
<button data-active="{{ published }}">
<svg>
<use xlink:href="/assets/images/global/sprite.svg#entypo-globe"/>
</svg>
</button>
<button data-active="{{ featured }}">
<svg>
<use xlink:href="/assets/images/global/sprite.svg#entypo-star"/>
</svg>
</button>
</div>
<div id="option-right">
<span>
{{ page.updated }}
</span>
</div>
</div>
<span>{{ page.prettyDate }}</span>
</div>
</div>

3
brain/views/dash/forms/login.twig
Unescape Escape View File

@ -1,10 +1,11 @@
<div id="dash-login">
<div id="dash-form" class="dash-form">
<img id="the-logo" src="/assets/images/global/the-logo.svg"/>
<form id="login" class='login' name="login" action="/@/dashboard/login" method="POST">
<input type="text" name="handle" class="form-control" placeholder="Handle" required ">
<input type="password" name="password" class="form-control" placeholder="Password" required">
<button id="login-btn" class='login-btn' type='submit'>
Let's see some ID
ID, PLEASE
</button><br /><br />
<a href="/dashboard/reset-password"> Forgot Password?</a>
</form>

57
brain/views/dash/init.twig
Unescape Escape View File

@ -12,51 +12,32 @@
<div id="dash-index">
<div id="dash-index-wrapper">
<div id="dash-init" class="dash-init">
<br />
<form id="init-form">
<h1>What up</h1>
<p>Just fill these in and it'll get you started.</p>
<br />
<label>What's your handle?</label><br />
<input type="text" name="new_member_handle" id="new_member_handle"/>
<br />
<label>Let's get that email</label><br />
<input type="text" name="new_member_email" id="new_member_email"/>
<br />
<label>And a password</label><br />
<input type="text" name="new_member_pass" id="new_member_pass"/>
<br />
<label>Confirm that pass</label><br />
<input type="text" name="new_member_pass2" id="new_member_pass2"/>
<br />
<label>What's your site called?</label><br />
<input type="text" name="new_member_title" id="new_member_title"/>
<br />
<button id="init-blog" data-action='blog-init' type='submit'>SET IT UP</button>
<img id="the-logo" src="/assets/images/global/the-logo.svg"/>
<input type="text" name="new_member_handle" id="new_member_handle" placeholder="handle"/>
<input type="text" name="new_member_email" id="new_member_email" placeholder="email"/>
<input type="text" name="new_member_pass" id="new_member_pass" placeholder="password"/>
<input type="text" name="new_member_pass2" id="new_member_pass2" placeholder="password confirm"/>
<input type="text" name="new_member_title" id="new_member_title" placeholder="title"/>
<button id="init-blog" data-action='blog-init' type='submit'>SET UP YOUR SITE</button>
<br /><br />
<button class="init-option" id="init-switch-restore">RESTORE FROM BACKUP</button>
</form>
<div class="option">
<button class="init-option" id="init-switch-restore">OR RESTORE FROM BACKUP</button>
</div>
</div>
<div id="dash-restore" class="dash-restore">
<form id="init-restore">
<h1>Restore from backup</h1>
<p>Let's verify your backup</p>
<br />
<label>What's your handle?</label><br />
<input type="text" name="restore_member_handle" id="restore_member_handle"/>
<br />
<label>And your password</label><br />
<input type="text" name="restore_member_pass" id="restore_member_pass"/>
<br />
<label>Backup File</label><br />
<input id="backup-upload" type="file" name="backup-upload"/>
<br />
<img id="the-logo" src="/assets/images/global/the-logo.svg"/>
<input type="text" name="restore_member_handle" id="restore_member_handle" placeholder="handle"/><input type="text" name="restore_member_pass" id="restore_member_pass" placeholder="password"/>
<div>
<label>Grab your backup zip</label>
<input id="backup-upload" type="file" name="backup-upload" placeholder="Backup Zip"/>
</div>
<br /><br />
<button id="blog-restore" data-action='blog-restore' type='submit'>RESTORE</button>
<br /><br />
<button class="init-option" id="init-switch-fresh">OR INSTALL FROM SCRATCH</button>
</form>
<div class="option">
<button class="init-option" id="init-switch-restore">OR INSTALL FROM SCRATCH</button>
</div>
</div>
</div>
</div>

16
brain/views/dash/navigation.twig
Unescape Escape View File

@ -5,7 +5,7 @@
{% endblock %}
{% block stylesheets %}
<link rel="stylesheet" type="text/css" href="/assets/css/dash.css?=adfafd">
<link rel="stylesheet" type="text/css" href="/assets/css/dash.css?=sdsdsds">
{% endblock %}
{% block mainContent %}
@ -14,13 +14,21 @@
<div id="nav-pages">
{% for item in menu %}
<div id="{{item.id}}" class="nav-item" data-slug="{{item.slug}}" data-uuid="{{item.uuid}}" data-path="{{item.path}}">
<svg id="item-arrows" viewbox="0 0 20 20" class="icons">
<svg id="item-arrows">
<use xlink:href="/assets/images/global/sprite.svg#entypo-select-arrows"/>
</svg>
<label>{{item.title}}</label>
<div id="nav-btns">
<button id="edit-item" class="nav-btn" data-id="{{item.uuid}}">EDIT</button>
<button id="remove-item" class="nav-btn" data-uuid="{{item.uuid}}" data-id="{{item.id}}">REMOVE</button>
<button id="edit-item" class="nav-btn" data-id="{{item.uuid}}" title="edit page">
<svg>
<use xlink:href="/assets/images/global/sprite.svg#entypo-edit"/>
</svg>
</button>
<button id="remove-item" class="nav-btn" data-uuid="{{item.uuid}}" data-id="{{item.id}}" title="delete from menu">
<svg>
<use xlink:href="/assets/images/global/sprite.svg#entypo-cross"/>
</svg>
</button>
</div>
</div>

64
brain/views/dash/partials/index.twig
Unescape Escape View File

@ -1,22 +1,35 @@
<div id="dash-recent">
<div id="recent-list">
<div class="recent-header">
<h3>Recent</h3>
<div class="index-menu">
<a href='/dashboard/pages'>View Pages</a>
.
<a href='/dashboard/page/add/new'>Create Page</a>
<div class="index-header-left">
Recent
</div>
<div class="index-header-right">
<a href='/dashboard/pages' title="view pages">
<button>
<svg class="page-link">
<use xlink:href="/assets/images/global/sprite.svg#entypo-archive"/>
</svg>
</button>
</a>
<a href='/dashboard/page/add/new' title="add new page">
<button>
<svg class="page-link">
<use xlink:href="/assets/images/global/sprite.svg#entypo-plus"/>
</svg>
</button>
</a>
</div>
</div>
<br/>
{% if data["entryCount"] != 0 %}
{% for page in data['pages'] %}
<a href="/dashboard/page/edit/{{ page.uuid }}" id="{{ page.uuid }}" class="post-link" style="background: url({{ page.feature }}) no-repeat center center / cover">
<div>
<label>
{{ page.title }}
</label>
<label>
{{ page.title }}
</label>
<div id="options">
{% if page.menu == 'true' %}
{% set menu = "true" %}
{% else %}
@ -32,15 +45,30 @@
{% else %}
{% set featured = "false" %}
{% endif %}
<div id="options">
<span class="item-options" data-active="{{ menu }}">
Menu Item</span>
<span class="item-options" data-active="{{ published }}">
Published</span>
<span class="item-options" data-active="{{ featured }}">
Featured</span>
<div id="option-left">
<button data-active="{{ menu }}">
<svg>
<use xlink:href="/assets/images/global/sprite.svg#entypo-add-to-list"/>
</svg>
</button>
<button data-active="{{ published }}">
<svg>
<use xlink:href="/assets/images/global/sprite.svg#entypo-globe"/>
</svg>
</button>
<button data-active="{{ featured }}">
<svg>
<use xlink:href="/assets/images/global/sprite.svg#entypo-star"/>
</svg>
</button>
</div>
<div id="option-right">
<span>
{{ page.updated }}
</span>
</div>
<span>{{ page.updated }}</span>
</div>
</a>

24
brain/views/dash/partials/navigation.twig
Unescape Escape View File

@ -1,5 +1,23 @@
<div id="dash-menu">
<a id="settings" href="/dashboard/settings" >Settings</a> .
<a id="navigation" href="/dashboard/navigation" >Navigation</a> .
<a id="navigation" href="/dashboard/logout" >Log Out</a>
<a id="settings" href="/dashboard/settings" title="settings">
<button>
<svg class="menu">
<use xlink:href="/assets/images/global/sprite.svg#entypo-sound-mix"/>
</svg>
</button>
</a> .
<a id="navigation" href="/dashboard/navigation" title="edit navigation">
<button>
<svg class="menu">
<use xlink:href="/assets/images/global/sprite.svg#entypo-list"/>
</svg>
</button>
</a> .
<a id="navigation" href="/dashboard/logout" title="log out">
<button>
<svg class="menu">
<use xlink:href="/assets/images/global/sprite.svg#entypo-log-out"/>
</svg>
</button>
</a>
</div>

2
brain/views/dash/partials/options.twig
Unescape Escape View File

@ -19,7 +19,7 @@
<div id="post-options">
<button id="option-menu-pin" class="option-inactive post-option-btn" data-active="{{ menu }}" title='Pin to Menu'>
<svg id="option-page-icon" viewbox="0 0 20 20" class="icons">
<use id="option-page-icon" xlink:href="/assets/images/global/sprite.svg#entypo-pin"/>
<use id="option-page-icon" xlink:href="/assets/images/global/sprite.svg#entypo-add-to-list"/>
</svg>
</button>
<button id="option-feature" class="option-inactive post-option-btn" data-active="{{ featured }}" title='Feature'>

9
brain/views/dash/reset-password.twig
Unescape Escape View File

@ -13,20 +13,21 @@
<div id="dash-index-wrapper">
<div id="dash-login">
<div id="dash-reset" class="dash-reset">
<img id="the-logo" src="/assets/images/global/the-logo.svg"/>
<form id="reset" class='login' name="reset" action="/@/dashboard/login" method="POST">
<input type="password" id="new_password"name="new_password" class="form-control" placeholder="New Password" required">
<input type="password" id="new_password2" name="new_password2" class="form-control" placeholder="New Password Confirm" required">
<input type="password" id="secret" name="secret" class="form-control" placeholder="Account Secret" required">
<button id="reset-btn" class='login-btn' type='submit'>
Update Password
</button><br /><br />
RESET PASSWORD
</button><br />
<p>
Use this to get your secret to verify it's you. If your email is set up, the secret will be sent there. If not, the form will be updated automatically(but please set up your email, once you reset your password).
</p>
<input type="text"id="email" name="email" class="form-control" placeholder="Verify Email" required">
<input type="text"id="email" name="email" class="form-control" placeholder="email to verify" required">
<button id="get-secret-btn" class='login-btn' type='submit'>
Retrieve Secret
VERIFY EMAIL
</button><br /><br />
</form>
</div>

65
brain/views/dash/settings.twig
Unescape Escape View File

@ -11,27 +11,22 @@
{% endblock %}
{% block stylesheets %}
<link rel="stylesheet" type="text/css" href="/assets/css/dash.css?=adfafd">
<link rel="stylesheet" type="text/css" href="/assets/css/dash.css?=dfdvcvb">
{% endblock %}
{% block mainContent %}
<div id="settings-actions">
<div id="buttons">
<button id="save-toggle">
<svg id="submit-update" viewbox="0 0 20 20" class="icons">
<button id="save-toggle" title="save settings">
<svg id="submit-update" class="icons">
<use id="submit-update" xlink:href="/assets/images/global/sprite.svg#entypo-save"/>
</svg>
</button>
<button id="publish-pages">
<svg id="submit-update" viewbox="0 0 20 20" class="icons">
<button id="publish-pages" title="publish site">
<svg id="submit-update" class="icons">
<use id="submit-update" xlink:href="/assets/images/global/sprite.svg#entypo-publish"/>
</svg>
</button>
<button id="render-toggle" data-render="{{render}}">
<svg id="submit-update" viewbox="0 0 20 20" class="icons">
<use id="submit-update" xlink:href="/assets/images/global/sprite.svg#entypo-ccw"/>
</svg>
</button>
</button>
</div>
</div>
<div id="site-background">
@ -42,39 +37,49 @@
<div id="settings-index">
<div id="settings-index-wrapper">
<div id="member-settings" class="columns">
<div id="member-settings-1" class="column">
<label> AVATAR </label>
<div id="member-settings-1" class="column is-one-third">
<div id="member-avatar-drop">
<img id="avatar" src="{{member['avatar']}}" for="avatar-upload"/>
<input id="avatar-upload" type="file" name="avatar-upload" />
</div>
</div>
<div id="member-settings-2" class="column">
<label>INFO</label>
<input type='text' name='handle' id='settings-handle' placeholder='handle' value="{{member['handle']}}" autofocus />
<input type='text' name='email' id='settings-email' placeholder='email' value="{{member['email']}}" autofocus />
<input type='text' name='base-url' id='settings-url' placeholder='url' value="{{baseUrl}}" autofocus />
<input type='text' name='base-title' id='settings-title' placeholder='site title' value="{{siteTitle}}" autofocus />
<textarea id="settings-desc" type='text' name='settings_desc' class='settings-dec' placeholder='description stuff', autofocus>{{desc}}</textarea>
</div>
<div class="column is-three-fifths">
<div class="columns">
<div id="member-settings-2" class="column">
<input type='text' name='handle' id='settings-handle' placeholder='handle' value="{{member['handle']}}" autofocus />
<input type='text' name='email' id='settings-email' placeholder='email' value="{{member['email']}}" autofocus />
</div>
<div id="member-settings-3" class="column">
<input type='text' name='base-url' id='settings-url' placeholder='url' value="{{baseUrl}}" autofocus />
<input type='text' name='base-title' id='settings-title' placeholder='site title' value="{{siteTitle}}" autofocus />
</div>
</div>
<div class="columns">
<div class="column is-full">
<textarea id="settings-desc" type='text' name='settings_desc' class='settings-dec' placeholder='description stuff', autofocus>{{desc}}</textarea>
</div>
</div>
</div>
</div>
<div id="member-utils" class="columns">
<div id="util-1" class="column">
<label>BACK UP TOOLS</label> <br />
<button id="create-backup">CREATE BACK UP</button><br />
<div id="util-1" class="column is-one-third">
<button id="create-backup">BACK UP YOUR SITE</button><br />
</div>
<div id="util-2" class="column is-three-fifths">
{% if lastBackup != '' %}
<div class="backup-meta">
The last back up was created <a href="/api/v1/files">{{lastBackup}}</a><br />
LAST BACK UP <a href="/api/v1/files">{{lastBackup}}</a><br />
</div>
{% else %}
<span>span No back ups. Frowny face.</span>
{% endif %}
</div>
<div id="util-2" class="column">
<label> MAINTENANCE </label><br />
<button id="reindex-pages">REINDEX PAGES</button>
</div>
</div>
<div id="option-settings" class="columns">
<div id="theme-settings" class="column">

6
brain/views/dash/start.twig
Unescape Escape View File

@ -5,14 +5,16 @@
{% endblock %}
{% block stylesheets %}
<link rel="stylesheet" type="text/css" href="/assets/css/dash.css?=tyurtyuryu">
<link rel="stylesheet" type="text/css" href="/assets/css/dash.css?=adsfdfdf">
{% endblock %}
{% block mainContent %}
<div id="dash-index">
<div id="dash-index-wrapper">
{% if status %}
{{ include("dash/partials/index.twig") }}
{% apply spaceless %}
{{ include("dash/partials/index.twig") }}
{% endapply %}
{% else %}
{{ include("dash/forms/login.twig") }}
{% endif %}

634
public/assets/css/dash.css
View File

File diff suppressed because it is too large Load Diff

4
public/assets/scripts/dash.min.js vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save