Merge pull request #1537 from chaoss/main

Frontend updates from latest release to main
chaoss · Dec 14, 2021 · e9f9723 · e9f9723
2 parents a570a30 + c42306f
commit e9f9723
Show file tree

Hide file tree

Showing 32 changed files with 1,003 additions and 896 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1 @@
+# Pull Request Template
diff --git a/docs/pull_request_template.md b/docs/pull_request_template.md
@@ -0,0 +1 @@
+# Pull Request Template
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <!-- This file is where the title and Icon are finally set -->
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="shortcut icon" type="image/png" href="./logowithoutletters2.png"/>
+    <title>Augur</title>
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>
diff --git a/frontend/public/logowithoutletters.png b/frontend/public/logowithoutletters.png
diff --git a/frontend/public/logowithoutletters2.png b/frontend/public/logowithoutletters2.png
diff --git a/frontend/src/assets/avatars/0.jpg b/frontend/src/assets/avatars/0.jpg
diff --git a/frontend/src/assets/avatars/1.jpg b/frontend/src/assets/avatars/1.jpg
diff --git a/frontend/src/assets/avatars/2.jpg b/frontend/src/assets/avatars/2.jpg
diff --git a/frontend/src/assets/avatars/3.jpg b/frontend/src/assets/avatars/3.jpg
diff --git a/frontend/src/assets/content-management/1.jpeg b/frontend/src/assets/content-management/1.jpeg
diff --git a/frontend/src/assets/content-management/10.jpeg b/frontend/src/assets/content-management/10.jpeg
diff --git a/frontend/src/assets/content-management/11.jpeg b/frontend/src/assets/content-management/11.jpeg
diff --git a/frontend/src/assets/content-management/12.jpeg b/frontend/src/assets/content-management/12.jpeg
diff --git a/frontend/src/assets/content-management/13.jpeg b/frontend/src/assets/content-management/13.jpeg
diff --git a/frontend/src/assets/content-management/14.jpeg b/frontend/src/assets/content-management/14.jpeg
diff --git a/frontend/src/assets/content-management/15.jpeg b/frontend/src/assets/content-management/15.jpeg
diff --git a/frontend/src/assets/content-management/16.jpeg b/frontend/src/assets/content-management/16.jpeg
diff --git a/frontend/src/assets/content-management/2.jpeg b/frontend/src/assets/content-management/2.jpeg
diff --git a/frontend/src/assets/content-management/3.jpeg b/frontend/src/assets/content-management/3.jpeg
diff --git a/frontend/src/assets/content-management/4.jpeg b/frontend/src/assets/content-management/4.jpeg
diff --git a/frontend/src/assets/content-management/5.jpeg b/frontend/src/assets/content-management/5.jpeg
diff --git a/frontend/src/assets/content-management/6.jpeg b/frontend/src/assets/content-management/6.jpeg
diff --git a/frontend/src/assets/content-management/7.jpeg b/frontend/src/assets/content-management/7.jpeg
diff --git a/frontend/src/assets/content-management/8.jpeg b/frontend/src/assets/content-management/8.jpeg
diff --git a/frontend/src/assets/content-management/9.jpeg b/frontend/src/assets/content-management/9.jpeg
diff --git a/frontend/src/components/ReposInGroup.vue b/frontend/src/components/ReposInGroup.vue
@@ -70,7 +70,7 @@
               <tbody>
                 <tr v-for="(repo,index) in sortedReposInGroup(base,sortColumn,ascending)" v-bind:item="repo">
                   <td>
-                    <a href="#" @click="onGitRepo(repo)">{{ repo.url }}</a>
+                    <router-link tag="a" :to="'/repo/' + repo.rg_name + '/' + repo.repo_name + '/overview'">{{ repo.url }}</router-link>
                   </td>
                   <td>{{ repo.rg_name }}</td>
                   <!-- <td>{{ repo.description }}</td> -->
@@ -182,14 +182,16 @@ export default class ReposInGroup extends Vue{
         this.sortColumn = col;
       }
   }
