projects/fipamo
projects/fipamo
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases 24 Packages Wiki Activity Actions

Replaced Moment with Carbon #84

Merged
Ghost merged 148 commits from develop into beta 2022-09-22 05:53:36 +02:00
Conversation 1 Commits 148 Files changed 306 +35 -19
5 changed files with 35 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ed6f028598 - Show all commits

26
.gitignore vendored
View file

@ -33,16 +33,32 @@ yarn-error.log
public/* public/*
!public/favicon.ico !public/favicon.ico
!public/index.php !public/index.php
!public/assets !public/assets/
public/assets/* public/assets/*
!public/assets/css !public/assets/css/
public/assets/css/* public/assets/css/*
!public/assets/css/dash !public/assets/css/dash
!public/assets/scripts !public/assets/scripts/
!public/assets/images !public/assets/scripts/theme/
public/assets/scripts/theme/*
# images
!public/assets/images/
public/assets/images/* public/assets/images/*
!public/assets/images/global/ !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/
content/* content/*

2
app/Http/Controllers/ThemeController.php
View file

@ -71,7 +71,7 @@ class ThemeController extends Controller
break; break;
default: default:
$template = $currentTheme . '.index'; $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); $pageData = $this->sort->page($page);
} }
if ($this->member::status()) { if ($this->member::status()) {

2
app/Services/Assets/RenderService.php
View file

@ -80,6 +80,7 @@ class RenderService
'theme' => $this->theme, // for theme kit 'theme' => $this->theme, // for theme kit
'title' => 'Pages Tagged as ' . $item['tag_name'], 'title' => 'Pages Tagged as ' . $item['tag_name'],
'dynamicRender' => $data['dynamicRender'], 'dynamicRender' => $data['dynamicRender'],
'layout' => 'page',
'info' => $data['info'], 'info' => $data['info'],
'menu' => $data['menu'], 'menu' => $data['menu'],
'pages' => $item['pages'], 'pages' => $item['pages'],
@ -91,7 +92,6 @@ class RenderService
if (!is_dir('../public/tags')) { if (!is_dir('../public/tags')) {
mkdir('../public/tags', 0755, true); mkdir('../public/tags', 0755, true);
} }
File::put( File::put(
$location, $location,
view($template) view($template)

4
app/Services/Data/SortingService.php
View file

@ -66,6 +66,7 @@ class SortingService
} }
$tagData = [ $tagData = [
'debug' => $debug, // for theme kit 'debug' => $debug, // for theme kit
'layout' => 'page',
'tags' => $this->p_tags, 'tags' => $this->p_tags,
'theme' => $this->info['theme'], // for theme kit 'theme' => $this->info['theme'], // for theme kit
'title' => 'Pages Tagged as Tag', 'title' => 'Pages Tagged as Tag',
@ -152,6 +153,7 @@ class SortingService
$archiveData = [ $archiveData = [
'debug' => $debug, // for theme kit 'debug' => $debug, // for theme kit
'theme' => $this->info['theme'], // for theme kit 'theme' => $this->info['theme'], // for theme kit
'layout' => 'page',
'title' => 'Archives', 'title' => 'Archives',
'dynamicRender' => $this->info['dynamicRender'], 'dynamicRender' => $this->info['dynamicRender'],
'archive' => $this->p_archive, 'archive' => $this->p_archive,
@ -231,7 +233,6 @@ class SortingService
} }
} }
} }
$pageData = [ $pageData = [
"debug" => $debug, "debug" => $debug,
"theme" => $this->info['theme'], "theme" => $this->info['theme'],
@ -243,6 +244,7 @@ class SortingService
"media" => $page['media'], "media" => $page['media'],
"files" => $page['docs'], "files" => $page['docs'],
"content" => $page['html'], "content" => $page['html'],
"layout" => $page['layout'],
"recent" => $recent, "recent" => $recent,
"feature" => $featured, "feature" => $featured,
"tags" => $meta['tags'], "tags" => $meta['tags'],

20
public/assets/scripts/theme/Base.js
View file

@ -1,3 +1,6 @@
import Nav from './NavControl.js';
import Audio from './AudioControl.js';
export default class Base { export default class Base {
//-------------------------- //--------------------------
// constructor // constructor
@ -5,23 +8,18 @@ export default class Base {
constructor() { constructor() {
this.currentSlide = 0; this.currentSlide = 0;
this.slides = document.querySelectorAll('.slide'); this.slides = document.querySelectorAll('.slide');
//alert('FRESH'); this.nav = new Nav();
document.getElementById('menu-open').addEventListener('click', e => { if (document.querySelector('[role="page-meta"]')) {
document.getElementById('menu').style.opacity = '100%'; let audio = new Audio();
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.start(); this.start();
} }
start() { start() {
if (this.slides.length > 1) { if (this.slides.length > 1) {
this.slideInterval = setInterval(() => { 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.currentSlide = (this.currentSlide + 1) % this.slides.length;
this.slides[this.currentSlide].className = 'show slide'; this.slides[this.currentSlide].className = 'show';
}, 3000); }, 3000);
} }
} }