Skip to content

Commit

Permalink
Merge pull request #81 from UoaWDCC/Feat/CMS
Browse files Browse the repository at this point in the history
Feat/cms
  • Loading branch information
GBHU753 authored Aug 6, 2024
2 parents 9f7770d + f44b65d commit 3d9ae9c
Show file tree
Hide file tree
Showing 187 changed files with 63 additions and 12 deletions.
16 changes: 10 additions & 6 deletions .devcontainer/full/devcontainer.json
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"name": "ASPA Dev Container (Full)",
"dockerFile": "../dockerfile/Dockerfile",
"dockerComposeFile": [
"../../docker/docker-compose.microservice.yml",
"../../docker/docker-compose.workspace.yml"
],
"service": "app",
"customizations": {
"vscode": {
"settings": {
Expand All @@ -10,15 +14,15 @@
"GitHub.copilot-chat",
"GitHub.copilot",
"ms-vscode.vscode-typescript-next",
"material-theme-icons",
"material-theme-icons"
]
}
},
"workspaceMount": "source=${localWorkspaceFolder},target=/repo,type=bind,consistency=cached",
"workspaceFolder": "/repo",
"postCreateCommand": "yarn install && cd backend && docker compose up --build -d",
"postStartCommand": "cd backend && docker compose up -d",
"postCreateCommand": "yarn install",
"postStartCommand": "",
"mounts": [
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
"source=${localWorkspaceFolder},target=/repo,type=bind,consistency=cached"
]
}
18 changes: 14 additions & 4 deletions .devcontainer/minimal/devcontainer.json
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"name": "ASPA Dev Container (Minimal)",
"dockerFile": "../dockerfile/Dockerfile",
"dockerComposeFile": [
"../../docker/docker-compose.microservice.yml",
"../../docker/docker-compose.workspace.yml"
],
"service": "app",
"customizations": {
"vscode": {
"settings": {
Expand All @@ -9,10 +13,16 @@
"extensions": [
"GitHub.copilot-chat",
"GitHub.copilot",
"ms-vscode.vscode-typescript-next"
"ms-vscode.vscode-typescript-next",
"material-theme-icons"
]
}
},
"workspaceMount": "source=${localWorkspaceFolder},target=/repo,type=bind,consistency=cached",
"workspaceFolder": "/repo"
"workspaceFolder": "/repo",
// "postCreateCommand": "yarn install && cd docker && docker compose up --build -d",
// "postStartCommand": "cd docker && docker compose up -d",
"mounts": [
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
"source=${localWorkspaceFolder},target=/repo,type=bind,consistency=cached"
]
}
Empty file modified .github/ISSUE_TEMPLATE/issue_template.md
100644 → 100755
Empty file.
Empty file modified .github/pull_request_template.md
100644 → 100755
Empty file.
Empty file modified .github/workflows/deploy.production.yml
100644 → 100755
Empty file.
Empty file modified .github/workflows/deploy.staging.yml
100644 → 100755
Empty file.
Empty file modified .github/workflows/generate-api-client.yml
100644 → 100755
Empty file.
Empty file modified .github/workflows/notification.yml
100644 → 100755
Empty file.
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified README.MD
100644 → 100755
Empty file.
Empty file modified backend/.env
100644 → 100755
Empty file.
Empty file modified backend/.gitignore
100644 → 100755
Empty file.
Empty file modified backend/README.md
100644 → 100755
Empty file.
Empty file modified backend/api/api-doc.yml
100644 → 100755
Empty file.
Empty file modified backend/api/paths/events.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/events/past.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/events/upcoming.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/events/{eventId}.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/events/{eventId}/allTickets.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/events/{eventId}/members.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/events/{eventId}/paidTickets.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/events/{eventId}/totalTicketNumber.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/events/{eventId}/unpaidTickets.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/users.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/users/allNames.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/users/totalNumber.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/users/{id}.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/users/{id}/allEvents.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/users/{id}/allTickets.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/users/{id}/paidTickets.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/users/{id}/pastEvents.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/users/{id}/unpaidTickets.js
100644 → 100755
Empty file.
Empty file modified backend/api/paths/users/{id}/upcomingEvents.js
100644 → 100755
Empty file.
Empty file modified backend/api/services/eventsService.js
100644 → 100755
Empty file.
Empty file modified backend/api/services/usersService.js
100644 → 100755
Empty file.
Empty file modified backend/app.js
100644 → 100755
Empty file.
Empty file modified backend/docs/EventRoutes.md
100644 → 100755
Empty file.
Empty file modified backend/docs/ExecRoutes.md
100644 → 100755
Empty file.
Empty file modified backend/docs/TicketRoutes.md
100644 → 100755
Empty file.
Empty file modified backend/docs/UserRoutes.md
100644 → 100755
Empty file.
Empty file modified backend/fly.production.toml
100644 → 100755
Empty file.
Empty file modified backend/fly.staging.toml
100644 → 100755
Empty file.
Empty file modified backend/package.json
100644 → 100755
Empty file.
Empty file modified backend/prisma/migrations/20240803091427_/migration.sql
100644 → 100755
Empty file.
Empty file modified backend/prisma/migrations/migration_lock.toml
100644 → 100755
Empty file.
Empty file modified backend/prisma/schema.prisma
100644 → 100755
Empty file.
Empty file modified backend/scripts/javascript/api-json-gen.cjs
100644 → 100755
Empty file.
Empty file modified backend/tests/dummy-data/dummyEvents.json
100644 → 100755
Empty file.
Empty file modified backend/tests/dummy-data/dummyExecs.json
100644 → 100755
Empty file.
Empty file modified backend/tests/dummy-data/dummyTickets.json
100644 → 100755
Empty file.
Empty file modified backend/tests/dummy-data/dummyUsers.json
100644 → 100755
Empty file.
Empty file modified backend/tests/helper-scripts/prismaClear.js
100644 → 100755
Empty file.
Empty file modified backend/tests/helper-scripts/prismaPopulate.js
100644 → 100755
Empty file.
Empty file modified backend/tests/http-requests/users.rest
100644 → 100755
Empty file.
Empty file modified backend/yarn.lock
100644 → 100755
Empty file.
Binary file added docker/database/data.db
Binary file not shown.
27 changes: 25 additions & 2 deletions backend/docker-compose.yml → docker/docker-compose.microservice.yml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Use postgres/example user/password credentials
version: '3.9'

