Merge pull request #157 from Serubin/add-license-page

IMPORTANT: Add critical license attribution and notices
Serubin · Feb 23, 2021 · cf5f522 · cf5f522
2 parents 12b82ba + e13949d
commit cf5f522
Show file tree

Hide file tree

Showing 8 changed files with 19,689 additions and 76 deletions.
diff --git a/NOTICES b/NOTICES
diff --git a/public/index.html b/public/index.html
@@ -1,4 +1,12 @@
 <!DOCTYPE html>
+
+<!--
+     PulseSMS Web
+     Copyright 2018 Solomon Rubin & Luke Klinker
+     Licensed under MIT and Apache 2.0 - See Licenses and Notices for full information
+     This notice cannot be removed.
+     [email protected]
+-->
 <html lang="en">
     <head>
         <meta charset="utf-8">

diff --git a/src/components/Conversations/Conversations.vue b/src/components/Conversations/Conversations.vue
@@ -516,6 +516,9 @@ export default {
         margin-left: 6px;
         margin-top: 36px !important;
 
+        position: relative;
+        z-index: 10;
+
         @media screen and (max-width: 600px) {
             margin: 0;
         }

diff --git a/src/components/HelpFeedback.vue b/src/components/HelpFeedback.vue
@@ -6,23 +6,23 @@
                 I have created a very extensive FAQ section for the app.<br>As a one-man crew, I get a significant amount of emails, and they cut heavily into my development time. Before sending an email, do a quick search to free up time for both of us. You will probably find your answer, very easily.<br><br>If you don't find what you are looking for, feel free to reach out and I will be more than happy to get back to you as quickly as I am able.
             </div>
         </div>
-        <div class="click-item" @click="routeTo('https://home.pulsesms.app/help/')">
+        <div class="click-item" :href="urls.help" @click.stop.prevent="routeTo(urls.help)">
             <div class="mdl-color-text--grey-900">
                 Help Page
             </div>
             <div class="mdl-color-text--grey-600">
                 Search here, first!
             </div>
         </div>
-        <div class="click-item" @click="routeTo('https://twitter.com/pulsesms')">
+        <div class="click-item" :href="urls.twitter" @click.stop.prevent="routeTo(urls.twitter)">
             <div class="mdl-color-text--grey-900">
                 Twitter
             </div>
             <div class="mdl-color-text--grey-600">
                 @PulseSMS
             </div>
         </div>
-        <div class="click-item" @click="routeTo('mailto:[email protected]?subject=Pulse%20SMS')">
+        <div class="click-item" :href="urls.email" @click.stop.prevent="routeTo(urls.email)">
             <div class="mdl-color-text--grey-900">
                 Email
             </div>
@@ -32,59 +32,44 @@
         </div>
 
         <h4>Information</h4>
-        <div class="click-item mdl-color-text--grey-900" @click="routeTo('https://github.com/klinker24/pulse-sms-web/releases')">
-            Web App Changelog
-        </div>
-        <div class="click-item mdl-color-text--grey-900" @click="routeTo('https://home.pulsesms.app/overview/')">
-            Pulse's Features
-        </div>
-        <div class="click-item mdl-color-text--grey-900" @click="routeTo('https://home.pulsesms.app/overview/')">
-            Supported Platforms
+        <div class="click-item mdl-color-text--grey-900" :href="urls.overview" @click.stop.prevent="routeTo(urls.overview)">
+            Features & Supported Platforms
         </div>
         <div class="click-item mdl-color-text--grey-900" @click="routeTo('https://github.com/klinker-apps/pulse-sms-issues/issues/344')">
             Web Shortcut Keys
         </div>
-        <div class="click-item mdl-color-text--grey-900" @click="routeTo('https://home.pulsesms.app/privacy.html')">
+        <div class="click-item mdl-color-text--grey-900" :href="urls.privacy" @click.stop.prevent="routeTo(urls.privacy)">
             Privacy Policy
         </div>
-        <div class="click-item mdl-color-text--grey-900" @click="routeTo('https://home.pulsesms.app/tos.html')">
+        <div class="click-item mdl-color-text--grey-900" :href="urls.tos" @click.stop.prevent="routeTo(urls.tos)">
             Terms of Service
         </div>
 
-        <h4>Contributions</h4>
-        <div class="item">
-            <div class="mdl-color-text--grey-900">
-                © 2019 Luke and Jake Klinker
-            </div>
-        </div>
-        <div class="click-item" @click="routeTo('https://github.com/klinker-apps/pulse-sms-web/')">
-            <div class="mdl-color-text--grey-900">
-                Pulse's web app is open-source
-            </div>
-            <div class="mdl-color-text--grey-600">
-                Thanks to everyone that has contributed their ideas and code!
-            </div>
-        </div>
-        <div class="item">
-            <div class="mdl-color-text--grey-900">
-                Special Thanks
-            </div>
-            <div class="mdl-color-text--grey-600">
-                Solomon Rubin for creating the base for this web app.
-            </div>
-        </div>
+        <License />
     </div>
 </template>
 
 <script>
+import License from '@/components/License';
 
 export default {
     name: 'HelpFeedback',
+    components: {
+        License
+    },
 
     data () {
         return {
-            title: "Help and Feedback",
+            title: 'Help and Feedback',
             loading: false,
+            urls: {
+                help: 'https://home.pulsesms.app/help/',
+                overview: 'https://home.pulsesms.app/overview/',
+                twitter: 'https://twitter.com/pulsesms',
+                email: 'mailto:[email protected]?subject=Pulse%20SMS',
+                privacy: 'https://home.pulsesms.app/privacy.html',
+                tos: 'https://home.pulsesms.app/tos.html'
+            }
         };
     },
 
@@ -94,7 +79,7 @@ export default {
 
     methods: {
         routeTo (route) {
-            window.open(route,'_blank');
+            window.open(route, '_blank');
         }
     }
 };

diff --git a/src/components/License.vue b/src/components/License.vue
@@ -0,0 +1,118 @@
+<template>
+    <div id="license-display" v-mdl :class="isCurrentPage && 'page-content'">
+        <h1>Licenses & Notices</h1>
+        <div class="item">
+            <div class="mdl-color-text--grey-900">
+                PulseSMS Web is Open Source and community created.
+            </div>
+            <div class="mdl-color-text--grey-600">
+                Required notices and changelog can be found below.
+            </div>
+        </div>
+
+        <a class="click-item" :href="urls.changelog" @click.stop.prevent="routeTo(urls.changelog)">Changelog</a>
+        <a class="click-item" :href="urls.notices" @click.stop.prevent="routeTo(urls.notices)">Notices</a>
+        <a class="click-item" :href="urls.license" @click.stop.prevent="routeTo(urls.license)">Full License</a>
+
+        <h1><!-- No CSS spacer --></h1>
+        <div class="item">
+            <div class="license">
+                <p>Copyright 2018 Luke Klinker and Solomon Rubin</p>
+                <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at</p>
+                <p>http://www.apache.org/licenses/LICENSE-2.0</p>
+                <p>Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p>
+            </div>
+            <p id="and">AND</p>
+            <div class="license">
+                <p>Copyright 2018 Solomon Rubin</p>
+                <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
+                <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
+                <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+
+export default {
+    name: 'License',
+
+    data () {
+        return {
+            title: 'License and Notices',
+            loading: false,
+            urls: {
+                changelog: 'https://github.com/serubin/pulse-sms-web/',
+                license: 'https://github.com/Serubin/pulse-sms-web/blob/master/LICENSE',
+                notices: 'https://github.com/Serubin/pulse-sms-web/blob/master/NOTICES'
+            }
+        };
+    },
+
+    computed: {
+        isCurrentPage () {
+            return this.$route.name.toLowerCase() === this.$options.name.toLowerCase();
+        }
+    },
+
+    mounted () {
+        this.$store.commit('title', this.title);
+    },
+
+    methods: {
+        routeTo (route) {
+            window.open(route, '_blank');
+        }
+    }
+};
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+    @import "../assets/scss/_vars.scss";
+    h1 {
+        font-size: 24px;
+        line-height: 32px;
+        margin: 24px 0 16px;
+    }
+
+    .item, .click-item {
+        position: relative;
+        width: 100%;
+        padding: 12px;
+        line-height: 18px;
+    }
+
+    .item:hover, .click-item:hover {
+         background: #E0E0E0;
+    }
+
+    .click-item:hover {
+        cursor: pointer;
+    }
+
+    a.click-item {
+        display: block;
+        text-decoration: none;
+        color: inherit;
+    }
+
+    .license {
+        font-family: monospace;
+        :first-child {
+            text-align: center;
+        }
+    }
+    #and {
+        font-weight: bold;
+        text-align: center;
+    }
+
+    body.dark {
+        .item:hover, .click-item:hover {
+            background: #202020;
+        }
+    }
+
+</style>
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
@@ -63,13 +63,18 @@
                         </div>
                     </li>
                 </ul>
-                <!-- If route is not conversation list -->
 
+                <!-- If route is not conversation list -->
                 <transition name="slide-left">
-                    <conversations v-if="showConversations" small="true" />
+                    <conversations v-if="showConversations" small="true"/>
                 </transition>
                 <!-- End if -->
             </div>
+
+            <div v-if="!showConversations" class="mdl-color-text--grey-500" id="attribution">
+                <a href="/license" @click.stop.prevent="routeTo('license')">license</a>
+                <a href="https://github.com/serubin/pulse-sms-web">github</a>
+            </div>
         </div> <!-- End sidebar-internal -->
 
         <!-- If not full_theme and side bar is open -->
@@ -102,6 +107,7 @@ export default {
                 private: { name: 'conversations-list-private' },
                 folders: { name: 'folders' },
                 scheduled: { name: 'scheduled-messages' },
+                license: { name: 'license'},
                 templates: { name: 'templates' }
             },
             listeners: [],
@@ -436,7 +442,21 @@ export default {
                 }
             }
         }
+
+        #attribution {
+            position: fixed;
+            margin: 0 12px;
+            bottom: 1em;
+            z-index: 5;
+            a {
+                margin: 0 5px;
+                color: inherit;
+                text-decoration: none;
+                cursor: pointer;
+            }
+        }
     }
+
     /* Click catcher - Overlay */
     #sidebar-overlay {
         opacity: 0.2;