Skip to content

Commit 68aaecc

Browse files
authored
Implemented new override markup (#106)
* Added Frontend.UIKit * Extracted some things into UIKit * Override editing markup * Added deployment page main override markup * Made override size configurable * Did override listing * Deployment overrides are now first everywhere * Really hacky keys search * Button loading state * Patched project home page
1 parent 726e4a6 commit 68aaecc

File tree

26 files changed

+1370
-545
lines changed

26 files changed

+1370
-545
lines changed

.hlint.yaml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# HLint configuration file
2+
# https://github.com/ndmitchell/hlint
3+
##########################
4+
5+
# This file contains a template configuration file, which is typically
6+
# placed as .hlint.yaml in the root of your project
7+
8+
# Specify additional command line arguments
9+
#
10+
# - arguments: [--color, --cpp-simple, -XQuasiQuotes]
11+
12+
# Control which extensions/flags/modules/functions can be used
13+
#
14+
# - extensions:
15+
# - default: false # all extension are banned by default
16+
# - name: [PatternGuards, ViewPatterns] # only these listed extensions can be used
17+
# - {name: CPP, within: CrossPlatform} # CPP can only be used in a given module
18+
#
19+
# - flags:
20+
# - {name: -w, within: []} # -w is allowed nowhere
21+
#
22+
# - modules:
23+
# - {name: [Data.Set, Data.HashSet], as: Set} # if you import Data.Set qualified, it must be as 'Set'
24+
# - {name: Control.Arrow, within: []} # Certain modules are banned entirely
25+
#
26+
# - functions:
27+
# - {name: unsafePerformIO, within: []} # unsafePerformIO can only appear in no modules
28+
29+
# Add custom hints for this project
30+
#
31+
# Will suggest replacing "wibbleMany [myvar]" with "wibbleOne myvar"
32+
# - error: {lhs: "wibbleMany [x]", rhs: wibbleOne x}
33+
34+
# Turn on hints that are off by default
35+
#
36+
# Ban "module X(module X) where", to require a real export list
37+
# - warn: {name: Use explicit module export list}
38+
#
39+
# Replace a $ b $ c with a . b $ c
40+
# - group: {name: dollar, enabled: true}
41+
#
42+
# Generalise map to fmap, ++ to <>
43+
# - group: {name: generalise, enabled: true}
44+
45+
# Ignore some builtin hints
46+
# - ignore: {name: Use let}
47+
# - ignore: {name: Use const, within: SpecialModule} # Only within certain modules
48+
49+
- ignore: { name: Replace case with maybe }
50+
- ignore: { name: Use if }
51+
# Define some custom infix operators
52+
# - fixity: infixr 3 ~^#^~
53+
54+
# To generate a suitable file for HLint do:
55+
# $ hlint --default > .hlint.yaml

charts/octopod/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ appVersion: 1.3.1
77
keywords:
88
- kubernetes
99
- octopod
10-
home: https://octopod.site
10+
home: https://github.com/typeable/octopod
1111
sources:
1212
- https://github.com/typeable/octopod
1313
maintainers:

charts/octopod/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Octopod
22

3-
[Octopod](https://octopod.site/) is a fully open-source self-hosted solution for managing multiple deployments in a Kubernetes cluster with a user-friendly web interface. Managing deployments does not require any technical expertise.
3+
[Octopod](https://github.com/typeable/octopod) is a fully open-source self-hosted solution for managing multiple deployments in a Kubernetes cluster with a user-friendly web interface. Managing deployments does not require any technical expertise.
44

55
## TL;DR
66
```console

octopod-css/development/layouts/staging.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,15 @@ <h3 class="deployment__sub-heading">
127127
<span class="listing__key default">SECRET_CODE:</span>
128128
<span class="listing__value">asdfaisdjri235868ear7%lorem-ipsum-dolor-sit-amen</span>
129129
</div>
130+
<div class="listing__item deleted">
131+
<span class="listing__key default">SECRET_CODE:</span>
132+
<span class="listing__value default">asdfaisdjri235868ear7%lorem-ipsum-dolor-sit-amen</span>
133+
</div>
134+
<div class="listing__item deleted">
135+
<span class="listing__key default">SECRET_CODE:</span>
136+
<div class="listing__placeholder"></div>
137+
<div class="listing__spinner"></div>
138+
</div>
130139
<div class="listing__item">
131140
<span class="listing__key default">INFO:</span>
132141
<span class="listing__value default">New Project Staging</span>

octopod-css/development/markups/_dash.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2>.dash--add</h2>
3232
<br>
3333
<br>
3434
<br>
35-
<h2>.dash--add</h2>
35+
<h2>.dash--back</h2>
3636

3737
<button class="dash dash--back" type="button">
3838
All deployments

octopod-css/development/styles/_listing.css

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
text-overflow: ellipsis;
3939
}
4040

41+
.listing--for-text .deleted > span {
42+
text-decoration-line: line-through;
43+
opacity: 0.2;
44+
}
4145
.listing--for-text .listing__item:first-child {
4246
margin-top: 0;
4347
}
@@ -59,6 +63,26 @@
5963
font-style: italic;
6064
}
6165

66+
.listing__placeholder {
67+
content: "";
68+
display: inline-block;
69+
height: 14px;
70+
width: 140px;
71+
border-radius: 2px;
72+
background: rgba(143, 143, 143, 0.2);
73+
margin-right: 4px;
74+
margin-top: 3px;
75+
}
76+
77+
.listing__placeholder__value {
78+
width: 70px;
79+
}
80+
81+
.listing--info-text {
82+
font-style: italic;
83+
color: rgba(143, 143, 143);
84+
}
85+
6286
.listing--for-text .listing__more {
6387
margin-top: 8px;
6488
}
@@ -68,3 +92,23 @@
6892
font-size: 16px;
6993
line-height: 24px;
7094
}
95+
96+
.listing__spinner {
97+
display: inline-block;
98+
vertical-align: top;
99+
border: none;
100+
background-color: transparent;
101+
background-repeat: no-repeat;
102+
background-position: center center;
103+
background-size: 20px 20px;
104+
padding: 0;
105+
width: 20px;
106+
height: 20px;
107+
cursor: pointer;
108+
text-indent: 200%;
109+
white-space: nowrap;
110+
overflow: hidden;
111+
opacity: 1;
112+
background-image: url("../vectors/spot-loader.svg");
113+
animation: loading 2.2s linear infinite;
114+
}

octopod-css/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"gulp": "3.9.1",
77
"gulp-base64": "0.1.3",
88
"gulp-change": "1.0.0",
9-
"gulp-clean-css": "2.0.6",
9+
"gulp-clean-css": "4.2.0",
1010
"gulp-plumber": "1.1.0",
1111
"gulp-postcss": "6.1.0",
1212
"gulp-size": "2.1.0",

0 commit comments

Comments
 (0)