Home Explore Help
Sign In
da
/
website
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' into elections

JoostSijm 6 years ago
parent
f573100886 7ad276a019
commit
249620f522
6 changed files with 75 additions and 62 deletions
Split View Show Diff Stats
  1. 2 5
      app/modules/auth/app.py
  2. 24 22
      app/modules/backend/templates/layout/backend.j2
  3. 13 11
      app/modules/backend/templates/layout/public.j2
  4. 9 0
      app/static/css/index.css
  5. 8 5
      app/static/js/index.js
  6. 19 19
      webpack.config.js

+ 2 - 5
app/modules/auth/app.py
View File 

@@ -82,12 +82,9 @@ def register():
 
 
     db.session.add(user)
 
     db.session.commit()
 
-    login_user(user, remember=True)
 
-    flash('Successfully registered account "%s".' % (user.name), 'success')
 
 
-    if request.args.get("next") is not None:
 
-        return redirect(request.args.get("next"))
 
-    return redirect(url_for('static.index'))
 
+    flash('Successfully registered account "%s". Wait for verfication.' % (user.name), 'success')
 
+    return render_template('login.j2')
 
 
 
 @BLUEPRINT.route("/logout")

+ 24 - 22
app/modules/backend/templates/layout/backend.j2
View File 

@@ -6,28 +6,30 @@
 
 </head>
 
 <body>
 
     <nav class="navbar navbar-expand-md navbar-dark bg-dark">
 
-        <a class="navbar-brand" href="/backend"><img src="/static/uploads/logo.png" style="height: 27px"></a>
 
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsDefault" aria-controls="navbarsDefault" aria-expanded="false" aria-label="Toggle navigation">
 
-            <span class="navbar-toggler-icon"></span>
 
-        </button>
 
-        <div class="collapse navbar-collapse" id="navbarsDefault">
 
-            <ul class="navbar-nav mr-auto">
 
-                {%- for item in current_menu.children recursive -%}
 
-                <li class="nav-item {{ 'active' if item.active }}" data-toggle="tooltip" data-placement="right" title="{{ item.text }}">
 
-                    <a class="nav-link" href="{{ item.url}}">
 
-                        <span class="nav-link-text">{{ item.text }}</span>
 
-                    </a>
 
-                </li>
 
-                {%- endfor -%}
 
-            </ul>
 
-            <ul class="navbar-nav">
 
-                <li class="nav-item text-nowrap">
 
-                      <a class="nav-link" href="/">Public</a>
 
-                </li>
 
-                <li class="nav-item text-nowrap">
 
-                      <a class="nav-link" href="/logout">Logout</a>
 
-                </li>
 
-            </ul>
 
+        <div class="container">
 
+            <a class="navbar-brand" href="/backend"><img src="/static/uploads/logo.png" style="height: 27px"></a>
 
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsDefault" aria-controls="navbarsDefault" aria-expanded="false" aria-label="Toggle navigation">
 
+                <span class="navbar-toggler-icon"></span>
 
+            </button>
 
+            <div class="collapse navbar-collapse" id="navbarsDefault">
 
+                <ul class="navbar-nav mr-auto">
 
+                    {%- for item in current_menu.children recursive -%}
 
+                    <li class="nav-item {{ 'active' if item.active }}" data-toggle="tooltip" data-placement="right" title="{{ item.text }}">
 
+                        <a class="nav-link" href="{{ item.url}}">
 
+                            <span class="nav-link-text">{{ item.text }}</span>
 
+                        </a>
 
+                    </li>
 
+                    {%- endfor -%}
 
+                </ul>
 
+                <ul class="navbar-nav">
 
+                    <li class="nav-item text-nowrap">
 
+                          <a class="nav-link" href="/">Public</a>
 
+                    </li>
 
+                    <li class="nav-item text-nowrap">
 
+                          <a class="nav-link" href="/logout">Logout</a>
 
+                    </li>
 
+                </ul>
 
+            </div>
 
         </div>
 
     </nav>
 
     <main class="container mt-3">

+ 13 - 11
app/modules/backend/templates/layout/public.j2
View File 

