Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ version: '2'

services:
mysql:
image: 'mysql:8'
image: 'mysql:8.0'
restart: on-failure
command: --default-authentication-plugin=mysql_native_password
volumes:
- './dump/mysql:/dump'
- 'mysql-data:/var/lib/mysql'
Expand Down
33 changes: 3 additions & 30 deletions www/application/classes/Controller/Landings.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,41 +90,14 @@ public function action_reactions()
/**
* Codex Editor Landing page
* https://codex.so/editor
* Redirects to https://editorjs.io
*/
public function action_editor()
{
$this->title = 'CodeX Editor';
$this->description = 'Block style visual editor for beautiful pages';
$this->view['version'] = $this->getEditorVersion();

/**
* Detect visits from Product Hunt
*/
$isFromPH = $this->request->query('ref') === 'producthunt';

if ($isFromPH) {
Cookie::set('from', 'producthunt', Date::YEAR * 3);
}

$this->view['isFromPH'] = $isFromPH;

$landing = View::factory('templates/landings/editor', $this->view);;

/**
* On editorjs.io we inject landing as an iframe
* where we does not need a site header
* Redirect to editorjs.io
*/
if ($this->request->query('frame') === '1') {
$landing .= '
<style>
.site-header {
display: none;
}
</style>
';
}

$this->template->content = $landing;
$this->redirect('https://editorjs.io');
}

/**
Expand Down
2 changes: 1 addition & 1 deletion www/application/classes/Controller/Pages.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public function action_process_join_form()

if (!$fields['email'] && !$this->user->id) {
$this->sendAjaxResponse(array(
'message' => 'Log in or enter your email so that we can contact you.',
'message' => 'Enter your contact information so that we can reach you.',
'success' => 0
));
return;
Expand Down
2 changes: 1 addition & 1 deletion www/application/views/templates/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</a>
</div>
<? else: ?>
<a class="site-header__right fl_r" href="/auth/github" rel="nofollow">
<a class="site-header__right site-header__login fl_r" href="/auth/github" rel="nofollow">
<i class="site-header__github-icon icon-github-circled"></i>
Login
</a>
Expand Down
512 changes: 387 additions & 125 deletions www/application/views/templates/landings/lab.php

Large diffs are not rendered by default.

Loading