Skip to content

Commit 0cae66a

Browse files
daystramdaystram
authored
Merge pull request #51 from daystram/dev
2 parents 0727343 + 581b949 commit 0cae66a

File tree

18 files changed

+113
-24
lines changed

18 files changed

+113
-24
lines changed

‎.github/workflows/nightly.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,17 @@ jobs:
2626
username: ${{ secrets.DOCKER_HUB_USERNAME }}
2727
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
2828
- name: Set Development Version
29-
run: echo "RELEASE_VERSION=dev" >> $GITHUB_ENV
29+
run: echo "RELEASE_VERSION=v0.0.0-development" >> $GITHUB_ENV
3030
- name: Provide Env File
31-
run: echo "${{ secrets.FE_ENV_FILE }}" > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
31+
run: |
32+
echo "${{ secrets.FE_ENV_FILE }}" > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
33+
echo "VUE_APP_VERSION=${{ env.RELEASE_VERSION }}" >> ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
3234
- name: Build and Push Image
3335
uses: docker/build-push-action@v2
3436
with:
3537
context: ${{ env.APPLICATION }}-${{ matrix.service }}
3638
platforms: linux/amd64
37-
tags: daystram/${{ env.APPLICATION }}:${{ matrix.service }}-${{ env.RELEASE_VERSION }}
39+
tags: daystram/${{ env.APPLICATION }}:${{ matrix.service }}-dev
3840
push: true
3941
chart:
4042
name: Publish Helm Chart

‎.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ jobs:
3030
- name: Get Release Version
3131
run: echo "RELEASE_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
3232
- name: Provide Env File
33-
run: echo "${{ secrets.FE_ENV_FILE }}" > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
33+
run: |
34+
echo "${{ secrets.FE_ENV_FILE }}" > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
35+
echo "VUE_APP_VERSION=${{ env.RELEASE_VERSION }}" >> ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
3436
- name: Build and Push Image
3537
uses: docker/build-push-action@v2
3638
with:

‎ratify-fe/public/favicon.ico

15 KB
Binary file not shown.

‎ratify-fe/public/images/android-chrome-192x192.png

-6.21 KB
Loading

‎ratify-fe/public/images/android-chrome-512x512.png

-37.6 KB
Loading

‎ratify-fe/public/images/apple-touch-icon.png

-5.87 KB
Loading

‎ratify-fe/public/images/favicon-16x16.png

-17 Bytes
Loading

‎ratify-fe/public/images/favicon-32x32.png

-138 Bytes
Loading

‎ratify-fe/public/images/favicon.ico

-15 KB
Binary file not shown.

‎ratify-fe/public/index.html

Lines changed: 59 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,69 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<meta name="viewport" content="width=device-width,initial-scale=1.0">
4+
<meta charset="utf-8" />
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
6+
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
7+
78
<title>Ratify</title>
8-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@5.x/css/materialdesignicons.min.css">
9-
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
10-
<link rel="icon" href="/images/favicon.ico">
11-
<link rel="apple-touch-icon" sizes="180x180" href="/images/apple-touch-icon.png">
12-
<link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.png">
13-
<link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.png">
14-
<link rel="manifest" href="/site.webmanifest">
9+
<meta name="title" content="Ratify" />
10+
<meta
11+
name="description"
12+
content="Central Authentication Service (CAS) implementing OAuth 2.0 and OpenID Connect (OID) protocols."
13+
/>
14+
15+
<meta property="og:type" content="website" />
16+
<meta property="og:url" content="https://ratify.daystram.com/" />
17+
<meta property="og:title" content="Ratify" />
18+
<meta
19+
property="og:description"
20+
content="Central Authentication Service (CAS) implementing OAuth 2.0 and OpenID Connect (OID) protocols."
21+
/>
22+
<meta property="og:image" content="" />
23+
24+
<meta property="twitter:card" content="summary_large_image" />
25+
<meta property="twitter:url" content="https://ratify.daystram.com/" />
26+
<meta property="twitter:title" content="Ratify" />
27+
<meta
28+
property="twitter:description"
29+
content="Central Authentication Service (CAS) implementing OAuth 2.0 and OpenID Connect (OID) protocols."
30+
/>
31+
<meta property="twitter:image" content="" />
32+
33+
<link
34+
rel="stylesheet"
35+
href="https://cdn.jsdelivr.net/npm/@mdi/font@5.x/css/materialdesignicons.min.css"
36+
/>
37+
<link
38+
rel="stylesheet"
39+
href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"
40+
/>
41+
<link rel="icon" href="/favicon.ico" />
42+
<link
43+
rel="apple-touch-icon"
44+
sizes="180x180"
45+
href="/images/apple-touch-icon.png"
46+
/>
47+
<link
48+
rel="icon"
49+
type="image/png"
50+
sizes="32x32"
51+
href="/images/favicon-32x32.png"
52+
/>
53+
<link
54+
rel="icon"
55+
type="image/png"
56+
sizes="16x16"
57+
href="/images/favicon-16x16.png"
58+
/>
59+
<link rel="manifest" href="/site.webmanifest" />
1560
</head>
1661
<body>
1762
<noscript>
18-
<strong>We're sorry but Ratify doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
63+
<strong
64+
>We're sorry but Ratify doesn't work properly without JavaScript
65+
enabled. Please enable it to continue.</strong
66+
>
1967
</noscript>
2068
<div id="app"></div>
2169
</body>

