diff --git a/api/package-lock.json b/api/package-lock.json
index 3a01ce7..40ba04f 100644
--- a/api/package-lock.json
+++ b/api/package-lock.json
@@ -1,11 +1,11 @@
{
- "name": "alphane-api",
+ "name": "calebburke-api",
"version": "0.0.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
- "name": "alphane-api",
+ "name": "calebburke-api",
"version": "0.0.1",
"license": "ISC",
"dependencies": {
diff --git a/api/package.json b/api/package.json
index 3fa7bba..738a1ff 100644
--- a/api/package.json
+++ b/api/package.json
@@ -1,8 +1,8 @@
{
- "name": "alphane-api",
+ "name": "calebburke-api",
"private": true,
"version": "0.0.1",
- "description": "Alphane Backend",
+ "description": "calebburke.dev Backend",
"main": "src/server.js",
"scripts": {
"build": "tsc && tsc-alias",
diff --git a/api/src/db/migrator.ts b/api/src/db/migrator.ts
index 3fa44cd..52828bc 100644
--- a/api/src/db/migrator.ts
+++ b/api/src/db/migrator.ts
@@ -1,5 +1,6 @@
import express, { Request, Response } from "express"
import { join } from "path"
+import { isArray } from "lodash"
import { NODE_ENV } from "@/config"
import dbMigrationClient from "@/db/db-migration-client"
@@ -35,7 +36,8 @@ export class Migrator {
this.migrationRouter.get("/seed/:environment", async (req: Request, res: Response) => {
try {
- await this.seedUp(req.params.environment)
+ const environment = isArray(req.params.environment) ? req.params.environment[0] : req.params.environment
+ await this.seedUp(environment)
} catch (err) {
logger.error(err)
}
diff --git a/docker-compose.development.yml b/docker-compose.development.yml
index a579b4e..23da572 100644
--- a/docker-compose.development.yml
+++ b/docker-compose.development.yml
@@ -2,8 +2,8 @@ x-default-environment: &default-environment
TZ: "UTC"
NODE_ENV: development
DB_HOST: db
- DB_USERNAME: &default-db-username alphane
- DB_DATABASE: alphane_development
+ DB_USERNAME: &default-db-username calebburke
+ DB_DATABASE: calebburke_development
DB_PASSWORD: &default-db-password DevPwd99!
DB_PORT: &default-db-port 5432
DB_TRUST_SERVER_CERTIFICATE: "true"
@@ -12,7 +12,7 @@ x-default-environment: &default-environment
DB_HEALTH_CHECK_RETRIES: 3
DB_HEALTH_CHECK_START_PERIOD_SECONDS: 5
FRONTEND_URL: "http://localhost:8080"
- VITE_APPLICATION_NAME: "ALPHANE"
+ VITE_APPLICATION_NAME: "CALEB BURKE DEV"
VITE_API_BASE_URL: "http://localhost:3000"
VITE_AUTH0_CLIENT_ID: "TRlKzdNBynpo9tU1RSmnF0p8d3IEam4J"
VITE_AUTH0_AUDIENCE: "alphane-api"
@@ -25,7 +25,6 @@ services:
build:
context: ./api
dockerfile: development.Dockerfile
- image: wrap-api:latest
env_file:
- ./api/.env.development
environment:
diff --git a/web/package-lock.json b/web/package-lock.json
index c43b330..dc368a4 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,11 +1,11 @@
{
- "name": "alphane-web",
+ "name": "calebburke-web",
"version": "0.1.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
- "name": "alphane-web",
+ "name": "calebburke-web",
"version": "0.1.0",
"dependencies": {
"@auth0/auth0-vue": "^2.5.0",
diff --git a/web/package.json b/web/package.json
index eb4167f..72ec985 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,5 +1,5 @@
{
- "name": "alphane-web",
+ "name": "calebburke-web",
"private": true,
"version": "0.1.0",
"type": "module",
diff --git a/web/public/Logo.png b/web/public/Logo.png
deleted file mode 100644
index df593a1..0000000
Binary files a/web/public/Logo.png and /dev/null differ
diff --git a/web/public/Logo.svg b/web/public/Logo.svg
deleted file mode 100644
index 571edb1..0000000
--- a/web/public/Logo.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/web/public/SplashImage.png b/web/public/SplashImage.png
deleted file mode 100644
index af85145..0000000
Binary files a/web/public/SplashImage.png and /dev/null differ
diff --git a/web/public/app_logo_big.png b/web/public/app_logo_big.png
new file mode 100644
index 0000000..64d19e5
Binary files /dev/null and b/web/public/app_logo_big.png differ
diff --git a/web/public/app_logo_small.png b/web/public/app_logo_small.png
new file mode 100644
index 0000000..713f514
Binary files /dev/null and b/web/public/app_logo_small.png differ
diff --git a/web/public/app_logo_splash.png b/web/public/app_logo_splash.png
new file mode 100644
index 0000000..3d8eb69
Binary files /dev/null and b/web/public/app_logo_splash.png differ
diff --git a/web/public/favicon.ico b/web/public/favicon.ico
deleted file mode 100644
index 5aebb70..0000000
Binary files a/web/public/favicon.ico and /dev/null differ
diff --git a/web/public/yukon.svg b/web/public/yukon.svg
deleted file mode 100644
index fc4a4ac..0000000
--- a/web/public/yukon.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/web/src/components/common/ResponsiveDialog.vue b/web/src/components/common/ResponsiveDialog.vue
index b8d5d00..595ace6 100644
--- a/web/src/components/common/ResponsiveDialog.vue
+++ b/web/src/components/common/ResponsiveDialog.vue
@@ -46,7 +46,7 @@
import { computed } from "vue"
import { useDisplay } from "vuetify"
-import HeaderActionsCard from "@/components/shared/cards/HeaderActionsCard.vue"
+import HeaderActionsCard from "@/components/common/HeaderActionsCard.vue"
const props = withDefaults(
defineProps<{
diff --git a/web/src/components/common/UniqueTextField.vue b/web/src/components/common/UniqueTextField.vue
new file mode 100644
index 0000000..6af99ba
--- /dev/null
+++ b/web/src/components/common/UniqueTextField.vue
@@ -0,0 +1,104 @@
+
+
+
+ mdi-progress-clock
+
+ mdi-check-circle-outline
+ mdi-alert-circle-outline
+
+
+
+
+
diff --git a/web/src/components/users/UserEmailUniqueTextField.vue b/web/src/components/users/UserEmailUniqueTextField.vue
new file mode 100644
index 0000000..13eb4f4
--- /dev/null
+++ b/web/src/components/users/UserEmailUniqueTextField.vue
@@ -0,0 +1,34 @@
+
+
+
+
+
diff --git a/web/src/pages/administration/users/UserNewPage.vue b/web/src/pages/administration/users/UserNewPage.vue
index 3ee6a05..8dc5fa2 100644
--- a/web/src/pages/administration/users/UserNewPage.vue
+++ b/web/src/pages/administration/users/UserNewPage.vue
@@ -53,114 +53,8 @@
validate-on="blur"
/>
-
-
-
-
-
-
-
-
-
-
-
-
- Images
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Notification Details
-
-
-
-
-
-
>({
@@ -205,88 +99,8 @@ const userAttributes = ref>({
displayName: "",
firstName: "",
lastName: "",
- title: null,
- pilotLicense: null,
- ameLicense: null,
- emailNotificationsEnabled: true,
})
-// Image handling
-const profileImageFile = ref(null)
-const signatureImageFile = ref(null)
-const profileImagePreview = ref(null)
-const signatureImagePreview = ref(null)
-
-async function handleProfileImageUpload() {
- if (!profileImageFile.value) {
- profileImagePreview.value = null
- userAttributes.value.profileImage = null
- return
- }
-
- // Handle both array and single file
- const file = Array.isArray(profileImageFile.value)
- ? profileImageFile.value[0]
- : profileImageFile.value
-
- if (!file) {
- profileImagePreview.value = null
- userAttributes.value.profileImage = null
- return
- }
-
- // Ensure we have a valid File object
- if (!(file instanceof File)) {
- console.error("Invalid file type:", file)
- return
- }
-
- try {
- // Resize image to 512x512 before upload
- const base64DataUrl = await resizeToStandard(file)
- profileImagePreview.value = base64DataUrl
- userAttributes.value.profileImage = base64DataUrl
- } catch (error) {
- console.error("Error resizing profile image:", error)
- snack.error("Failed to process profile image")
- }
-}
-
-async function handleSignatureImageUpload() {
- if (!signatureImageFile.value) {
- signatureImagePreview.value = null
- userAttributes.value.signatureImage = null
- return
- }
-
- // Handle both array and single file
- const file = Array.isArray(signatureImageFile.value)
- ? signatureImageFile.value[0]
- : signatureImageFile.value
-
- if (!file) {
- signatureImagePreview.value = null
- userAttributes.value.signatureImage = null
- return
- }
-
- // Ensure we have a valid File object
- if (!(file instanceof File)) {
- console.error("Invalid file type:", file)
- return
- }
-
- try {
- // Resize image to 512x512 before upload
- const base64DataUrl = await resizeToStandard(file)
- signatureImagePreview.value = base64DataUrl
- userAttributes.value.signatureImage = base64DataUrl
- } catch (error) {
- console.error("Error resizing signature image:", error)
- snack.error("Failed to process signature image")
- }
-}
-
function autoFillDependentFields(focused: boolean) {
if (focused) return
diff --git a/web/src/pages/errors/ForbiddenPage.vue b/web/src/pages/errors/ForbiddenPage.vue
index a8baa60..66bb0dc 100644
--- a/web/src/pages/errors/ForbiddenPage.vue
+++ b/web/src/pages/errors/ForbiddenPage.vue
@@ -3,7 +3,7 @@
headline="Whoops, 403"
title="Access Forbidden"
text="You do not have permission to access that page"
- :image="SplashImage"
+ :image="AppLogoSplash"
>
@@ -48,7 +48,7 @@