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 +45 -33
6 changed files with 45 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 37120efe18 - Show all commits

19
app/Helpers/StringHelpers.php
View file

@ -55,3 +55,22 @@ function randomString(int $length)
return $string;
}
function delete_directory($dirPath)
{
if (is_dir($dirPath)) {
$objects = new DirectoryIterator($dirPath);
foreach ($objects as $object) {
if (!$object->isDot()) {
if ($object->isDir()) {
delete_directory($object->getPathname());
} else {
unlink($object->getPathname());
}
}
}
rmdir($dirPath);
} else {
throw new Exception(__FUNCTION__ . '(dirPath): dirPath is not a directory!');
}
}

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

@ -56,8 +56,9 @@ class ThemeController extends Controller
$view == 'index' ?
$template = $currentTheme . '.index' :
$template = $currentTheme . '.page';
$page = $this->pages->getById('F4429D34-25E7-4CA9-9B0A-742810277505');
$pageData = $this->sort->page($page);
//TODO: Get rid of hard link page IDS
$page = $this->pages->getById('F791DED9-0359-4662-8976-4C474803D2C6');
$pageData = $this->sort->page($page);
break;
case "tags":
$template = $currentTheme . '.tags';
@ -69,8 +70,8 @@ class ThemeController extends Controller
$pageData = $this->sort->archive();
break;
default:
$template = $currentTheme . '.' . $view;
$page = $this->pages->getById('F4429D34-25E7-4CA9-9B0A-742810277505');
$template = $currentTheme . '.index';
$page = $this->pages->getById('F791DED9-0359-4662-8976-4C474803D2C6');
$pageData = $this->sort->page($page);
}
if ($this->member::status()) {

10
app/Repositories/MemberRepository.php
View file

@ -54,10 +54,12 @@ class MemberRepository implements MemberRepositoryInterface
public function update($member)
{
$index = findIndex($this->folks, ['id' => $member->id]);
$this->folks[$index]['handle'] = $member->handle;
$this->folks[$index]['email'] = $member->email;
$this->folks[$index]['avatar'] = $member->avatar;
$index = findIndex($this->folks, ['id' => $member->id]);
$this->folks[$index]['handle'] = $member->handle;
$this->folks[$index]['email'] = $member->email;
if (isset($member->avatar)) {
$this->folks[$index]['avatar'] = $member->avatar;
}
$this->folks[$index]['updated'] = Carbon::now();
//save new folks file
$this->docs::writeSettings($this->folks, env('FOLKS_PATH'));

8
app/Services/Assets/AssetService.php
View file

@ -60,7 +60,6 @@ class AssetService
} else {
//image is already there, so chill
}
//print $file->getFilename() . "\n";
}
//clear test theme css and script directories
$styles = glob($cssPath . '*'); // get all file names
@ -85,6 +84,13 @@ class AssetService
if (is_file($file)) {
$path = explode('/', $file);
copy($file, $cssPath . $path[6]);
} else {
// if there is a type/font folder, move it
$typePath = explode('/', $file);
if (is_dir($cssPath . $typePath[6])) {
delete_directory($cssPath . $typePath[6]);
}
rename($file, $cssPath . $typePath[6]);
}
}
$newjs = glob('../content/themes/' . $this->currentTheme . '/assets/scripts/*');

10
app/Services/Data/SettingsService.php
View file

@ -122,13 +122,9 @@ class SettingsService
$settings['global']['externalAPI'] = $data->global->externalAPI;
$settings['global']['dynamicRender'] = $data->global->dynamicRender;
//TODO: This is for to be created MemberServices
//Member::updateData('handle', $data['member']['handle']);
//Member::updateData('email', $data['member']['email']);
$settings['email']['active'] = $data->email->active;
$settings['email']['smtp'] = $data->email->smtp;
$settings['email']['mailgun'] = $data->email->mailgun;
//$settings['email']['active'] = $data->email->active;
//$settings['email']['smtp'] = $data->email->smtp;
//$settings['email']['mailgun'] = $data->email->mailgun;
return $this->docs::writeSettings($settings);
}

22
public/assets/scripts/dash/app/actions/SettingsActions.js
View file

@ -21,11 +21,11 @@ export default class SettingsActions {
.replace(/"/g, '');
let selected = '';
let selects = document.querySelectorAll('.theme-select');
let smtpDomain = document.getElementById('smtp-domain').value;
let smtpEmail = document.getElementById('smtp-email').value;
let smtpPass = document.getElementById('smtp-pass').value;
let mgDomain = document.getElementById('mg-domain').value;
let mgKey = document.getElementById('mg-key').value;
//let smtpDomain = document.getElementById('smtp-domain').value;
//let smtpEmail = document.getElementById('smtp-email').value;
//let smtpPass = document.getElementById('smtp-pass').value;
//let mgDomain = document.getElementById('mg-domain').value;
//let mgKey = document.getElementById('mg-key').value;
let mailActive = '';
let mailOptions = document.querySelectorAll('.mail-option');
let apiStatus = document
@ -60,18 +60,6 @@ export default class SettingsActions {
handle: handle,
email: email,
id: memberID
},
email: {
active: mailActive,
smtp: {
domain: smtpDomain,
email: smtpEmail,
password: smtpPass
},
mailgun: {
domain: mgDomain,
key: mgKey
}
}
};
return new Promise(function (resolve) {