update solstice theme (#40)

* update solstice theme

Signed-off-by: Christopher Guindon <chris.guindon@eclipse-foundation.org>

* update solstice theme

Signed-off-by: Christopher Guindon <chris.guindon@eclipse-foundation.org>

* update solstice theme

Signed-off-by: Christopher Guindon <chris.guindon@eclipse-foundation.org>

babel.config.json

+{
+	"extends": "./node_modules/eclipsefdn-solstice-assets/babel.config.json"
+}
\ No newline at end of file

content/_index.md

@@ -10,4 +10,13 @@ date: 2019-03-14T15:50:25-04:00
 hide_sidebar : true
 hide_page_title: true
 hide_breadcrumb: true
+layout: "single"
 ---
+
+{{< homepage/members >}}
+
+{{< homepage/vision >}}
+
+{{< homepage/news >}}
+  {{< newsroom/events id="events-template-id" templateId="custom-events-template" class="news-list" includeList="true" publishTarget="openmobility" templatePath="/js/templates/events.mustache" count="2" upcoming="true">}}
+{{</ homepage/news>}}
\ No newline at end of file

content/members/_index.md

@@ -2,5 +2,4 @@
 title: "Members"
 date: 2019-03-22T16:09:45-04:00
 description: ""
-layout: "member-list"
 ---

content/news/_index.md

@@ -8,4 +8,4 @@ aliases:
   - /news/community-news
 ---
 
-
+{{< newsroom/news id="news-list-container" archive="true" publishTarget="openmobility" count="10" paginate="true" >}}
\ No newline at end of file

js/main.js

+/*!
+ * Copyright (c) 2021 Eclipse Foundation, Inc.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * Contributors:
+ *   Christopher Guindon <chris.guindon@eclipse-foundation.org>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import 'eclipsefdn-solstice-assets'
\ No newline at end of file

layouts/_default/events-list.html

-{{ define "main" }}
-  {{ .Content }} 
-  {{ $paginator := .Paginate .Data.Pages }}
-  {{ if ne $paginator.NumberOfElements 0 }}
-    <div class="news-list">
-      <div class="news-list-col">
-        {{ range $paginator.Pages }}
-          <ul class="news-list-media list-unstyled">
-            <li>
-              <a href="{{- with .Params.link | default .RelPermalink }} {{.}} {{- end }}" class="media media-link">
-                <p><span class="label label-default">{{ .Params.label }}</span></p>
-                <p class="media-date">{{ .Params.event_date }}</p>
-                <h4 class="media-heading">{{ .Title }}</h4>
-                <p class="media-text">{{ .Params.location }}</p>
-                <p class="media-text">{{ .Summary }}</p>
-              </a>
-            </li>
-          </ul>
-        {{ end }}
-        {{ template "_internal/pagination.html" . }}
-      </div>
-    </div>
-  {{ end }}
-{{ end }}

layouts/_default/list.html

-{{ define "main" }}
-  {{ .Content }} 
-  <div id="news-list-container" class="news-list" data-pagination="true" data-news-type="{{ .Page.Params.type }}" data-news-count="10" data-publish-target="openmobility">
-{{ end }}

layouts/_default/news.html

-{{ define "main" }}
-<div class="row margin-bottom-50 margin-top-20">
-  <div class="col-xs-24 news-list">
-    <div id="community-news-list-container" class="news-list" data-pagination="true" data-news-count="10" data-publish-target="openmobility">
-    </div>
-  </div>
-</div>
-{{ end }}

layouts/_default/single-event.html

-{{ define "main" }}
-<div class="row">
-  <div class="col-md-18 padding-bottom-30">
-    Date: 
-    <h4 style="font-weight:bold;"> {{ .Params.event_date }}</h4>
-    Location: 
-    <h4 style="font-weight:bold;">{{ .Params.location }}</h4>
-    <br>
-    {{ .Content }}  
-  </div>
-</div>
-{{ end }}
\ No newline at end of file

layouts/_default/member-list.html → layouts/members/list.html

 {{ define "main" }}
-  {{ .Content }} 
+  {{ .Content }}
   {{ $paginator := .Paginate .Data.Pages }}
   {{ if ne $paginator.NumberOfElements 0 }}
   <div class="container-fluid">
@@ -15,5 +15,6 @@
       </div>
     </div>
   {{ end }}
+
 {{ end }}
 

layouts/partials/footer_custom.html

+<div class="container-fluid text-center" style="padding-top:50px; height: 150px; background-color: #0F2C5C;">
+  <a href="https://accounts.eclipse.org/mailing-list/openmobility"><button type="button" class="btn btn-lg btn-primary">Join our Mailing list <i class="fa fa-envelope"></i></button></a>
+</div>
\ No newline at end of file

layouts/partials/footer_suffix.html

-<script>
-(function($, document) {
-  // Eclipse News and events
-  $("#news-list-container").eclipseFdnApi({
-    type: "newsItems"
-  });
-  $("#community-news-list-container").eclipseFdnApi({
-    type: "newsItems"
-  });
-  $("#event-list-container").eclipseFdnApi({
-    type: "filteredEvents"
-  });
-})(jQuery, document);
-</script>
\ No newline at end of file

layouts/_default/home.html → layouts/shortcodes/homepage/members.html

-{{ define "main" }}
 <!-- Member logos -->
 <div class="margin-top-20">
   <h2 class="heading-line text-center" style="color:rgb(245,147,49); font-weight: bold;">Our Members</h2>
   <div class="container-fluid text-center">
     <br>
     <div class="row text-center">
-        <a href="{{ "/members/avl" | relURL }}">
-          <div class="col-md-3"><img src="images/members/avl-logo.svg" height="50px" alt="AVL logo" style="pointer-events:none; margin-bottom: 20px;"></div>
-          </a>
+      <a href="{{ "/members/avl" | relURL }}">
+      <div class="col-md-3"><img src="images/members/avl-logo.svg" height="50px" alt="AVL logo" style="pointer-events:none; margin-bottom: 20px;"></div>
+      </a>
       <a href="{{ "/members/bosch" | relURL }}">
       <div class="col-md-4"><img src="images/members/bosch-logo.svg" height="50px" alt="BOSCH logo" style="pointer-events:none; margin-bottom: 20px;"></div>
       </a>
@@ -25,42 +24,4 @@
       </a>
     </div>
   </div>
-</div>
-<div class="margin-top-40" style="padding: 35px; background: white;">
+</div>
\ No newline at end of file
-  <p><img src="images/gears.svg" width="200px" alt="gears" style="pointer-events:none; margin-bottom: 20px;float:left">
-    Mobility modelling and traffic simulation technologies are important tools for <b>testing autonomous driving functions</b>, developing <b>new mobility solutions</b> and for creating <b>digital twins</b> of urban areas. This working group shapes and fosters the development of required software tools and frameworks based on validated mobility models in order to provide a common platform for industrial applications and academic research.<br><br>
-    <a href="{{ "/vision/" | relURL }}"><button type="button" class="btn btn-secondary" style="margin-bottom:5px;">Read our Vision</button></a>
-    <a href="https://www.eclipse.org/org/workinggroups/openmobility_charter.php"><button type="button" class="btn btn-secondary"style="margin-bottom:5px;">View Group Charter</button></a>
-</div>
-<!-- Upcoming Meetings & Conferences and Tweets -->
-<div class="row margin-top-40">
-  <div class="col-sm-12 news-list">
-      <h2 class="heading-line text-center" style="color:rgb(245,147,49); font-weight: bold;">
-        <span>Meetings & Conferences</span>
-      </h2>
-      <div id="event-list-container" class="news-items" data-template-id="events-list" data-count="3" data-publish-target="openmobility" data-upcoming="1">
-      </div>
-      <ul class="list-inline block-summary-more margin-bottom-40">
-        <li><a href="https://events.eclipse.org">View all</a></li>
-        <li class="news-list-links-view-all"><a href="https://newsroom.eclipse.org/node/add/events">Submit Event</a></li>
-      </ul>
-    </div>
-  <div class="col-sm-12 news-list">
-    <div class="news-list-col margin-bottom-20">
-      <h2 class="heading-line text-center" style="color:rgb(245,147,49); font-weight: bold;">
-        <span>Our Tweets</span>
-      </h2>
-      <a class="twitter-timeline" data-height="700" href="https://twitter.com/open_mobility?ref_src=twsrc%5Etfw">Tweets by openMobility</a> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
-    </div>
-  </div>
-</div>
-{{ end }}
-
-{{ define "footer-custom" }}
- <div class="container-fluid text-center" style="padding-top:50px; height: 150px; background-color: #0F2C5C;">
-  <a href="https://accounts.eclipse.org/mailing-list/openmobility"><button type="button" class="btn btn-lg btn-primary">Join our Mailing list <i class="fa fa-envelope"></i></button></a>
-</div>
-<script id="events-list" type="text/html">
-{{ readFile ("/js/templates/events.mustache") | safeHTML }}
-</script>
-{{ end }}

layouts/shortcodes/homepage/news.html

+<!-- Upcoming Meetings & Conferences and Tweets -->
+<div class="row margin-top-40">
+  <div class="col-sm-12 news-list">
+    <h2 class="heading-line text-center" style="color:rgb(245,147,49); font-weight: bold;">
+      <span>Meetings & Conferences</span>
+    </h2>
+    {{ .Inner }}
+  </div>
+  <div class="col-sm-12 news-list">
+    <div class="news-list-col margin-bottom-20">
+      <h2 class="heading-line text-center" style="color:rgb(245,147,49); font-weight: bold;">
+        <span>Our Tweets</span>
+      </h2>
+      <a class="twitter-timeline" data-height="700" href="https://twitter.com/open_mobility?ref_src=twsrc%5Etfw">Tweets by openMobility</a> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
+    </div>
+  </div>
+</div>
\ No newline at end of file

layouts/shortcodes/homepage/vision.html

+<div class="margin-top-40" style="padding: 35px; background: white;">
+  <p><img src="images/gears.svg" width="200px" alt="gears" style="pointer-events:none; margin-bottom: 20px;float:left">
+    Mobility modelling and traffic simulation technologies are important tools for <b>testing autonomous driving functions</b>, developing <b>new mobility solutions</b> and for creating <b>digital twins</b> of urban areas. This working group shapes and fosters the development of required software tools and frameworks based on validated mobility models in order to provide a common platform for industrial applications and academic research.<br><br>
+    <a href="{{ "/vision/" | relURL }}"><button type="button" class="btn btn-secondary" style="margin-bottom:5px;">Read our Vision</button></a>
+    <a href="https://www.eclipse.org/org/workinggroups/openmobility_charter.php"><button type="button" class="btn btn-secondary"style="margin-bottom:5px;">View Group Charter</button></a>
+</div>
\ No newline at end of file

package.json

@@ -23,7 +23,7 @@
   },
   "readmeFilename": "README.md",
   "dependencies": {
-    "eclipsefdn-hugo-solstice-theme": "0.0.111"
+    "eclipsefdn-hugo-solstice-theme": "0.0.129"
   },
   "browserslist": "last 5 version, > 0.2%, not dead, IE 11"
 }

static/mix-manifest.json

 {
-    "/css/styles.css": "/css/styles.css",
-    "/js/solstice.js": "/js/solstice.js"
+    "/js/solstice.js": "/js/solstice.js",
+    "/css/styles.css": "/css/styles.css"
 }

webpack.mix.js

 /*!
  * Copyright (c) 2018 Eclipse Foundation, Inc.
- * 
+ *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
- * 
+ *
  * Contributors:
  *   Christopher Guindon <chris.guindon@eclipse-foundation.org>
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
-*/
+ */
 
 mix = require('laravel-mix');
-mix.options({uglify: {uglifyOptions: {compress: false, output: {comments: true}}}});
+require('laravel-mix-transpile-node-modules');
+mix.transpileNodeModules(['eclipsefdn-solstice-assets']);
+mix.options({
+  uglify: { uglifyOptions: { compress: false, output: { comments: true } } },
+});
 
 mix.setPublicPath('static');
 mix.setResourceRoot('../');
 
 mix.less('./less/styles.less', 'static/css/styles.css');
 
-mix.babel([
-    './node_modules/jquery/dist/jquery.min.js',
-    './node_modules/bootstrap/dist/js/bootstrap.min.js',
-    './node_modules/jquery-match-height/dist/jquery.matchHeight-min.js',
-    './node_modules/feather-icons/dist/feather.min.js',
-    './node_modules/cookieconsent/src/cookieconsent.js',
-    './node_modules/jquery-eclipsefdn-api/dist/jquery.eclipsefdn-api.min.js',
-    './node_modules/eclipsefdn-solstice-assets/js/solstice.cookieconsent.js',
-    './node_modules/eclipsefdn-solstice-assets/js/eclipsefdn.videos.js',
-    './node_modules/eclipsefdn-solstice-assets/js/solstice.cookies.js',
-    './node_modules/eclipsefdn-solstice-assets/js/solstice.js'
-], './static/js/solstice.js');
+mix.webpackConfig({
+  resolve: {
+    alias: {
+      jquery: 'jquery/src/jquery',
+    },
+  },
+});
+
+mix.js('js/main.js', './static/js/solstice.js');
\ No newline at end of file