Merged in develop (pull request #56)

Develop
2020-04-09 16:23:40 +00:00 · 2020-04-09 16:23:40 +00:00 · 595809a4cb
parent 1a8e28c114 9bf7f2e9fa
commit 595809a4cb
21 changed files with 182 additions and 18 deletions
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@ -68,7 +68,7 @@ aliases:
  deployment: dev
  trigger: manual
  script:
-  - git push https://heroku:$HEROKU_API_KEY@git.heroku.com/skillbox-dev.git HEAD:master
+  - git push --force https://heroku:$HEROKU_API_KEY@git.heroku.com/skillbox-dev.git HEAD:master

 pipelines:
  default:
--- a/client/index.html
+++ b/client/index.html
@ -3,7 +3,7 @@
 <head>
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
-  <title>skillbox</title>
+  <title>mySkillbox</title>

  <link href='https://fonts.googleapis.com/css?family=Material+Icons' rel="stylesheet" type="text/css">
  <link href="https://fonts.googleapis.com/css?family=Montserrat:400,600,800" rel="stylesheet">
@ -11,6 +11,13 @@
  <!--  FIXME: replace with own css -->
  <link href="https://surveyjs.azureedge.net/1.0.87/survey.css" type="text/css" rel="stylesheet"/>

+  <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/static/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/static/favicon-16x16.png">
+  <link rel="manifest" href="/static/site.webmanifest">
+  <link rel="mask-icon" href="/static/safari-pinned-tab.svg" color="#5bbad5">
+  <meta name="msapplication-TileColor" content="#da532c">
+  <meta name="theme-color" content="#ffffff">

  <script>
    window.UPLOADCARE_PUBLIC_KEY = '78212ff39934a59775ac';
--- a/client/src/components/ContentBlock.vue
+++ b/client/src/components/ContentBlock.vue
@ -57,7 +57,9 @@

  const instruments = {
    base_communication: 'Sprache & Kommunikation',
-    base_society: 'Gesellschaft'
+    base_society: 'Gesellschaft',
+    base_interdisciplinary: 'Überfachliches Instrument',
+
  };

  export default {
@ -291,6 +293,14 @@
      }
    }

+    &--base_interdisciplinary {
+      @include content-box($color-accent-4-list);
+
+      .content-block__instrument-label {
+        color: $color-accent-4-dark;
+      }
+    }
+
    /deep/ p {
      line-height: 1.5;
      margin-bottom: 1em;
--- a/client/src/styles/_forms.scss
+++ b/client/src/styles/_forms.scss
@ -154,4 +154,13 @@ $icon-size: 20px;
      margin-top: 1px;
    }
  }
+
+  &--matrix {
+    margin: 0;
+
+    #{$base}__label-container {
+      display: flex;
+      justify-content: flex-start;
+    }
+  }
 }
