Skip to content

Commit e1fd9a7

Browse files
slaveeksneSpecc
slaveeks
and
neSpecc
authored
Added default index page, default startPage, removed iframe (#250)
* Removed iframe, added default index page, made startPage optional parameter * Renamed class for landing content * Added paddings for message in index page, removed iframe link from index * Renamed landing to greeting * rm extra margins, upd svg Co-authored-by: Peter Savchenko <specc.dev@gmail.com>
1 parent ba40b4f commit e1fd9a7

File tree

7 files changed

+50
-39
lines changed

7 files changed

+50
-39
lines changed

‎.codexdocsrc.sample‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"Guides",
66
{"title": "CodeX", "uri": "https://codex.so"}
77
],
8-
"landingFrameSrc": "https://codex.so/editor?frame=1",
98
"startPage": "",
109
"misprintsChatId": "12344564",
1110
"yandexMetrikaId": "",

‎src/backend/routes/home.ts‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
11
import express, { Request, Response } from 'express';
22
import verifyToken from './middlewares/token.js';
3+
import PagesOrder from '../controllers/pagesOrder.js';
4+
import Pages from '../controllers/pages.js';
5+
36

47
const router = express.Router();
58

69
/* GET home page. */
710
router.get('/', verifyToken, async (req: Request, res: Response) => {
811
const config = req.app.locals.config;
912

13+
// Check if config consists startPage
1014
if (config.startPage) {
1115
return res.redirect(config.startPage);
16+
} else {
17+
const pageOrder = await PagesOrder.getRootPageOrder();
18+
19+
// Check if page order consists
20+
if (pageOrder.order.length > 0) {
21+
// Get the first parent page
22+
const page = await Pages.get(pageOrder.order[0]);
23+
24+
res.redirect(page.uri!);
25+
} else {
26+
res.render('pages/index', { isAuthorized: res.locals.isAuthorized });
27+
}
1228
}
13-
res.render('pages/index', { isAuthorized: res.locals.isAuthorized });
1429
});
1530

1631
export default router;

‎src/backend/views/pages/index.twig‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<head>
44
<title>{{ config.title }}</title>
55
<link rel="stylesheet" href="/dist/main.css" />
6-
<link rel="preload" href="{{ config.landingFrameSrc }}" as="document">
76
<link rel="icon" type="{{ favicon.type }}" href="{{ favicon.destination }}">
87
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
98
<meta property="og:title" content="{{ config.title }}" />
@@ -12,13 +11,15 @@
1211
</head>
1312
<script>
1413
</script>
15-
<body class="landing-body">
14+
<body class="greeting-body">
1615
{% include "components/header.twig" %}
17-
<div class="landing-loader" id="frame-loader">
18-
{{ svg('loader') }}
16+
<div class="greeting-content">
17+
{{ svg('frog') }}
18+
<p class="greeting-content__message">
19+
It’s time to create the first page!
20+
</p>
21+
{% include 'components/button.twig' with {label: 'Add page', icon: 'plus', size: 'small', url: '/page/new'} %}
1922
</div>
20-
<iframe class="landing-frame" src="{{ config.landingFrameSrc }}" seamless frameborder="0" onload="this.style.opacity = 1; setTimeout(document.getElementById('frame-loader').remove(), 500)"></iframe>
21-
2223
{% if config.yandexMetrikaId is not empty %}
2324
<script type="text/javascript" >
2425
(function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};

‎src/frontend/styles/components/greeting.pcss‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
.greeting-body {
2+
display: flex;
3+
flex-direction: column;
4+
width: 100%;
5+
height: 100%;
6+
}
7+
8+
.greeting-content {
9+
display: flex;
10+
flex-direction: column;
11+
justify-content: center;
12+
align-items: center;
13+
margin: auto;
14+
15+
& > svg {
16+
width: 62px;
17+
height: 71px;
18+
}
19+
20+
&__message {
21+
margin: 0;
22+
padding: 26px 0 26px 0;
23+
font-weight: 500;
24+
}
25+
}

‎src/frontend/styles/components/landing.pcss‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎src/frontend/styles/main.pcss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@import './components/header.pcss';
77
@import './components/writing.pcss';
88
@import './components/page.pcss';
9-
@import './components/landing.pcss';
9+
@import './components/greeting.pcss';
1010
@import './components/auth.pcss';
1111
@import './components/error.pcss';
1212
@import './components/button.pcss';

‎src/frontend/svg/frog.svg‎

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)