From 5e9e64797365515bed9d85df9c1514b8d686e2b3 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 16 Dec 2020 00:17:26 +0300 Subject: [PATCH] [SSE mobile] added statusbar --- apps/spreadsheeteditor/mobile/index.html | 249 ------------------ .../mobile/src/controller/Statusbar.jsx | 9 + .../mobile/src/less/app.less | 10 +- .../mobile/src/page/main.jsx | 2 + .../mobile/src/view/Statusbar.jsx | 13 +- 5 files changed, 31 insertions(+), 252 deletions(-) delete mode 100644 apps/spreadsheeteditor/mobile/index.html create mode 100644 apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx diff --git a/apps/spreadsheeteditor/mobile/index.html b/apps/spreadsheeteditor/mobile/index.html deleted file mode 100644 index 87d8d1791..000000000 --- a/apps/spreadsheeteditor/mobile/index.html +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - - - - - ONLYOFFICE Spreadsheets - - - - - - - - - - -
-
-
-
- -
-
-
-
-
-
-
-
- - - - - - - - - - - - diff --git a/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx b/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx new file mode 100644 index 000000000..d177b3323 --- /dev/null +++ b/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx @@ -0,0 +1,9 @@ + +import React from 'react'; +import StatusbarView from '../view/Statusbar'; + +const Statusbar = props => { + return +}; + +export default Statusbar; \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/src/less/app.less b/apps/spreadsheeteditor/mobile/src/less/app.less index d2ac278b0..8660dc330 100644 --- a/apps/spreadsheeteditor/mobile/src/less/app.less +++ b/apps/spreadsheeteditor/mobile/src/less/app.less @@ -10,7 +10,15 @@ @import './app-ios.less'; @import './icons-ios.less'; @import './icons-material.less'; -@import "./icons-common.less"; +@import './icons-common.less'; + +.page[data-name='home'] { + .page-content { + display: flex; + flex-direction: column; + align-items: stretch; + } +}; :root { --f7-popover-width: 360px; diff --git a/apps/spreadsheeteditor/mobile/src/page/main.jsx b/apps/spreadsheeteditor/mobile/src/page/main.jsx index a9a8030a2..f38826548 100644 --- a/apps/spreadsheeteditor/mobile/src/page/main.jsx +++ b/apps/spreadsheeteditor/mobile/src/page/main.jsx @@ -5,6 +5,7 @@ import { Page, View, Navbar, NavLeft, NavRight, Link, Icon } from 'framework7-re import Settings from '../view/settings/Settings'; import CollaborationView from '../../../../common/mobile/lib/view/Collaboration.jsx' import CellEditor from '../controller/CellEditor'; +import Statusbar from '../controller/StatusBar' export default class MainPage extends Component { constructor(props) { @@ -62,6 +63,7 @@ export default class MainPage extends Component { !this.state.collaborationVisible ? null : } + ) } diff --git a/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx b/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx index 1d7996bbd..6c7d19fad 100644 --- a/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx @@ -1,8 +1,17 @@ import React from 'react'; -import { View } from 'framework7-react'; +import { View, Toolbar, Link } from 'framework7-react'; + +const viewStyle = { + height: 30 +}; const StatusbarView = props => { - return
; + return + + Sheet 1 + Sheet 2 + + ; }; export default StatusbarView;