diff --git a/build/dev-server.js b/build/dev-server.js index 907efb5d..a517b6cc 100644 --- a/build/dev-server.js +++ b/build/dev-server.js @@ -1,9 +1,9 @@ require('./check-versions')() var config = require('../config') -Object.entries(config.dev.env).forEach(([key, value]) => { +Object.keys(config.dev.env).forEach((key) => { if (!process.env[key]) { - process.env[key] = JSON.parse(value); + process.env[key] = JSON.parse(config.dev.env[key]); } }); diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index f72e9df5..2e78e351 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -99,7 +99,7 @@ var webpackConfig = merge(baseWebpackConfig, { events: true }, excludes: ['**/.*', '**/*.map', '**/index.html', '**/static/oauth2/callback.html', '**/icons-*/*.png', '**/static/fonts/KaTeX_*'], - externals: ['/app', '/oauth2/callback'] + externals: ['/', '/app', '/oauth2/callback'] }) ] }) diff --git a/build/webpack.style.conf.js b/build/webpack.style.conf.js index 06745ea2..fbccd20b 100644 --- a/build/webpack.style.conf.js +++ b/build/webpack.style.conf.js @@ -5,7 +5,6 @@ var utils = require('./utils') var config = require('../config') var vueLoaderConfig = require('./vue-loader.conf') var StylelintPlugin = require('stylelint-webpack-plugin') -var FaviconsWebpackPlugin = require('favicons-webpack-plugin') var ExtractTextPlugin = require('extract-text-webpack-plugin') var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') diff --git a/index.js b/index.js index 4ff493f3..f549108e 100644 --- a/index.js +++ b/index.js @@ -1,8 +1,8 @@ const env = require('./config/prod.env'); -Object.entries(env).forEach(([key, value]) => { +Object.keys(env).forEach((key) => { if (!process.env[key]) { - process.env[key] = JSON.parse(value); + process.env[key] = JSON.parse(env[key]); } }); diff --git a/server/index.js b/server/index.js index 7e599f3f..6ea23175 100644 --- a/server/index.js +++ b/server/index.js @@ -44,6 +44,8 @@ module.exports = (app, serveV4) => { /* eslint-enable global-require, import/no-unresolved */ } + // Serve landing.html + app.get('/', (req, res) => res.sendFile(resolvePath('static/landing/index.html'))); // Serve callback.html app.get('/oauth2/callback', (req, res) => res.sendFile(resolvePath('static/oauth2/callback.html'))); // Google Drive action receiver @@ -53,8 +55,6 @@ module.exports = (app, serveV4) => { // Serve static resources if (process.env.NODE_ENV === 'production') { if (serveV4) { - // Serve landing.html in / - app.get('/', (req, res) => res.sendFile(resolvePath('stackedit_v4/views/landing.html'))); // Serve editor.html in /viewer app.get('/editor', (req, res) => res.sendFile(resolvePath('stackedit_v4/views/editor.html'))); // Serve viewer.html in /viewer diff --git a/src/components/menus/MainMenu.vue b/src/components/menus/MainMenu.vue index 6610900a..561b2212 100644 --- a/src/components/menus/MainMenu.vue +++ b/src/components/menus/MainMenu.vue @@ -36,12 +36,12 @@
Synchronize
- Open, save, collaborate in the Cloud. + Sync your files in the Cloud.
Publish
- Export your file to the web. + Export your files to the web. diff --git a/src/components/modals/AboutModal.vue b/src/components/modals/AboutModal.vue index e81bea57..34046535 100644 --- a/src/components/modals/AboutModal.vue +++ b/src/components/modals/AboutModal.vue @@ -2,15 +2,18 @@
-
v{{version}} — © 2017 Benoit Schweblin
+
v{{version}} — © 2018 Benoit Schweblin
- StackEdit on GitHub / + GitHub repo — issue tracker
Chrome app — thanks for your review!
- StackEdit on Twitter + StackEdit on Twitter
+ Licensed under an + Apache License +
Privacy Policy
@@ -46,7 +49,7 @@ export default { } .app-version { - font-size: 0.75em; + font-size: 0.8em; } hr { diff --git a/src/data/welcomeFile.md b/src/data/welcomeFile.md index 2817fa8f..0f8d76ee 100644 --- a/src/data/welcomeFile.md +++ b/src/data/welcomeFile.md @@ -1,18 +1,12 @@ # Welcome to StackEdit! -Hi! I'm your first Markdown file in **StackEdit**. If you want to learn about StackEdit, you can read me. If you want to play with Markdown, you can edit me. If you have finished with me, you can just create new files by opening the **file explorer** on left corner of the navigation bar. +Hi! I'm your first Markdown file in **StackEdit**. If you want to learn about StackEdit, you can read me. If you want to play with Markdown, you can edit me. If you have finished with me, you can just create new files by opening the **file explorer** on the left corner of the navigation bar. # Files StackEdit stores your files in your browser, which means all your files are automatically saved locally and are accessible **offline!** -> **Note:** -> -> - StackEdit can be used offline thanks to the application cache. -> - Your local files are not shared between different browsers or computers unless you use the [synchronization mechanism](#synchronization). -> - Clearing your browser's data may **delete all your files!** Make sure you sign in with Google to have all your files and settings backed up and synced. - ## Create files and folders The file explorer is accessible using the button in left corner of the navigation bar. You can create a new file by clicking the **New file** button in the file explorer. You can also create folders by clicking the **New folder** button. diff --git a/static/landing/discussion.png b/static/landing/discussion.png new file mode 100644 index 00000000..b8a01892 Binary files /dev/null and b/static/landing/discussion.png differ diff --git a/static/landing/favicon.ico b/static/landing/favicon.ico new file mode 100644 index 00000000..cc80bbd7 Binary files /dev/null and b/static/landing/favicon.ico differ diff --git a/static/landing/gfm.png b/static/landing/gfm.png new file mode 100644 index 00000000..1ddf4a84 Binary files /dev/null and b/static/landing/gfm.png differ diff --git a/static/landing/index.html b/static/landing/index.html new file mode 100644 index 00000000..8a22f708 --- /dev/null +++ b/static/landing/index.html @@ -0,0 +1,397 @@ + + + + + StackEdit – In-browser Markdown editor + + + + + + + + + + + + + + +
+
+ + + Start writing! + +
+
+ +
+ + + Read more + +
+
+
+
+

Unrivalled writing experience

+
+
+
+

Rich Markdown editor

+

StackEdit’s Markdown syntax highlighting is unique. The refined text formatting of the editor helps you visualize the final rendering of your files.

+
+
+
+ +
+
+
+ +
+

WYSIWYG controls

+

StackEdit provides very handy formatting buttons and shortcuts, thanks to PageDown, the WYSIWYG-style Markdown editor used by Stack Overflow.

+
+
+
+
+
+

Smart layout

+

Whether you write, you review, you comment… StackEdit's layout provides you with the flexibility you need, without sacrifice.

+
+
+
+ +
+
+
+
+

Live preview with Scroll Sync

+

StackEdit’s Scroll Sync feature accurately binds the scrollbars of the editor panel and the preview panel to ensure that you always keep an eye on the output while writing.

+
+ +
+

Designed for web writers

+
+
+
+

Stay connected

+

StackEdit can sync your files with Google Drive, Dropbox and GitHub. It can also publish them as blog posts to Blogger, WordPress and Zendesk. You can choose whether to upload in Markdown format, HTML, or to format the output using the Handlebars template engine.

+
+
+
+ +
+
+
+
+
+

Collaborate

+

With StackEdit, you can share collaborative workspaces, thanks to the Google Drive synchronization mechanism. If two collaborators are working on the same file at the same time, StackEdit takes care of merging the changes.

+
+ +
+
+
+

Comment

+

StackEdit allows you to insert inline comments and embed collaborator discussions in your files, just as well as Microsoft Word and Google Docs.

+
+ +
+
+
+
+

Write offline!

+

Even when you travel, StackEdit is still accessible and lets you write offline just like any desktop application. You have no excuse!

+
+
+

Extended Markdown support

+
+
+
+ +
+
+
+

GitHub Flavored Markdown

+

StackEdit supports different markdown flavors such as Markdown Extra, GFM and CommonMark. Each markdown feature can be enabled or disabled at your convenience.

+
+
+
+
+
+
+ +
+
+
+

LaTeX mathematical expressions

+

StackEdit renders mathematics from LaTeX expressions inside your markdown file, as you would do on Stack Exchange.

+
+
+
+
+
+ +
+
+
+

UML diagrams

+

StackEdit enables you to write sequence diagrams and flow charts using a simple syntax.

+
+
+
+
+
+ + Copyright 2013-2018 Benoit Schweblin
+ Licensed under an + Apache License – + Privacy Policy +
+
+ + + + diff --git a/static/landing/katex.gif b/static/landing/katex.gif new file mode 100644 index 00000000..216677dd Binary files /dev/null and b/static/landing/katex.gif differ diff --git a/static/landing/logo.svg b/static/landing/logo.svg new file mode 100644 index 00000000..db985353 --- /dev/null +++ b/static/landing/logo.svg @@ -0,0 +1 @@ + diff --git a/static/landing/mermaid.gif b/static/landing/mermaid.gif new file mode 100644 index 00000000..8dcab22c Binary files /dev/null and b/static/landing/mermaid.gif differ diff --git a/static/landing/navigation-bar.png b/static/landing/navigation-bar.png new file mode 100644 index 00000000..6e81e8dc Binary files /dev/null and b/static/landing/navigation-bar.png differ diff --git a/static/landing/providers.png b/static/landing/providers.png new file mode 100644 index 00000000..d031a9d1 Binary files /dev/null and b/static/landing/providers.png differ diff --git a/static/landing/scroll-sync.gif b/static/landing/scroll-sync.gif new file mode 100644 index 00000000..93f81910 Binary files /dev/null and b/static/landing/scroll-sync.gif differ diff --git a/static/landing/smart-layout.png b/static/landing/smart-layout.png new file mode 100644 index 00000000..94752142 Binary files /dev/null and b/static/landing/smart-layout.png differ diff --git a/static/landing/syntax-highlighting.gif b/static/landing/syntax-highlighting.gif new file mode 100644 index 00000000..bf967b5c Binary files /dev/null and b/static/landing/syntax-highlighting.gif differ diff --git a/static/landing/workspace.png b/static/landing/workspace.png new file mode 100644 index 00000000..3a863b22 Binary files /dev/null and b/static/landing/workspace.png differ