Merge pull request #10 from dartartem/master

#6,#7,#8,#9: Fixed ui elements.
eventuate-tram · May 3, 2020 · eedd71a · eedd71a
2 parents fad8499 + 2b2ede1
commit eedd71a
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 114 deletions.
diff --git a/build-all.sh b/build-all.sh
@@ -2,5 +2,5 @@
 
 set -e
 
-./mvnw package -DskipTests
+./mvnw install -DskipTests
 docker-compose build
diff --git a/start-client/src/components/common/layout/Footer.js b/start-client/src/components/common/layout/Footer.js
@@ -7,31 +7,10 @@ const Footer = ({ children }) => (
       <div className='left nopadding'>
         <footer className='footer'>
           <div className='footer-container'>
-            © 2013-{new Date().getFullYear()} VMware, Inc.
+            Copyright (c) 2020, Eventuate Inc
             <br />
-            start.spring.io is powered by
+            © 2013-2020 VMware, Inc.
             <br />
-            <span>
-              <a
-                tabIndex='-1'
-                target='_blank'
-                rel='noopener noreferrer'
-                href='https://github.com/spring-io/initializr/'
-              >
-                Spring Initializr
-              </a>
-            </span>{' '}
-            <span>and</span>{' '}
-            <span>
-              <a
-                tabIndex='-1'
-                target='_blank'
-                rel='noopener noreferrer'
-                href='https://run.pivotal.io/'
-              >
-                Pivotal Web Services
-              </a>
-            </span>
           </div>
         </footer>
       </div>

diff --git a/start-client/src/components/common/layout/Header.js b/start-client/src/components/common/layout/Header.js
@@ -1,17 +1,13 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 
-import Logo from './Logo'
+import Logo from '../../../images/initializr-icon.png'
 
 const Header = ({ children }) => (
   <div className='header'>
-    <h1 className='logo'>
+    <h1 >
       <a href='/'>
-        <Logo />
-        <span className='title'>
-          Spring <strong>Initializr</strong>
-        </span>
-        <span className='description'>Bootstrap your application</span>
+        <img src={Logo}></img>
       </a>
     </h1>
     {children}

diff --git a/start-client/src/components/common/layout/QuickLinks.js b/start-client/src/components/common/layout/QuickLinks.js
@@ -42,7 +42,7 @@ const QuickLinks = () => {
       </li>
       <li>
         <a
-          href='https://github.com/spring-io/start.spring.io'
+          href='https://github.com/eventuate-tram'
           rel='noreferrer noopener'
           target='_blank'
           tabIndex='-1'
@@ -53,7 +53,7 @@ const QuickLinks = () => {
       </li>
       <li>
         <a
-          href='https://twitter.com/springboot'
+          href='https://twitter.com/eventuateio'
           rel='noreferrer noopener'
           target='_blank'
           tabIndex='-1'
@@ -62,75 +62,6 @@ const QuickLinks = () => {
           Twitter
         </a>
       </li>
-      <li>
-        <a
-          href='/'
-          className='dropdown'
-          tabIndex='-1'
-          onClick={e => {
-            e.preventDefault()
-            setHelp(!help)
-          }}
-          ref={wrapper}
-        >
-          <IconSpring />
-          Help
-          <IconCaretDown className='caret' />
-        </a>
-
-        <TransitionGroup component={null}>
-          {help && (
-            <CSSTransition classNames='nav-anim' timeout={500}>
-              <ul className='dropdown-menu'>
-                <li>
-                  <a
-                    id='ql-help-projects'
-                    target='_blank'
-                    rel='noopener noreferrer'
-                    href='https://spring.io/projects'
-                    tabIndex='-1'
-                  >
-                    Spring Projects
-                  </a>
-                </li>
-                <li>
-                  <a
-                    id='ql-help-guides'
-                    target='_blank'
-                    rel='noopener noreferrer'
-                    tabIndex='-1'
-                    href='https://spring.io/guides'
-                  >
-                    Spring Guides
-                  </a>
-                </li>
-                <li>
-                  <a
-                    id='ql-help-spring-blog'
-                    target='_blank'
-                    rel='noopener noreferrer'
-                    tabIndex='-1'
-                    href='https://spring.io/blog'
-                  >
-                    What&apos;s New With Spring
-                  </a>
-                </li>
-                <li>
-                  <a
-                    id='ql-help-migration'
-                    target='_blank'
-                    rel='noopener noreferrer'
-                    tabIndex='-1'
-                    href='https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.0-Migration-Guide'
-                  >
-                    Migrate from 1.5 =&gt; 2.0
-                  </a>
-                </li>
-              </ul>
-            </CSSTransition>
-          )}
-        </TransitionGroup>
-      </li>
     </ul>
   )
 }

diff --git a/start-client/src/images/initializr-icon.png b/start-client/src/images/initializr-icon.png
diff --git a/start-client/webpack.common.js b/start-client/webpack.common.js
@@ -52,7 +52,7 @@ const config = {
         use: ['style-loader', 'css-loader', 'sass-loader'],
       },
       {
-        test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
+        test: /\.(woff(2)?|ttf|eot|svg|png)(\?v=\d+\.\d+\.\d+)?$/,
         use: [
           {
             loader: 'file-loader',

diff --git a/start-site/src/main/resources/config/application.yml b/start-site/src/main/resources/config/application.yml
@@ -27,7 +27,7 @@ custom:
                 href: https://github.com/eventuate-local/eventuate-local
       - name: Eventuate Tram
         content:
-          - name: Basic messaging
+          - name: Eventuate Basic messaging
             id: eventuatetrambasicmessaging
             groupId: io.eventuate.tram.core
             artifactId: eventuate-tram-spring-messaging
@@ -38,7 +38,7 @@ custom:
             links:
               - rel: reference
                 href: https://github.com/eventuate-tram/eventuate-tram-core
-          - name: Domain Events
+          - name: Eventuate Domain Events
             id: eventuatetramdomainevents
             groupId: io.eventuate.tram.core
             artifactId: eventuate-tram-spring-events
@@ -49,7 +49,7 @@ custom:
             links:
               - rel: reference
                 href: https://github.com/eventuate-tram/eventuate-tram-core
-          - name: Command/Async Reply messaging
+          - name: Eventuate Command/Async Reply messaging
             id: eventuatetramcommands
             groupId: io.eventuate.tram.core
             artifactId: eventuate-tram-spring-commands
@@ -60,7 +60,7 @@ custom:
             links:
               - rel: reference
                 href: https://github.com/eventuate-tram/eventuate-tram-core
-          - name: Kafka Transport
+          - name: Eventuate Kafka Transport
             id: eventuatetramkafka
             groupId: io.eventuate.tram.core
             artifactId: eventuate-tram-spring-jdbc-kafka
@@ -71,7 +71,7 @@ custom:
             links:
               - rel: reference
                 href: https://github.com/eventuate-tram/eventuate-tram-core
-          - name: ActiveMQ Transport
+          - name: Eventuate ActiveMQ Transport
             id: eventuatetramactivemq
             groupId: io.eventuate.tram.core
             artifactId: eventuate-tram-jdbc-activemq
@@ -82,7 +82,7 @@ custom:
             links:
               - rel: reference
                 href: https://github.com/eventuate-tram/eventuate-tram-core
-          - name: RabbitMQ Transport
+          - name: Eventuate RabbitMQ Transport
             id: eventuatetramrabbitmqmq
             groupId: io.eventuate.tram.core
             artifactId: eventuate-tram-jdbc-rabbitmq
@@ -93,7 +93,7 @@ custom:
             links:
               - rel: reference
                 href: https://github.com/eventuate-tram/eventuate-tram-core
-          - name: Redis Transport
+          - name: Eventuate Redis Transport
             id: eventuatetramredis
             groupId: io.eventuate.tram.core
             artifactId: eventuate-tram-jdbc-redis
@@ -104,7 +104,7 @@ custom:
             links:
               - rel: reference
                 href: https://github.com/eventuate-tram/eventuate-tram-core
-          - name: Tram Testing Support
+          - name: Eventuate Tram Testing Support
             id: eventuatetramtestingsupport
             groupId: io.eventuate.tram.core
             artifactId: eventuate-tram-testing-support
@@ -117,7 +117,7 @@ custom:
                 href: https://github.com/eventuate-tram/eventuate-tram-core
       - name: Eventuate Tram Sagas
         content:
-          - name: Saga Orchestrator
+          - name: Eventuate Saga Orchestrator
             id: eventuatetramsagaorchestrator
             groupId: io.eventuate.tram.sagas
             artifactId: eventuate-tram-sagas-spring-orchestration-simple-dsl
@@ -128,7 +128,7 @@ custom:
             links:
               - rel: reference
                 href: https://github.com/eventuate-tram/eventuate-tram-sagas
-          - name: Saga Participant
+          - name: Eventuate Saga Participant
             id: eventuatetramsagaparticipant
             groupId: io.eventuate.tram.sagas
             artifactId: eventuate-tram-sagas-spring-participant
@@ -139,7 +139,7 @@ custom:
             links:
               - rel: reference
                 href: https://github.com/eventuate-tram/eventuate-tram-sagas
-          - name: Saga Testing Support
+          - name: Eventuate Saga Testing Support
             id: eventuatetramsagatestingsupport
             groupId: io.eventuate.tram.sagas
             artifactId: eventuate-tram-sagas-spring-testing-support