-
-  onGitRepo (e: any) {
-    console.log(e)
-    this.$router.push({
-      name: 'repo_overview',
-      params: {group:e.rg_name, repo:e.repo_name, repo_group_id: e.repo_group_id, repo_id: e.repo_id, url:e.url}
-    })
-  }
+  // Removed 12/6/2021
+  // Replaced by router-link element
+  // If something broke in regards to parameter passing to the router, this could be it
+  // onGitRepo (e: any) {
+  //   console.log(e)
+  //   this.$router.push({
+  //     name: 'repo_overview',
+  //     params: {group:e.rg_name, repo:e.repo_name, repo_group_id: e.repo_group_id, repo_id: e.repo_id, url:e.url}
+  //   })
+  // }
 }
 
 </script>
diff --git a/frontend/src/components/layout/MainSidebar/MainSidebar.vue b/frontend/src/components/layout/MainSidebar/MainSidebar.vue
@@ -30,7 +30,7 @@
 
       <div class="nav-wrapper">
           <d-nav class="flex-column mainSideBarNav">
-            <li v-for="(item, navItemIdx) in items" :key="navItemIdx" class="nav-item dropdown" @click="checkForRepoRouteChange($event)">
+            <li v-for="(item, navItemIdx) in items" :key="navItemIdx" class="nav-item dropdown">
               <d-link class="mainSideBarLink" :class="['nav-link', item.items && item.items.length ? 'dropdown-toggle' : '']" :to="item.to" v-d-toggle="`snc-${navItemIdx}`">
                 <div class="item-icon-wrapper" v-if="item.htmlBefore" v-html="item.htmlBefore" />
                 <span v-if="item.title" class="mainSideBarV">{{ item.title }}</span>
@@ -130,7 +130,7 @@
       }, {
         title: 'Repos',
         to: {
-          name: 'group_overview',
+          name: 'repos',
           params: { }
         },
         htmlBefore: '<i class="material-icons">table_chart</i>',
@@ -193,19 +193,19 @@
     findRepoGroup() {
       console.log(Object.keys(this.$store.state.common.apiGroups));
     }
-    checkForRepoRouteChange(e: any) {
-      console.log(e);
-      if (e.target.innerHTML !== 'Repos') {
-        return;
-      }
-      let currentlySelectedRepoGroup = Object.keys(this.$store.state.common.apiGroups)[Object.keys(this.$store.state.common.apiGroups).length - 1].split('/')[0];
-      console.log('HERE: ' + currentlySelectedRepoGroup);
-      if (currentlySelectedRepoGroup === 'undefined') {
-        this.$router.push({ name: 'repo_groups' });
-      } else {
-        this.$router.push(`group/${currentlySelectedRepoGroup}/overview`);
-      }
-    }
+    // checkForRepoRouteChange(e: any) {
+    //   console.log(e);
+    //   if (e.target.innerHTML !== 'Repos') {
+    //     return;
+    //   }
+    //   //let currentlySelectedRepoGroup = Object.keys(this.$store.state.common.apiGroups)[Object.keys(this.$store.state.common.apiGroups).length - 1].split('/')[0];
+    //   //console.log('HERE: ' + currentlySelectedRepoGroup);
+    //   //if (currentlySelectedRepoGroup === 'undefined') {
+    //   //  this.$router.push({ name: 'repo_groups' });
+    //   //} else {
+    //     this.$router.push(`/repos`);
+    //   //}
+    // }
   }
 </script>
 

diff --git a/frontend/src/views/Dashboard.vue b/frontend/src/views/Dashboard.vue
@@ -38,7 +38,7 @@
                   <d-tooltip 
                     :target="'#' + idx"
                     container=".shards-demo--example--tooltip-01"
-                    placement="right"
+                    placement="bottom"
                     offset="10">
                     Click here to see an overview of this repository's metrics
                   </d-tooltip>
@@ -57,7 +57,9 @@
                         <d-tooltip 
                           :target="'#ev' + idx"
                           container=".shards-demo--example--tooltip-01"
-                          offset="20">
+                          offset="20"
+                          position="top"
+                        >
                           Click to see evolution metrics for this repo.
                         </d-tooltip>
                       </d-col>
@@ -95,7 +97,7 @@
                         <d-tooltip 
                           :target="'#ri' + idx"
                           container=".shards-demo--example--tooltip-01"
-                          placement="right"
+                          placement="top"
                           offset="20">
                           Click to see risk metrics for this repo.
                         </d-tooltip>

