forked from projects/fipamo
added layout varible to sorting, updated ignore
data sorting needed a new variable to differentiate between index page rendering and standard page rendering, so that was added to the return as well as updating the render script to include the variable that wasn't being added for tags also updated the git ignore file to ignore global images that are not used by the base system. the script theme folder needs to be ignore as well as that is going to updated by the theme itself for front end coding and not used by the system
This commit is contained in:
parent
7c027beb92
commit
ed6f028598
5 changed files with 35 additions and 19 deletions
26
.gitignore
vendored
26
.gitignore
vendored
|
@ -33,16 +33,32 @@ yarn-error.log
|
|||
public/*
|
||||
!public/favicon.ico
|
||||
!public/index.php
|
||||
!public/assets
|
||||
!public/assets/
|
||||
public/assets/*
|
||||
!public/assets/css
|
||||
!public/assets/css/
|
||||
public/assets/css/*
|
||||
!public/assets/css/dash
|
||||
!public/assets/scripts
|
||||
!public/assets/images
|
||||
!public/assets/scripts/
|
||||
!public/assets/scripts/theme/
|
||||
public/assets/scripts/theme/*
|
||||
# images
|
||||
!public/assets/images/
|
||||
public/assets/images/*
|
||||
!public/assets/images/global/
|
||||
!public/assets/images/global/*
|
||||
public/assets/images/global/*
|
||||
# base assets used by the app
|
||||
!public/assets/images/global/close.svg
|
||||
!public/assets/images/global/default-avi.svg
|
||||
!public/assets/images/global/default-avi-2.svg
|
||||
!public/assets/images/global/default-bg.jpg
|
||||
!public/assets/images/global/fipamo-logo-primary.svg
|
||||
!public/assets/images/global/fipamo-logo-secondary.svg
|
||||
!public/assets/images/global/menu.svg
|
||||
!public/assets/images/global/sprite.svg
|
||||
!public/assets/images/global/upload-audio.png
|
||||
!public/assets/images/global/upload-doc.png
|
||||
!public/assets/images/global/upload-video.png
|
||||
|
||||
|
||||
!content/
|
||||
content/*
|
||||
|
|
|
@ -71,7 +71,7 @@ class ThemeController extends Controller
|
|||
break;
|
||||
default:
|
||||
$template = $currentTheme . '.index';
|
||||
$page = $this->pages->getById('F791DED9-0359-4662-8976-4C474803D2C6');
|
||||
$page = $this->pages->getById('26245BDB-1A38-4455-80A2-7A03DE26EE33');
|
||||
$pageData = $this->sort->page($page);
|
||||
}
|
||||
if ($this->member::status()) {
|
||||
|
|
|
@ -80,6 +80,7 @@ class RenderService
|
|||
'theme' => $this->theme, // for theme kit
|
||||
'title' => 'Pages Tagged as ' . $item['tag_name'],
|
||||
'dynamicRender' => $data['dynamicRender'],
|
||||
'layout' => 'page',
|
||||
'info' => $data['info'],
|
||||
'menu' => $data['menu'],
|
||||
'pages' => $item['pages'],
|
||||
|
@ -91,7 +92,6 @@ class RenderService
|
|||
if (!is_dir('../public/tags')) {
|
||||
mkdir('../public/tags', 0755, true);
|
||||
}
|
||||
|
||||
File::put(
|
||||
$location,
|
||||
view($template)
|
||||
|
|
|
@ -66,6 +66,7 @@ class SortingService
|
|||
}
|
||||
$tagData = [
|
||||
'debug' => $debug, // for theme kit
|
||||
'layout' => 'page',
|
||||
'tags' => $this->p_tags,
|
||||
'theme' => $this->info['theme'], // for theme kit
|
||||
'title' => 'Pages Tagged as Tag',
|
||||
|
@ -152,6 +153,7 @@ class SortingService
|
|||
$archiveData = [
|
||||
'debug' => $debug, // for theme kit
|
||||
'theme' => $this->info['theme'], // for theme kit
|
||||
'layout' => 'page',
|
||||
'title' => 'Archives',
|
||||
'dynamicRender' => $this->info['dynamicRender'],
|
||||
'archive' => $this->p_archive,
|
||||
|
@ -231,7 +233,6 @@ class SortingService
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
$pageData = [
|
||||
"debug" => $debug,
|
||||
"theme" => $this->info['theme'],
|
||||
|
@ -243,6 +244,7 @@ class SortingService
|
|||
"media" => $page['media'],
|
||||
"files" => $page['docs'],
|
||||
"content" => $page['html'],
|
||||
"layout" => $page['layout'],
|
||||
"recent" => $recent,
|
||||
"feature" => $featured,
|
||||
"tags" => $meta['tags'],
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
import Nav from './NavControl.js';
|
||||
import Audio from './AudioControl.js';
|
||||
|
||||
export default class Base {
|
||||
//--------------------------
|
||||
// constructor
|
||||
|
@ -5,23 +8,18 @@ export default class Base {
|
|||
constructor() {
|
||||
this.currentSlide = 0;
|
||||
this.slides = document.querySelectorAll('.slide');
|
||||
//alert('FRESH');
|
||||
document.getElementById('menu-open').addEventListener('click', e => {
|
||||
document.getElementById('menu').style.opacity = '100%';
|
||||
document.getElementById('menu').style.visibility = 'visible';
|
||||
});
|
||||
document.getElementById('menu-close').addEventListener('click', e => {
|
||||
document.getElementById('menu').style.opacity = '0';
|
||||
document.getElementById('menu').style.visibility = 'hidden';
|
||||
});
|
||||
this.nav = new Nav();
|
||||
if (document.querySelector('[role="page-meta"]')) {
|
||||
let audio = new Audio();
|
||||
}
|
||||
this.start();
|
||||
}
|
||||
start() {
|
||||
if (this.slides.length > 1) {
|
||||
this.slideInterval = setInterval(() => {
|
||||
this.slides[this.currentSlide].className = 'hide slide';
|
||||
this.slides[this.currentSlide].className = 'hide';
|
||||
this.currentSlide = (this.currentSlide + 1) % this.slides.length;
|
||||
this.slides[this.currentSlide].className = 'show slide';
|
||||
this.slides[this.currentSlide].className = 'show';
|
||||
}, 3000);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue