Compare commits
1 Commits
main
...
Matomo-Int
| Author | SHA1 | Date | |
|---|---|---|---|
| 0382acbb25 |
@@ -1,62 +0,0 @@
|
|||||||
name: Continuous Deployment
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
Deploy:
|
|
||||||
name: Update Deployment
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
container:
|
|
||||||
volumes:
|
|
||||||
- /var/www/html/milsim-site-v4:/var/www/html/milsim-site-v4:rw
|
|
||||||
steps:
|
|
||||||
- name: Setup Local Environment
|
|
||||||
run: |
|
|
||||||
groupadd -g 989 nginx || true
|
|
||||||
useradd nginx -u 990 -g nginx -m || true
|
|
||||||
|
|
||||||
- name: Verify Node Environment
|
|
||||||
run: |
|
|
||||||
npm -v
|
|
||||||
node -v
|
|
||||||
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
ref: 'main'
|
|
||||||
|
|
||||||
- name: Token Copy
|
|
||||||
run: |
|
|
||||||
cd /var/www/html/milsim-site-v4
|
|
||||||
cp /workspace/17th-Ranger-Battalion-ORG/milsim-site-v4/.git/config .git/config
|
|
||||||
chown nginx:nginx .git/config
|
|
||||||
|
|
||||||
- name: Fix File Permissions
|
|
||||||
run: |
|
|
||||||
sudo chown -R nginx:nginx /var/www/html/milsim-site-v4
|
|
||||||
sudo chmod -R u+w /var/www/html/milsim-site-v4
|
|
||||||
|
|
||||||
- name: Update Application Code
|
|
||||||
run: |
|
|
||||||
sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4 && git reset --hard && git pull origin main"
|
|
||||||
|
|
||||||
- name: Update Shared Dependencies
|
|
||||||
run: |
|
|
||||||
sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/shared && npm install"
|
|
||||||
|
|
||||||
- name: Update UI Dependencies
|
|
||||||
run: |
|
|
||||||
sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/ui && npm install"
|
|
||||||
|
|
||||||
- name: Update API Dependencies
|
|
||||||
run: |
|
|
||||||
sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/api && npm install"
|
|
||||||
|
|
||||||
- name: Build UI
|
|
||||||
run: |
|
|
||||||
sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/ui && npm run build"
|
|
||||||
|
|
||||||
- name: Build API
|
|
||||||
run: |
|
|
||||||
sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/api && npm run build"
|
|
||||||
@@ -20,8 +20,8 @@ const port = process.env.SERVER_PORT;
|
|||||||
|
|
||||||
//glitchtip setup
|
//glitchtip setup
|
||||||
const sentry = require('@sentry/node');
|
const sentry = require('@sentry/node');
|
||||||
if (process.env.DISABLE_GLITCHTIP) {
|
if (!process.env.DISABLE_GLITCHTIP) {
|
||||||
console.log("Glitchtip disabled")
|
console.log("Glitchtip disabled AAAAAA")
|
||||||
} else {
|
} else {
|
||||||
let dsn = process.env.GLITCHTIP_DSN;
|
let dsn = process.env.GLITCHTIP_DSN;
|
||||||
sentry.init({ dsn: dsn });
|
sentry.init({ dsn: dsn });
|
||||||
|
|||||||
@@ -38,27 +38,12 @@ router.get('/all', async (req, res) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
router.get('/me', async (req, res) => {
|
router.get('/me', async (req, res) => {
|
||||||
|
|
||||||
let userID = req.user.id;
|
let userID = req.user.id;
|
||||||
|
|
||||||
try {
|
console.log("application/me")
|
||||||
let application = await getMemberApplication(userID);
|
|
||||||
|
|
||||||
if (application === undefined)
|
let app = getMemberApplication(userID);
|
||||||
res.sendStatus(204);
|
console.log(app);
|
||||||
|
|
||||||
const comments: CommentRow[] = await getApplicationComments(application.id);
|
|
||||||
|
|
||||||
const output: ApplicationFull = {
|
|
||||||
application,
|
|
||||||
comments,
|
|
||||||
}
|
|
||||||
|
|
||||||
return res.status(200).json(output);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to load application:', error);
|
|
||||||
return res.status(500).json(error);
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
|
|
||||||
// GET /application/:id
|
// GET /application/:id
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import pool from '../db';
|
import pool from '../db';
|
||||||
import { Role } from '@app/shared/types/roles'
|
|
||||||
|
|
||||||
export async function assignUserGroup(userID: number, roleID: number) {
|
export async function assignUserGroup(userID: number, roleID: number) {
|
||||||
|
|
||||||
@@ -17,7 +16,7 @@ export async function createGroup(name: string, color: string, description: stri
|
|||||||
return { id: result.insertId, name, color, description };
|
return { id: result.insertId, name, color, description };
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getUserRoles(userID: number): Promise<Role[]> {
|
export async function getUserRoles(userID: number) {
|
||||||
const sql = `SELECT r.id, r.name
|
const sql = `SELECT r.id, r.name
|
||||||
FROM members_roles mr
|
FROM members_roles mr
|
||||||
INNER JOIN roles r ON mr.role_id = r.id
|
INNER JOIN roles r ON mr.role_id = r.id
|
||||||
|
|||||||
@@ -19,42 +19,5 @@ export const trainingReportSchema = z.object({
|
|||||||
),
|
),
|
||||||
remarks: z.string().nullable().optional(),
|
remarks: z.string().nullable().optional(),
|
||||||
attendees: z.array(courseEventAttendeeSchema).default([]),
|
attendees: z.array(courseEventAttendeeSchema).default([]),
|
||||||
}).superRefine((data, ctx) => {
|
|
||||||
const trainerRole = 1;
|
|
||||||
const traineeRole = 2;
|
|
||||||
|
|
||||||
const hasTrainer = data.attendees.some((a) => a.attendee_role_id === trainerRole);
|
|
||||||
const hasTrainee = data.attendees.some((a) => a.attendee_role_id === traineeRole);
|
|
||||||
|
|
||||||
if (!hasTrainer) {
|
|
||||||
ctx.addIssue({
|
|
||||||
code: z.ZodIssueCode.custom,
|
|
||||||
path: ["attendees"],
|
|
||||||
message: "At least one Primary Trainer is required.",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!hasTrainee) {
|
|
||||||
ctx.addIssue({
|
|
||||||
code: z.ZodIssueCode.custom,
|
|
||||||
path: ["attendees"],
|
|
||||||
message: "At least one Trainee is required.",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
//no duplicates
|
|
||||||
const idCounts = new Map<number, number>();
|
|
||||||
|
|
||||||
data.attendees.forEach((a, index) => {
|
|
||||||
idCounts.set(a.attendee_id, (idCounts.get(a.attendee_id) ?? 0) + 1);
|
|
||||||
|
|
||||||
if (idCounts.get(a.attendee_id)! > 1) {
|
|
||||||
ctx.addIssue({
|
|
||||||
code: z.ZodIssueCode.custom,
|
|
||||||
path: ["attendees"],
|
|
||||||
message: "Cannot have duplicate attendee.",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
export interface Role {
|
|
||||||
id: number;
|
|
||||||
name: string;
|
|
||||||
color?: string;
|
|
||||||
description?: string;
|
|
||||||
}
|
|
||||||
@@ -5,3 +5,6 @@ VITE_ENVIRONMENT= # dev / prod
|
|||||||
# Glitchtip
|
# Glitchtip
|
||||||
VITE_GLITCHTIP_DSN=
|
VITE_GLITCHTIP_DSN=
|
||||||
VITE_DISABLE_GLITCHTIP= # true/false
|
VITE_DISABLE_GLITCHTIP= # true/false
|
||||||
|
|
||||||
|
# Matomo
|
||||||
|
VITE_DISABLE_MATOMO= # true/false
|
||||||
35
ui/package-lock.json
generated
35
ui/package-lock.json
generated
@@ -8,6 +8,7 @@
|
|||||||
"name": "milsimsitev4",
|
"name": "milsimsitev4",
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@certible/use-matomo": "^1.1.0",
|
||||||
"@fullcalendar/core": "^6.1.19",
|
"@fullcalendar/core": "^6.1.19",
|
||||||
"@fullcalendar/daygrid": "^6.1.19",
|
"@fullcalendar/daygrid": "^6.1.19",
|
||||||
"@fullcalendar/interaction": "^6.1.19",
|
"@fullcalendar/interaction": "^6.1.19",
|
||||||
@@ -22,7 +23,7 @@
|
|||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"lucide-vue-next": "^0.539.0",
|
"lucide-vue-next": "^0.539.0",
|
||||||
"pinia": "^3.0.3",
|
"pinia": "^3.0.3",
|
||||||
"reka-ui": "^2.6.1",
|
"reka-ui": "^2.6.0",
|
||||||
"tailwind-merge": "^3.3.1",
|
"tailwind-merge": "^3.3.1",
|
||||||
"tailwindcss": "^4.1.11",
|
"tailwindcss": "^4.1.11",
|
||||||
"tw-animate-css": "^1.3.6",
|
"tw-animate-css": "^1.3.6",
|
||||||
@@ -510,6 +511,12 @@
|
|||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@certible/use-matomo": {
|
||||||
|
"version": "1.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@certible/use-matomo/-/use-matomo-1.1.0.tgz",
|
||||||
|
"integrity": "sha512-9kOTj0ldP+RX2Rhlosxm/+1uQ2deDefMb4p2DQGFi3Gqi3TuTSrOtx+beUNKGN7D8up/8SsBPJS+ipY1ZHMfrA==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/@esbuild/aix-ppc64": {
|
"node_modules/@esbuild/aix-ppc64": {
|
||||||
"version": "0.25.9",
|
"version": "0.25.9",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
|
||||||
@@ -3333,9 +3340,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/reka-ui": {
|
"node_modules/reka-ui": {
|
||||||
"version": "2.6.1",
|
"version": "2.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.6.1.tgz",
|
"resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.6.0.tgz",
|
||||||
"integrity": "sha512-XK7cJDQoNuGXfCNzBBo/81Yg/OgjPwvbabnlzXG2VsdSgNsT6iIkuPBPr+C0Shs+3bb0x0lbPvgQAhMSCKm5Ww==",
|
"integrity": "sha512-NrGMKrABD97l890mFS3TNUzB0BLUfbL3hh0NjcJRIUSUljb288bx3Mzo31nOyUcdiiW0HqFGXJwyCBh9cWgb0w==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@floating-ui/dom": "^1.6.13",
|
"@floating-ui/dom": "^1.6.13",
|
||||||
@@ -3594,13 +3601,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/tinyglobby": {
|
"node_modules/tinyglobby": {
|
||||||
"version": "0.2.14",
|
"version": "0.2.15",
|
||||||
"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
|
"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
|
||||||
"integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
|
"integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fdir": "^6.4.4",
|
"fdir": "^6.5.0",
|
||||||
"picomatch": "^4.0.2"
|
"picomatch": "^4.0.3"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=12.0.0"
|
"node": ">=12.0.0"
|
||||||
@@ -3728,17 +3735,17 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vite": {
|
"node_modules/vite": {
|
||||||
"version": "7.1.2",
|
"version": "7.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/vite/-/vite-7.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/vite/-/vite-7.2.4.tgz",
|
||||||
"integrity": "sha512-J0SQBPlQiEXAF7tajiH+rUooJPo0l8KQgyg4/aMunNtrOa7bwuZJsJbDWzeljqQpgftxuq5yNJxQ91O9ts29UQ==",
|
"integrity": "sha512-NL8jTlbo0Tn4dUEXEsUg8KeyG/Lkmc4Fnzb8JXN/Ykm9G4HNImjtABMJgkQoVjOBN/j2WAwDTRytdqJbZsah7w==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"esbuild": "^0.25.0",
|
"esbuild": "^0.25.0",
|
||||||
"fdir": "^6.4.6",
|
"fdir": "^6.5.0",
|
||||||
"picomatch": "^4.0.3",
|
"picomatch": "^4.0.3",
|
||||||
"postcss": "^8.5.6",
|
"postcss": "^8.5.6",
|
||||||
"rollup": "^4.43.0",
|
"rollup": "^4.43.0",
|
||||||
"tinyglobby": "^0.2.14"
|
"tinyglobby": "^0.2.15"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
"vite": "bin/vite.js"
|
"vite": "bin/vite.js"
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
"preview": "vite preview"
|
"preview": "vite preview"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@certible/use-matomo": "^1.1.0",
|
||||||
"@fullcalendar/core": "^6.1.19",
|
"@fullcalendar/core": "^6.1.19",
|
||||||
"@fullcalendar/daygrid": "^6.1.19",
|
"@fullcalendar/daygrid": "^6.1.19",
|
||||||
"@fullcalendar/interaction": "^6.1.19",
|
"@fullcalendar/interaction": "^6.1.19",
|
||||||
@@ -26,7 +27,7 @@
|
|||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"lucide-vue-next": "^0.539.0",
|
"lucide-vue-next": "^0.539.0",
|
||||||
"pinia": "^3.0.3",
|
"pinia": "^3.0.3",
|
||||||
"reka-ui": "^2.6.1",
|
"reka-ui": "^2.6.0",
|
||||||
"tailwind-merge": "^3.3.1",
|
"tailwind-merge": "^3.3.1",
|
||||||
"tailwindcss": "^4.1.11",
|
"tailwindcss": "^4.1.11",
|
||||||
"tw-animate-css": "^1.3.6",
|
"tw-animate-css": "^1.3.6",
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 42 KiB |
109
ui/src/App.vue
109
ui/src/App.vue
@@ -1,13 +1,41 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { RouterView } from 'vue-router';
|
import { RouterLink, RouterView } from 'vue-router';
|
||||||
|
import Separator from './components/ui/separator/Separator.vue';
|
||||||
import Button from './components/ui/button/Button.vue';
|
import Button from './components/ui/button/Button.vue';
|
||||||
|
import { Popover, PopoverContent, PopoverTrigger } from './components/ui/popover';
|
||||||
|
import {
|
||||||
|
DropdownMenu,
|
||||||
|
DropdownMenuContent,
|
||||||
|
DropdownMenuItem,
|
||||||
|
DropdownMenuTrigger,
|
||||||
|
} from './components/ui/dropdown-menu';
|
||||||
|
import { onMounted } from 'vue';
|
||||||
import { useUserStore } from './stores/user';
|
import { useUserStore } from './stores/user';
|
||||||
import Alert from './components/ui/alert/Alert.vue';
|
import Alert from './components/ui/alert/Alert.vue';
|
||||||
import AlertDescription from './components/ui/alert/AlertDescription.vue';
|
import AlertDescription from './components/ui/alert/AlertDescription.vue';
|
||||||
import Navbar from './components/Navigation/Navbar.vue';
|
|
||||||
|
|
||||||
const userStore = useUserStore();
|
const userStore = useUserStore();
|
||||||
|
|
||||||
|
// onMounted(async () => {
|
||||||
|
// const res = await fetch(`${import.meta.env.VITE_APIHOST}/members/me`, {
|
||||||
|
// credentials: 'include',
|
||||||
|
// });
|
||||||
|
// const data = await res.json();
|
||||||
|
// console.log(data);
|
||||||
|
// userStore.user = data;
|
||||||
|
// });
|
||||||
|
const APIHOST = import.meta.env.VITE_APIHOST;
|
||||||
|
|
||||||
|
async function logout() {
|
||||||
|
// await fetch(`${APIHOST}/logout`, {
|
||||||
|
// method: 'GET',
|
||||||
|
// credentials: 'include',
|
||||||
|
// });
|
||||||
|
|
||||||
|
userStore.user = null;
|
||||||
|
window.location.href = APIHOST + "/logout";
|
||||||
|
}
|
||||||
|
|
||||||
function formatDate(dateStr) {
|
function formatDate(dateStr) {
|
||||||
if (!dateStr) return "";
|
if (!dateStr) return "";
|
||||||
return new Date(dateStr).toLocaleDateString("en-US", {
|
return new Date(dateStr).toLocaleDateString("en-US", {
|
||||||
@@ -21,9 +49,77 @@ const environment = import.meta.env.VITE_ENVIRONMENT;
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="flex flex-col min-h-screen">
|
<div>
|
||||||
<div class="sticky top-0 bg-background z-50">
|
<div class="flex items-center justify-between px-10">
|
||||||
<Navbar class="flex"></Navbar>
|
<div></div>
|
||||||
|
<div class="h-15 flex items-center justify-center gap-20">
|
||||||
|
<RouterLink to="/">
|
||||||
|
<Button variant="link">Home</Button>
|
||||||
|
</RouterLink>
|
||||||
|
<RouterLink to="/calendar">
|
||||||
|
<Button variant="link">Calendar</Button>
|
||||||
|
</RouterLink>
|
||||||
|
<RouterLink to="/members">
|
||||||
|
<Button variant="link">Members</Button>
|
||||||
|
</RouterLink>
|
||||||
|
<Popover>
|
||||||
|
<PopoverTrigger as-child>
|
||||||
|
<Button variant="link">Forms</Button>
|
||||||
|
</PopoverTrigger>
|
||||||
|
<PopoverContent class="flex flex-col gap-4 items-center w-min">
|
||||||
|
<RouterLink to="/transfer">
|
||||||
|
<Button variant="link">Transfer Request</Button>
|
||||||
|
</RouterLink>
|
||||||
|
<RouterLink to="/trainingReport">
|
||||||
|
<Button variant="link">Training Report</Button>
|
||||||
|
</RouterLink>
|
||||||
|
</PopoverContent>
|
||||||
|
</Popover>
|
||||||
|
<Popover>
|
||||||
|
<PopoverTrigger as-child>
|
||||||
|
<Button variant="link">Administration</Button>
|
||||||
|
</PopoverTrigger>
|
||||||
|
<PopoverContent class="flex flex-col gap-4 items-center w-min">
|
||||||
|
<RouterLink to="/administration/rankChange">
|
||||||
|
<Button variant="link">Promotions</Button>
|
||||||
|
</RouterLink>
|
||||||
|
<RouterLink to="/administration/loa">
|
||||||
|
<Button variant="link">Leave of Absence</Button>
|
||||||
|
</RouterLink>
|
||||||
|
<RouterLink to="/administration/transfer">
|
||||||
|
<Button variant="link">Transfer Requests</Button>
|
||||||
|
</RouterLink>
|
||||||
|
<RouterLink to="/administration/applications">
|
||||||
|
<Button variant="link">Recruitment</Button>
|
||||||
|
</RouterLink>
|
||||||
|
<RouterLink to="/administration/roles">
|
||||||
|
<Button variant="link">Role Management</Button>
|
||||||
|
</RouterLink>
|
||||||
|
</PopoverContent>
|
||||||
|
</Popover>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<DropdownMenu v-if="userStore.isLoggedIn">
|
||||||
|
<DropdownMenuTrigger class="cursor-pointer">
|
||||||
|
<p>{{ userStore.user.name }}</p>
|
||||||
|
</DropdownMenuTrigger>
|
||||||
|
<DropdownMenuContent>
|
||||||
|
<DropdownMenuItem>My Profile</DropdownMenuItem>
|
||||||
|
<DropdownMenuItem>Settings</DropdownMenuItem>
|
||||||
|
<DropdownMenuItem>
|
||||||
|
<RouterLink to="/loa">
|
||||||
|
Submit LOA
|
||||||
|
</RouterLink>
|
||||||
|
</DropdownMenuItem>
|
||||||
|
<DropdownMenuItem :variant="'destructive'" @click="logout()">Logout</DropdownMenuItem>
|
||||||
|
</DropdownMenuContent>
|
||||||
|
</DropdownMenu>
|
||||||
|
|
||||||
|
<a v-else :href="APIHOST + '/login'">Login</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<Separator></Separator>
|
||||||
<Alert v-if="environment == 'dev'" class="m-2 mx-auto w-5xl" variant="info">
|
<Alert v-if="environment == 'dev'" class="m-2 mx-auto w-5xl" variant="info">
|
||||||
<AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
|
<AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
|
||||||
<p>This is a development build of the application. Some features will be unavailable or unstable.</p>
|
<p>This is a development build of the application. Some features will be unavailable or unstable.</p>
|
||||||
@@ -35,9 +131,8 @@ const environment = import.meta.env.VITE_ENVIRONMENT;
|
|||||||
<Button variant="secondary">End LOA</Button>
|
<Button variant="secondary">End LOA</Button>
|
||||||
</AlertDescription>
|
</AlertDescription>
|
||||||
</Alert>
|
</Alert>
|
||||||
</div>
|
|
||||||
|
|
||||||
<RouterView class="flex-1 min-h-0"></RouterView>
|
<RouterView class=""></RouterView>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ export enum ApplicationStatus {
|
|||||||
const addr = import.meta.env.VITE_APIHOST;
|
const addr = import.meta.env.VITE_APIHOST;
|
||||||
|
|
||||||
export async function loadApplication(id: number | string): Promise<ApplicationFull | null> {
|
export async function loadApplication(id: number | string): Promise<ApplicationFull | null> {
|
||||||
const res = await fetch(`${addr}/application/${id}`, { credentials: 'include' })
|
const res = await fetch(`${addr}/application/${id}`)
|
||||||
if (res.status === 204) return null
|
if (res.status === 204) return null
|
||||||
if (!res.ok) throw new Error('Failed to load application')
|
if (!res.ok) throw new Error('Failed to load application')
|
||||||
const json = await res.json()
|
const json = await res.json()
|
||||||
|
|||||||
@@ -4,55 +4,6 @@
|
|||||||
@custom-variant dark (&:is(.dark *));
|
@custom-variant dark (&:is(.dark *));
|
||||||
|
|
||||||
:root {
|
:root {
|
||||||
--background: oklch(0.2046 0 0);
|
|
||||||
--foreground: oklch(0.9219 0 0);
|
|
||||||
--card: oklch(23.075% 0.00003 271.152);
|
|
||||||
--card-foreground: oklch(0.9219 0 0);
|
|
||||||
--popover: oklch(0.2686 0 0);
|
|
||||||
--popover-foreground: oklch(0.9219 0 0);
|
|
||||||
--primary: oklch(0.7686 0.1647 70.0804);
|
|
||||||
--primary-foreground: oklch(0 0 0);
|
|
||||||
--secondary: oklch(0.2686 0 0);
|
|
||||||
--secondary-foreground: oklch(0.9219 0 0);
|
|
||||||
--muted: oklch(0.2686 0 0);
|
|
||||||
--muted-foreground: oklch(0.7155 0 0);
|
|
||||||
--accent: oklch(100% 0.00011 271.152 / 0.253);
|
|
||||||
--accent-foreground: oklch(100% 0.00011 271.152);
|
|
||||||
--destructive: oklch(0.6368 0.2078 25.3313);
|
|
||||||
--destructive-foreground: oklch(1.0000 0 0);
|
|
||||||
--success: oklch(66.104% 0.16937 144.153);
|
|
||||||
--success-foreground: oklch(1.0000 0 0);
|
|
||||||
--border: oklch(0.3715 0 0);
|
|
||||||
--input: oklch(0.3715 0 0);
|
|
||||||
--ring: oklch(0.7686 0.1647 70.0804);
|
|
||||||
--chart-1: oklch(0.8369 0.1644 84.4286);
|
|
||||||
--chart-2: oklch(0.6658 0.1574 58.3183);
|
|
||||||
--chart-3: oklch(0.4732 0.1247 46.2007);
|
|
||||||
--chart-4: oklch(0.5553 0.1455 48.9975);
|
|
||||||
--chart-5: oklch(0.4732 0.1247 46.2007);
|
|
||||||
--sidebar: oklch(0.1684 0 0);
|
|
||||||
--sidebar-foreground: oklch(0.9219 0 0);
|
|
||||||
--sidebar-primary: oklch(0.7686 0.1647 70.0804);
|
|
||||||
--sidebar-primary-foreground: oklch(1.0000 0 0);
|
|
||||||
--sidebar-accent: oklch(0.4732 0.1247 46.2007);
|
|
||||||
--sidebar-accent-foreground: oklch(0.9243 0.1151 95.7459);
|
|
||||||
--sidebar-border: oklch(0.3715 0 0);
|
|
||||||
--sidebar-ring: oklch(0.7686 0.1647 70.0804);
|
|
||||||
--font-sans: Inter, sans-serif;
|
|
||||||
--font-serif: Source Serif 4, serif;
|
|
||||||
--font-mono: JetBrains Mono, monospace;
|
|
||||||
--radius: 0.375rem;
|
|
||||||
--shadow-2xs: 0px 4px 8px -1px hsl(0 0% 0% / 0.07);
|
|
||||||
--shadow-xs: 0px 4px 8px -1px hsl(0 0% 0% / 0.07);
|
|
||||||
--shadow-sm: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 1px 2px -2px hsl(0 0% 0% / 0.14);
|
|
||||||
--shadow: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 1px 2px -2px hsl(0 0% 0% / 0.14);
|
|
||||||
--shadow-md: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 2px 4px -2px hsl(0 0% 0% / 0.14);
|
|
||||||
--shadow-lg: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 4px 6px -2px hsl(0 0% 0% / 0.14);
|
|
||||||
--shadow-xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 8px 10px -2px hsl(0 0% 0% / 0.14);
|
|
||||||
--shadow-2xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.35);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* .dark {
|
|
||||||
--background: oklch(0.2046 0 0);
|
--background: oklch(0.2046 0 0);
|
||||||
--foreground: oklch(0.9219 0 0);
|
--foreground: oklch(0.9219 0 0);
|
||||||
--card: oklch(23.075% 0.00003 271.152);
|
--card: oklch(23.075% 0.00003 271.152);
|
||||||
@@ -99,7 +50,56 @@
|
|||||||
--shadow-lg: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 4px 6px -2px hsl(0 0% 0% / 0.14);
|
--shadow-lg: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 4px 6px -2px hsl(0 0% 0% / 0.14);
|
||||||
--shadow-xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 8px 10px -2px hsl(0 0% 0% / 0.14);
|
--shadow-xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 8px 10px -2px hsl(0 0% 0% / 0.14);
|
||||||
--shadow-2xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.35);
|
--shadow-2xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.35);
|
||||||
} */
|
}
|
||||||
|
|
||||||
|
.dark {
|
||||||
|
--background: oklch(0.2046 0 0);
|
||||||
|
--foreground: oklch(0.9219 0 0);
|
||||||
|
--card: oklch(23.075% 0.00003 271.152);
|
||||||
|
--card-foreground: oklch(0.9219 0 0);
|
||||||
|
--popover: oklch(0.2686 0 0);
|
||||||
|
--popover-foreground: oklch(0.9219 0 0);
|
||||||
|
--primary: oklch(0.7686 0.1647 70.0804);
|
||||||
|
--primary-foreground: oklch(0 0 0);
|
||||||
|
--secondary: oklch(0.2686 0 0);
|
||||||
|
--secondary-foreground: oklch(0.9219 0 0);
|
||||||
|
--muted: oklch(0.2686 0 0);
|
||||||
|
--muted-foreground: oklch(0.7155 0 0);
|
||||||
|
--accent: oklch(0.4732 0.1247 46.2007);
|
||||||
|
--accent-foreground: oklch(0.9243 0.1151 95.7459);
|
||||||
|
--destructive: oklch(0.6368 0.2078 25.3313);
|
||||||
|
--destructive-foreground: oklch(1.0000 0 0);
|
||||||
|
--success: oklch(66.104% 0.16937 144.153);
|
||||||
|
--success-foreground: oklch(1.0000 0 0);
|
||||||
|
--border: oklch(0.3715 0 0);
|
||||||
|
--input: oklch(0.3715 0 0);
|
||||||
|
--ring: oklch(0.7686 0.1647 70.0804);
|
||||||
|
--chart-1: oklch(0.8369 0.1644 84.4286);
|
||||||
|
--chart-2: oklch(0.6658 0.1574 58.3183);
|
||||||
|
--chart-3: oklch(0.4732 0.1247 46.2007);
|
||||||
|
--chart-4: oklch(0.5553 0.1455 48.9975);
|
||||||
|
--chart-5: oklch(0.4732 0.1247 46.2007);
|
||||||
|
--sidebar: oklch(0.1684 0 0);
|
||||||
|
--sidebar-foreground: oklch(0.9219 0 0);
|
||||||
|
--sidebar-primary: oklch(0.7686 0.1647 70.0804);
|
||||||
|
--sidebar-primary-foreground: oklch(1.0000 0 0);
|
||||||
|
--sidebar-accent: oklch(0.4732 0.1247 46.2007);
|
||||||
|
--sidebar-accent-foreground: oklch(0.9243 0.1151 95.7459);
|
||||||
|
--sidebar-border: oklch(0.3715 0 0);
|
||||||
|
--sidebar-ring: oklch(0.7686 0.1647 70.0804);
|
||||||
|
--font-sans: Inter, sans-serif;
|
||||||
|
--font-serif: Source Serif 4, serif;
|
||||||
|
--font-mono: JetBrains Mono, monospace;
|
||||||
|
--radius: 0.375rem;
|
||||||
|
--shadow-2xs: 0px 4px 8px -1px hsl(0 0% 0% / 0.07);
|
||||||
|
--shadow-xs: 0px 4px 8px -1px hsl(0 0% 0% / 0.07);
|
||||||
|
--shadow-sm: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 1px 2px -2px hsl(0 0% 0% / 0.14);
|
||||||
|
--shadow: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 1px 2px -2px hsl(0 0% 0% / 0.14);
|
||||||
|
--shadow-md: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 2px 4px -2px hsl(0 0% 0% / 0.14);
|
||||||
|
--shadow-lg: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 4px 6px -2px hsl(0 0% 0% / 0.14);
|
||||||
|
--shadow-xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 8px 10px -2px hsl(0 0% 0% / 0.14);
|
||||||
|
--shadow-2xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.35);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@theme inline {
|
@theme inline {
|
||||||
|
|||||||
@@ -1,181 +0,0 @@
|
|||||||
<script setup lang="ts">
|
|
||||||
import { RouterLink } from 'vue-router';
|
|
||||||
import Separator from '../ui/separator/Separator.vue';
|
|
||||||
import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover';
|
|
||||||
import {
|
|
||||||
DropdownMenu,
|
|
||||||
DropdownMenuContent,
|
|
||||||
DropdownMenuItem,
|
|
||||||
DropdownMenuTrigger,
|
|
||||||
} from '../ui/dropdown-menu';
|
|
||||||
import { useUserStore } from '@/stores/user';
|
|
||||||
import Button from '../ui/button/Button.vue';
|
|
||||||
import NavigationMenu from '../ui/navigation-menu/NavigationMenu.vue';
|
|
||||||
import NavigationMenuList from '../ui/navigation-menu/NavigationMenuList.vue';
|
|
||||||
import NavigationMenuItem from '../ui/navigation-menu/NavigationMenuItem.vue';
|
|
||||||
import NavigationMenuLink from '../ui/navigation-menu/NavigationMenuLink.vue';
|
|
||||||
import NavigationMenuTrigger from '../ui/navigation-menu/NavigationMenuTrigger.vue';
|
|
||||||
import NavigationMenuContent from '../ui/navigation-menu/NavigationMenuContent.vue';
|
|
||||||
import { navigationMenuTriggerStyle } from '../ui/navigation-menu/'
|
|
||||||
import { useAuth } from '@/composables/useAuth';
|
|
||||||
import { CircleArrowOutUpRight } from 'lucide-vue-next';
|
|
||||||
|
|
||||||
const userStore = useUserStore();
|
|
||||||
const auth = useAuth();
|
|
||||||
|
|
||||||
//@ts-ignore
|
|
||||||
const APIHOST = import.meta.env.VITE_APIHOST;
|
|
||||||
|
|
||||||
async function logout() {
|
|
||||||
userStore.user = null;
|
|
||||||
window.location.href = APIHOST + "/logout";
|
|
||||||
}
|
|
||||||
|
|
||||||
function blurAfter() {
|
|
||||||
requestAnimationFrame(() => {
|
|
||||||
(document.activeElement as HTMLElement)?.blur();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="w-full border-b">
|
|
||||||
<div class="max-w-screen-3xl w-full mx-auto flex items-center justify-between pr-10 pl-7">
|
|
||||||
<!-- left side -->
|
|
||||||
<div class="flex items-center gap-7">
|
|
||||||
<RouterLink to="/">
|
|
||||||
<img src="/17RBN_Logo.png" class="w-10 h-10 object-contain"></img>
|
|
||||||
</RouterLink>
|
|
||||||
<!-- Member navigation -->
|
|
||||||
<div v-if="auth.accountStatus.value == 'member'" class="h-15 flex items-center justify-center">
|
|
||||||
<NavigationMenu>
|
|
||||||
<NavigationMenuList class="gap-3">
|
|
||||||
|
|
||||||
<!-- Calendar -->
|
|
||||||
<NavigationMenuItem>
|
|
||||||
<NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
|
|
||||||
<RouterLink to="/calendar" @click="blurAfter">Calendar</RouterLink>
|
|
||||||
</NavigationMenuLink>
|
|
||||||
</NavigationMenuItem>
|
|
||||||
|
|
||||||
<!-- Members -->
|
|
||||||
<NavigationMenuItem>
|
|
||||||
<NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
|
|
||||||
<RouterLink to="/" @click="blurAfter">Documents</RouterLink>
|
|
||||||
</NavigationMenuLink>
|
|
||||||
</NavigationMenuItem>
|
|
||||||
|
|
||||||
<!-- Forms (Dropdown) -->
|
|
||||||
<NavigationMenuItem class="bg-none !focus:bg-none !active:bg-none">
|
|
||||||
<NavigationMenuTrigger>Forms</NavigationMenuTrigger>
|
|
||||||
<NavigationMenuContent
|
|
||||||
class="grid gap-1 p-2 text-left [&_a]:w-full [&_a]:block [&_a]:whitespace-nowrap *:bg-transparent">
|
|
||||||
<NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
|
|
||||||
<RouterLink to="/loa" @click="blurAfter">
|
|
||||||
Leave of Absence
|
|
||||||
</RouterLink>
|
|
||||||
</NavigationMenuLink>
|
|
||||||
|
|
||||||
<NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
|
|
||||||
<RouterLink to="/transfer" @click="blurAfter">
|
|
||||||
Transfer Request
|
|
||||||
</RouterLink>
|
|
||||||
</NavigationMenuLink>
|
|
||||||
|
|
||||||
<NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
|
|
||||||
<RouterLink to="/trainingReport" @click="blurAfter">
|
|
||||||
Training Report
|
|
||||||
</RouterLink>
|
|
||||||
</NavigationMenuLink>
|
|
||||||
|
|
||||||
</NavigationMenuContent>
|
|
||||||
</NavigationMenuItem>
|
|
||||||
|
|
||||||
<!-- Administration (Dropdown) -->
|
|
||||||
<NavigationMenuItem
|
|
||||||
v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command', 'Recruiter'])">
|
|
||||||
<NavigationMenuTrigger>Administration</NavigationMenuTrigger>
|
|
||||||
<NavigationMenuContent
|
|
||||||
class="grid gap-1 p-2 text-left [&_a]:w-full [&_a]:block [&_a]:whitespace-nowrap *:bg-transparent">
|
|
||||||
|
|
||||||
<NavigationMenuLink
|
|
||||||
v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
|
|
||||||
as-child :class="navigationMenuTriggerStyle()">
|
|
||||||
<RouterLink to="/administration/rankChange" @click="blurAfter">
|
|
||||||
Promotions
|
|
||||||
</RouterLink>
|
|
||||||
</NavigationMenuLink>
|
|
||||||
|
|
||||||
<NavigationMenuLink
|
|
||||||
v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
|
|
||||||
as-child :class="navigationMenuTriggerStyle()">
|
|
||||||
<RouterLink to="/administration/loa" @click="blurAfter">
|
|
||||||
Leave of Absence
|
|
||||||
</RouterLink>
|
|
||||||
</NavigationMenuLink>
|
|
||||||
|
|
||||||
<NavigationMenuLink
|
|
||||||
v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
|
|
||||||
as-child :class="navigationMenuTriggerStyle()">
|
|
||||||
<RouterLink to="/administration/transfer" @click="blurAfter">
|
|
||||||
Transfer Requests
|
|
||||||
</RouterLink>
|
|
||||||
</NavigationMenuLink>
|
|
||||||
|
|
||||||
<NavigationMenuLink v-if="auth.hasRole('Recruiter')" as-child
|
|
||||||
:class="navigationMenuTriggerStyle()">
|
|
||||||
<RouterLink to="/administration/applications" @click="blurAfter">
|
|
||||||
Recruitment
|
|
||||||
</RouterLink>
|
|
||||||
</NavigationMenuLink>
|
|
||||||
|
|
||||||
<NavigationMenuLink v-if="auth.hasRole('17th Administrator')" as-child
|
|
||||||
:class="navigationMenuTriggerStyle()">
|
|
||||||
<RouterLink to="/administration/roles" @click="blurAfter">
|
|
||||||
Role Management
|
|
||||||
</RouterLink>
|
|
||||||
</NavigationMenuLink>
|
|
||||||
</NavigationMenuContent>
|
|
||||||
</NavigationMenuItem>
|
|
||||||
|
|
||||||
<NavigationMenuItem as-child :class="navigationMenuTriggerStyle()">
|
|
||||||
<RouterLink to="/members" @click="blurAfter">
|
|
||||||
Members (debug)
|
|
||||||
</RouterLink>
|
|
||||||
</NavigationMenuItem>
|
|
||||||
|
|
||||||
</NavigationMenuList>
|
|
||||||
</NavigationMenu>
|
|
||||||
</div>
|
|
||||||
<!-- Guest navigation -->
|
|
||||||
<div v-else class="h-15 flex items-center justify-center">
|
|
||||||
<NavigationMenu>
|
|
||||||
<NavigationMenuList>
|
|
||||||
<NavigationMenuItem>
|
|
||||||
<NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
|
|
||||||
<RouterLink to="/join" @click="blurAfter">Join</RouterLink>
|
|
||||||
</NavigationMenuLink>
|
|
||||||
</NavigationMenuItem>
|
|
||||||
</NavigationMenuList>
|
|
||||||
</NavigationMenu>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- right side -->
|
|
||||||
<div>
|
|
||||||
<DropdownMenu v-if="userStore.isLoggedIn">
|
|
||||||
<DropdownMenuTrigger class="cursor-pointer">
|
|
||||||
<p>{{ userStore.user.name }}</p>
|
|
||||||
</DropdownMenuTrigger>
|
|
||||||
<DropdownMenuContent>
|
|
||||||
<!-- <DropdownMenuItem>My Profile</DropdownMenuItem> -->
|
|
||||||
<!-- <DropdownMenuItem>Settings</DropdownMenuItem> -->
|
|
||||||
<DropdownMenuItem @click="$router.push('/join')">My Application</DropdownMenuItem>
|
|
||||||
<DropdownMenuItem :variant="'destructive'" @click="logout()">Logout</DropdownMenuItem>
|
|
||||||
</DropdownMenuContent>
|
|
||||||
</DropdownMenu>
|
|
||||||
<a v-else :href="APIHOST + '/login'">Login</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- <Separator></Separator> -->
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
@@ -38,7 +38,7 @@ function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => vo
|
|||||||
<Form :validation-schema="commentSchema" @submit="onSubmit">
|
<Form :validation-schema="commentSchema" @submit="onSubmit">
|
||||||
<FormField name="text" v-slot="{ componentField }">
|
<FormField name="text" v-slot="{ componentField }">
|
||||||
<FormItem>
|
<FormItem>
|
||||||
<FormLabel>Comment</FormLabel>
|
<FormLabel class="sr-only">Comment</FormLabel>
|
||||||
<FormControl>
|
<FormControl>
|
||||||
<Textarea v-bind="componentField" rows="3" placeholder="Write a comment…"
|
<Textarea v-bind="componentField" rows="3" placeholder="Write a comment…"
|
||||||
class="bg-neutral-800 resize-none w-full" />
|
class="bg-neutral-800 resize-none w-full" />
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ function toMariaDBDatetime(date: Date): string {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="flex flex-row-reverse gap-6 mx-auto w-full" :class="!adminMode ? 'max-w-5xl' : 'max-w-5xl'">
|
<div class="flex flex-row-reverse gap-6 mx-auto " :class="!adminMode ? 'max-w-5xl' : 'max-w-5xl'">
|
||||||
<div v-if="!adminMode" class="flex-1 flex space-x-4 rounded-md border p-4">
|
<div v-if="!adminMode" class="flex-1 flex space-x-4 rounded-md border p-4">
|
||||||
<div class="flex-2 space-y-1">
|
<div class="flex-2 space-y-1">
|
||||||
<p class="text-sm font-medium leading-none">
|
<p class="text-sm font-medium leading-none">
|
||||||
|
|||||||
@@ -18,12 +18,10 @@ import FieldSet from '../ui/field/FieldSet.vue'
|
|||||||
import FieldLegend from '../ui/field/FieldLegend.vue'
|
import FieldLegend from '../ui/field/FieldLegend.vue'
|
||||||
import FieldDescription from '../ui/field/FieldDescription.vue'
|
import FieldDescription from '../ui/field/FieldDescription.vue'
|
||||||
import Checkbox from '../ui/checkbox/Checkbox.vue'
|
import Checkbox from '../ui/checkbox/Checkbox.vue'
|
||||||
import { configure } from 'vee-validate'
|
|
||||||
|
|
||||||
|
|
||||||
const { handleSubmit, resetForm, errors, values, setFieldValue } = useForm({
|
const { handleSubmit, resetForm, errors, values, setFieldValue } = useForm({
|
||||||
validationSchema: toTypedSchema(trainingReportSchema),
|
validationSchema: toTypedSchema(trainingReportSchema),
|
||||||
validateOnMount: false,
|
|
||||||
initialValues: {
|
initialValues: {
|
||||||
course_id: null,
|
course_id: null,
|
||||||
event_date: "",
|
event_date: "",
|
||||||
@@ -131,17 +129,8 @@ onMounted(async () => {
|
|||||||
|
|
||||||
<VeeFieldArray name="attendees" v-slot="{ fields, push, remove }">
|
<VeeFieldArray name="attendees" v-slot="{ fields, push, remove }">
|
||||||
<FieldSet class="gap-4">
|
<FieldSet class="gap-4">
|
||||||
<div class="flex flex-col gap-2">
|
<FieldLegend class="scroll-m-20 text-lg tracking-tight">Attendees</FieldLegend>
|
||||||
<FieldLegend class="scroll-m-20 text-lg tracking-tight mb-0">Attendees</FieldLegend>
|
<FieldDescription>Add members who attended this session.</FieldDescription>
|
||||||
<FieldDescription class="mb-0">Add members who attended this session.</FieldDescription>
|
|
||||||
<div class="h-4">
|
|
||||||
<div class="text-red-500 text-sm"
|
|
||||||
v-if="errors.attendees && typeof errors.attendees === 'string'">
|
|
||||||
{{ errors.attendees }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<FieldGroup class="gap-4">
|
<FieldGroup class="gap-4">
|
||||||
|
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { NavigationMenuRoot, useForwardPropsEmits } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
import NavigationMenuViewport from "./NavigationMenuViewport.vue";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
modelValue: { type: String, required: false },
|
|
||||||
defaultValue: { type: String, required: false },
|
|
||||||
dir: { type: String, required: false },
|
|
||||||
orientation: { type: String, required: false },
|
|
||||||
delayDuration: { type: Number, required: false },
|
|
||||||
skipDelayDuration: { type: Number, required: false },
|
|
||||||
disableClickTrigger: { type: Boolean, required: false },
|
|
||||||
disableHoverTrigger: { type: Boolean, required: false },
|
|
||||||
disablePointerLeaveClose: { type: Boolean, required: false },
|
|
||||||
unmountOnHide: { type: Boolean, required: false },
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
viewport: { type: Boolean, required: false, default: true },
|
|
||||||
});
|
|
||||||
const emits = defineEmits(["update:modelValue"]);
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class", "viewport");
|
|
||||||
const forwarded = useForwardPropsEmits(delegatedProps, emits);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<NavigationMenuRoot
|
|
||||||
v-slot="slotProps"
|
|
||||||
data-slot="navigation-menu"
|
|
||||||
:data-viewport="viewport"
|
|
||||||
v-bind="forwarded"
|
|
||||||
:class="
|
|
||||||
cn(
|
|
||||||
'group/navigation-menu relative flex max-w-max flex-1 items-center justify-center',
|
|
||||||
props.class,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<slot v-bind="slotProps" />
|
|
||||||
<NavigationMenuViewport v-if="viewport" />
|
|
||||||
</NavigationMenuRoot>
|
|
||||||
</template>
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { NavigationMenuContent, useForwardPropsEmits } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
forceMount: { type: Boolean, required: false },
|
|
||||||
disableOutsidePointerEvents: { type: Boolean, required: false },
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
});
|
|
||||||
const emits = defineEmits([
|
|
||||||
"escapeKeyDown",
|
|
||||||
"pointerDownOutside",
|
|
||||||
"focusOutside",
|
|
||||||
"interactOutside",
|
|
||||||
]);
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class");
|
|
||||||
|
|
||||||
const forwarded = useForwardPropsEmits(delegatedProps, emits);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<NavigationMenuContent
|
|
||||||
data-slot="navigation-menu-content"
|
|
||||||
v-bind="forwarded"
|
|
||||||
:class="
|
|
||||||
cn(
|
|
||||||
'data-[motion^=from-]:animate-in data-[motion^=to-]:animate-out data-[motion^=from-]:fade-in data-[motion^=to-]:fade-out data-[motion=from-end]:slide-in-from-right-52 data-[motion=from-start]:slide-in-from-left-52 data-[motion=to-end]:slide-out-to-right-52 data-[motion=to-start]:slide-out-to-left-52 top-0 left-0 w-full p-2 pr-2.5 md:absolute md:w-auto',
|
|
||||||
'group-data-[viewport=false]/navigation-menu:bg-popover group-data-[viewport=false]/navigation-menu:text-popover-foreground group-data-[viewport=false]/navigation-menu:data-[state=open]:animate-in group-data-[viewport=false]/navigation-menu:data-[state=closed]:animate-out group-data-[viewport=false]/navigation-menu:data-[state=closed]:zoom-out-95 group-data-[viewport=false]/navigation-menu:data-[state=open]:zoom-in-95 group-data-[viewport=false]/navigation-menu:data-[state=open]:fade-in-0 group-data-[viewport=false]/navigation-menu:data-[state=closed]:fade-out-0 group-data-[viewport=false]/navigation-menu:top-full group-data-[viewport=false]/navigation-menu:mt-1.5 group-data-[viewport=false]/navigation-menu:overflow-hidden group-data-[viewport=false]/navigation-menu:rounded-md group-data-[viewport=false]/navigation-menu:border group-data-[viewport=false]/navigation-menu:shadow group-data-[viewport=false]/navigation-menu:duration-200 **:data-[slot=navigation-menu-link]:focus:ring-0 **:data-[slot=navigation-menu-link]:focus:outline-none',
|
|
||||||
props.class,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<slot />
|
|
||||||
</NavigationMenuContent>
|
|
||||||
</template>
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { NavigationMenuIndicator, useForwardProps } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
forceMount: { type: Boolean, required: false },
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class");
|
|
||||||
|
|
||||||
const forwardedProps = useForwardProps(delegatedProps);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<NavigationMenuIndicator
|
|
||||||
data-slot="navigation-menu-indicator"
|
|
||||||
v-bind="forwardedProps"
|
|
||||||
:class="
|
|
||||||
cn(
|
|
||||||
'data-[state=visible]:animate-in data-[state=hidden]:animate-out data-[state=hidden]:fade-out data-[state=visible]:fade-in top-full z-[1] flex h-1.5 items-end justify-center overflow-hidden',
|
|
||||||
props.class,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="bg-border relative top-[60%] h-2 w-2 rotate-45 rounded-tl-sm shadow-md"
|
|
||||||
/>
|
|
||||||
</NavigationMenuIndicator>
|
|
||||||
</template>
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { NavigationMenuItem } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
value: { type: String, required: false },
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class");
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<NavigationMenuItem
|
|
||||||
data-slot="navigation-menu-item"
|
|
||||||
v-bind="delegatedProps"
|
|
||||||
:class="cn('relative', props.class)"
|
|
||||||
>
|
|
||||||
<slot />
|
|
||||||
</NavigationMenuItem>
|
|
||||||
</template>
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { NavigationMenuLink, useForwardPropsEmits } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
active: { type: Boolean, required: false },
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
});
|
|
||||||
const emits = defineEmits(["select"]);
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class");
|
|
||||||
const forwarded = useForwardPropsEmits(delegatedProps, emits);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<NavigationMenuLink
|
|
||||||
data-slot="navigation-menu-link"
|
|
||||||
v-bind="forwarded"
|
|
||||||
:class="
|
|
||||||
cn(
|
|
||||||
'data-active:focus:bg-accent data-active:hover:bg-accent data-active:bg-accent/50 data-active:text-accent-foreground hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground ring-ring/10 dark:ring-ring/20 dark:outline-ring/40 outline-ring/50 [&_svg:not([class*=\'text-\'])]:text-muted-foreground flex flex-col gap-1 rounded-sm p-2 text-sm transition-[color,box-shadow] focus-visible:ring-4 focus-visible:outline-1 [&_svg:not([class*=\'size-\'])]:size-4',
|
|
||||||
props.class,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<slot />
|
|
||||||
</NavigationMenuLink>
|
|
||||||
</template>
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { NavigationMenuList, useForwardProps } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class");
|
|
||||||
|
|
||||||
const forwardedProps = useForwardProps(delegatedProps);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<NavigationMenuList
|
|
||||||
data-slot="navigation-menu-list"
|
|
||||||
v-bind="forwardedProps"
|
|
||||||
:class="
|
|
||||||
cn(
|
|
||||||
'group flex flex-1 list-none items-center justify-center gap-1',
|
|
||||||
props.class,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<slot />
|
|
||||||
</NavigationMenuList>
|
|
||||||
</template>
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { ChevronDown } from "lucide-vue-next";
|
|
||||||
import { NavigationMenuTrigger, useForwardProps } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
import { navigationMenuTriggerStyle } from ".";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
disabled: { type: Boolean, required: false },
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class");
|
|
||||||
|
|
||||||
const forwardedProps = useForwardProps(delegatedProps);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<NavigationMenuTrigger
|
|
||||||
data-slot="navigation-menu-trigger"
|
|
||||||
v-bind="forwardedProps"
|
|
||||||
:class="cn(navigationMenuTriggerStyle(), 'group', props.class)"
|
|
||||||
>
|
|
||||||
<slot />
|
|
||||||
<ChevronDown
|
|
||||||
class="relative top-[1px] ml-1 size-3 transition duration-300 group-data-[state=open]:rotate-180"
|
|
||||||
aria-hidden="true"
|
|
||||||
/>
|
|
||||||
</NavigationMenuTrigger>
|
|
||||||
</template>
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { NavigationMenuViewport, useForwardProps } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
forceMount: { type: Boolean, required: false },
|
|
||||||
align: { type: String, required: false },
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class");
|
|
||||||
|
|
||||||
const forwardedProps = useForwardProps(delegatedProps);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="absolute top-full left-0 isolate z-50 flex justify-center">
|
|
||||||
<NavigationMenuViewport
|
|
||||||
data-slot="navigation-menu-viewport"
|
|
||||||
v-bind="forwardedProps"
|
|
||||||
:class="
|
|
||||||
cn(
|
|
||||||
'origin-top-center bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-90 relative mt-1.5 h-[var(--reka-navigation-menu-viewport-height)] w-full overflow-hidden rounded-md border shadow md:w-[var(--reka-navigation-menu-viewport-width)] left-[var(--reka-navigation-menu-viewport-left)]',
|
|
||||||
props.class,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import { cva } from "class-variance-authority";
|
|
||||||
|
|
||||||
export { default as NavigationMenu } from "./NavigationMenu.vue";
|
|
||||||
export { default as NavigationMenuContent } from "./NavigationMenuContent.vue";
|
|
||||||
export { default as NavigationMenuIndicator } from "./NavigationMenuIndicator.vue";
|
|
||||||
export { default as NavigationMenuItem } from "./NavigationMenuItem.vue";
|
|
||||||
export { default as NavigationMenuLink } from "./NavigationMenuLink.vue";
|
|
||||||
export { default as NavigationMenuList } from "./NavigationMenuList.vue";
|
|
||||||
export { default as NavigationMenuTrigger } from "./NavigationMenuTrigger.vue";
|
|
||||||
export { default as NavigationMenuViewport } from "./NavigationMenuViewport.vue";
|
|
||||||
|
|
||||||
export const navigationMenuTriggerStyle = cva(
|
|
||||||
"group inline-flex h-9 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=open]:hover:bg-accent data-[state=open]:text-accent-foreground data-[state=open]:focus:bg-accent data-[state=open]:bg-accent/50 focus-visible:ring-ring/50 outline-none transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1",
|
|
||||||
);
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { StepperRoot, useForwardPropsEmits } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
defaultValue: { type: Number, required: false },
|
|
||||||
orientation: { type: String, required: false },
|
|
||||||
dir: { type: String, required: false },
|
|
||||||
modelValue: { type: Number, required: false },
|
|
||||||
linear: { type: Boolean, required: false },
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
});
|
|
||||||
const emits = defineEmits(["update:modelValue"]);
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class");
|
|
||||||
|
|
||||||
const forwarded = useForwardPropsEmits(delegatedProps, emits);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<StepperRoot
|
|
||||||
v-slot="slotProps"
|
|
||||||
:class="cn('flex gap-2', props.class)"
|
|
||||||
v-bind="forwarded"
|
|
||||||
>
|
|
||||||
<slot v-bind="slotProps" />
|
|
||||||
</StepperRoot>
|
|
||||||
</template>
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { StepperDescription, useForwardProps } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class");
|
|
||||||
|
|
||||||
const forwarded = useForwardProps(delegatedProps);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<StepperDescription
|
|
||||||
v-slot="slotProps"
|
|
||||||
v-bind="forwarded"
|
|
||||||
:class="cn('text-xs text-muted-foreground', props.class)"
|
|
||||||
>
|
|
||||||
<slot v-bind="slotProps" />
|
|
||||||
</StepperDescription>
|
|
||||||
</template>
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { StepperIndicator, useForwardProps } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class");
|
|
||||||
|
|
||||||
const forwarded = useForwardProps(delegatedProps);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<StepperIndicator
|
|
||||||
v-slot="slotProps"
|
|
||||||
v-bind="forwarded"
|
|
||||||
:class="
|
|
||||||
cn(
|
|
||||||
'inline-flex items-center justify-center rounded-full text-muted-foreground/50 w-8 h-8',
|
|
||||||
// Disabled
|
|
||||||
'group-data-[disabled]:text-muted-foreground group-data-[disabled]:opacity-50',
|
|
||||||
// Active
|
|
||||||
'group-data-[state=active]:bg-primary group-data-[state=active]:text-primary-foreground',
|
|
||||||
// Completed
|
|
||||||
'group-data-[state=completed]:bg-accent group-data-[state=completed]:text-accent-foreground',
|
|
||||||
props.class,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<slot v-bind="slotProps" />
|
|
||||||
</StepperIndicator>
|
|
||||||
</template>
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { StepperItem, useForwardProps } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
step: { type: Number, required: true },
|
|
||||||
disabled: { type: Boolean, required: false },
|
|
||||||
completed: { type: Boolean, required: false },
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class");
|
|
||||||
|
|
||||||
const forwarded = useForwardProps(delegatedProps);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<StepperItem
|
|
||||||
v-slot="slotProps"
|
|
||||||
v-bind="forwarded"
|
|
||||||
:class="
|
|
||||||
cn(
|
|
||||||
'flex items-center gap-2 group data-[disabled]:pointer-events-none',
|
|
||||||
props.class,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<slot v-bind="slotProps" />
|
|
||||||
</StepperItem>
|
|
||||||
</template>
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { StepperSeparator, useForwardProps } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
orientation: { type: String, required: false },
|
|
||||||
decorative: { type: Boolean, required: false },
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class");
|
|
||||||
|
|
||||||
const forwarded = useForwardProps(delegatedProps);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<StepperSeparator
|
|
||||||
v-bind="forwarded"
|
|
||||||
:class="
|
|
||||||
cn(
|
|
||||||
'bg-muted',
|
|
||||||
// Disabled
|
|
||||||
'group-data-[disabled]:bg-muted group-data-[disabled]:opacity-50',
|
|
||||||
// Completed
|
|
||||||
'group-data-[state=completed]:bg-accent',
|
|
||||||
props.class,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { StepperTitle, useForwardProps } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class");
|
|
||||||
|
|
||||||
const forwarded = useForwardProps(delegatedProps);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<StepperTitle
|
|
||||||
v-bind="forwarded"
|
|
||||||
:class="cn('text-md font-semibold whitespace-nowrap', props.class)"
|
|
||||||
>
|
|
||||||
<slot />
|
|
||||||
</StepperTitle>
|
|
||||||
</template>
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { reactiveOmit } from "@vueuse/core";
|
|
||||||
import { StepperTrigger, useForwardProps } from "reka-ui";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
asChild: { type: Boolean, required: false },
|
|
||||||
as: { type: null, required: false },
|
|
||||||
class: { type: null, required: false },
|
|
||||||
});
|
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class");
|
|
||||||
|
|
||||||
const forwarded = useForwardProps(delegatedProps);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<StepperTrigger
|
|
||||||
v-bind="forwarded"
|
|
||||||
:class="
|
|
||||||
cn(
|
|
||||||
'p-1 flex flex-col items-center text-center gap-1 rounded-md',
|
|
||||||
props.class,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<slot />
|
|
||||||
</StepperTrigger>
|
|
||||||
</template>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
export { default as Stepper } from "./Stepper.vue";
|
|
||||||
export { default as StepperDescription } from "./StepperDescription.vue";
|
|
||||||
export { default as StepperIndicator } from "./StepperIndicator.vue";
|
|
||||||
export { default as StepperItem } from "./StepperItem.vue";
|
|
||||||
export { default as StepperSeparator } from "./StepperSeparator.vue";
|
|
||||||
export { default as StepperTitle } from "./StepperTitle.vue";
|
|
||||||
export { default as StepperTrigger } from "./StepperTrigger.vue";
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
import { useUserStore } from "@/stores/user"
|
|
||||||
import { computed } from "vue";
|
|
||||||
import { Role } from "@shared/types/roles"
|
|
||||||
|
|
||||||
export function useAuth() {
|
|
||||||
const userStore = useUserStore();
|
|
||||||
|
|
||||||
// Account status control
|
|
||||||
const accountStatus = computed(() => userStore.state);
|
|
||||||
|
|
||||||
// RBAC
|
|
||||||
const roles = computed<string[]>(() => {
|
|
||||||
return userStore.user?.roleData?.map((r: Role) => r.name) ?? [];
|
|
||||||
});
|
|
||||||
|
|
||||||
function isDev() {
|
|
||||||
return roles.value.includes('Dev');
|
|
||||||
}
|
|
||||||
|
|
||||||
function hasRole(roleName: string): boolean {
|
|
||||||
if (isDev()) return true;
|
|
||||||
return roles.value.includes(roleName);
|
|
||||||
}
|
|
||||||
|
|
||||||
function hasAnyRole(roleNames: string[]): boolean {
|
|
||||||
if (isDev()) return true;
|
|
||||||
return roles.value.some(name => roleNames.includes(name))
|
|
||||||
}
|
|
||||||
|
|
||||||
function hasAllRoles(roleNames: string[]): boolean {
|
|
||||||
if (isDev()) return true;
|
|
||||||
return roles.value.every(name => roleNames.includes(name))
|
|
||||||
}
|
|
||||||
|
|
||||||
return { hasRole, hasAnyRole, hasAllRoles, accountStatus }
|
|
||||||
}
|
|
||||||
@@ -9,18 +9,14 @@ import FormCheckbox from './components/form/FormCheckbox.vue'
|
|||||||
import FormInput from './components/form/FormInput.vue'
|
import FormInput from './components/form/FormInput.vue'
|
||||||
|
|
||||||
import * as Sentry from "@sentry/vue";
|
import * as Sentry from "@sentry/vue";
|
||||||
|
import { initMatomo } from "@certible/use-matomo"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const app = createApp(App)
|
const app = createApp(App)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
app.use(createPinia())
|
app.use(createPinia())
|
||||||
app.use(router)
|
app.use(router)
|
||||||
|
|
||||||
if (!import.meta.env.VITE_DISABLE_GLITCHTIP) {
|
if (!!import.meta.env.VITE_DISABLE_GLITCHTIP) {
|
||||||
let dsn = import.meta.env.VITE_GLITCHTIP_DSN;
|
let dsn = import.meta.env.VITE_GLITCHTIP_DSN;
|
||||||
let environment = import.meta.env.VITE_ENVIRONMENT;
|
let environment = import.meta.env.VITE_ENVIRONMENT;
|
||||||
|
|
||||||
@@ -36,7 +32,18 @@ if (!import.meta.env.VITE_DISABLE_GLITCHTIP) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!!import.meta.env.VITE_DISABLE_MATOMO) {
|
||||||
|
console.log("Matomo init")
|
||||||
|
app.use(initMatomo({
|
||||||
|
host: 'https://stats.nexuszone.net/',
|
||||||
|
siteId: 4,
|
||||||
|
trackRouter: true,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
app.component("FormInput", FormInput)
|
app.component("FormInput", FormInput)
|
||||||
app.component("FormCheckbox", FormCheckbox)
|
app.component("FormCheckbox", FormCheckbox)
|
||||||
|
|
||||||
app.mount('#app')
|
app.mount('#app')
|
||||||
|
|
||||||
|
// window._paq.push(['trackPageView']);
|
||||||
@@ -17,15 +17,19 @@ const decisionDate = ref<Date | null>(null);
|
|||||||
const submitDate = ref<Date | null>(null);
|
const submitDate = ref<Date | null>(null);
|
||||||
const loading = ref<boolean>(true);
|
const loading = ref<boolean>(true);
|
||||||
const member_name = ref<string>();
|
const member_name = ref<string>();
|
||||||
|
onMounted(async () => {
|
||||||
const props = defineProps<{
|
try {
|
||||||
mode?: "create" | "view-self" | "view-recruiter"
|
//get app ID from URL param
|
||||||
}>()
|
const router = useRoute();
|
||||||
|
const appIDRaw = router.params.id;
|
||||||
const finalMode = ref<"create" | "view-self" | "view-recruiter">("create");
|
if (appIDRaw === undefined) {
|
||||||
|
//new app
|
||||||
async function loadByID(id: number | string) {
|
appData.value = null
|
||||||
const raw = await loadApplication(id);
|
readOnly.value = false;
|
||||||
|
newApp.value = true;
|
||||||
|
} else {
|
||||||
|
//load app
|
||||||
|
const raw = await loadApplication(appIDRaw.toString());
|
||||||
|
|
||||||
const data = raw.application;
|
const data = raw.application;
|
||||||
|
|
||||||
@@ -39,73 +43,22 @@ async function loadByID(id: number | string) {
|
|||||||
newApp.value = false;
|
newApp.value = false;
|
||||||
readOnly.value = true;
|
readOnly.value = true;
|
||||||
}
|
}
|
||||||
|
} catch (e) {
|
||||||
const router = useRoute();
|
console.error(e);
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
|
|
||||||
//recruiter mode
|
|
||||||
if (props.mode === 'view-recruiter') {
|
|
||||||
finalMode.value = 'view-recruiter';
|
|
||||||
await loadByID(Number(router.params.id));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//viewer mode
|
|
||||||
if (props.mode === 'view-self') {
|
|
||||||
finalMode.value = 'view-self';
|
|
||||||
await loadByID('me');
|
|
||||||
}
|
|
||||||
|
|
||||||
//creator mode
|
|
||||||
if (props.mode === 'create') {
|
|
||||||
finalMode.value = 'create';
|
|
||||||
appData.value = null
|
|
||||||
readOnly.value = false;
|
|
||||||
newApp.value = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
|
|
||||||
// try {
|
|
||||||
// //get app ID from URL param
|
|
||||||
// if (appIDRaw === undefined) {
|
|
||||||
// //new app
|
|
||||||
// appData.value = null
|
|
||||||
// readOnly.value = false;
|
|
||||||
// newApp.value = true;
|
|
||||||
// } else {
|
|
||||||
// //load app
|
|
||||||
// const raw = await loadApplication(appIDRaw.toString());
|
|
||||||
|
|
||||||
// const data = raw.application;
|
|
||||||
|
|
||||||
// appID.value = data.id;
|
|
||||||
// appData.value = data.app_data;
|
|
||||||
// chatData.value = raw.comments;
|
|
||||||
// status.value = data.app_status;
|
|
||||||
// decisionDate.value = new Date(data.decision_at);
|
|
||||||
// submitDate.value = data.submitted_at ? new Date(data.submitted_at) : null;
|
|
||||||
// member_name.value = data.member_name;
|
|
||||||
// newApp.value = false;
|
|
||||||
// readOnly.value = true;
|
|
||||||
// }
|
|
||||||
// } catch (e) {
|
|
||||||
// console.error(e);
|
|
||||||
// }
|
|
||||||
})
|
})
|
||||||
|
|
||||||
async function postComment(comment) {
|
async function postComment(comment) {
|
||||||
chatData.value.push(await postChatMessage(comment, appID.value));
|
chatData.value.push(await postChatMessage(comment, appID.value));
|
||||||
}
|
}
|
||||||
|
|
||||||
const emit = defineEmits(['submit']);
|
|
||||||
|
|
||||||
async function postApp(appData) {
|
async function postApp(appData) {
|
||||||
|
console.log("test")
|
||||||
const res = await postApplication(appData);
|
const res = await postApplication(appData);
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
readOnly.value = true;
|
readOnly.value = true;
|
||||||
newApp.value = false;
|
newApp.value = false;
|
||||||
emit('submit');
|
|
||||||
}
|
}
|
||||||
// TODO: Handle fail to post
|
// TODO: Handle fail to post
|
||||||
}
|
}
|
||||||
@@ -121,7 +74,7 @@ async function handleDeny(id) {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div v-if="!loading" class="w-full h-20">
|
<div v-if="!loading" class="max-w-3xl mx-auto my-20">
|
||||||
<div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
|
<div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
|
||||||
<!-- Application header -->
|
<!-- Application header -->
|
||||||
<div>
|
<div>
|
||||||
@@ -149,7 +102,7 @@ async function handleDeny(id) {
|
|||||||
hour: "2-digit",
|
hour: "2-digit",
|
||||||
minute: "2-digit"
|
minute: "2-digit"
|
||||||
}) }}</p>
|
}) }}</p>
|
||||||
<div class="mt-2" v-else-if="finalMode === 'view-recruiter'">
|
<div class="mt-2" v-else>
|
||||||
<Button variant="success" class="mr-2" :onclick="() => { handleApprove(appID) }">
|
<Button variant="success" class="mr-2" :onclick="() => { handleApprove(appID) }">
|
||||||
<CheckIcon></CheckIcon>
|
<CheckIcon></CheckIcon>
|
||||||
</Button>
|
</Button>
|
||||||
@@ -170,5 +123,5 @@ async function handleDeny(id) {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- TODO: Implement some kinda loading screen -->
|
<!-- TODO: Implement some kinda loading screen -->
|
||||||
<div v-else class="flex items-center justify-center h-full">Loading</div>
|
<div v-else>Loading</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -13,8 +13,8 @@ function goToApplication() {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div v-if="user.state == 'guest'"
|
||||||
<div v-if="user.state == 'guest'" class="flex flex-col items-center justify-center">
|
class="min-h-screen flex flex-col items-center justify-center text-center bg-neutral-950 text-white px-4">
|
||||||
<h1 class="text-4xl font-bold mb-4">Welcome to the 17th</h1>
|
<h1 class="text-4xl font-bold mb-4">Welcome to the 17th</h1>
|
||||||
<p class="text-neutral-400 mb-8 max-w-md">
|
<p class="text-neutral-400 mb-8 max-w-md">
|
||||||
To join our unit, please fill out an application to continue.
|
To join our unit, please fill out an application to continue.
|
||||||
@@ -26,5 +26,4 @@ function goToApplication() {
|
|||||||
<div v-else>
|
<div v-else>
|
||||||
HOMEPAGEEEEEEEEEEEEEEEEEEE
|
HOMEPAGEEEEEEEEEEEEEEEEEEE
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,258 +1,24 @@
|
|||||||
<script setup lang="ts">
|
<template>
|
||||||
import ApplicationForm from '@/components/application/ApplicationForm.vue';
|
<div class="min-h-screen flex items-center justify-center ">
|
||||||
|
<div class="w-full max-w-2xl mx-auto p-8 text-center">
|
||||||
|
<h1 class="text-4xl sm:text-5xl font-extrabold mb-4">
|
||||||
|
welcome to the 17th
|
||||||
|
</h1>
|
||||||
|
<p class=" mb-8">
|
||||||
|
Welcome — click below to get started.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<Button class="w-44" @click="goToLogin">Get started</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
import Button from '@/components/ui/button/Button.vue';
|
import Button from '@/components/ui/button/Button.vue';
|
||||||
import {
|
|
||||||
Stepper,
|
|
||||||
StepperDescription,
|
|
||||||
StepperIndicator,
|
|
||||||
StepperItem,
|
|
||||||
StepperSeparator,
|
|
||||||
StepperTitle,
|
|
||||||
StepperTrigger,
|
|
||||||
} from '@/components/ui/stepper'
|
|
||||||
import { useUserStore } from '@/stores/user';
|
|
||||||
import { Check, Circle, Dot, Users, X } from 'lucide-vue-next'
|
|
||||||
import { computed, ref } from 'vue';
|
|
||||||
import Application from './Application.vue';
|
|
||||||
|
|
||||||
function goToLogin() {
|
function goToLogin() {
|
||||||
const redirectUrl = encodeURIComponent(window.location.origin + '/join')
|
window.location.href = 'https://aj17thdevapi.nexuszone.net/login';
|
||||||
window.location.href = `https://aj17thdevapi.nexuszone.net/login?redirect=${redirectUrl}`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let userStore = useUserStore();
|
|
||||||
|
|
||||||
const steps = computed(() => {
|
|
||||||
const isDenied = userStore.state === 'denied'
|
|
||||||
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
step: 1,
|
|
||||||
title: 'Create account',
|
|
||||||
description: 'Begin by setting up your account',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
step: 2,
|
|
||||||
title: 'Submit application',
|
|
||||||
description: 'Provide a few details about yourself',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
step: 3,
|
|
||||||
title: 'Application review',
|
|
||||||
description: 'Our team will review your submission',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
step: 4,
|
|
||||||
title: isDenied ? 'Application denied' : 'Acceptance',
|
|
||||||
description: isDenied
|
|
||||||
? 'Your application was not approved'
|
|
||||||
: 'Get started with the 17th Rangers',
|
|
||||||
},
|
|
||||||
]
|
|
||||||
})
|
|
||||||
|
|
||||||
const currentStep = computed<number>(() => {
|
|
||||||
if (!userStore.isLoggedIn)
|
|
||||||
return 1;
|
|
||||||
switch (userStore.state) {
|
|
||||||
case "guest":
|
|
||||||
return 2;
|
|
||||||
break;
|
|
||||||
case "applicant":
|
|
||||||
return 3;
|
|
||||||
break;
|
|
||||||
case "member":
|
|
||||||
return 5;
|
|
||||||
break;
|
|
||||||
case "denied":
|
|
||||||
return 5;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
const finalPanel = ref<'app' | 'message'>('message');
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="flex flex-col items-center mt-10 w-full">
|
|
||||||
|
|
||||||
<!-- Stepper Container -->
|
|
||||||
<div class="w-full flex justify-center">
|
|
||||||
<div class="w-full max-w-7xl">
|
|
||||||
<Stepper class="flex w-full items-start gap-2" v-model="currentStep">
|
|
||||||
<StepperItem v-for="step in steps" :key="step.step" v-slot="{ state }"
|
|
||||||
class="relative flex w-full flex-col items-center" :step="step.step">
|
|
||||||
<StepperSeparator v-if="step.step !== steps[steps.length - 1]?.step"
|
|
||||||
class="absolute left-[calc(50%+20px)] right-[calc(-50%+10px)] top-5 block h-0.5 rounded-full bg-muted group-data-[state=completed]:bg-primary" />
|
|
||||||
|
|
||||||
<StepperTrigger as-child>
|
|
||||||
<Button :variant="state === 'completed' || state === 'active' ? 'default' : 'outline'"
|
|
||||||
size="icon" class="z-10 rounded-full shrink-0"
|
|
||||||
:class="[state === 'active' && 'ring-2 ring-ring ring-offset-2 ring-offset-background']">
|
|
||||||
<template v-if="state === 'completed'">
|
|
||||||
<X v-if="step.step === 4 && userStore.state === 'denied'" class="size-5" />
|
|
||||||
<Check v-else class="size-5" />
|
|
||||||
</template>
|
|
||||||
<Circle v-if="state === 'active'" />
|
|
||||||
<Dot v-if="state === 'inactive'" />
|
|
||||||
</Button>
|
|
||||||
</StepperTrigger>
|
|
||||||
|
|
||||||
<div class="mt-2 flex flex-col items-center text-center">
|
|
||||||
<StepperTitle class="text-sm font-semibold transition lg:text-base"
|
|
||||||
:class="[state === 'active' && 'text-primary']">
|
|
||||||
{{ step.title }}
|
|
||||||
</StepperTitle>
|
|
||||||
|
|
||||||
<StepperDescription
|
|
||||||
class="sr-only text-xs text-muted-foreground transition md:not-sr-only lg:text-sm"
|
|
||||||
:class="[state === 'active' && 'text-primary']">
|
|
||||||
{{ step.description }}
|
|
||||||
</StepperDescription>
|
|
||||||
</div>
|
|
||||||
</StepperItem>
|
|
||||||
</Stepper>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Content -->
|
|
||||||
<div class="mt-12 mb-20 flex w-full max-w-6xl justify-center">
|
|
||||||
<div v-if="currentStep === 1" class="w-full max-w-2xl p-8">
|
|
||||||
<h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left">
|
|
||||||
Create your account
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<p class="text-left text-muted-foreground mb-6">
|
|
||||||
You'll be redirected to our secure sign-in system to set up your account
|
|
||||||
and begin your application.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<Button class="px-6 py-3" @click="goToLogin">
|
|
||||||
Continue to account creation
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
<Application v-else-if="currentStep === 2" @submit="userStore.loadUser()" :mode="'create'"></Application>
|
|
||||||
<Application v-else-if="currentStep === 3" :mode="'view-self'"></Application>
|
|
||||||
<div v-if="currentStep === 5" class="w-full p-8 pt-0">
|
|
||||||
<div class="mb-5">
|
|
||||||
<div class="flex w-min *:px-10 pt-2 border-b *:w-full *:text-center *:pb-1 *:cursor-pointer">
|
|
||||||
<label :class="finalPanel === 'message' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
|
|
||||||
@click="finalPanel = 'message'">Message
|
|
||||||
</label>
|
|
||||||
<label :class="finalPanel === 'app' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
|
|
||||||
@click="finalPanel = 'app'">Application
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-if="finalPanel === 'message'">
|
|
||||||
<!-- Accepted message -->
|
|
||||||
<div v-if="userStore.state === 'member'">
|
|
||||||
<h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left">
|
|
||||||
Welcome to the 17th Ranger Battalion
|
|
||||||
</h1>
|
|
||||||
<div class="space-y-4 text-muted-foreground text-left leading-relaxed">
|
|
||||||
<p>
|
|
||||||
Your application to the 17th Ranger Battalion has been <strong>accepted</strong>!
|
|
||||||
We’re excited to welcome you to the community.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
There are just a couple of steps to complete before joining us on the battlefield:
|
|
||||||
</p>
|
|
||||||
<!-- MODPACK SECTION -->
|
|
||||||
<h2 class="text-xl font-semibold text-foreground mt-6">1. Download the Modpack</h2>
|
|
||||||
<p>
|
|
||||||
You’ll need to download our private server modpack. This can take some time, so we
|
|
||||||
recommend
|
|
||||||
starting as soon as possible. The link below leads to our
|
|
||||||
<strong>Shadow Mod</strong>, which automatically pulls all required dependencies.
|
|
||||||
</p>
|
|
||||||
<ul class="list-disc pl-6 space-y-1">
|
|
||||||
<li>Subscribe to the Shadow Mod.</li>
|
|
||||||
<li>When prompted, choose <em>“Yes”</em> to download all associated mods.</li>
|
|
||||||
</ul>
|
|
||||||
<p>
|
|
||||||
<a href="https://www.guilded.gg/Iceberg-gaming/groups/v3j2vAP3/channels/6979335e-60f7-4ab9-9590-66df69367d1e/docs/2013948655"
|
|
||||||
class="text-primary underline" target="_blank">
|
|
||||||
Click here for the full installation guide
|
|
||||||
</a>
|
|
||||||
</p>
|
|
||||||
<!-- CONTACT SECTION -->
|
|
||||||
<h2 class="text-xl font-semibold text-foreground mt-6">2. Contact a Corporal or Higher</h2>
|
|
||||||
<p>
|
|
||||||
Once you have the modpack installed, connect on TeamSpeak or post in Discord. Anyone
|
|
||||||
with
|
|
||||||
the
|
|
||||||
rank of <strong>Corporal or above</strong> can help get you set up.
|
|
||||||
</p>
|
|
||||||
<ul class="list-none pl-0 space-y-1">
|
|
||||||
<li><strong>TeamSpeak:</strong><a href="ts3server://ts.iceberg-gaming.com"
|
|
||||||
class="text-primary underline"
|
|
||||||
target="_blank">ts3server://ts.iceberg-gaming.com</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<strong>Discord:</strong>
|
|
||||||
<a href="https://discord.gg/7hDQCEb" class="text-primary underline"
|
|
||||||
target="_blank">https://discord.gg/7hDQCEb</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
<p>
|
|
||||||
They will assist you with your initial assessments and training. Basic trainings run on
|
|
||||||
a
|
|
||||||
rotating schedule or can be requested through our Battalion Forms. Don’t hesitate to hop
|
|
||||||
in
|
|
||||||
during weeknights or Saturday operations to start playing with us!
|
|
||||||
</p>
|
|
||||||
<!-- FINAL NOTES -->
|
|
||||||
<h2 class="text-xl font-semibold text-foreground mt-6">3. Get Familiar with the Unit</h2>
|
|
||||||
<p>
|
|
||||||
Please take a moment to read through our <strong>Code of Conduct</strong>,
|
|
||||||
<strong>Ranks</strong>, and <strong>Structure</strong> pages. We also encourage you to
|
|
||||||
browse
|
|
||||||
our forums and introduce yourself.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
If you have any questions, feel free to reach out on TeamSpeak, Discord, or Guilded,
|
|
||||||
someone
|
|
||||||
will always be around to help.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- Denied message -->
|
|
||||||
<div v-else-if="userStore.state === 'denied'">
|
|
||||||
<div class="w-full max-w-2xl p-8">
|
|
||||||
<h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left text-destructive">
|
|
||||||
Application Not Approved
|
|
||||||
</h1>
|
|
||||||
<div class="space-y-4 text-muted-foreground text-left leading-relaxed">
|
|
||||||
<p>
|
|
||||||
Thank you for your interest in joining the <strong>17th Ranger Battalion</strong>.
|
|
||||||
After reviewing your application, we regret to inform you that we are not able to
|
|
||||||
approve it at this time.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
If you would like more information, you are encouraged to
|
|
||||||
<strong>reach out and inquire</strong> about the reason your application was not
|
|
||||||
approved.
|
|
||||||
We are always happy to provide clarification where possible.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
You are welcome to <strong>resubmit your application in the future</strong> should
|
|
||||||
your
|
|
||||||
circumstances change or when we may be better able to incorporate you into the unit.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
All the best,<br />
|
|
||||||
<span class="text-foreground font-medium">The 17th Ranger Battalion Recruitment
|
|
||||||
Team</span>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-if="finalPanel === 'app'">
|
|
||||||
<Application :mode="'view-self'"></Application>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|||||||
@@ -10,10 +10,9 @@ import {
|
|||||||
TableRow,
|
TableRow,
|
||||||
} from '@/components/ui/table'
|
} from '@/components/ui/table'
|
||||||
import Button from '@/components/ui/button/Button.vue';
|
import Button from '@/components/ui/button/Button.vue';
|
||||||
import { onMounted, ref, watch } from 'vue';
|
import { onMounted, ref } from 'vue';
|
||||||
import { useRoute, useRouter } from 'vue-router';
|
import { useRouter } from 'vue-router';
|
||||||
import { CheckIcon, XIcon } from 'lucide-vue-next';
|
import { CheckIcon, XIcon } from 'lucide-vue-next';
|
||||||
import Application from './Application.vue';
|
|
||||||
|
|
||||||
const appList = ref([]);
|
const appList = ref([]);
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
@@ -62,40 +61,18 @@ async function handleDeny(id) {
|
|||||||
|
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
function openApplication(id) {
|
function openApplication(id) {
|
||||||
router.push(`/administration/applications/${id}`)
|
router.push(`./application/${id}`)
|
||||||
openPanel.value = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function closeApplication() {
|
|
||||||
router.push('/administration/applications')
|
|
||||||
openPanel.value = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const route = useRoute();
|
|
||||||
|
|
||||||
watch(() => route.params.id, (newId) => {
|
|
||||||
if (newId === undefined) {
|
|
||||||
openPanel.value = false;
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
const openPanel = ref(false);
|
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
appList.value = await getAllApplications();
|
appList.value = await getAllApplications();
|
||||||
|
|
||||||
//preload application
|
|
||||||
if (route.params.id != undefined) {
|
|
||||||
openApplication(route.params.id)
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div class="px-20 mx-auto max-w-[100rem] w-full flex mt-5 h-52 min-h-0 overflow-hidden">
|
<div class="mx-auto max-w-5xl">
|
||||||
<!-- application list -->
|
<h1 class="my-4">Manage Applications</h1>
|
||||||
<div :class="openPanel == false ? 'w-full' : 'w-2/5'" class="pr-9">
|
|
||||||
<h1 class="scroll-m-20 text-2xl font-semibold tracking-tight">Manage Applications</h1>
|
|
||||||
<Table>
|
<Table>
|
||||||
|
<!-- <TableCaption>A list of your recent invoices.</TableCaption> -->
|
||||||
<TableHeader>
|
<TableHeader>
|
||||||
<TableRow>
|
<TableRow>
|
||||||
<TableHead>User</TableHead>
|
<TableHead>User</TableHead>
|
||||||
@@ -103,15 +80,14 @@ onMounted(async () => {
|
|||||||
<TableHead class="text-right">Status</TableHead>
|
<TableHead class="text-right">Status</TableHead>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
</TableHeader>
|
</TableHeader>
|
||||||
<TableBody class="overflow-y-auto scrollbar-themed">
|
<TableBody>
|
||||||
<TableRow v-for="app in appList" :key="app.id" class="cursor-pointer"
|
<TableRow v-for="app in appList" :key="app.id" class="cursor-pointer"
|
||||||
:onClick="() => { openApplication(app.id) }">
|
:onClick="() => { openApplication(app.id) }">
|
||||||
<TableCell class="font-medium">{{ app.member_name }}</TableCell>
|
<TableCell class="font-medium">{{ app.member_name }}</TableCell>
|
||||||
<TableCell :title="formatExact(app.submitted_at)">
|
<TableCell :title="formatExact(app.submitted_at)">
|
||||||
{{ formatAgo(app.submitted_at) }}
|
{{ formatAgo(app.submitted_at) }}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell v-if="app.app_status === ApplicationStatus.Pending"
|
<TableCell v-if="app.app_status === ApplicationStatus.Pending" class="inline-flex items-end gap-2">
|
||||||
class="inline-flex items-end gap-2">
|
|
||||||
<Button variant="success" @click.stop="() => { handleApprove(app.id) }">
|
<Button variant="success" @click.stop="() => { handleApprove(app.id) }">
|
||||||
<CheckIcon></CheckIcon>
|
<CheckIcon></CheckIcon>
|
||||||
</Button>
|
</Button>
|
||||||
@@ -129,46 +105,4 @@ onMounted(async () => {
|
|||||||
</TableBody>
|
</TableBody>
|
||||||
</Table>
|
</Table>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="openPanel" class="pl-9 border-l w-3/5" :key="$route.params.id">
|
|
||||||
<div class="mb-5 flex justify-between">
|
|
||||||
<p class="scroll-m-20 text-2xl font-semibold tracking-tight"> Application</p>
|
|
||||||
<button @click="closeApplication()" class="cursor-pointer">
|
|
||||||
<XIcon></XIcon>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div class="overflow-y-auto max-h-[80vh] h-full mt-5 scrollbar-themed">
|
|
||||||
<Application :mode="'view-recruiter'"></Application>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
/* Firefox */
|
|
||||||
.scrollbar-themed {
|
|
||||||
scrollbar-width: thin;
|
|
||||||
scrollbar-color: #555 #1f1f1f;
|
|
||||||
padding-right: 6px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Chrome, Edge, Safari */
|
|
||||||
.scrollbar-themed::-webkit-scrollbar {
|
|
||||||
width: 10px;
|
|
||||||
/* slightly wider to allow padding look */
|
|
||||||
}
|
|
||||||
|
|
||||||
.scrollbar-themed::-webkit-scrollbar-track {
|
|
||||||
background: #1f1f1f;
|
|
||||||
margin-left: 6px;
|
|
||||||
/* ❗ adds space between content + scrollbar */
|
|
||||||
}
|
|
||||||
|
|
||||||
.scrollbar-themed::-webkit-scrollbar-thumb {
|
|
||||||
background: #555;
|
|
||||||
border-radius: 9999px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.scrollbar-themed::-webkit-scrollbar-thumb:hover {
|
|
||||||
background: #777;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -68,7 +68,7 @@ onMounted(async () => {
|
|||||||
</DialogContent>
|
</DialogContent>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
|
|
||||||
<div class="max-w-5xl w-full mx-auto">
|
<div class="max-w-5xl mx-auto">
|
||||||
Active
|
Active
|
||||||
<div>
|
<div>
|
||||||
<Card>
|
<Card>
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ onMounted(async () => {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="px-20 mx-auto max-w-[100rem] w-full flex mt-5">
|
<div class="px-20 mx-auto max-w-[100rem] flex mt-5">
|
||||||
<!-- training report list -->
|
<!-- training report list -->
|
||||||
<div class="px-4 my-3" :class="sidePanel == sidePanelState.closed ? 'w-full' : 'w-2/5'">
|
<div class="px-4 my-3" :class="sidePanel == sidePanelState.closed ? 'w-full' : 'w-2/5'">
|
||||||
<div class="flex justify-between mb-4">
|
<div class="flex justify-between mb-4">
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="flex flex-col items-center justify-center text-center px-6">
|
<div class="min-h-screen flex flex-col items-center justify-center text-center px-6">
|
||||||
<h1 class="text-5xl font-bold mb-4">Unauthorized</h1>
|
<h1 class="text-5xl font-bold mb-4">Unauthorized</h1>
|
||||||
<p class="text-lg text-muted-foreground max-w-md mb-6">
|
<p class="text-lg text-muted-foreground max-w-md mb-6">
|
||||||
You don't have permission to access this page.
|
You don't have permission to access this page.
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ const router = createRouter({
|
|||||||
|
|
||||||
// AUTH REQUIRED
|
// AUTH REQUIRED
|
||||||
{ path: '/apply', component: () => import('@/pages/Application.vue'), meta: { requiresAuth: true } },
|
{ path: '/apply', component: () => import('@/pages/Application.vue'), meta: { requiresAuth: true } },
|
||||||
{ path: '/', component: () => import('@/pages/Homepage.vue') },
|
{ path: '/', component: () => import('@/pages/Homepage.vue'), meta: { requiresAuth: true } },
|
||||||
|
|
||||||
// MEMBER ROUTES
|
// MEMBER ROUTES
|
||||||
{ path: '/members', component: () => import('@/pages/memberList.vue'), meta: { requiresAuth: true, memberOnly: true } },
|
{ path: '/members', component: () => import('@/pages/memberList.vue'), meta: { requiresAuth: true, memberOnly: true } },
|
||||||
@@ -29,7 +29,7 @@ const router = createRouter({
|
|||||||
meta: { requiresAuth: true, memberOnly: true, roles: ['staff', 'admin'] },
|
meta: { requiresAuth: true, memberOnly: true, roles: ['staff', 'admin'] },
|
||||||
children: [
|
children: [
|
||||||
{ path: 'applications', component: () => import('@/pages/ManageApplications.vue') },
|
{ path: 'applications', component: () => import('@/pages/ManageApplications.vue') },
|
||||||
{ path: 'applications/:id', component: () => import('@/pages/ManageApplications.vue') },
|
{ path: 'application/:id', component: () => import('@/pages/Application.vue') },
|
||||||
{ path: 'rankChange', component: () => import('@/pages/RankChange.vue') },
|
{ path: 'rankChange', component: () => import('@/pages/RankChange.vue') },
|
||||||
{ path: 'applications/:id', component: () => import('@/pages/Application.vue') },
|
{ path: 'applications/:id', component: () => import('@/pages/Application.vue') },
|
||||||
{ path: 'transfer', component: () => import('@/pages/ManageTransfers.vue') },
|
{ path: 'transfer', component: () => import('@/pages/ManageTransfers.vue') },
|
||||||
@@ -63,15 +63,15 @@ router.beforeEach(async (to) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Must be a member
|
// // Must be a member
|
||||||
if (to.meta.memberOnly && user.state !== 'member') {
|
// if (to.meta.memberOnly && user.state !== 'member') {
|
||||||
return '/unauthorized'
|
// return '/unauthorized'
|
||||||
}
|
// }
|
||||||
|
|
||||||
// Must have specific role
|
// // Must have specific role
|
||||||
if (to.meta.roles && !user.hasRole('Dev') && !user.hasAnyRole(to.meta.roles)) {
|
// if (to.meta.roles && !user.hasRole('Dev') && !user.hasAnyRole(to.meta.roles)) {
|
||||||
return '/unauthorized'
|
// return '/unauthorized'
|
||||||
}
|
// }
|
||||||
})
|
})
|
||||||
|
|
||||||
export default router;
|
export default router;
|
||||||
@@ -5,7 +5,7 @@ export const useUserStore = defineStore('user', () => {
|
|||||||
const user = ref(null)
|
const user = ref(null)
|
||||||
const roles = computed(() => new Set(user.value?.roleData?.map(r => r.name) ?? []));
|
const roles = computed(() => new Set(user.value?.roleData?.map(r => r.name) ?? []));
|
||||||
const loaded = ref(false);
|
const loaded = ref(false);
|
||||||
const state = computed<string | undefined>(() => user.value?.state || undefined);
|
const state = computed(() => user.value.state);
|
||||||
const isLoggedIn = computed(() => user.value !== null)
|
const isLoggedIn = computed(() => user.value !== null)
|
||||||
|
|
||||||
async function loadUser() {
|
async function loadUser() {
|
||||||
@@ -16,7 +16,6 @@ export const useUserStore = defineStore('user', () => {
|
|||||||
|
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
const data = await res.json();
|
const data = await res.json();
|
||||||
console.log(data);
|
|
||||||
user.value = data;
|
user.value = data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user