From 3b5366aeadcc4e684c1611c061bf39f19a1c6afa Mon Sep 17 00:00:00 2001
From: Bram Wiepjes <bramw@protonmail.com>
Date: Mon, 18 Feb 2019 20:25:43 +0100
Subject: [PATCH] added form action on the login page
---
web-frontend/public/login.html | 14 ++++++++++
web-frontend/src/scss/_vendors.scss | 2 +-
.../src/scss/abstracts/_variables.scss | 2 ++
web-frontend/src/scss/base/_typography.scss | 1 +
web-frontend/src/scss/components/_form.scss | 27 +++++++++++++++++++
web-frontend/webpack/config.js | 3 ++-
web-frontend/webpack/webpack.common.js | 15 +++++------
7 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/web-frontend/public/login.html b/web-frontend/public/login.html
index 1832e2a64..826098ec1 100644
--- a/web-frontend/public/login.html
+++ b/web-frontend/public/login.html
@@ -30,6 +30,20 @@
<input type="password" class="input input-large" />
</div>
</div>
+ <div class="actions">
+ <ul class="action-links">
+ <li>
+ <a href="#">Sign up</a>
+ </li>
+ <li>
+ <a href="#">Forgot password</a>
+ </li>
+ </ul>
+ <a href="#" class="button button-large">
+ Sign in
+ <i class="fas fa-lock-open"></i>
+ </a>
+ </div>
</form>
</div>
</div>
diff --git a/web-frontend/src/scss/_vendors.scss b/web-frontend/src/scss/_vendors.scss
index 69e940569..f20661142 100644
--- a/web-frontend/src/scss/_vendors.scss
+++ b/web-frontend/src/scss/_vendors.scss
@@ -1,4 +1,4 @@
-@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700,700i");
+@import url("https://fonts.googleapis.com/css?family=Montserrat:700|Open+Sans:400,400i,700,700i");
@import "~normalize.css/normalize.css";
diff --git a/web-frontend/src/scss/abstracts/_variables.scss b/web-frontend/src/scss/abstracts/_variables.scss
index 2633487a1..0396f6a5a 100644
--- a/web-frontend/src/scss/abstracts/_variables.scss
+++ b/web-frontend/src/scss/abstracts/_variables.scss
@@ -1,4 +1,6 @@
$text-font-stack: 'Open Sans', sans-serif;
+$logo-font-stack: 'Montserrat', sans-serif;
+
// primary colors
$color-primary-100: #ebf7ff !default;
diff --git a/web-frontend/src/scss/base/_typography.scss b/web-frontend/src/scss/base/_typography.scss
index 8339d154b..fb631dbd6 100644
--- a/web-frontend/src/scss/base/_typography.scss
+++ b/web-frontend/src/scss/base/_typography.scss
@@ -29,6 +29,7 @@ h1,
.heading-1 {
@extend %first-last-no-margin;
+ font-family: $logo-font-stack;
font-size: 33px;
margin: 30px 0;
}
diff --git a/web-frontend/src/scss/components/_form.scss b/web-frontend/src/scss/components/_form.scss
index bf5538b7d..1f5748903 100644
--- a/web-frontend/src/scss/components/_form.scss
+++ b/web-frontend/src/scss/components/_form.scss
@@ -34,3 +34,30 @@
margin-top: 6px;
color: $color-error-500;
}
+
+.actions {
+ @extend %first-last-no-margin;
+
+ display: flex;
+ width: 100%;
+ align-items: center;
+ justify-content: space-between;
+ text-align: right;
+ margin: 30px 0;
+}
+
+.action-links {
+ list-style: none;
+ margin: 0;
+ padding: 0;
+
+ li {
+ display: inline;
+ margin-right: 20px;
+ white-space: nowrap;
+
+ &:last-child {
+ margin-right: 0;
+ }
+ }
+}
diff --git a/web-frontend/webpack/config.js b/web-frontend/webpack/config.js
index bf7fbef3f..f381e1b43 100755
--- a/web-frontend/webpack/config.js
+++ b/web-frontend/webpack/config.js
@@ -9,7 +9,8 @@ const config = {
'jsFilename': './baserow.js',
'cssFilename': './baserow.css',
'sourceMaps': true,
- 'devtool': 'inline-source-map'
+ 'devtool': 'inline-source-map',
+ 'pages': ['index.html', 'login.html']
};
// Export config
diff --git a/web-frontend/webpack/webpack.common.js b/web-frontend/webpack/webpack.common.js
index dfdbba179..9e3241352 100755
--- a/web-frontend/webpack/webpack.common.js
+++ b/web-frontend/webpack/webpack.common.js
@@ -111,16 +111,15 @@ const plugins = [
allowExternal: true,
}),
new ExtractTextPlugin(config.cssFilename),
- new HtmlWebpackPlugin({
- template: `${config.output}/index.html`,
- filename: 'index.html'
- }),
- new HtmlWebpackPlugin({
- template: `${config.output}/login.html`,
- filename: 'login.html'
- })
];
+for(const page in config.pages) {
+ plugins.push(new HtmlWebpackPlugin({
+ template: `${config.output}/${config.pages[page]}`,
+ filename: `${config.pages[page]}`
+ }));
+}
+
const webpackConfig = {
entry,
resolve,