diff --git a/.gitea/workflows/deploy-edge.yml b/.gitea/workflows/deploy-edge.yml
index d16e48f..0243f12 100644
--- a/.gitea/workflows/deploy-edge.yml
+++ b/.gitea/workflows/deploy-edge.yml
@@ -1,8 +1,8 @@
name: Deploy Edge
run-name: ${{ gitea.actor }} Deploy Edge
on:
- push:
- branches: [ master ]
+ push:
+ branches: [master]
env:
GITEA_TOKEN: ${{ secrets.ELYSIUM_ORG_READ_TOKEN }}
@@ -13,12 +13,12 @@ env:
jobs:
deploy-edge:
steps:
- - name: Oasis Setup
- uses: https://gitea.dunemask.dev/elysium/oasis-action@master
- with:
- gitea-token: ${{ env.GITEA_TOKEN }}
- kubeconfig: ${{ env.KUBECONFIG_BASE64 }}
- oasis-prod-config: ${{ env. OASIS_PROD_CONFIG }}
- - name: Deploy to Edge env
- run: garden deploy $GARDEN_DEPLOY_ACTION --env usw-edge
- working-directory: ${{ env.OASIS_WORKSPACE }}
\ No newline at end of file
+ - name: Oasis Setup
+ uses: https://gitea.dunemask.dev/elysium/oasis-action@master
+ with:
+ gitea-token: ${{ env.GITEA_TOKEN }}
+ kubeconfig: ${{ env.KUBECONFIG_BASE64 }}
+ oasis-prod-config: ${{ env. OASIS_PROD_CONFIG }}
+ - name: Deploy to Edge env
+ run: garden deploy $GARDEN_DEPLOY_ACTION --env usw-edge
+ working-directory: ${{ env.OASIS_WORKSPACE }}
diff --git a/.gitea/workflows/s3-repo-backup.yml b/.gitea/workflows/s3-repo-backup.yml
index 77b0702..3987094 100644
--- a/.gitea/workflows/s3-repo-backup.yml
+++ b/.gitea/workflows/s3-repo-backup.yml
@@ -1,8 +1,8 @@
name: S3 Repo Backup
run-name: ${{ gitea.actor }} S3 Repo Backup
on:
- push:
- branches: [ master ]
+ push:
+ branches: [master]
env:
S3_BACKUP_ENDPOINT: https://s3.dunemask.dev
diff --git a/README.md b/README.md
index 2fb573a..5f704f1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
# Nile
+
Nile is a modern digital portfolio for Dunemask
-# WIP
\ No newline at end of file
+# WIP
diff --git a/package.json b/package.json
index 1ac7d5a..87d2b4b 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
"type": "module",
"scripts": {
"start": "vite --host",
+ "start:dev": "vite",
"build:react": "vite build",
"lint": "npx prettier -w src/ index.html vite.config.js"
},
diff --git a/src/Routing.jsx b/src/Routing.jsx
index 81d0657..2b09995 100644
--- a/src/Routing.jsx
+++ b/src/Routing.jsx
@@ -3,6 +3,7 @@ import Toolbar from "@mui/material/Toolbar";
import Delta from "./pages/delta/Delta.jsx";
import Resume from "./pages/resume/Resume.jsx";
import { useScrollToLocation } from "./hooks.jsx";
+import Upgrades from "./Upgrades.jsx";
const redirects = [
{ path: "/r1", rewrite: "/resume" },
@@ -15,11 +16,12 @@ export default function Routing() {
- } />
+ } />
+ {/*} />
} />
{redirects.map((r, i) => (
} />
- ))}
+ ))} */}
} />
} />
diff --git a/src/Upgrades.jsx b/src/Upgrades.jsx
new file mode 100644
index 0000000..a000704
--- /dev/null
+++ b/src/Upgrades.jsx
@@ -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 (
+
+
+ Servers currently upgrading!
+
+
+ Process Started {formatDate(now)} and will end{" "}
+ {formatDate(twoWeeksFromNow)}
+
+
+ {" "}
+ If you need to get in contact with me sooner, please email me at{" "}
+
+ elijahglennparker@outlook.com
+
+
+
+
+ );
+}
diff --git a/templates/service.yaml b/templates/service.yaml
index 49d396d..388a43d 100644
--- a/templates/service.yaml
+++ b/templates/service.yaml
@@ -1,15 +1,13 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "nile.fullname" . }}
- labels:
- {{- include "nile.labels" . | nindent 4 }}
+ name: { { include "nile.fullname" . } }
+ labels: { { - include "nile.labels" . | nindent 4 } }
spec:
- type: {{ .Values.service.type }}
+ type: { { .Values.service.type } }
ports:
- - port: {{ .Values.service.port }}
+ - port: { { .Values.service.port } }
targetPort: http
protocol: TCP
name: http
- selector:
- {{- include "nile.selectorLabels" . | nindent 4 }}
+ selector: { { - include "nile.selectorLabels" . | nindent 4 } }
diff --git a/values.yaml b/values.yaml
index ef67a41..f133f29 100644
--- a/values.yaml
+++ b/values.yaml
@@ -25,10 +25,12 @@ serviceAccount:
podAnnotations: {}
-podSecurityContext: {}
+podSecurityContext:
+ {}
# fsGroup: 2000
-securityContext: {}
+securityContext:
+ {}
# capabilities:
# drop:
# - ALL
@@ -46,7 +48,8 @@ containerPort:
ingress:
enabled: false
className: ""
- annotations: {}
+ annotations:
+ {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
hosts:
@@ -59,7 +62,8 @@ ingress:
# hosts:
# - tut.local
-resources: {}
+resources:
+ {}
# 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
# resources, such as Minikube. If you do want to specify resources, uncomment the following
diff --git a/vite.config.js b/vite.config.js
index 8e19457..04b4d2f 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -8,7 +8,7 @@ export default () => {
port: process.env.VITE_DEV_PORT ?? 5173,
host: "0.0.0.0",
hmr: {
- protocol: process.env.VITE_DEV_PROTOCOL ?? "wss",
+ protocol: process.env.VITE_DEV_PROTOCOL ?? "ws",
},
},
build: {