--- a/client/src/styles/_survey.scss
+++ b/client/src/styles/_survey.scss
@ -2,6 +2,7 @@
  &__page-title {
    @include main-title;
    margin-bottom: $large-spacing*2;
+
    span {
      @include main-title;
    }
@ -22,6 +23,7 @@
  &__question-title {
    @include heading-4;
    margin-bottom: $medium-spacing;
+
    > span > span { // weird survey.js html structure
      @include heading-4;
      line-height: $default-line-height;
@ -57,6 +59,7 @@
  }

  $progress-margin-right: 140px;
+
  &__progress {
    background-color: $color-silver-light;
    height: 0.3em;
@ -67,6 +70,10 @@
    margin-right: $progress-margin-right;
    box-sizing: border-box;
    display: flex;
+
+    > span {
+      display: none;
+    }
  }

  &__radiogroup-group, &__checkbox-group {
@ -102,11 +109,59 @@
  &__completed-text {
    @include regular-text;
  }
+
+  &__matrix {
+    width: 100%;
+  }
+
+}
+
+.matrix {
+  margin-bottom: $large-spacing;
+
+  &__row {
+    display: table-row;
+    border-top: 1px solid $color-silver;
+  }
+
+  &__cell {
+    display: table-cell;
+    padding: $medium-spacing 0;
+    text-align: left;
+    vertical-align: middle;
+    @include small-text;
+
+    span {
+      line-height: 1.5;
+    }
+  }
+
+  thead {
+    th {
+      text-align: left;
+      @include small-text;
+      vertical-align: bottom;
+      padding: $small-spacing/2 $small-spacing/2 $small-spacing/2 0;
+
+      > span {
+        margin-right: $small-spacing;
+      }
+    }
+  }
+
+  &__radio {
+    margin: 0;
+  }
+
+  &__label {
+    display: flex;
+  }
 }

 .question {

  $question: &;
+
  &--error #{$question}__input {
    border-color: $color-error;
    box-shadow: none;
--- a/client/src/styles/_variables.scss
+++ b/client/src/styles/_variables.scss
@ -21,6 +21,7 @@ $color-accent-5: #DBE6EC;

 $color-accent-1-list: $color-accent-1 $color-accent-1-light $color-accent-1-dark;
 $color-accent-2-list: $color-accent-2 $color-accent-2-light $color-accent-2-dark;
+$color-accent-4-list: $color-accent-4 $color-accent-4-light $color-accent-4-dark;

 /* brand */
 $color-brand-dark: #138E72;
@ -50,16 +51,8 @@ $serif-font-family: "ff-meta-serif-web-pro", serif;
 $base-font-size: 100%; // 16px in most browsers
 $base-font-size-pixels: 16px; // used to calculate rem

-
-//temporary, for room mock, todo: define with real types
-$red: #FA5F5F;
-$green: #6DD79A;
-$brown: #EB9E77;
-
 $list-height: 52px;

-
-
 $default-border-radius: 13px;
 $input-border-radius: 3px;

@ -67,14 +60,12 @@ $input-border-radius: 3px;
 $modal-lateral-padding: 34px;
 $modal-input-width: 560px;

-
 $default-padding: 30px;

 $small-spacing: 10px;
 $medium-spacing: 20px;
 $large-spacing: 30px;

-
 $font-weight-bold: 700;
 $font-weight-semibold: 600;
 $font-weight-regular: 400;
--- a/client/src/survey.config.js
+++ b/client/src/survey.config.js
@ -73,11 +73,16 @@ export const css = {
    'root': ''
  },
  'matrix': {
-    'root': 'table table-striped',
-    'label': 'sv_q_m_label',
-    'cellText': 'sv_q_m_cell_text',
-    'cellTextSelected': 'sv_q_m_cell_selected bg-primary',
-    'cellLabel': 'sv_q_m_cell_label'
+    'root': 'survey__matrix matrix',
+    'label': 'base-input-container__label-container matrix__label',
+    'item': 'survey__matrix-item',
+    'itemValue': 'survey__matrix-item matrix__item base-input-container__input',
+    'materialDecorator': 'base-input-container__radiobutton base-input-container__icon matrix__radio',
+    'row': 'survey__radiogroup-group matrix__row',
+    'cell': 'base-input-container base-input-container--survey base-input-container--matrix matrix__cell',
+    'cellText': 'survey__matrix-cell-text',
+    'cellTextSelected': 'survey__matrix-cell-text--selected',
+    'cellLabel': 'survey__matrix-cell-label'
  },
  'matrixdropdown': {
    'root': 'table'
--- a/server/basicknowledge/migrations/0005_auto_20200408_0834.py
+++ b/server/basicknowledge/migrations/0005_auto_20200408_0834.py
@ -0,0 +1,18 @@
+# Generated by Django 2.1.15 on 2020-04-08 08:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('basicknowledge', '0004_auto_20191128_1601'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='basicknowledge',
+            name='type',
+            field=models.CharField(choices=[('language_communication', 'Sprache & Kommunikation'), ('society', 'Gesellschaft'), ('interdisciplinary', 'Überfachliches Instrument')], max_length=100),
+        ),
+    ]
--- a/server/basicknowledge/models.py
+++ b/server/basicknowledge/models.py
@ -26,10 +26,12 @@ class BasicKnowledge(StrictHierarchyPage):

    LANGUAGE_COMMUNICATION = 'language_communication'
    SOCIETY = 'society'
+    INTERDISCIPLINARY = 'interdisciplinary'

    TYPE_CHOICES = (
        (LANGUAGE_COMMUNICATION, 'Sprache & Kommunikation'),
        (SOCIETY, 'Gesellschaft'),
+        (INTERDISCIPLINARY, 'Überfachliches Instrument'),
    )

    type = models.CharField(
--- a/server/books/migrations/0019_auto_20200408_0841.py
+++ b/server/books/migrations/0019_auto_20200408_0841.py
@ -0,0 +1,18 @@
+# Generated by Django 2.1.15 on 2020-04-08 08:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0018_remove_module_solutions_enabled_by'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contentblock',
+            name='type',
+            field=models.CharField(choices=[('normal', 'Normal'), ('base_communication', 'Instrument Sprache & Kommunikation'), ('task', 'Auftrag'), ('base_society', 'Instrument Gesellschaft'), ('base_interdisciplinary', 'Überfachliches Instrument')], default='normal', max_length=100),
+        ),
+    ]
--- a/server/books/models/contentblock.py
+++ b/server/books/models/contentblock.py
@ -27,12 +27,14 @@ class ContentBlock(StrictHierarchyPage):
    BASE_COMMUNICATION = 'base_communication'
    TASK = 'task'
    BASE_SOCIETY = 'base_society'
+    BASE_INTERDISCIPLINARY = 'base_interdisciplinary'

    TYPE_CHOICES = (
        (NORMAL, 'Normal'),
        (BASE_COMMUNICATION, 'Instrument Sprache & Kommunikation'),
        (TASK, 'Auftrag'),
        (BASE_SOCIETY, 'Instrument Gesellschaft'),
+        (BASE_INTERDISCIPLINARY, 'Überfachliches Instrument'),
    )

    # blocks without owner are visible by default, need to be hidden for each class
--- a/server/core/static/android-chrome-192x192.png
+++ b/server/core/static/android-chrome-192x192.png
--- a/server/core/static/android-chrome-256x256.png
+++ b/server/core/static/android-chrome-256x256.png
--- a/server/core/static/apple-touch-icon.png
+++ b/server/core/static/apple-touch-icon.png
--- a/server/core/static/browserconfig.xml
+++ b/server/core/static/browserconfig.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
--- a/server/core/static/favicon-16x16.png
+++ b/server/core/static/favicon-16x16.png
--- a/server/core/static/favicon-32x32.png
+++ b/server/core/static/favicon-32x32.png
--- a/server/core/static/favicon.ico
+++ b/server/core/static/favicon.ico
--- a/server/core/static/mstile-150x150.png
+++ b/server/core/static/mstile-150x150.png
--- a/server/core/static/safari-pinned-tab.svg
+++ b/server/core/static/safari-pinned-tab.svg
@ -0,0 +1,19 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="332.000000pt" height="332.000000pt" viewBox="0 0 332.000000 332.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,332.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M1400 3300 c-579 -96 -1043 -460 -1273 -1000 -37 -87 -84 -238 -93
+-300 -3 -19 -10 -55 -16 -80 -17 -73 -19 -392 -2 -495 68 -428 262 -774 587
+-1047 495 -414 1219 -496 1801 -202 108 54 251 147 314 203 18 16 52 47 75 68
+125 112 262 293 349 463 74 144 116 269 154 455 18 90 28 409 14 490 -4 28
+-11 70 -14 95 -19 144 -99 365 -187 521 -229 403 -598 686 -1039 799 -199 51
+-471 63 -670 30z"/>
+</g>
+</svg>
--- a/server/core/static/site.webmanifest
+++ b/server/core/static/site.webmanifest
@ -0,0 +1,19 @@
+{
+    "name": "",
+    "short_name": "",
+    "icons": [
+        {
+            "src": "/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/android-chrome-256x256.png",
+            "sizes": "256x256",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}