add mohner and upgrade deps

krystofbe · Apr 27, 2020 · 5ec618a · 5ec618a
1 parent aa0572a
commit 5ec618a
Show file tree

Hide file tree

Showing 7 changed files with 3,396 additions and 2,792 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,12 +11,10 @@ pids
 *.seed
 *.pid.lock
 
-
-build
-
+dist
 
 # Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
+dist/Release
 
 # Dependency directories
 node_modules/

diff --git a/deploy.js b/deploy.js
@@ -7,14 +7,14 @@ const config = {
   password: process.env.password,
   host: "praxis-kreativkai.de",
   port: 21,
-  localRoot: __dirname + "/build",
+  localRoot: __dirname + "/dist",
   remoteRoot: "/praxis-kreativkai.de/",
   include: ["*", "**/*", ".htaccess"], // this uploads everything except dot files
-  deleteRemote: true // delete existing files at destination before uploading
+  deleteRemote: true, // delete existing files at destination before uploading
 };
 
 // use with promises
 ftpDeploy
   .deploy(config)
-  .then(res => console.log("finished"))
-  .catch(err => console.log(err));
+  .then((res) => console.log("finished"))
+  .catch((err) => console.log(err));
diff --git a/package.json b/package.json
@@ -43,26 +43,26 @@
   "devDependencies": {
     "@babel/core": "^7.1.0",
     "babel-loader": "^8.0.2",
-    "clean-webpack-plugin": "^0.1.19",
-    "copy-webpack-plugin": "^4.5.2",
-    "css-loader": "^1.0.0",
+    "clean-webpack-plugin": "^3.0.0",
+    "copy-webpack-plugin": "^5.1.1",
+    "css-loader": "^3.5.3",
     "cssnano": "^4.1.0",
-    "dotenv": "^6.0.0",
+    "dotenv": "^8.2.0",
     "exports-loader": "^0.7.0",
     "expose-loader": "^0.7.5",
-    "file-loader": "^2.0.0",
+    "file-loader": "^6.0.0",
     "ftp-deploy": "^2.1.3",
-    "image-webpack-loader": "^4.3.1",
-    "mini-css-extract-plugin": "^0.4.3",
+    "image-webpack-loader": "^6.0.0",
+    "mini-css-extract-plugin": "^0.9.0",
     "node-sass": "^4.9.3",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
     "postcss-cssnext": "^3.1.0",
     "postcss-flexbugs-fixes": "^4.1.0",
     "postcss-import": "^12.0.0",
     "postcss-loader": "^3.0.0",
-    "sass-loader": "^7.1.0",
+    "sass-loader": "^8.0.2",
     "uglifyjs-webpack-plugin": "^2.0.1",
-    "url-loader": "^1.1.1",
+    "url-loader": "^4.1.0",
     "webpack": "^4.19.1",
     "webpack-cli": "^3.1.0",
     "webpack-dev-server": "^3.1.8",

diff --git a/src/img/team/mohner.png b/src/img/team/mohner.png
diff --git a/src/index.html b/src/index.html
@@ -11,7 +11,8 @@
   <title>Praxis Kreativkai</title>
   <!-- Custom fonts for this template -->
   <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
-  <link href='https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
+  <link href='https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic' rel='stylesheet'
+    type='text/css'>
   <link href='https://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700' rel='stylesheet' type='text/css'>
 
   <!-- Custom styles for this template -->
@@ -23,8 +24,9 @@
   <!-- Navigation -->
   <nav class="navbar fixed-top navbar-expand-md navbar-inverse" id="mainNav">
     <div class="container">
-      <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarResponsive"
-        aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
+      <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
+        data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false"
+        aria-label="Toggle navigation">
         Menü
         <i class="fa fa-bars"></i>
       </button>
@@ -103,7 +105,8 @@ <h4>M. Grumbach-Wendt</h4>
                   </a>
                 </li>
                 <li class="list-inline-item">
-                  <a href="#phonePopup" data-container="body" data-toggle="popover" data-placement="bottom" data-html="true"
+                  <a href="#phonePopup" data-container="body" data-toggle="popover" data-placement="bottom"
+                    data-html="true"
                     data-content="<div><strong>Telefonische Sprechzeit</strong><br /> Freitag: 12:00 Uhr - 13:00 Uhr<br />Tel. 0251 39 488 150</div>">
                     <i class="fa fa-phone"></i>
                   </a>
@@ -137,7 +140,8 @@ <h4>Tanja Langer</h4>
                   </a>
                 </li>
                 <li class="list-inline-item">
-                  <a href="#phonePopup" data-container="body" data-toggle="popover" data-placement="bottom" data-html="true"
+                  <a href="#phonePopup" data-container="body" data-toggle="popover" data-placement="bottom"
+                    data-html="true"
                     data-content="<div><strong>Telefonische Sprechzeit</strong><br /> Montag: 11:00 Uhr - 12:00 Uhr<br />Tel. 0251 39 488 150</div>">
                     <i class="fa fa-phone"></i>
                   </a>
@@ -166,7 +170,8 @@ <h4>Jasmin Schmäing</h4>
                   </a>
                 </li>
                 <li class="list-inline-item">
-                  <a href="#phonePopup" data-container="body" data-toggle="popover" data-placement="bottom" data-html="true"
+                  <a href="#phonePopup" data-container="body" data-toggle="popover" data-placement="bottom"
+                    data-html="true"
                     data-content="<div><strong>Telefonische Sprechzeit</strong><br /> Donnerstag: 13:00 Uhr - 14:00 Uhr<br />Tel. 0251 39 488 150</div>">
                     <i class="fa fa-phone"></i>
                   </a>
@@ -193,7 +198,8 @@ <h3 class="section-subheading text-muted">Die Schritte einer Therapie.</h3>
           <ul class="timeline">
             <li>
               <div class="timeline-image">
-                <img class="rounded-circle rounded mx-auto d-block img-fluid" src="img/about/1.jpg" alt="Kontaktaufnahme">
+                <img class="rounded-circle rounded mx-auto d-block img-fluid" src="img/about/1.jpg"
+                  alt="Kontaktaufnahme">
               </div>
               <div class="timeline-panel">
                 <div class="timeline-heading">
@@ -651,7 +657,8 @@ <h3 class="section-subheading text-muted">So finden Sie unsere Praxisräume!</h3
         </div>
       </div>
       <div class="map-responsive">
-      <iframe src='https://www.uwp.is.ed.ac.uk/3rd-party-widgets/maps/embeds/gm.php?map=IPBOTd2axz' width='420' height='400' frameborder='0' class='uwpgmap'></iframe>
+        <iframe src='https://www.uwp.is.ed.ac.uk/3rd-party-widgets/maps/embeds/gm.php?map=IPBOTd2axz' width='420'
+          height='400' frameborder='0' class='uwpgmap'></iframe>
 
       </div>
     </div>
@@ -685,37 +692,37 @@ <h3 class="section-subheading text-muted">Rufen Sie an oder schreiben Sie eine E
           </li>
         </ul>
         <p class="mt-4">Sie erreichen die Therapeutinnen auch individuell per E-Mail.
-      </p>
-      <div class="row">
-            <div class="col my-2">
-              <strong>Dipl.-Psych. M. Grumbach-Wendt</strong>
-              <br />
-              
-              <a href="mailto:grumbach-wendt@praxis-kreativkai.de">
+        </p>
+        <div class="row">
+          <div class="col my-2">
+            <strong>Dipl.-Psych. M. Grumbach-Wendt</strong>
+            <br />
+
+            <a href="mailto:grumbach-wendt@praxis-kreativkai.de">
               <i class="fa fa-envelope-o mr-1" aria-hidden="true"></i>
               grumbach-wendt@praxis-kreativkai.de</a>
-            </div>
-
           </div>
-          <div class="row">
-            <div class="col my-2">
-              <strong>Dipl.-Päd. Tanja Langer</strong>
-              <br />
-              <a href="mailto:langer@praxis-kreativkai.de">
+
+        </div>
+        <div class="row">
+          <div class="col my-2">
+            <strong>Dipl.-Päd. Tanja Langer</strong>
+            <br />
+            <a href="mailto:langer@praxis-kreativkai.de">
               <i class="fa fa-envelope-o mr-1" aria-hidden="true"></i>
               langer@praxis-kreativkai.de</a>
-            </div>
-
           </div>
-          <div class="row">
-            <div class="col my-2">
-              <strong>Dipl.-Psych. Jasmin Schmäing</strong>
-              <br />
-              <a href="mailto:schmaeing@praxis-kreativkai.de">
+
+        </div>
+        <div class="row">
+          <div class="col my-2">
+            <strong>Dipl.-Psych. Jasmin Schmäing</strong>
+            <br />
+            <a href="mailto:schmaeing@praxis-kreativkai.de">
               <i class="fa fa-envelope-o mr-1" aria-hidden="true"></i>
               schmaeing@praxis-kreativkai.de</a>
-            </div>
           </div>
+        </div>
 
 
       </div>
@@ -773,12 +780,14 @@ <h3>Telefonische Sprechzeiten</h3>
         <div class="col-md-12 col-lg-6">
           <div class="row">
             <div class="col-sm-auto my-2">
-              <img style="max-width: 10rem;" class="center-block rounded-circle mr-2" src="img/team/fliss.png" alt="Foto von Frau Dominicus" />
+              <img style="max-width: 10rem;" class="center-block rounded-circle mr-2" src="img/team/mohner.png"
+                alt="Foto von Frau Dominicus" />
             </div>
             <div class="col-sm-6 my-2">
               <div class="container d-flex h-100">
                 <div class="row justify-content-center align-self-center">
-                  Sie erreichen unsere Mitarbeiterin Frau Fliß dienstags in der Zeit von 09:00 Uhr bis 11:00 Uhr.
+                  Sie erreichen unsere Mitarbeiterin Frau Eva Katharina Mohner dienstags in der Zeit von 09:00 Uhr bis
+                  11:00 Uhr.
                 </div>
               </div>
             </div>
@@ -877,8 +886,7 @@ <h3 class="mb-5">Dipl.-Psych. Marion Grumbach-Wendt</h3>
                     <div class="col-lg-6">
                       <img class=" rounded-circle rounded
                                             mx-auto d-block img-fluid d-block mx-auto w-50
-                                           "
-                        src="img/team/1.jpg" alt="Dipl.-Psych. Marion Grumbach-Wendt">
+                                           " src="img/team/1.jpg" alt="Dipl.-Psych. Marion Grumbach-Wendt">
                     </div>
                     <div class="col-lg-6 align-self-center">
 
@@ -1066,8 +1074,8 @@ <h3 class="mb-5">Dipl.-Psych. Marion Grumbach-Wendt</h3>
                   <h3 class="mb-5">Dipl.-Päd. Tanja Langer</h3>
                   <div class="row">
                     <div class="col-lg-6">
-                      <img class=" rounded-circle rounded mx-auto d-block img-fluid d-block mx-auto w-50" src="img/team/2.jpg"
-                        alt="">
+                      <img class=" rounded-circle rounded mx-auto d-block img-fluid d-block mx-auto w-50"
+                        src="img/team/2.jpg" alt="">
                     </div>
                     <div class="col-lg-6 align-self-center">
 
@@ -1139,9 +1147,11 @@ <h3 class="mb-5">Dipl.-Päd. Tanja Langer</h3>
                         <strong>Dozentin:</strong>
                       </p>
                       <ul>
-                        <li>"Störungsbilder der Kinder- und Jugendpsychiatrie" beim Institut für Psychologische Psychotherapieausbildung, IPP, Münster
+                        <li>"Störungsbilder der Kinder- und Jugendpsychiatrie" beim Institut für Psychologische
+                          Psychotherapieausbildung, IPP, Münster
                         </li>
-                        <li>"Gruppenpsychotherapie" beim WAK Walstedde, Westfälische Ausbildungsakademie für Kinder- und Jugenlichenpsychotherapie
+                        <li>"Gruppenpsychotherapie" beim WAK Walstedde, Westfälische Ausbildungsakademie für Kinder- und
+                          Jugenlichenpsychotherapie
                         </li>
                       </ul>
                       <p>&nbsp;
@@ -1205,8 +1215,8 @@ <h3 class="mb-5">Dipl.-Päd. Tanja Langer</h3>
                   <h3 class="mb-5">Dipl.-Psych. Jasmin Schmäing</h3>
                   <div class="row">
                     <div class="col-lg-6">
-                      <img class=" rounded-circle rounded mx-auto d-block img-fluid d-block mx-auto w-50" src="img/team/3.jpg"
-                        alt="">
+                      <img class=" rounded-circle rounded mx-auto d-block img-fluid d-block mx-auto w-50"
+                        src="img/team/3.jpg" alt="">
                     </div>
                     <div class="col-lg-6 align-self-center">