Skip to content

Commit

Permalink
Merge pull request #24 from kubero-dev/release/v1.4.0
Browse files Browse the repository at this point in the history
Release/v1.4.0
  • Loading branch information
mms-gianni authored Dec 16, 2022
2 parents 402bfaf + a638e02 commit d38dd47
Show file tree
Hide file tree
Showing 37 changed files with 2,940 additions and 95 deletions.
1 change: 1 addition & 0 deletions .env.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORT=2000
KUBERO_WEBHOOK_SECRET=mysecret
KUBERO_USERS=base64encodedJson

# webhook configuration
KUBERO_WEBHOOK_URL=https://kuberoXXXXXXXXXXXXX.loca.lt/api/repo/webhooks
Expand Down
46 changes: 46 additions & 0 deletions .env.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
PORT=2000
KUBERO_WEBHOOK_SECRET=mysecret
#KUBERO_USERS=base64encodedJson

# webhook configuration
KUBERO_WEBHOOK_URL=https://kuberoXXXXXXXXXXXXX.loca.lt/api/repo/webhooks

KUBECONFIG_PATH=./kubeconfig
KUBERO_CONFIG_PATH=./config.yaml
KUBERO_CONTEXT=kind-kubero
KUBERO_NAMESPACE=kubero-dev
KUBERO_SESSION_KEY=randomString
DEBUG=*.*

##########################################
# git repository configuration
#
#GITHUB_PERSONAL_ACCESS_TOKEN=

#GITEA_PERSONAL_ACCESS_TOKEN=
#GITEA_BASEURL=http://localhost:3000

#GOGS_PERSONAL_ACCESS_TOKEN=
#GOGS_BASEURL=http://localhost:3000

#GITLAB_BASEURL=http://localhost:3080
#GITLAB_PERSONAL_ACCESS_TOKEN=glpat-

#BITBUCKET_USERNAME=XXXXXXXXX
#BITBUCKET_APP_PASSWORD=


################################################
# authentication section
#
#GITHUB_CLIENT_SECRET=
#GITHUB_CLIENT_ID=
#GITHUB_CLIENT_CALLBACKURL=http://kubero.lacolhost.com/api/auth/github/callback
#GITHUB_CLIENT_ORG=

#OAUTO2_CLIENT_NAME=Gitea
#OAUTO2_CLIENT_AUTH_URL=http://gitea.lacolhost.com:3000/login/oauth/authorize
#OAUTO2_CLIENT_TOKEN_URL=http://gitea.lacolhost.com:3000/login/oauth/access_token
#OAUTH2_CLIENT_ID=
#OAUTH2_CLIENT_SECRET=
#OAUTH2_CLIENT_CALLBACKURL=http://kubero.lacolhost.com/api/auth/oauth2/callback
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "client",
"version": "1.1.0",
"version": "1.4.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
1 change: 1 addition & 0 deletions client/public/img/icons/discord.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
84 changes: 70 additions & 14 deletions client/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,74 @@
</v-list-item-icon>
<v-list-item-title>Pipelines</v-list-item-title>
</v-list-item>
<!--
<v-list-item link to="/settings">
<v-list-item-icon>
<v-icon>mdi-file-cog-outline</v-icon>
</v-list-item-icon>
<v-list-item-title>Settings</v-list-item-title>
</v-list-item>
-->
<v-list-item link to="/addons">
<v-list-item-icon>
<v-icon>mdi-bookshelf</v-icon>
</v-list-item-icon>
<v-list-item-title>Addons</v-list-item-title>
</v-list-item>
<v-list-item link to="/events">
<v-list-item-icon>
<v-icon>mdi-file-document-check-outline</v-icon>
</v-list-item-icon>
<v-list-item-title>Events</v-list-item-title>
</v-list-item>
<v-list-item link to="/settings" v-if="session">
<v-list-item-icon>
<v-icon>mdi-cog-outline</v-icon>
</v-list-item-icon>
<v-list-item-title>Settings</v-list-item-title>
</v-list-item>
<v-list-item @click="logout()" v-if="session">
<v-list-item-icon>
<v-icon>mdi-logout</v-icon>
</v-list-item-icon>
<v-list-item-title>Logout</v-list-item-title>
</v-list-item>

</v-list>