‎ratify-fe/public/robots.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
User-agent: *
22
Disallow: /api/
3+
Disallow: /oauth/

‎ratify-fe/public/site.webmanifest

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,20 @@
1-
{"name":"Ratify","short_name":"Ratify","icons":[{"src":"/images/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/images/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"start_url": "/", "theme_color":"#00c3c3","background_color":"#121212","display":"standalone"}
1+
{
2+
"name": "Ratify",
3+
"short_name": "Ratify",
4+
"icons": [
5+
{
6+
"src": "/images/android-chrome-192x192.png",
7+
"sizes": "192x192",
8+
"type": "image/png"
9+
},
10+
{
11+
"src": "/images/android-chrome-512x512.png",
12+
"sizes": "512x512",
13+
"type": "image/png"
14+
}
15+
],
16+
"start_url": "/",
17+
"theme_color": "#00c3c3",
18+
"background_color": "#121212",
19+
"display": "standalone"
20+
}

‎ratify-fe/src/assets/logo.png

-6.69 KB
Binary file not shown.

‎ratify-fe/src/assets/logo.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎ratify-fe/src/components/Logo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<v-icon
55
style="font-size: inherit; vertical-align: baseline"
66
v-text="'mdi-lock'"
7-
color="secondary lighten-1"
7+
color="secondary"
88
/>Ratify
99
</span>
1010
</div>

‎ratify-fe/src/plugins/vuetify.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default new Vuetify({
1010
dark: {
1111
primary: "#00c3c3",
1212
primaryDim: "#008686",
13-
secondary: "#c1842f"
13+
secondary: "#f29c24"
1414
}
1515
},
1616
options: { customProperties: true }

‎ratify-fe/src/styles/App.sass

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,18 @@ html
66
background: linear-gradient(30deg, rgb(112, 80, 27) 20%, rgb(0, 62, 62) 80%)
77

88
.app-subtitle
9-
max-width: 480px
9+
max-width: 460px
10+
11+
.app-version
12+
position: absolute
13+
bottom: 32px
14+
margin: 0 auto
15+
left: 0
16+
right: 0
17+
text-align: center
18+
user-select: none
19+
-moz-user-select: none
20+
-webkit-user-select: none
1021

1122
a.text-link
1223
color: white !important
@@ -34,4 +45,4 @@ code
3445
.danger-border
3546
border: var(--v-error-base) !important
3647
border-style: solid !important
37-
border-width: 1px !important
48+
border-width: 1px !important

‎ratify-fe/src/views/Home.vue

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<p
1010
class="mt-12 mb-12 text-subtitle-1 ma-auto text-center app-subtitle"
1111
>
12-
Ratify is a Central Authentication Service (CAS) implementing OAuth
13-
2.0 and OpenID Connect (OID) protocols.
12+
Central Authentication Service (CAS) implementing OAuth 2.0 and
13+
OpenID Connect (OID) protocols.
1414
</p>
1515
</v-col>
1616
</v-row>
@@ -59,6 +59,9 @@
5959
</v-btn>
6060
</v-row>
6161
</v-col>
62+
<div class="app-version text-overline text--disabled">
63+
{{ appVersion || "" }}
64+
</div>
6265
</v-container>
6366
</template>
6467

@@ -69,7 +72,11 @@ import { authManager } from "@/auth";
6972
7073
export default Vue.extend({
7174
components: { Logo },
72-
75+
data() {
76+
return {
77+
appVersion: process.env.VUE_APP_VERSION
78+
};
79+
},
7380
computed: {
7481
isAuthenticated() {
7582
return authManager.isAuthenticated();

0 commit comments

Comments
 (0)