fixed form login

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.90.24
+- Fixed login form from not showing
+
 # 0.90.23
 - Added Incident Reporting
 - Added Cypress tests

frontend/src/forms/Login.vue

@@ -23,10 +23,6 @@
             </div>
         </div>
 
-        <a v-if="oauth.oauth_providers.split(',').includes('github')" class="btn btn-block btn-outline-dark" :href="`https://github.com/login/oauth/authorize?scope=user:email&client_id=${oauth.gh_client_id}`">Login with Github</a>
-        <a v-if="oauth.oauth_providers.split(',').includes('google')" class="btn btn-block btn-outline-secondary" :href="`https://accounts.google.com/signin/oauth?client_id=${oauth.google_client_id}&response_type=code&scope=${google_scope}&redirect_uri=${$store.getters.core.domain}/oauth/google`">Login with Google</a>
-        <a v-if="oauth.oauth_providers.split(',').includes('slack')" class="btn btn-block btn-outline-secondary" :href="`https://slack.com/oauth/v2/authorize?client_id=${oauth.slack_client_id}&team=${oauth.slack_team}&user_scope=${slack_scope}&redirect_uri=${$store.getters.core.domain}/oauth/slack`">Login with Slack</a>
-
     </form>
 </template>
 
@@ -36,6 +32,9 @@
   export default {
       name: 'FormLogin',
       computed: {
+          core() {
+              return this.$store.getters.core
+          },
           oauth() {
               return this.$store.getters.core.oauth
           }

frontend/src/forms/OAuth.vue

@@ -49,7 +49,12 @@
                 <div class="form-group row">
                     <label for="gh_callback" class="col-sm-4 col-form-label">Callback URL</label>
                     <div class="col-sm-8">
-                        <input v-bind:value="`${$store.getters.core.domain}/oauth/github`" type="text" class="form-control" id="gh_callback" readonly>
+                        <div class="input-group">
+                            <input v-bind:value="`${core.domain}/oauth/github`" type="text" class="form-control" id="gh_callback" readonly>
+                            <div class="input-group-append copy-btn">
+                                <button @click.prevent="copy(`${core.domain}/oauth/github`)" class="btn btn-outline-secondary" type="button">Copy</button>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -81,9 +86,14 @@
                     </div>
                 </div>
                 <div class="form-group row">
-                    <label for="callback" class="col-sm-4 col-form-label">Callback URL</label>
+                    <label for="google_callback" class="col-sm-4 col-form-label">Callback URL</label>
                     <div class="col-sm-8">
-                        <input v-bind:value="`${$store.getters.core.domain}/oauth/google`" type="text" class="form-control" id="callback" readonly>
+                        <div class="input-group">
+                            <input v-bind:value="`${core.domain}/oauth/google`" type="text" class="form-control" id="google_callback" readonly>
+                            <div class="input-group-append copy-btn">
+                                <button @click.prevent="copy(`${core.domain}/oauth/google`)" class="btn btn-outline-secondary" type="button">Copy</button>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -124,7 +134,12 @@
                 <div class="form-group row">
                     <label for="slack_callback" class="col-sm-4 col-form-label">Callback URL</label>
                     <div class="col-sm-8">
-                        <input v-bind:value="`${$store.getters.core.domain}/oauth/slack`" type="text" class="form-control" id="slack_callback" readonly>
+                        <div class="input-group">
+                            <input v-bind:value="`${core.domain}/oauth/slack`" type="text" class="form-control" id="slack_callback" readonly>
+                            <div class="input-group-append copy-btn">
+                                <button @click.prevent="copy(`${core.domain}/oauth/slack`)" class="btn btn-outline-secondary" type="button">Copy</button>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -149,6 +164,11 @@
           type: Object
         }
     },
+      computed: {
+          core() {
+             return this.$store.getters.core
+          }
+      },
       data() {
           return {
             internal_enabled: this.$store.getters.core.oauth.oauth_providers.split(",").includes('local'),

frontend/src/pages/Login.vue

@@ -2,11 +2,9 @@
     <div class="container col-md-7 col-sm-12 mt-md-5 bg-light">
         <div class="col-10 offset-1 col-md-8 offset-md-2 mt-md-2">
             <div class="col-12 col-md-8 offset-md-2 mb-4">
-                <img alt="Statping Login" class="col-12 mt-5 mt-md-0" style="max-width:680px" src="banner.png">
+                <img alt="Statping Login" class="col-12 mt-5 mt-md-0" style="max-width:650px" src="banner.png">
             </div>
-
             <FormLogin/>
-
         </div>
     </div>
 </template>

frontend/src/pages/Settings.vue

@@ -129,7 +129,7 @@
                         <OAuth :oauth="core.oauth"/>
                     </div>
 
-                    <div v-for="(notifier, index) in $store.getters.notifiers" v-bind:key="`${notifier.title}_${index}`" class="tab-pane fade" v-bind:class="{active: liClass(`v-pills-${notifier.method.toLowerCase()}-tab`), show: liClass(`v-pills-${notifier.method.toLowerCase()}-tab`)}" v-bind:id="`v-pills-${notifier.method.toLowerCase()}-tab`" role="tabpanel" v-bind:aria-labelledby="`v-pills-${notifier.method.toLowerCase()}-tab`">
+                    <div v-for="(notifier, index) in notifiers" v-bind:key="`${notifier.title}_${index}`" class="tab-pane fade" v-bind:class="{active: liClass(`v-pills-${notifier.method.toLowerCase()}-tab`), show: liClass(`v-pills-${notifier.method.toLowerCase()}-tab`)}" v-bind:id="`v-pills-${notifier.method.toLowerCase()}-tab`" role="tabpanel" v-bind:aria-labelledby="`v-pills-${notifier.method.toLowerCase()}-tab`">
                         <Notifier :notifier="notifier"/>
                     </div>
 
@@ -171,6 +171,9 @@
       computed: {
           core() {
               return this.$store.getters.core
+          },
+          notifiers() {
+              return this.$store.getters.notifiers
           }
       },
       async mounted() {

version.txt

@@ -1 +1 @@
-0.90.23
+0.90.24