diff --git a/frontend/src/views/RepoGroups.vue b/frontend/src/views/RepoGroups.vue
@@ -89,7 +89,7 @@
               <tbody>
                 <tr v-for="(group, index) in sortedRepoGroups(sortColumn, ascending)">
                   <td>
-                    <a href="#" @click="onRepoGroup(group)">{{ group.rg_name }}</a>
+                    <router-link tag="a" :to="'/group/' + group.rg_name + '/overview'">{{ group.rg_name }}</router-link>
                   </td>
                   <td>{{ group.rg_description }}</td>
                   <td>{{ group.rg_website }}</td>
@@ -219,11 +219,14 @@ export default class RepoGroups extends Vue {
     }
   }
 
-  onRepoGroup(e: any) {
-    this.$router.push({
-      name: "group_overview",
-      params: { group: e.rg_name, repo_group_id: e.repo_group_id }
-    });
-  }
+  // Removed 12/6/2021
+  // Replaced by router-link element
+  // If something broke in regards to group or repo_group_id being passed to the router, this could be it
+  // onRepoGroup(e: any) {
+  //   this.$router.push({
+  //     name: "group_overview",
+  //     params: { group: e.rg_name, repo_group_id: e.repo_group_id }
+  //   });
+  // }
 }
 </script>
diff --git a/frontend/src/views/Repos.vue b/frontend/src/views/Repos.vue
@@ -74,7 +74,7 @@
               <tbody>
                 <tr v-for="repo in sortedRepos(sortColumn,ascending)" v-bind:item="repo" :key="repo.url">
                   <td>
-                    <a href="#" @click="onGitRepo(repo.rg_name, repo.repo_name)">{{ repo.url }}</a>
+                    <router-link tag="a" :to="'/repo/' + repo.rg_name + '/' + repo.repo_name + '/overview'">{{ repo.url }}</router-link>
                   </td>
                   <td>{{ repo.rg_name }}</td>
                   <!-- <td>{{ repo.description }}</td> -->
@@ -184,23 +184,26 @@ export default class Repos extends Vue{
       }
   }
 
-  onGitRepo (rg_name: String, repo_name: String) {
-    // this.$router.push({
-    //   name: 'repo_overview',
-    //   params: {group:e.rg_name, repo:e.repo_name, repo_group_id: e.repo_group_id, repo_id: e.repo_id, url:e.url}
-    // }, () => {
-    //   console.dir(e);
-    // });
-    if (rg_name == null || repo_name == null ) {
-      window.alert('Error - repo name not found in store');
-      console.log(this.sortedRepos(this.sortColumn,this.ascending));
-    } else {
-      this.$router.push(`repo/${rg_name}/${repo_name}/overview`, () => {
-        console.log(`RG_NAME: ${rg_name}`);
-        console.log(`REPO_NAME: ${repo_name}`);
-      });
-    }
-  }
+  // Removed 12/9/2021
+  // Replaced by router-link element
+  // If something broke in regards to parameter passing to the router, this could be it
+  // onGitRepo (rg_name: String, repo_name: String) {
+  //   // this.$router.push({
+  //   //   name: 'repo_overview',
+  //   //   params: {group:e.rg_name, repo:e.repo_name, repo_group_id: e.repo_group_id, repo_id: e.repo_id, url:e.url}
+  //   // }, () => {
+  //   //   console.dir(e);
+  //   // });
+  //   if (rg_name == null || repo_name == null ) {
+  //     window.alert('Error - repo name not found in store');
+  //     console.log(this.sortedRepos(this.sortColumn,this.ascending));
+  //   } else {
+  //     this.$router.push(`repo/${rg_name}/${repo_name}/overview`, () => {
+  //       console.log(`RG_NAME: ${rg_name}`);
+  //       console.log(`REPO_NAME: ${repo_name}`);
+  //     });
+  //   }
+  // }
 }
 
 </script>
diff --git a/metadata.py b/metadata.py
@@ -5,8 +5,8 @@
 
 __short_description__ = "Python 3 package for free/libre and open-source software community metrics & data collection"
 
-__version__ = "0.22.0"
-__release__ = "v0.22.0"
+__version__ = "0.21.12"
+__release__ = "v0.21.12"
 
 __license__ = "MIT"
 __copyright__ = "CHAOSS & Augurlabs 2021"