Compare commits
2 commits
8c58951fd3
...
8c21184145
Author | SHA1 | Date | |
---|---|---|---|
8c21184145 | |||
455ceb11e4 |
9 changed files with 88 additions and 28 deletions
|
@ -1,8 +1,8 @@
|
||||||
name: Deploy Edge
|
name: Deploy Edge
|
||||||
run-name: ${{ gitea.actor }} Deploy Edge
|
run-name: ${{ gitea.actor }} Deploy Edge
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ master ]
|
branches: [master]
|
||||||
|
|
||||||
env:
|
env:
|
||||||
GITEA_TOKEN: ${{ secrets.ELYSIUM_ORG_READ_TOKEN }}
|
GITEA_TOKEN: ${{ secrets.ELYSIUM_ORG_READ_TOKEN }}
|
||||||
|
@ -13,12 +13,12 @@ env:
|
||||||
jobs:
|
jobs:
|
||||||
deploy-edge:
|
deploy-edge:
|
||||||
steps:
|
steps:
|
||||||
- name: Oasis Setup
|
- name: Oasis Setup
|
||||||
uses: https://gitea.dunemask.dev/elysium/oasis-action@master
|
uses: https://gitea.dunemask.dev/elysium/oasis-action@master
|
||||||
with:
|
with:
|
||||||
gitea-token: ${{ env.GITEA_TOKEN }}
|
gitea-token: ${{ env.GITEA_TOKEN }}
|
||||||
kubeconfig: ${{ env.KUBECONFIG_BASE64 }}
|
kubeconfig: ${{ env.KUBECONFIG_BASE64 }}
|
||||||
oasis-prod-config: ${{ env. OASIS_PROD_CONFIG }}
|
oasis-prod-config: ${{ env. OASIS_PROD_CONFIG }}
|
||||||
- name: Deploy to Edge env
|
- name: Deploy to Edge env
|
||||||
run: garden deploy $GARDEN_DEPLOY_ACTION --env usw-edge
|
run: garden deploy $GARDEN_DEPLOY_ACTION --env usw-edge
|
||||||
working-directory: ${{ env.OASIS_WORKSPACE }}
|
working-directory: ${{ env.OASIS_WORKSPACE }}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
name: S3 Repo Backup
|
name: S3 Repo Backup
|
||||||
run-name: ${{ gitea.actor }} S3 Repo Backup
|
run-name: ${{ gitea.actor }} S3 Repo Backup
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ master ]
|
branches: [master]
|
||||||
|
|
||||||
env:
|
env:
|
||||||
S3_BACKUP_ENDPOINT: https://s3.dunemask.dev
|
S3_BACKUP_ENDPOINT: https://s3.dunemask.dev
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
# Nile
|
# Nile
|
||||||
|
|
||||||
Nile is a modern digital portfolio for Dunemask
|
Nile is a modern digital portfolio for Dunemask
|
||||||
|
|
||||||
# WIP
|
# WIP
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "vite --host",
|
"start": "vite --host",
|
||||||
|
"start:dev": "vite",
|
||||||
"build:react": "vite build",
|
"build:react": "vite build",
|
||||||
"lint": "npx prettier -w src/ index.html vite.config.js"
|
"lint": "npx prettier -w src/ index.html vite.config.js"
|
||||||
},
|
},
|
||||||
|
|
|
@ -3,6 +3,7 @@ import Toolbar from "@mui/material/Toolbar";
|
||||||
import Delta from "./pages/delta/Delta.jsx";
|
import Delta from "./pages/delta/Delta.jsx";
|
||||||
import Resume from "./pages/resume/Resume.jsx";
|
import Resume from "./pages/resume/Resume.jsx";
|
||||||
import { useScrollToLocation } from "./hooks.jsx";
|
import { useScrollToLocation } from "./hooks.jsx";
|
||||||
|
import Upgrades from "./Upgrades.jsx";
|
||||||
|
|
||||||
const redirects = [
|
const redirects = [
|
||||||
{ path: "/r1", rewrite: "/resume" },
|
{ path: "/r1", rewrite: "/resume" },
|
||||||
|
@ -15,11 +16,12 @@ export default function Routing() {
|
||||||
<div className="view">
|
<div className="view">
|
||||||
<Toolbar disableGutters />
|
<Toolbar disableGutters />
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" element={<Delta />} />
|
<Route path="/" element={<Upgrades />} />
|
||||||
|
{/*<Route path="/" element={<Delta />} />
|
||||||
<Route path="/resume" element={<Resume />} />
|
<Route path="/resume" element={<Resume />} />
|
||||||
{redirects.map((r, i) => (
|
{redirects.map((r, i) => (
|
||||||
<Route key={i} path={r.path} element={<Navigate to={r.rewrite} />} />
|
<Route key={i} path={r.path} element={<Navigate to={r.rewrite} />} />
|
||||||
))}
|
))} */}
|
||||||
<Route path="*" element={<Navigate to="/" replace />} />
|
<Route path="*" element={<Navigate to="/" replace />} />
|
||||||
<Route path="/*" element={<Navigate to="/" replace />} />
|
<Route path="/*" element={<Navigate to="/" replace />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
|
|
54
src/Upgrades.jsx
Normal file
54
src/Upgrades.jsx
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
import Typography from "@mui/material/Typography";
|
||||||
|
import Box from "@mui/material/Box";
|
||||||
|
import Link from "@mui/material/Link";
|
||||||
|
|
||||||
|
// Function to format a date as MMM DD, YYYY
|
||||||
|
function formatDate(date) {
|
||||||
|
const months = [
|
||||||
|
"JAN",
|
||||||
|
"FEB",
|
||||||
|
"MAR",
|
||||||
|
"APR",
|
||||||
|
"MAY",
|
||||||
|
"JUN",
|
||||||
|
"JUL",
|
||||||
|
"AUG",
|
||||||
|
"SEP",
|
||||||
|
"OCT",
|
||||||
|
"NOV",
|
||||||
|
"DEC",
|
||||||
|
];
|
||||||
|
const month = months[date.getMonth()];
|
||||||
|
const day = ("0" + date.getDate()).slice(-2);
|
||||||
|
const year = date.getFullYear();
|
||||||
|
return `${month} ${day}, ${year}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the current date
|
||||||
|
const now = new Date();
|
||||||
|
|
||||||
|
// Get the date 2 weeks from now
|
||||||
|
const twoWeeksFromNow = new Date();
|
||||||
|
twoWeeksFromNow.setDate(now.getDate() + 14);
|
||||||
|
|
||||||
|
export default function Upgrades() {
|
||||||
|
return (
|
||||||
|
<Box height="calc(100vh - 8.8rem)" display="flex">
|
||||||
|
<Box my="auto" mx="auto" flexWrap="wrap" textAlign="center">
|
||||||
|
<Typography variant="h4">Servers currently upgrading!</Typography>
|
||||||
|
<br />
|
||||||
|
<Typography variant="h5">
|
||||||
|
Process Started {formatDate(now)} and will end{" "}
|
||||||
|
{formatDate(twoWeeksFromNow)}
|
||||||
|
</Typography>
|
||||||
|
<Typography variant="h6">
|
||||||
|
{" "}
|
||||||
|
If you need to get in contact with me sooner, please email me at{" "}
|
||||||
|
<Link href="mailto:elijahglennparker@outlook.com">
|
||||||
|
elijahglennparker@outlook.com
|
||||||
|
</Link>
|
||||||
|
</Typography>
|
||||||
|
</Box>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
}
|
|
@ -1,15 +1,13 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "nile.fullname" . }}
|
name: { { include "nile.fullname" . } }
|
||||||
labels:
|
labels: { { - include "nile.labels" . | nindent 4 } }
|
||||||
{{- include "nile.labels" . | nindent 4 }}
|
|
||||||
spec:
|
spec:
|
||||||
type: {{ .Values.service.type }}
|
type: { { .Values.service.type } }
|
||||||
ports:
|
ports:
|
||||||
- port: {{ .Values.service.port }}
|
- port: { { .Values.service.port } }
|
||||||
targetPort: http
|
targetPort: http
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
name: http
|
name: http
|
||||||
selector:
|
selector: { { - include "nile.selectorLabels" . | nindent 4 } }
|
||||||
{{- include "nile.selectorLabels" . | nindent 4 }}
|
|
||||||
|
|
12
values.yaml
12
values.yaml
|
@ -25,10 +25,12 @@ serviceAccount:
|
||||||
|
|
||||||
podAnnotations: {}
|
podAnnotations: {}
|
||||||
|
|
||||||
podSecurityContext: {}
|
podSecurityContext:
|
||||||
|
{}
|
||||||
# fsGroup: 2000
|
# fsGroup: 2000
|
||||||
|
|
||||||
securityContext: {}
|
securityContext:
|
||||||
|
{}
|
||||||
# capabilities:
|
# capabilities:
|
||||||
# drop:
|
# drop:
|
||||||
# - ALL
|
# - ALL
|
||||||
|
@ -46,7 +48,8 @@ containerPort:
|
||||||
ingress:
|
ingress:
|
||||||
enabled: false
|
enabled: false
|
||||||
className: ""
|
className: ""
|
||||||
annotations: {}
|
annotations:
|
||||||
|
{}
|
||||||
# kubernetes.io/ingress.class: nginx
|
# kubernetes.io/ingress.class: nginx
|
||||||
# kubernetes.io/tls-acme: "true"
|
# kubernetes.io/tls-acme: "true"
|
||||||
hosts:
|
hosts:
|
||||||
|
@ -59,7 +62,8 @@ ingress:
|
||||||
# hosts:
|
# hosts:
|
||||||
# - tut.local
|
# - tut.local
|
||||||
|
|
||||||
resources: {}
|
resources:
|
||||||
|
{}
|
||||||
# We usually recommend not to specify default resources and to leave this as a conscious
|
# We usually recommend not to specify default resources and to leave this as a conscious
|
||||||
# choice for the user. This also increases chances charts run on environments with little
|
# choice for the user. This also increases chances charts run on environments with little
|
||||||
# resources, such as Minikube. If you do want to specify resources, uncomment the following
|
# resources, such as Minikube. If you do want to specify resources, uncomment the following
|
||||||
|
|
|
@ -8,7 +8,7 @@ export default () => {
|
||||||
port: process.env.VITE_DEV_PORT ?? 5173,
|
port: process.env.VITE_DEV_PORT ?? 5173,
|
||||||
host: "0.0.0.0",
|
host: "0.0.0.0",
|
||||||
hmr: {
|
hmr: {
|
||||||
protocol: process.env.VITE_DEV_PROTOCOL ?? "wss",
|
protocol: process.env.VITE_DEV_PROTOCOL ?? "ws",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
build: {
|
build: {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue