Skip to content

Commit

Permalink
Merge pull request #1702 from hypersign-protocol/v5.9.0
Browse files Browse the repository at this point in the history
V5.9.0
  • Loading branch information
varsha766 authored Sep 20, 2022
2 parents aae5dad + 4d2c474 commit c7aa5b0
Show file tree
Hide file tree
Showing 52 changed files with 5,527 additions and 837 deletions.
109 changes: 108 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hyperfye-frontend",
"version": "v5.8.0",
"version": "v5.9.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --mode production",
Expand All @@ -16,6 +16,7 @@
"predeploy": "npm run build"
},
"dependencies": {
"@cosmjs/launchpad": "^0.27.1",
"@mdi/font": "^6.2.95",
"@mdi/light-font": "^0.2.63",
"@sumsub/websdk": "^1.3.0",
Expand Down Expand Up @@ -57,6 +58,7 @@
"vuejs-datepicker": "^1.6.2",
"vuejs-datetimepicker": "^1.1.13",
"vuejs-paginate": "^2.1.0",
"vuex": "^3.0.0",
"watchify": "^4.0.0",
"web3": "^1.6.0"
},
Expand Down Expand Up @@ -113,4 +115,4 @@
"last 2 versions",
"not ie <= 8"
]
}
}
32 changes: 21 additions & 11 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default {
},
name: config.appName,
hover: false,
authToken: localStorage.getItem("authToken"),
authToken:null,
isSidebarCollapsed: true,
authRoutes: ["register", "PKIIdLogin"],
showNavbar: false,
Expand Down Expand Up @@ -111,23 +111,23 @@ export default {
{
href: "/admin/createapp",
title: "Apps",
icon: "fa fa-plus",
icon: "fa fa-code",
exactPath: true,
},
{
href: "/admin/subscription",
title: "Subscriptions",
icon: "fas fa-receipt",
exactPath: true,
},
{
href: "/admin/login",
title: "Logout",
icon: "fas fa-sign-out-alt",
exactPath: true,
},
}
]
}
},
{
href: "/admin/login",
title: "Logout",
icon: "fas fa-sign-out-alt",
exactPath: true,
},
],
unsubsSubscribedMenu: [
{
Expand Down Expand Up @@ -160,11 +160,17 @@ export default {
mounted() {
if(localStorage.getItem("authToken")){
this.authToken = localStorage.getItem("authToken")
}
eventBus.$on('UpdateAdminNav', (isSubscribed) => {
this.isSubscribed = isSubscribed;
})
if(this.authToken && !window.location.pathname.includes("/form")){
this.$store.dispatch('getApps',this.authToken);
this.$store.dispatch('getTeammates',this.authToken);
}
eventBus.$on("UpdateThemeEvent", (themeData) => {
Object.assign(this.themeData, { ...themeData })
this.isForm = window.location.pathname.includes("/form") ? true : false
Expand Down Expand Up @@ -321,6 +327,10 @@ export default {
margin-left: auto;
}
.sidebar-wrapper{
box-shadow: 0 0 15px 0 rgba(34,41,47,.05);
}
.showNavbar.collapsed .sidebar-wrapper {
overflow: hidden;
}
Expand Down
1 change: 1 addition & 0 deletions src/assets/cosmos-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 15 additions & 2 deletions src/assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
@import url('https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap');
body {
overflow-y: auto;
font-family: 'Lato', sans-serif;
font-family: Montserrat,Helvetica,Arial,serif;
background: #F7F8FC;
height: 100vh;
color: #636363;
}
.markdown{
padding: 0.1em;
Expand Down Expand Up @@ -363,7 +364,7 @@ ul.social-links li:hover {
.btn-plan {
min-height: 48px;
font-weight: 600;
font-size: 20px;
font-size: 18px;
line-height: 20px;
text-align: center;
letter-spacing: 0.2px;
Expand Down Expand Up @@ -593,4 +594,16 @@ ul.social-links li:hover {
flex: 0 0 25%;
max-width: 25%;
}
}

.event-card{
border: 0;
border-radius: 10px;
-webkit-box-shadow: 2px 0 10px rgba(0, 0, 0, 0.1);
box-shadow: 2px 0 10px rgba(0, 0, 0, 0.1);
width:100%
}

.page-nav{
margin-top: 2%; padding: 10px;
}
1 change: 1 addition & 0 deletions src/assets/github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/sumsub.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit c7aa5b0

Please sign in to comment.