services:

db:
container_name: aspa-db
image: postgres
Expand Down Expand Up @@ -32,6 +30,31 @@ services:
restart: always
ports:
- 8080:8080

directus:
image: directus/directus:10.13.1
ports:
- 8055:8055
volumes:
- ./database:/directus/database
- ./uploads:/directus/uploads
- ./extensions:/directus/extensions
environment:
SECRET: "replace-with-secure-random-value"
ADMIN_EMAIL: "[email protected]"
ADMIN_PASSWORD: "d1r3ctu5"
WEBSOCKETS_ENABLED: "true"
DB_CLIENT: "sqlite3"
DB_FILENAME: "/directus/database/data.db"
# For external database
# DB_CLIENT: "pg"
# DB_HOST: "host.docker.internal"
# DB_PORT: "5432"
# DB_DATABASE: "main"
# DB_USER: "aspa"
# DB_PASSWORD: "pool"





14 changes: 14 additions & 0 deletions docker/docker-compose.workspace.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: aspa-dev-container
services:
app:
container_name: aspa-app
build:
context: .
dockerfile: ./dockerfile/Dockerfile
ports:
- "3307:3307"
volumes:
- .:/repo
environment:
- NODE_ENV=development
command: sh -c "while sleep 1000; do :; done"
File renamed without changes.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Empty file modified frontend/.eslintrc.json
100644 → 100755
Empty file.
Empty file modified frontend/.gitignore
100644 → 100755
Empty file.
Empty file modified frontend/Dockerfile.production
100644 → 100755
Empty file.
Empty file modified frontend/Dockerfile.staging
100644 → 100755
Empty file.
Empty file modified frontend/README.md
100644 → 100755
Empty file.
Empty file modified frontend/fly.production.toml
100644 → 100755
Empty file.
Empty file modified frontend/fly.staging.toml
100644 → 100755
Empty file.
Empty file modified frontend/next.config.mjs
100644 → 100755
Empty file.
Empty file modified frontend/package-lock.json
100644 → 100755
Empty file.
Empty file modified frontend/package.json
100644 → 100755
Empty file.
Empty file modified frontend/postcss.config.mjs
100644 → 100755
Empty file.
Empty file modified frontend/public/672pool8ball_100439.ico
100644 → 100755
Empty file.
Empty file modified frontend/public/ASPA Title.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified frontend/public/ASPA Title.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified frontend/public/ContactsHeroBanner.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified frontend/public/Event Photo.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified frontend/public/EventsHeroBanner.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified frontend/public/discord.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified frontend/public/discord.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified frontend/public/facebook.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified frontend/public/instagram.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified frontend/public/linkedin.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified frontend/public/next.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified frontend/public/vercel.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified frontend/src/api-client/.gitignore
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/.npmignore
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/.openapi-generator-ignore
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/.openapi-generator/FILES
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/.openapi-generator/VERSION
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/api.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/api/default-api.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/api/users-api.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/base.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/common.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/configuration.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/git_push.sh
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/index.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/models/create-event-request.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/models/create-user401-response.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/models/event.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/models/exec.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/models/get-user-by-id404-response.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/models/index.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/models/ticket.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/models/update-user-by-id-request.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/models/update-user-by-id400-response.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/models/update-user-by-id401-response.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/api-client/models/user.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/app/contact/page.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/app/events-admin/events-dashboard/page.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/app/events-admin/page.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/app/events/event-info/event-registration/page.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/app/events/event-info/page.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/app/events/page.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/app/favicon.ico
100644 → 100755
Empty file.
Empty file modified frontend/src/app/globals.css
100644 → 100755
Empty file.
Empty file modified frontend/src/app/home/detail-form/page.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/app/home/login/page.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/app/home/page.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/app/layout.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/app/page.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/app/profile-page/page.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/EventCard.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/EventCard.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/Footer.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/Footer.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/Header.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/Modal.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/Modal.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/NavBar.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/Navbar.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/PastEvents.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/PastEvents.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/TestButton.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/TestButton.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/contact/ContactForm.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/contact/ExecCard.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/contact/ExecCard.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/contact/TeamList.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/contact/TeamList.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/contact/contacts.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/EventInfo.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/EventInfo.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/RegisterEventForm.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/Registereventform.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/UpcomingEventCard.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/UpcomingEventCard.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/UpcomingEvents.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/UpcomingEvents.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/admin/EditRows.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/admin/EditRows.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/admin/EventPage.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/admin/EventPage.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/admin/Pagination.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/admin/Pagination.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/admin/ReadOnlyRow.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/admin/ReadOnlyRow.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/admin/mock-data.json
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/events/admin/usePagination.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/fonts.ts
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/home/Description.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/home/Description.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/home/RegisterAccountForm.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/home/Registeraccountform.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/profile-page/NavLinks.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/profile-page/ParticipatedEvents.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/profile-page/ParticipatedEvents.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/profile-page/ProfileCard.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/profile-page/ProfileCard.tsx
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/profile-page/UpcomingEvents.module.css
100644 → 100755
Empty file.
Empty file modified frontend/src/ui/profile-page/UpcomingEvents.tsx
100644 → 100755
Empty file.
Empty file modified frontend/tailwind.config.ts
100644 → 100755
Empty file.
Empty file modified frontend/tsconfig.json
100644 → 100755
Empty file.
Empty file modified frontend/yarn.lock
100644 → 100755
Empty file.
Empty file modified openapitools.json
100644 → 100755
Empty file.
Empty file modified package.json
100644 → 100755
Empty file.
Empty file modified yarn.lock
100644 → 100755
Empty file.

0 comments on commit 3d9ae9c

Please sign in to comment.