@@ -1,21 +1,23 @@
 
 <!DOCTYPE html>
 
-<html>
 
+<html class="vh-100">
 
 <head>
 
-    <title>{{ page.title }} - ssg</title>
 
+    <title>{{ page.title }} - Democratic Assembly</title>
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <script src="/static/js/main.js"></script>
 
 </head>
 
-<body>
 
-    <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
 
-        <a class="navbar-brand" href="/"><img src="/static/uploads/logo.png" style="height: 27px"></a>
 
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
 
-            <span class="navbar-toggler-icon"></span>
 
-        </button>
 
-        <div class="collapse navbar-collapse" id="navbarSupportedContent">
 
-            {% block nav %}{% endblock %}
 
+<body class="vh-100 background">
 
+    <nav class="navbar row navbar-expand-lg navbar-dark bg-dark">
 
+        <div class="container">
 
+            <a class="navbar-brand" href="/"><img src="/static/uploads/logo.png" style="height: 27px"></a>
 
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
 
+                <span class="navbar-toggler-icon"></span>
 
+            </button>
 
+            <div class="collapse navbar-collapse" id="navbarSupportedContent">
 
+                {% block nav %}{% endblock %}
 
+            </div>
 
         </div>
 
     </nav>
 
-    <div class="container mt-3">
 
+    <div class="container p-3 bg-white min-vh-75">
 
         {{ page.content() }}
 
     </div>
 
 </body>

+ 9 - 0
app/static/css/index.css
View File 

@@ -0,0 +1,9 @@
 
+.min-vh-75
 
+{
 
+	min-height: 75vh !important;
 
+}
 
+
 
+.background
 
+{
 
+	background: url('/static/uploads/background.jpg') no-repeat center center fixed; background-size: cover;
 
+}

+ 8 - 5
app/static/js/index.js
View File 

@@ -1,9 +1,12 @@
 
-// import 'bootstrap';
 
-
 
+// Import Bootstrap
 
 import 'bootstrap'
 
 import 'bootstrap/dist/css/bootstrap.min.css'
 
 
-import SimpleMDE from 'simplemde';
 
-import 'simplemde/dist/simplemde.min.css';
 
+// Import own css
 
+import '../css/index.css'
 
+
 
+// Import SimpleMDE
 
+import SimpleMDE from 'simplemde'
 
+import 'simplemde/dist/simplemde.min.css'
 
 
-new SimpleMDE();
 
+new SimpleMDE()

+ 19 - 19
webpack.config.js
View File 

@@ -3,11 +3,11 @@ const webpack = require('webpack');
 
 
 module.exports = {
 
     mode: 'development',
 
-	entry: './app/static/js/index.js',
 
+    entry: './app/static/js/index.js',
 
     output: {
 
         filename: 'main.js',
 
         path: path.resolve(__dirname, 'app/static/js'),
 
-		publicPath: 'static/js'
 
+        publicPath: 'static/js'
 
     },
 
     plugins: [
 
         new webpack.ProvidePlugin({
 
@@ -21,25 +21,25 @@ module.exports = {
 
         }
 
     },
 
     module: {
 
-      rules: [
 
-        {
 
-          test: /\.js$/,
 
-          exclude: /node_modules/,
 
-          use: {
 
-            loader: 'babel-loader',
 
-            options: {
 
-              presets: ['@babel/preset-env']
 
+        rules: [
 
+            {
 
+                test: /\.js$/,
 
+                exclude: /node_modules/,
 
+                use: {
 
+                    loader: 'babel-loader',
 
+                    options: {
 
+                        presets: ['@babel/preset-env']
 
+                    }
 
+                }
 
             }
 
-          }
 
-        }
 
-      ]
 
+        ]
 
     },
 
     module: {
 
-      rules: [
 
-        {
 
-          test: /\.css$/,
 
-          use: ['style-loader', 'css-loader']
 
-        }
 
-      ]
 
+        rules: [
 
+            {
 
+                test: /\.css$/,
 
+                use: ['style-loader', 'css-loader']
 
+            }
 
+        ]
 
     }
 
 };