<template v-slot:append>
<v-list nav dense>
<v-list-item link href="https://github.com/kubero-dev/kubero/discussions">
<v-list-item-icon>
<v-icon>mdi-github</v-icon>
</v-list-item-icon>
<v-list-item-title>Github</v-list-item-title>
</v-list-item>
<v-list-item link href="https://www.reddit.com/r/kubero/">
<v-list-item-icon>
<v-icon>mdi-reddit</v-icon>
</v-list-item-icon>
<v-list-item-title>Reddit</v-list-item-title>
</v-list-item>
<v-list-item link href="https://discord.gg/tafRPMWS4r">
<v-list-item-icon>
<v-icon class="discord">mdi-discord</v-icon>
</v-list-item-icon>
<v-list-item-title>Discord</v-list-item-title>
</v-list-item>
<v-list-item link href="https://join.slack.com/t/kubero/shared_invite/zt-1leocjhrm-kYwk_dcwHUcEkcjUgQCFaA">
<v-list-item-icon>
<v-icon>mdi-slack</v-icon>
</v-list-item-icon>
<v-list-item-title>Slack</v-list-item-title>
</v-list-item>
<v-list-item>
<v-list-item-icon>
<v-icon>mdi-star</v-icon>
</v-list-item-icon>
<v-list-item-title>v{{version}}</v-list-item-title>
</v-list-item>
</v-list>
</template>

</v-navigation-drawer>

<v-main>
<router-view></router-view>
</v-main>

<!--<Appfooter :swarmversion="status.swarmversion" :kubeversion="status.kubeVersion.gitVersion" />-->
</v-app>
</template>
Expand Down Expand Up @@ -74,7 +113,8 @@ export default {
},
data: () => ({
session: false,
isAuthenticated: false
isAuthenticated: false,
version: "dev"
}),
methods: {
logout: () => {
Expand All @@ -92,16 +132,17 @@ export default {
axios
.get("/api/session")
.then((result) => {
console.log("isAuthenticated: " + result.data);
this.session = result.data;
console.log("isAuthenticated: " + result.data.isAuthenticated);
this.session = result.data.isAuthenticated;
this.version = result.data.version;
if (result.status === 200) {
this.isAuthenticated = true;
}
})
.catch((err) => {
if (err.response.status === 401) {
this.isAuthenticated = false;
this.$router.push('/login')
this.$router.push('/login')
} else {
console.log(err);
}
Expand All @@ -116,4 +157,19 @@ export default {
.v-icon {
color: #8560A9!important;
}
.discord{
background-image: url('./../public/img/icons/discord.svg');
background-size: contain;
background-repeat: no-repeat;
filter: invert(39%) sepia(47%) saturate(584%) hue-rotate(228deg) brightness(95%) contrast(80%);
/*filter: invert(93%) sepia(49%) saturate(7411%) hue-rotate(184deg) brightness(87%) contrast(90%);*/
}
.discord::before {
height: 23px;
width: 23px;
visibility: hidden;
content: "";
}
</style>
75 changes: 75 additions & 0 deletions client/src/components/apps/detail.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<template>
<v-container>
<v-breadcrumbs :items="items">
<template v-slot:item="{ item }">
<v-breadcrumbs-item
:href="item.href"
:disabled="item.disabled"
>
{{ item.text.toUpperCase() }}
</v-breadcrumbs-item>
</template>
</v-breadcrumbs>
<v-tabs v-model="tab">
<v-tab>Logs</v-tab>
<v-tab>Events</v-tab>
</v-tabs>

<v-tabs-items v-model="tab">
<v-tab-item transition="false">
<logs :pipeline="pipeline" :phase="phase" :app="app"/>
</v-tab-item>
<v-tab-item transition="false">
<events :pipeline="pipeline" :phase="phase" :app="app"/>
</v-tab-item>
</v-tabs-items>
</v-container>
</template>

<script>
export default {
data () {
return {
tab: null,
items: [
{
text: 'Pipelines Dashboard',
disabled: false,
href: '#/',
},
{
text: this.pipeline,
disabled: false,
href: '#/pipeline/'+this.pipeline+'/apps',
},
{
text: this.phase,
disabled: false,
},
{
text: this.app,
disabled: false,
},
],
}
},
components: {
events : () => import('./events.vue'),
logs : () => import('./logs.vue'),
},
props: {
pipeline: {
type: String,
default: "MISSING"
},
phase: {
type: String,
default: "MISSING"
},
app: {
type: String,
default: "new"
}
},
}
</script>
Loading

0 comments on commit d38dd47

Please sign in to comment.